diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java index 47a209f..23623f3 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java @@ -718,7 +718,7 @@ public RelNode apply(RelOptCluster cluster, RelOptSchema relOptSchema, SchemaPlu hepPgmBldr.addRuleInstance(ReduceExpressionsRule.JOIN_INSTANCE); hepPgmBldr.addRuleInstance(ReduceExpressionsRule.FILTER_INSTANCE); hepPgmBldr.addRuleInstance(ReduceExpressionsRule.PROJECT_INSTANCE); - hepPgmBldr.addRuleInstance(ProjectRemoveRule.NAME_CALC_INSTANCE); + hepPgmBldr.addRuleInstance(ProjectRemoveRule.INSTANCE); hepPgmBldr.addRuleInstance(UnionMergeRule.INSTANCE); hepPgm = hepPgmBldr.build(); @@ -792,7 +792,7 @@ private RelNode applyPreJoinOrderingTransforms(RelNode basePlan, RelMetadataProv RelFieldTrimmer fieldTrimmer = new RelFieldTrimmer(null, HiveProject.DEFAULT_PROJECT_FACTORY, HiveFilter.DEFAULT_FILTER_FACTORY, HiveJoin.HIVE_JOIN_FACTORY, RelFactories.DEFAULT_SEMI_JOIN_FACTORY, HiveSort.HIVE_SORT_REL_FACTORY, - HiveAggregate.HIVE_AGGR_REL_FACTORY, HiveUnion.UNION_REL_FACTORY, true); + HiveAggregate.HIVE_AGGR_REL_FACTORY, HiveUnion.UNION_REL_FACTORY); basePlan = fieldTrimmer.trim(basePlan); // 5. Rerun PPD through Project as column pruning would have introduced DT diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java index 706390b..e8217fd 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java @@ -555,7 +555,7 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, private static ExprNodeDesc toExprNodeDesc(ColumnInfo colInfo) { ObjectInspector inspector = colInfo.getObjectInspector(); - if (inspector instanceof ConstantObjectInspector && + if (inspector instanceof ConstantObjectInspector && inspector instanceof PrimitiveObjectInspector) { PrimitiveObjectInspector poi = (PrimitiveObjectInspector) inspector; Object constant = ((ConstantObjectInspector) inspector).getWritableConstantValue(); @@ -994,8 +994,15 @@ protected ExprNodeDesc processQualifiedColRef(TypeCheckCtx ctx, ASTNode expr, .getText()); // NOTE: tableAlias must be a valid non-ambiguous table alias, // because we've checked that in TOK_TABLE_OR_COL's process method. - ColumnInfo colInfo = input.get(tableAlias, ((ExprNodeConstantDesc) nodeOutputs[1]).getValue() - .toString()); + String colName; + if (nodeOutputs[1] instanceof ExprNodeConstantDesc) { + colName = ((ExprNodeConstantDesc) nodeOutputs[1]).getValue().toString(); + } else if (nodeOutputs[1] instanceof ExprNodeColumnDesc) { + colName = ((ExprNodeColumnDesc)nodeOutputs[1]).getColumn(); + } else { + throw new SemanticException("Unexpected ExprNode : " + nodeOutputs[1]); + } + ColumnInfo colInfo = input.get(tableAlias, colName); if (colInfo == null) { ctx.setError(ErrorMsg.INVALID_COLUMN.getMsg(expr.getChild(1)), expr); diff --git a/ql/src/test/results/clientpositive/auto_join11.q.out b/ql/src/test/results/clientpositive/auto_join11.q.out index 84119d5..d98c975 100644 --- a/ql/src/test/results/clientpositive/auto_join11.q.out +++ b/ql/src/test/results/clientpositive/auto_join11.q.out @@ -23,11 +23,11 @@ STAGE PLANS: Stage: Stage-5 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src + $hdt$_0:$hdt$_0:$hdt$_0:src Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src + $hdt$_0:$hdt$_0:$hdt$_0:src TableScan alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/auto_join12.q.out b/ql/src/test/results/clientpositive/auto_join12.q.out index 4f6bf31..8e2c1cf 100644 --- a/ql/src/test/results/clientpositive/auto_join12.q.out +++ b/ql/src/test/results/clientpositive/auto_join12.q.out @@ -29,14 +29,14 @@ STAGE PLANS: Stage: Stage-7 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src + $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src Fetch Operator limit: -1 - $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_1:src + $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src + $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src TableScan alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE @@ -51,7 +51,7 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_1:src + $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src TableScan alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/auto_join13.q.out b/ql/src/test/results/clientpositive/auto_join13.q.out index b0b7be5..ca80816 100644 --- a/ql/src/test/results/clientpositive/auto_join13.q.out +++ b/ql/src/test/results/clientpositive/auto_join13.q.out @@ -29,14 +29,14 @@ STAGE PLANS: Stage: Stage-7 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src + $hdt$_0:$hdt$_0:$hdt$_0:src Fetch Operator limit: -1 - $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src + $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:src Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src + $hdt$_0:$hdt$_0:$hdt$_0:src TableScan alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE @@ -51,7 +51,7 @@ STAGE PLANS: keys: 0 UDFToDouble(_col0) (type: double) 1 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: double) - $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src + $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:src TableScan alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/auto_join27.q.out b/ql/src/test/results/clientpositive/auto_join27.q.out index 9a383fc..16a7f02 100644 --- a/ql/src/test/results/clientpositive/auto_join27.q.out +++ b/ql/src/test/results/clientpositive/auto_join27.q.out @@ -73,11 +73,11 @@ STAGE PLANS: Stage: Stage-7 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_1:$hdt$_1:src + $hdt$_0:$hdt$_1:src Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_1:$hdt$_1:src + $hdt$_0:$hdt$_1:src TableScan alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/auto_join4.q.out b/ql/src/test/results/clientpositive/auto_join4.q.out index 9508503..dbbee56 100644 --- a/ql/src/test/results/clientpositive/auto_join4.q.out +++ b/ql/src/test/results/clientpositive/auto_join4.q.out @@ -46,11 +46,11 @@ STAGE PLANS: Stage: Stage-5 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_1:$hdt$_1:$hdt$_1:src1 + $hdt$_1:$hdt$_1:src1 Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_1:$hdt$_1:$hdt$_1:src1 + $hdt$_1:$hdt$_1:src1 TableScan alias: src1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/auto_join5.q.out b/ql/src/test/results/clientpositive/auto_join5.q.out index cd970cc..69b7aab 100644 --- a/ql/src/test/results/clientpositive/auto_join5.q.out +++ b/ql/src/test/results/clientpositive/auto_join5.q.out @@ -46,11 +46,11 @@ STAGE PLANS: Stage: Stage-5 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_1:$hdt$_1:$hdt$_1:src1 + $hdt$_1:$hdt$_1:src1 Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_1:$hdt$_1:$hdt$_1:src1 + $hdt$_1:$hdt$_1:src1 TableScan alias: src1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/auto_join8.q.out b/ql/src/test/results/clientpositive/auto_join8.q.out index 1fec036..485622a 100644 --- a/ql/src/test/results/clientpositive/auto_join8.q.out +++ b/ql/src/test/results/clientpositive/auto_join8.q.out @@ -46,11 +46,11 @@ STAGE PLANS: Stage: Stage-5 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_1:$hdt$_1:$hdt$_1:src1 + $hdt$_1:$hdt$_1:src1 Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_1:$hdt$_1:$hdt$_1:src1 + $hdt$_1:$hdt$_1:src1 TableScan alias: src1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out index 4ac2416..40d2dd4 100644 --- a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out +++ b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out @@ -203,8 +203,8 @@ STAGE PLANS: name: default.src1 name: default.src1 Truncated Path -> Alias: - /src [$hdt$_0:$hdt$_1:a] - /src1 [$hdt$_0:$hdt$_0:b] + /src [$hdt$_1:a] + /src1 [$hdt$_0:b] Needs Tagging: true Reduce Operator Tree: Join Operator diff --git a/ql/src/test/results/clientpositive/correlationoptimizer1.q.out b/ql/src/test/results/clientpositive/correlationoptimizer1.q.out index f2f924e..8530e1d 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer1.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer1.q.out @@ -329,11 +329,11 @@ STAGE PLANS: Stage: Stage-6 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x + $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x + $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x TableScan alias: x Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/correlationoptimizer6.q.out b/ql/src/test/results/clientpositive/correlationoptimizer6.q.out index b5848f5..2e78dbe 100644 --- a/ql/src/test/results/clientpositive/correlationoptimizer6.q.out +++ b/ql/src/test/results/clientpositive/correlationoptimizer6.q.out @@ -500,14 +500,14 @@ STAGE PLANS: Stage: Stage-8 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:x + $hdt$_0:$hdt$_0:$hdt$_0:x Fetch Operator limit: -1 - $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:x + $hdt$_1:$hdt$_1:$hdt$_1:x Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:x + $hdt$_0:$hdt$_0:$hdt$_0:x TableScan alias: x Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE @@ -522,7 +522,7 @@ STAGE PLANS: keys: 0 _col0 (type: string) 1 _col0 (type: string) - $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:x + $hdt$_1:$hdt$_1:$hdt$_1:x TableScan alias: x Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE @@ -3822,11 +3822,11 @@ STAGE PLANS: Stage: Stage-10 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:x + $hdt$_0:$hdt$_0:$hdt$_0:x Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:x + $hdt$_0:$hdt$_0:$hdt$_0:x TableScan alias: x Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE @@ -3894,11 +3894,11 @@ STAGE PLANS: Stage: Stage-9 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:x + $hdt$_1:$hdt$_1:$hdt$_1:x Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:x + $hdt$_1:$hdt$_1:$hdt$_1:x TableScan alias: x Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/explain_logical.q.out b/ql/src/test/results/clientpositive/explain_logical.q.out index 015ab71..9a26f45 100644 --- a/ql/src/test/results/clientpositive/explain_logical.q.out +++ b/ql/src/test/results/clientpositive/explain_logical.q.out @@ -804,20 +804,20 @@ $hdt$_0:$hdt$_0:src TableScan (TS_0) alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Filter Operator (FIL_20) + Filter Operator (FIL_19) predicate: key is not null (type: boolean) Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE Select Operator (SEL_1) expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator (RS_11) + Reduce Output Operator (RS_10) key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: string) - Join Operator (JOIN_14) + Join Operator (JOIN_13) condition map: Inner Join 0 to 1 keys: @@ -825,62 +825,62 @@ $hdt$_0:$hdt$_0:src 1 _col0 (type: string) outputColumnNames: _col0, _col1, _col3 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE - Select Operator (SEL_15) + Select Operator (SEL_14) expressions: _col0 (type: string), _col3 (type: bigint), _col1 (type: string) outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator (RS_17) + Reduce Output Operator (RS_16) key expressions: _col0 (type: string) sort order: + Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint), _col2 (type: string) - Select Operator (SEL_18) + Select Operator (SEL_17) expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), VALUE._col1 (type: string) outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE - File Output Operator (FS_19) + File Output Operator (FS_18) compressed: false Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe -$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src +$hdt$_0:$hdt$_1:$hdt$_1:src TableScan (TS_2) alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Filter Operator (FIL_21) + Filter Operator (FIL_20) predicate: key is not null (type: boolean) Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE Select Operator (SEL_3) expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE - Group By Operator (GBY_6) + Group By Operator (GBY_5) aggregations: count(_col1) keys: _col0 (type: string) mode: hash outputColumnNames: _col0, _col1 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator (RS_7) + Reduce Output Operator (RS_6) key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) - Group By Operator (GBY_8) + Group By Operator (GBY_7) aggregations: count(VALUE._col0) keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0, _col1 Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator (RS_13) + Reduce Output Operator (RS_12) key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: bigint) - Join Operator (JOIN_14) + Join Operator (JOIN_13) condition map: Inner Join 0 to 1 keys: diff --git a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out index 2ba3b53..bb9fee5 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out @@ -1192,7 +1192,7 @@ STAGE PLANS: name: default.t1 name: default.t1 Truncated Path -> Alias: - /t1 [$hdt$_0:$hdt$_0:$hdt$_0:t1] + /t1 [$hdt$_0:$hdt$_0:t1] Stage: Stage-7 Conditional Operator @@ -2278,7 +2278,7 @@ STAGE PLANS: name: default.t1 name: default.t1 Truncated Path -> Alias: - /t1 [$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:t1] + /t1 [$hdt$_0:$hdt$_0:$hdt$_0:t1] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -3247,7 +3247,7 @@ STAGE PLANS: name: default.t1 name: default.t1 Truncated Path -> Alias: - /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:$hdt$_0:t1] + /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:t1] #### A masked pattern was here #### Stage: Stage-8 diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out index 73f9b7a..e509ff8 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out @@ -1257,7 +1257,7 @@ STAGE PLANS: name: default.t1 name: default.t1 Truncated Path -> Alias: - /t1 [$hdt$_0:$hdt$_0:$hdt$_0:t1] + /t1 [$hdt$_0:$hdt$_0:t1] Stage: Stage-7 Conditional Operator @@ -2539,7 +2539,7 @@ STAGE PLANS: name: default.t1 name: default.t1 Truncated Path -> Alias: - /t1 [$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:t1] + /t1 [$hdt$_0:$hdt$_0:$hdt$_0:t1] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -3637,7 +3637,7 @@ STAGE PLANS: name: default.t1 name: default.t1 Truncated Path -> Alias: - /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:$hdt$_0:t1] + /t1 [null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:t1] #### A masked pattern was here #### Stage: Stage-8 diff --git a/ql/src/test/results/clientpositive/metadataonly1.q.out b/ql/src/test/results/clientpositive/metadataonly1.q.out index fdf7662..b4d2617 100644 --- a/ql/src/test/results/clientpositive/metadataonly1.q.out +++ b/ql/src/test/results/clientpositive/metadataonly1.q.out @@ -138,7 +138,7 @@ STAGE PLANS: value expressions: _col0 (type: string) auto parallelism: false Path -> Alias: - -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1] + -mr-10003default.test1{ds=1} [$hdt$_0:test1] Path -> Partition: -mr-10003default.test1{ds=1} Partition @@ -180,7 +180,7 @@ STAGE PLANS: name: default.test1 name: default.test1 Truncated Path -> Alias: - -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1] + -mr-10003default.test1{ds=1} [$hdt$_0:test1] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -279,7 +279,7 @@ STAGE PLANS: tag: -1 auto parallelism: false Path -> Alias: - -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1] + -mr-10003default.test1{ds=1} [$hdt$_0:test1] Path -> Partition: -mr-10003default.test1{ds=1} Partition @@ -321,7 +321,7 @@ STAGE PLANS: name: default.test1 name: default.test1 Truncated Path -> Alias: - -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1] + -mr-10003default.test1{ds=1} [$hdt$_0:test1] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -462,7 +462,7 @@ STAGE PLANS: name: default.test1 name: default.test1 Truncated Path -> Alias: - /test1/ds=1 [$hdt$_0:$hdt$_0:test1] + /test1/ds=1 [$hdt$_0:test1] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -598,8 +598,8 @@ STAGE PLANS: value expressions: _col0 (type: string) auto parallelism: false Path -> Alias: - -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2] - -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2] + -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:a2] + -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:a2] Path -> Partition: -mr-10005default.test1{ds=1} Partition @@ -680,8 +680,8 @@ STAGE PLANS: name: default.test1 name: default.test1 Truncated Path -> Alias: - -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2] - -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:a2] + -mr-10005default.test1{ds=1} [$hdt$_0:$hdt$_1:$hdt$_1:a2] + -mr-10006default.test1{ds=2} [$hdt$_0:$hdt$_1:$hdt$_1:a2] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -1049,9 +1049,9 @@ STAGE PLANS: tag: -1 auto parallelism: false Path -> Alias: - -mr-10003default.test2{ds=1, hr=1} [$hdt$_0:$hdt$_0:test2] - -mr-10004default.test2{ds=1, hr=2} [$hdt$_0:$hdt$_0:test2] - -mr-10005default.test2{ds=1, hr=3} [$hdt$_0:$hdt$_0:test2] + -mr-10003default.test2{ds=1, hr=1} [$hdt$_0:test2] + -mr-10004default.test2{ds=1, hr=2} [$hdt$_0:test2] + -mr-10005default.test2{ds=1, hr=3} [$hdt$_0:test2] Path -> Partition: -mr-10003default.test2{ds=1, hr=1} Partition @@ -1174,9 +1174,9 @@ STAGE PLANS: name: default.test2 name: default.test2 Truncated Path -> Alias: - -mr-10003default.test2{ds=1, hr=1} [$hdt$_0:$hdt$_0:test2] - -mr-10004default.test2{ds=1, hr=2} [$hdt$_0:$hdt$_0:test2] - -mr-10005default.test2{ds=1, hr=3} [$hdt$_0:$hdt$_0:test2] + -mr-10003default.test2{ds=1, hr=1} [$hdt$_0:test2] + -mr-10004default.test2{ds=1, hr=2} [$hdt$_0:test2] + -mr-10005default.test2{ds=1, hr=3} [$hdt$_0:test2] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -1414,9 +1414,9 @@ STAGE PLANS: name: default.test2 name: default.test2 Truncated Path -> Alias: - /test2/ds=1/hr=1 [$hdt$_0:$hdt$_0:test2] - /test2/ds=1/hr=2 [$hdt$_0:$hdt$_0:test2] - /test2/ds=1/hr=3 [$hdt$_0:$hdt$_0:test2] + /test2/ds=1/hr=1 [$hdt$_0:test2] + /test2/ds=1/hr=2 [$hdt$_0:test2] + /test2/ds=1/hr=3 [$hdt$_0:test2] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -1518,8 +1518,8 @@ STAGE PLANS: value expressions: _col0 (type: string) auto parallelism: false Path -> Alias: - -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1] - -mr-10004default.test1{ds=2} [$hdt$_0:$hdt$_0:test1] + -mr-10003default.test1{ds=1} [$hdt$_0:test1] + -mr-10004default.test1{ds=2} [$hdt$_0:test1] Path -> Partition: -mr-10003default.test1{ds=1} Partition @@ -1600,8 +1600,8 @@ STAGE PLANS: name: default.test1 name: default.test1 Truncated Path -> Alias: - -mr-10003default.test1{ds=1} [$hdt$_0:$hdt$_0:test1] - -mr-10004default.test1{ds=2} [$hdt$_0:$hdt$_0:test1] + -mr-10003default.test1{ds=1} [$hdt$_0:test1] + -mr-10004default.test1{ds=2} [$hdt$_0:test1] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -1760,11 +1760,11 @@ STAGE PLANS: tag: -1 auto parallelism: false Path -> Alias: - -mr-10003default.test2{ds=01_10_10, hr=01} [$hdt$_0:$hdt$_0:test2] - -mr-10004default.test2{ds=01_10_20, hr=02} [$hdt$_0:$hdt$_0:test2] - -mr-10005default.test2{ds=1, hr=1} [$hdt$_0:$hdt$_0:test2] - -mr-10006default.test2{ds=1, hr=2} [$hdt$_0:$hdt$_0:test2] - -mr-10007default.test2{ds=1, hr=3} [$hdt$_0:$hdt$_0:test2] + -mr-10003default.test2{ds=01_10_10, hr=01} [$hdt$_0:test2] + -mr-10004default.test2{ds=01_10_20, hr=02} [$hdt$_0:test2] + -mr-10005default.test2{ds=1, hr=1} [$hdt$_0:test2] + -mr-10006default.test2{ds=1, hr=2} [$hdt$_0:test2] + -mr-10007default.test2{ds=1, hr=3} [$hdt$_0:test2] Path -> Partition: -mr-10003default.test2{ds=01_10_10, hr=01} Partition @@ -1967,11 +1967,11 @@ STAGE PLANS: name: default.test2 name: default.test2 Truncated Path -> Alias: - -mr-10003default.test2{ds=01_10_10, hr=01} [$hdt$_0:$hdt$_0:test2] - -mr-10004default.test2{ds=01_10_20, hr=02} [$hdt$_0:$hdt$_0:test2] - -mr-10005default.test2{ds=1, hr=1} [$hdt$_0:$hdt$_0:test2] - -mr-10006default.test2{ds=1, hr=2} [$hdt$_0:$hdt$_0:test2] - -mr-10007default.test2{ds=1, hr=3} [$hdt$_0:$hdt$_0:test2] + -mr-10003default.test2{ds=01_10_10, hr=01} [$hdt$_0:test2] + -mr-10004default.test2{ds=01_10_20, hr=02} [$hdt$_0:test2] + -mr-10005default.test2{ds=1, hr=1} [$hdt$_0:test2] + -mr-10006default.test2{ds=1, hr=2} [$hdt$_0:test2] + -mr-10007default.test2{ds=1, hr=3} [$hdt$_0:test2] Needs Tagging: false Reduce Operator Tree: Group By Operator diff --git a/ql/src/test/results/clientpositive/ppd_join_filter.q.out b/ql/src/test/results/clientpositive/ppd_join_filter.q.out index e1a188f..e99986f 100644 --- a/ql/src/test/results/clientpositive/ppd_join_filter.q.out +++ b/ql/src/test/results/clientpositive/ppd_join_filter.q.out @@ -202,7 +202,7 @@ STAGE PLANS: name: default.src name: default.src Truncated Path -> Alias: - /src [$hdt$_1:$hdt$_1:$hdt$_1:a] + /src [$hdt$_1:$hdt$_1:a] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -627,7 +627,7 @@ STAGE PLANS: name: default.src name: default.src Truncated Path -> Alias: - /src [$hdt$_1:$hdt$_1:$hdt$_1:a] + /src [$hdt$_1:$hdt$_1:a] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -1040,7 +1040,7 @@ STAGE PLANS: name: default.src name: default.src Truncated Path -> Alias: - /src [$hdt$_1:$hdt$_1:$hdt$_1:a] + /src [$hdt$_1:$hdt$_1:a] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -1461,7 +1461,7 @@ STAGE PLANS: name: default.src name: default.src Truncated Path -> Alias: - /src [$hdt$_1:$hdt$_1:$hdt$_1:a] + /src [$hdt$_1:$hdt$_1:a] Needs Tagging: false Reduce Operator Tree: Group By Operator diff --git a/ql/src/test/results/clientpositive/ppd_vc.q.out b/ql/src/test/results/clientpositive/ppd_vc.q.out index 7e3953b..30067b4 100644 --- a/ql/src/test/results/clientpositive/ppd_vc.q.out +++ b/ql/src/test/results/clientpositive/ppd_vc.q.out @@ -680,10 +680,10 @@ STAGE PLANS: name: default.srcpart Truncated Path -> Alias: /src [$hdt$_0:a] - /srcpart/ds=2008-04-08/hr=11 [$hdt$_1:$hdt$_1:srcpart] - /srcpart/ds=2008-04-08/hr=12 [$hdt$_1:$hdt$_1:srcpart] - /srcpart/ds=2008-04-09/hr=11 [$hdt$_1:$hdt$_1:srcpart] - /srcpart/ds=2008-04-09/hr=12 [$hdt$_1:$hdt$_1:srcpart] + /srcpart/ds=2008-04-08/hr=11 [$hdt$_1:srcpart] + /srcpart/ds=2008-04-08/hr=12 [$hdt$_1:srcpart] + /srcpart/ds=2008-04-09/hr=11 [$hdt$_1:srcpart] + /srcpart/ds=2008-04-09/hr=12 [$hdt$_1:srcpart] Needs Tagging: true Reduce Operator Tree: Join Operator diff --git a/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out b/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out index 5e7fac9..41608cf 100644 --- a/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out +++ b/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out @@ -253,7 +253,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -900,7 +900,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: null-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: null-subquery1:$hdt$_0-subquery1:$hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -1063,7 +1063,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:$hdt$_0:default.default__tbl_tbl_key_idx__ + alias: $hdt$_0:default.default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -1161,7 +1161,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:$hdt$_0:default.default__tbl_tbl_key_idx__ + alias: $hdt$_0:default.default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -2453,7 +2453,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:$hdt$_0:default.default__tbl_tbl_key_idx__ + alias: $hdt$_0:default.default__tbl_tbl_key_idx__ Statistics: Num rows: 6 Data size: 430 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) diff --git a/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out b/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out index 49d000c..9c9f8f5 100644 --- a/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out +++ b/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out @@ -176,7 +176,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), _count_of_l_orderkey (type: bigint) @@ -1223,7 +1223,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), _count_of_l_orderkey (type: bigint) @@ -1907,7 +1907,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (l_orderkey < 7) (type: boolean) @@ -3404,7 +3404,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (l_orderkey < 7) (type: boolean) @@ -3495,7 +3495,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_partkey_idx__ + alias: $hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_partkey_idx__ Statistics: Num rows: 100 Data size: 8937 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (l_partkey < 10) (type: boolean) diff --git a/ql/src/test/results/clientpositive/subquery_in_having.q.out b/ql/src/test/results/clientpositive/subquery_in_having.q.out index 365c6ab..e03da4a 100644 --- a/ql/src/test/results/clientpositive/subquery_in_having.q.out +++ b/ql/src/test/results/clientpositive/subquery_in_having.q.out @@ -1108,11 +1108,11 @@ STAGE PLANS: Stage: Stage-10 Map Reduce Local Work Alias -> Map Local Tables: - $hdt$_0:$hdt$_0:$hdt$_1:b + $hdt$_0:$hdt$_1:b Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - $hdt$_0:$hdt$_0:$hdt$_1:b + $hdt$_0:$hdt$_1:b TableScan alias: b Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE diff --git a/ql/src/test/results/clientpositive/subquery_notin.q.out b/ql/src/test/results/clientpositive/subquery_notin.q.out index 41e7239..4710966 100644 --- a/ql/src/test/results/clientpositive/subquery_notin.q.out +++ b/ql/src/test/results/clientpositive/subquery_notin.q.out @@ -575,7 +575,7 @@ Manufacturer#4 almond azure aquamarine papaya violet 12 Manufacturer#5 almond antique blue firebrick mint 31 Manufacturer#5 almond aquamarine dodger light gainsboro 46 Manufacturer#5 almond azure blanched chiffon midnight 23 -Warning: Shuffle Join JOIN[47][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product +Warning: Shuffle Join JOIN[45][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product PREHOOK: query: -- agg, non corr explain select p_name, p_size @@ -859,7 +859,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Shuffle Join JOIN[47][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product +Warning: Shuffle Join JOIN[45][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-2:MAPRED' is a cross product PREHOOK: query: select p_name, p_size from part where part.p_size not in @@ -906,7 +906,7 @@ almond aquamarine sandy cyan gainsboro 18 almond aquamarine yellow dodger mint 7 almond azure aquamarine papaya violet 12 almond azure blanched chiffon midnight 23 -Warning: Shuffle Join JOIN[44][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product +Warning: Shuffle Join JOIN[42][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product PREHOOK: query: -- agg, corr explain select p_mfgr, p_name, p_size @@ -1226,7 +1226,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Shuffle Join JOIN[44][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product +Warning: Shuffle Join JOIN[42][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product PREHOOK: query: select p_mfgr, p_name, p_size from part b where b.p_size not in (select min(p_size) diff --git a/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out b/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out index 8a0f97c..2d5b486 100644 --- a/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out +++ b/ql/src/test/results/clientpositive/subquery_notin_having.q.java1.7.out @@ -1,4 +1,4 @@ -Warning: Shuffle Join JOIN[25][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product +Warning: Shuffle Join JOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product PREHOOK: query: -- non agg, non corr -- JAVA_VERSION_SPECIFIC_OUTPUT @@ -188,7 +188,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Shuffle Join JOIN[38][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product +Warning: Shuffle Join JOIN[34][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product PREHOOK: query: -- non agg, corr explain select b.p_mfgr, min(p_retailprice) @@ -445,7 +445,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Shuffle Join JOIN[38][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product +Warning: Shuffle Join JOIN[34][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product PREHOOK: query: select b.p_mfgr, min(p_retailprice) from part b group by b.p_mfgr @@ -470,7 +470,7 @@ POSTHOOK: Input: default@part #### A masked pattern was here #### Manufacturer#1 1173.15 Manufacturer#2 1690.68 -Warning: Shuffle Join JOIN[41][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-3:MAPRED' is a cross product +Warning: Shuffle Join JOIN[38][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-3:MAPRED' is a cross product PREHOOK: query: -- agg, non corr explain select b.p_mfgr, min(p_retailprice) @@ -729,7 +729,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Shuffle Join JOIN[41][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-3:MAPRED' is a cross product +Warning: Shuffle Join JOIN[38][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-3:MAPRED' is a cross product PREHOOK: query: select b.p_mfgr, min(p_retailprice) from part b group by b.p_mfgr diff --git a/ql/src/test/results/clientpositive/table_access_keys_stats.q.out b/ql/src/test/results/clientpositive/table_access_keys_stats.q.out index cf6f794..f0da5db 100644 --- a/ql/src/test/results/clientpositive/table_access_keys_stats.q.out +++ b/ql/src/test/results/clientpositive/table_access_keys_stats.q.out @@ -63,7 +63,7 @@ PREHOOK: query: SELECT k, count(1) FROM (SELECT key as k, val as v FROM T1) subq PREHOOK: type: QUERY PREHOOK: Input: default@t1 #### A masked pattern was here #### -Operator:GBY_5 +Operator:GBY_4 Table:default@t1 Keys:key diff --git a/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out index 21e0876..df262de 100644 --- a/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out @@ -1773,7 +1773,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 #### A masked pattern was here #### 1000 -Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product +Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product PREHOOK: query: -- parent is reduce tasks EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08' PREHOOK: type: QUERY @@ -1875,7 +1875,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product +Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08' PREHOOK: type: QUERY PREHOOK: Input: default@srcpart @@ -4061,7 +4061,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 #### A masked pattern was here #### 1000 -Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product +Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product PREHOOK: query: -- parent is reduce tasks EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08' PREHOOK: type: QUERY @@ -4160,7 +4160,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product +Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08' PREHOOK: type: QUERY PREHOOK: Input: default@srcpart diff --git a/ql/src/test/results/clientpositive/tez/mrr.q.out b/ql/src/test/results/clientpositive/tez/mrr.q.out index 7a915a2..e7a3b3c 100644 --- a/ql/src/test/results/clientpositive/tez/mrr.q.out +++ b/ql/src/test/results/clientpositive/tez/mrr.q.out @@ -1418,18 +1418,18 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col3, _col4, _col5 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: _col0 (type: string), _col3 (type: bigint), _col0 (type: string), _col1 (type: bigint), _col4 (type: string), _col5 (type: bigint) - outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 + expressions: _col0 (type: string), _col3 (type: bigint), _col1 (type: bigint), _col4 (type: string), _col5 (type: bigint) + outputColumnNames: _col0, _col1, _col3, _col4, _col5 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: bigint), _col2 (type: string), _col3 (type: bigint), _col4 (type: string), _col5 (type: bigint) + value expressions: _col1 (type: bigint), _col3 (type: bigint), _col4 (type: string), _col5 (type: bigint) Reducer 5 Reduce Operator Tree: Select Operator - expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), VALUE._col1 (type: string), VALUE._col2 (type: bigint), VALUE._col3 (type: string), VALUE._col4 (type: bigint) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), KEY.reducesinkkey0 (type: string), VALUE._col1 (type: bigint), VALUE._col2 (type: string), VALUE._col3 (type: bigint) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE File Output Operator @@ -1694,14 +1694,14 @@ STAGE PLANS: 1 Reducer 4 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: _col0 (type: string), _col3 (type: bigint), _col0 (type: string), _col1 (type: string) - outputColumnNames: _col0, _col1, _col2, _col3 + expressions: _col0 (type: string), _col3 (type: bigint), _col1 (type: string) + outputColumnNames: _col0, _col1, _col3 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE - value expressions: _col1 (type: bigint), _col2 (type: string), _col3 (type: string) + value expressions: _col1 (type: bigint), _col3 (type: string) Map 3 Map Operator Tree: TableScan @@ -1729,7 +1729,7 @@ STAGE PLANS: Reducer 2 Reduce Operator Tree: Select Operator - expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), VALUE._col1 (type: string), VALUE._col2 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), KEY.reducesinkkey0 (type: string), VALUE._col1 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE File Output Operator diff --git a/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out index 6fde788..224a9db 100644 --- a/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out @@ -1793,7 +1793,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 #### A masked pattern was here #### 1000 -Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product +Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product PREHOOK: query: -- parent is reduce tasks EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08' PREHOOK: type: QUERY @@ -1897,7 +1897,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product +Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08' PREHOOK: type: QUERY PREHOOK: Input: default@srcpart @@ -4108,7 +4108,7 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 #### A masked pattern was here #### 1000 -Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product +Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product PREHOOK: query: -- parent is reduce tasks EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08' PREHOOK: type: QUERY @@ -4209,7 +4209,7 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product +Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08' PREHOOK: type: QUERY PREHOOK: Input: default@srcpart