You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2015/04/28 19:18:47 UTC

hive git commit: HIVE-10512 : CBO (Calcite Return Path): SMBJoin conversion throws ClassCastException (Jesus Camacho Rodriguez via Ashutosh Chauhan)

Repository: hive
Updated Branches:
  refs/heads/master 5ec65ee28 -> 9b2042921


HIVE-10512 : CBO (Calcite Return Path): SMBJoin conversion throws ClassCastException (Jesus Camacho Rodriguez via Ashutosh Chauhan)

Signed-off-by: Ashutosh Chauhan <ha...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9b204292
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9b204292
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9b204292

Branch: refs/heads/master
Commit: 9b20429216169b57834c05f50468a918880d684a
Parents: 5ec65ee
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Tue Apr 28 02:29:00 2015 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Tue Apr 28 10:18:27 2015 -0700

----------------------------------------------------------------------
 .../translator/HiveOpConverterPostProc.java     | 39 ++++++++++++++++++--
 1 file changed, 35 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/9b204292/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverterPostProc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverterPostProc.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverterPostProc.java
index fcfe658..cdd7c7e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverterPostProc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/HiveOpConverterPostProc.java
@@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hive.ql.exec.JoinOperator;
 import org.apache.hadoop.hive.ql.exec.Operator;
 import org.apache.hadoop.hive.ql.exec.ReduceSinkOperator;
+import org.apache.hadoop.hive.ql.exec.TableScanOperator;
 import org.apache.hadoop.hive.ql.lib.DefaultRuleDispatcher;
 import org.apache.hadoop.hive.ql.lib.Dispatcher;
 import org.apache.hadoop.hive.ql.lib.ForwardWalker;
@@ -63,6 +64,7 @@ public class HiveOpConverterPostProc implements Transform {
     // 2. Trigger transformation
     Map<Rule, NodeProcessor> opRules = new LinkedHashMap<Rule, NodeProcessor>();
     opRules.put(new RuleRegExp("R1", JoinOperator.getOperatorName() + "%"), new JoinAnnotate());
+    opRules.put(new RuleRegExp("R2", TableScanOperator.getOperatorName() + "%"), new TableScanAnnotate());
 
     Dispatcher disp = new DefaultRuleDispatcher(new DefaultAnnotate(), opRules, null);
     GraphWalker ogw = new ForwardWalker(disp);
@@ -112,6 +114,31 @@ public class HiveOpConverterPostProc implements Transform {
 
   }
 
+  private class TableScanAnnotate implements NodeProcessor {
+
+    @Override
+    public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx procCtx,
+        Object... nodeOutputs) throws SemanticException {
+      TableScanOperator tableScanOp = (TableScanOperator) nd;
+
+      // 1. Get alias from topOps
+      String opAlias = null;
+      for (Map.Entry<String, Operator<? extends OperatorDesc>> topOpEntry : pctx.getTopOps().entrySet()) {
+        if (topOpEntry.getValue() == tableScanOp) {
+          opAlias = topOpEntry.getKey();
+        }
+      }
+
+      assert opAlias != null;
+
+      // 2. Add alias to 1) aliasToOpInfo and 2) opToAlias
+      aliasToOpInfo.put(opAlias, tableScanOp);
+      opToAlias.put(tableScanOp.toString(), opAlias);
+
+      return null;
+    }
+  }
+
   private class DefaultAnnotate implements NodeProcessor {
 
     @Override
@@ -119,10 +146,14 @@ public class HiveOpConverterPostProc implements Transform {
         Object... nodeOutputs) throws SemanticException {
       Operator<? extends OperatorDesc> op = (Operator<?>) nd;
 
-      // 1. Generate self alias
-      final String opAlias = genUniqueAlias();
-      aliasToOpInfo.put(opAlias, op);
-      opToAlias.put(op.toString(), opAlias);
+      // 1. Copy or generate alias
+      if(op.getParentOperators().size() == 1) {
+        final String opAlias = opToAlias.get(op.getParentOperators().get(0).toString());
+        opToAlias.put(op.toString(), opAlias);
+      } else {
+        final String opAlias = genUniqueAlias();
+        opToAlias.put(op.toString(), opAlias);
+      }
 
       return null;
     }