hive git commit: HIVE-15680: Incorrect results when hive.optimize.index.filter=true and same ORC table is referenced twice in query (Anthony Hsu, Prasanth Jayachandran reviewed by Thejas Nair)
Repository: hive Updated Branches: refs/heads/branch-2 95a66afb4 -> 455b2cc5b HIVE-15680: Incorrect results when hive.optimize.index.filter=true and same ORC table is referenced twice in query (Anthony Hsu, Prasanth Jayachandran reviewed by Thejas Nair) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/455b2cc5 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/455b2cc5 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/455b2cc5 Branch: refs/heads/branch-2 Commit: 455b2cc5b4d22cf39659a2f0d9bd88175165e379 Parents: 95a66af Author: Prasanth JayachandranAuthored: Fri Jan 26 16:07:19 2018 -0800 Committer: Prasanth Jayachandran Committed: Fri Jan 26 16:07:19 2018 -0800 -- .../apache/hadoop/hive/ql/exec/FetchTask.java | 2 +- .../hadoop/hive/ql/exec/SMBMapJoinOperator.java | 2 +- .../hadoop/hive/ql/exec/mr/MapredLocalTask.java | 2 +- .../hadoop/hive/ql/io/HiveInputFormat.java | 16 -- .../orc_ppd_same_table_multiple_aliases.q | 17 ++ .../orc_ppd_same_table_multiple_aliases.q.out | 60 6 files changed, 92 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hive/blob/455b2cc5/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java index e708d58..eb969bc 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java @@ -78,7 +78,7 @@ public class FetchTask extends Task implements Serializable { ColumnProjectionUtils.appendReadColumns( job, ts.getNeededColumnIDs(), ts.getNeededColumns(), ts.getNeededNestedColumnPaths()); // push down filters -HiveInputFormat.pushFilters(job, ts); +HiveInputFormat.pushFilters(job, ts, null); AcidUtils.setTransactionalTableScan(job, ts.getConf().isAcidTable()); AcidUtils.setAcidOperationalProperties(job, ts.getConf().getAcidOperationalProperties()); http://git-wip-us.apache.org/repos/asf/hive/blob/455b2cc5/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java index 7c1e344..8d82e32 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java @@ -207,7 +207,7 @@ public class SMBMapJoinOperator extends AbstractMapJoinOperator imp ColumnProjectionUtils.appendReadColumns( jobClone, ts.getNeededColumnIDs(), ts.getNeededColumns(), ts.getNeededNestedColumnPaths()); // push down filters - HiveInputFormat.pushFilters(jobClone, ts); + HiveInputFormat.pushFilters(jobClone, ts, null); AcidUtils.setTransactionalTableScan(jobClone, ts.getConf().isAcidTable()); AcidUtils.setAcidOperationalProperties(jobClone, ts.getConf().getAcidOperationalProperties()); http://git-wip-us.apache.org/repos/asf/hive/blob/455b2cc5/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java index 591ea97..934a6fc 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java @@ -477,7 +477,7 @@ public class MapredLocalTask extends Task implements Serializab ColumnProjectionUtils.appendReadColumns( jobClone, ts.getNeededColumnIDs(), ts.getNeededColumns(), ts.getNeededNestedColumnPaths()); // push down filters - HiveInputFormat.pushFilters(jobClone, ts); + HiveInputFormat.pushFilters(jobClone, ts, null); AcidUtils.setTransactionalTableScan(jobClone, ts.getConf().isAcidTable()); AcidUtils.setAcidOperationalProperties(jobClone, ts.getConf().getAcidOperationalProperties()); http://git-wip-us.apache.org/repos/asf/hive/blob/455b2cc5/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java index 010b88c..571223c 100755 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java +++
hive git commit: HIVE-15680: Incorrect results when hive.optimize.index.filter=true and same ORC table is referenced twice in query (Anthony Hsu, Prasanth Jayachandran reviewed by Thejas Nair)
Repository: hive Updated Branches: refs/heads/master ad1552745 -> df5c56bd6 HIVE-15680: Incorrect results when hive.optimize.index.filter=true and same ORC table is referenced twice in query (Anthony Hsu, Prasanth Jayachandran reviewed by Thejas Nair) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/df5c56bd Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/df5c56bd Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/df5c56bd Branch: refs/heads/master Commit: df5c56bd66c64200f675ce61058a0813f6b1f66f Parents: ad15527 Author: Prasanth JayachandranAuthored: Fri Jan 26 15:58:07 2018 -0800 Committer: Prasanth Jayachandran Committed: Fri Jan 26 15:58:07 2018 -0800 -- .../apache/hadoop/hive/ql/exec/FetchTask.java | 2 +- .../hadoop/hive/ql/exec/SMBMapJoinOperator.java | 2 +- .../hadoop/hive/ql/exec/mr/MapredLocalTask.java | 2 +- .../hadoop/hive/ql/io/HiveInputFormat.java | 16 +++-- .../orc_ppd_same_table_multiple_aliases.q | 17 ++ .../orc_ppd_same_table_multiple_aliases.q.out | 64 6 files changed, 96 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hive/blob/df5c56bd/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java index 39c1a42..a7dace9 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchTask.java @@ -77,7 +77,7 @@ public class FetchTask extends Task implements Serializable { ColumnProjectionUtils.appendReadColumns( job, ts.getNeededColumnIDs(), ts.getNeededColumns(), ts.getNeededNestedColumnPaths()); // push down filters -HiveInputFormat.pushFilters(job, ts); +HiveInputFormat.pushFilters(job, ts, null); AcidUtils.setAcidTableScan(job, ts.getConf().isAcidTable()); AcidUtils.setAcidOperationalProperties(job, ts.getConf().getAcidOperationalProperties()); http://git-wip-us.apache.org/repos/asf/hive/blob/df5c56bd/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java index 5a7c23d..270b576 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java @@ -207,7 +207,7 @@ public class SMBMapJoinOperator extends AbstractMapJoinOperator imp ColumnProjectionUtils.appendReadColumns( jobClone, ts.getNeededColumnIDs(), ts.getNeededColumns(), ts.getNeededNestedColumnPaths()); // push down filters - HiveInputFormat.pushFilters(jobClone, ts); + HiveInputFormat.pushFilters(jobClone, ts, null); AcidUtils.setAcidTableScan(jobClone, ts.getConf().isAcidTable()); AcidUtils.setAcidOperationalProperties(jobClone, ts.getConf().getAcidOperationalProperties()); http://git-wip-us.apache.org/repos/asf/hive/blob/df5c56bd/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java index 5ac3d58..abd42ec 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java @@ -483,7 +483,7 @@ public class MapredLocalTask extends Task implements Serializab ColumnProjectionUtils.appendReadColumns( jobClone, ts.getNeededColumnIDs(), ts.getNeededColumns(), ts.getNeededNestedColumnPaths()); // push down filters - HiveInputFormat.pushFilters(jobClone, ts); + HiveInputFormat.pushFilters(jobClone, ts, null); AcidUtils.setAcidTableScan(jobClone, ts.getConf().isAcidTable()); AcidUtils.setAcidOperationalProperties(jobClone, ts.getConf().getAcidOperationalProperties()); http://git-wip-us.apache.org/repos/asf/hive/blob/df5c56bd/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java -- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java b/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java index 7d3ff36..c3b846c 100755 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/HiveInputFormat.java +++