HIVE-10582 : variable typo in HiveOpConverter (714) and SemanticAnalyzer (7496) (Alexander Pivovarov via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b09fcfb5 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b09fcfb5 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b09fcfb5 Branch: refs/heads/parquet Commit: b09fcfb558c6cdb451a76924ea2c14f64282c61b Parents: fbdd7da Author: Alexander Pivovarov <([email protected])> Authored: Wed May 6 17:51:00 2015 -0700 Committer: Ashutosh Chauhan <[email protected]> Committed: Wed May 13 11:59:01 2015 -0700 ---------------------------------------------------------------------- .../hive/ql/optimizer/calcite/translator/HiveOpConverter.java | 4 +--- .../java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/b09fcfb5/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java index b8ae604..efc2542 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverter.java @@ -27,14 +27,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.calcite.rel.RelCollation; import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.RelDistribution; import org.apache.calcite.rel.RelDistribution.Type; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.SemiJoin; -import org.apache.calcite.rel.core.SortExchange; import org.apache.calcite.rel.rules.MultiJoin; import org.apache.calcite.rex.RexInputRef; import org.apache.calcite.rex.RexLiteral; @@ -711,7 +709,7 @@ public class HiveOpConverter { continue; } int vindex = exprBack == null ? -1 : ExprNodeDescUtils.indexOf(exprBack, reduceValuesBack); - if (kindex >= 0) { + if (vindex >= 0) { index[i] = -vindex - 1; continue; } http://git-wip-us.apache.org/repos/asf/hive/blob/b09fcfb5/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 2993539..30c87ad 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -7496,7 +7496,7 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer { continue; } int vindex = exprBack == null ? -1 : ExprNodeDescUtils.indexOf(exprBack, reduceValuesBack); - if (kindex >= 0) { + if (vindex >= 0) { index[i] = -vindex - 1; continue; }
