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/03/31 03:48:44 UTC
svn commit: r1670236 [1/5] - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/optimizer/calcite/
java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/
java/org/apache/hadoop/hive/ql/parse/ test/queries/clientpositive/
test/results/clientpos...
Author: hashutosh
Date: Tue Mar 31 01:48:43 2015
New Revision: 1670236
URL: http://svn.apache.org/r1670236
Log:
HIVE-10038 : Add Calcite's ProjectMergeRule (Ashutosh Chauhan via John Pullokkaran)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/PlanModifierForASTConv.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
hive/trunk/ql/src/test/queries/clientpositive/leadlag.q
hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join_nulls.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
hive/trunk/ql/src/test/results/clientpositive/combine2.q.out
hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out
hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out
hive/trunk/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_sort_6.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out
hive/trunk/ql/src/test/results/clientpositive/join28.q.out
hive/trunk/ql/src/test/results/clientpositive/join29.q.out
hive/trunk/ql/src/test/results/clientpositive/join31.q.out
hive/trunk/ql/src/test/results/clientpositive/join32.q.out
hive/trunk/ql/src/test/results/clientpositive/join32_lessSize.q.out
hive/trunk/ql/src/test/results/clientpositive/join33.q.out
hive/trunk/ql/src/test/results/clientpositive/join35.q.out
hive/trunk/ql/src/test/results/clientpositive/leadlag.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_11.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_12.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_13.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_2.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_4.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_5.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_6.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_8.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_9.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out
hive/trunk/ql/src/test/results/clientpositive/load_dyn_part14.q.out
hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
hive/trunk/ql/src/test/results/clientpositive/mapjoin_subquery.q.out
hive/trunk/ql/src/test/results/clientpositive/multiMapJoin2.q.out
hive/trunk/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out
hive/trunk/ql/src/test/results/clientpositive/pcr.q.out
hive/trunk/ql/src/test/results/clientpositive/ppd_vc.q.out
hive/trunk/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out
hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out
hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out
hive/trunk/ql/src/test/results/clientpositive/str_to_map.q.java1.7.out
hive/trunk/ql/src/test/results/clientpositive/subquery_in.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_in_having.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_notin.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
hive/trunk/ql/src/test/results/clientpositive/subquery_views.q.out
hive/trunk/ql/src/test/results/clientpositive/table_access_keys_stats.q.out
hive/trunk/ql/src/test/results/clientpositive/tez/subquery_in.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_reflect2.q.out
hive/trunk/ql/src/test/results/clientpositive/union24.q.out
hive/trunk/ql/src/test/results/clientpositive/unionDistinct_1.q.out
hive/trunk/ql/src/test/results/clientpositive/vector_decimal_round.q.out
hive/trunk/ql/src/test/results/clientpositive/vector_mapjoin_reduce.q.out
hive/trunk/ql/src/test/results/clientpositive/windowing_streaming.q.out
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/HiveCalciteUtil.java Tue Mar 31 01:48:43 2015
@@ -32,8 +32,16 @@ import org.apache.calcite.rel.core.RelFa
import org.apache.calcite.rel.core.Sort;
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.calcite.rex.RexBuilder;
+import org.apache.calcite.rex.RexCall;
+import org.apache.calcite.rex.RexCorrelVariable;
+import org.apache.calcite.rex.RexDynamicParam;
+import org.apache.calcite.rex.RexFieldAccess;
import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexLiteral;
+import org.apache.calcite.rex.RexLocalRef;
import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.rex.RexOver;
+import org.apache.calcite.rex.RexRangeRef;
import org.apache.calcite.rex.RexVisitor;
import org.apache.calcite.rex.RexVisitorImpl;
import org.apache.calcite.sql.SqlKind;
@@ -535,6 +543,7 @@ public class HiveCalciteUtil {
boolean deterministic = true;
RexVisitor<Void> visitor = new RexVisitorImpl<Void>(true) {
+ @Override
public Void visitCall(org.apache.calcite.rex.RexCall call) {
if (!call.getOperator().isDeterministic()) {
throw new Util.FoundOne(call);
@@ -551,4 +560,59 @@ public class HiveCalciteUtil {
return deterministic;
}
+
+ /**
+ * Walks over an expression and determines whether it is constant.
+ */
+ public static class ConstantFinder implements RexVisitor<Boolean> {
+
+ @Override
+ public Boolean visitLiteral(RexLiteral literal) {
+ return true;
+ }
+
+ @Override
+ public Boolean visitInputRef(RexInputRef inputRef) {
+ return false;
+ }
+
+ @Override
+ public Boolean visitLocalRef(RexLocalRef localRef) {
+ throw new RuntimeException("Not expected to be called.");
+ }
+
+ @Override
+ public Boolean visitOver(RexOver over) {
+ return false;
+ }
+
+ @Override
+ public Boolean visitCorrelVariable(RexCorrelVariable correlVariable) {
+ return false;
+ }
+
+ @Override
+ public Boolean visitDynamicParam(RexDynamicParam dynamicParam) {
+ return false;
+ }
+
+ @Override
+ public Boolean visitCall(RexCall call) {
+ // Constant if operator is deterministic and all operands are
+ // constant.
+ return call.getOperator().isDeterministic()
+ && RexVisitorImpl.visitArrayAnd(this, call.getOperands());
+ }
+
+ @Override
+ public Boolean visitRangeRef(RexRangeRef rangeRef) {
+ return false;
+ }
+
+ @Override
+ public Boolean visitFieldAccess(RexFieldAccess fieldAccess) {
+ // "<expr>.FIELD" is constant iff "<expr>" is constant.
+ return fieldAccess.getReferenceExpr().accept(this);
+ }
+ }
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/PlanModifierForASTConv.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/PlanModifierForASTConv.java?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/PlanModifierForASTConv.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/translator/PlanModifierForASTConv.java Tue Mar 31 01:48:43 2015
@@ -38,6 +38,9 @@ import org.apache.calcite.rel.core.Sort;
import org.apache.calcite.rel.rules.MultiJoin;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.rex.RexBuilder;
+import org.apache.calcite.rex.RexCall;
+import org.apache.calcite.rex.RexInputRef;
import org.apache.calcite.rex.RexNode;
import org.apache.calcite.sql.SqlAggFunction;
import org.apache.calcite.sql.SqlKind;
@@ -168,7 +171,27 @@ public class PlanModifierForASTConv {
ImmutableMap.Builder<Integer, RexNode> inputRefToCallMapBldr = ImmutableMap.builder();
for (int i = resultSchema.size(); i < rt.getFieldCount(); i++) {
if (collationInputRefs.contains(i)) {
- inputRefToCallMapBldr.put(i, obChild.getChildExps().get(i));
+ RexNode obyExpr = obChild.getChildExps().get(i);
+ if (obyExpr instanceof RexCall) {
+ int a = -1;
+ List<RexNode> operands = new ArrayList<>();
+ for (int k = 0; k< ((RexCall) obyExpr).operands.size(); k++) {
+ RexNode rn = ((RexCall) obyExpr).operands.get(k);
+ for (int j = 0; j < resultSchema.size(); j++) {
+ if( obChild.getChildExps().get(j).toString().equals(rn.toString())) {
+ a = j;
+ break;
+ }
+ } if (a != -1) {
+ operands.add(new RexInputRef(a, rn.getType()));
+ } else {
+ operands.add(rn);
+ }
+ a = -1;
+ }
+ obyExpr = obChild.getCluster().getRexBuilder().makeCall(((RexCall)obyExpr).getOperator(), operands);
+ }
+ inputRefToCallMapBldr.put(i, obyExpr);
}
}
ImmutableMap<Integer, RexNode> inputRefToCallMap = inputRefToCallMapBldr.build();
@@ -266,7 +289,7 @@ public class PlanModifierForASTConv {
RelNode select = introduceDerivedTable(rel);
parent.replaceInput(pos, select);
-
+
return select;
}
@@ -352,7 +375,7 @@ public class PlanModifierForASTConv {
return validChild;
}
-
+
private static boolean isEmptyGrpAggr(RelNode gbNode) {
// Verify if both groupset and aggrfunction are empty)
Aggregate aggrnode = (Aggregate) gbNode;
@@ -361,12 +384,12 @@ public class PlanModifierForASTConv {
}
return false;
}
-
+
private static void replaceEmptyGroupAggr(final RelNode rel, RelNode parent) {
// If this function is called, the parent should only include constant
List<RexNode> exps = parent.getChildExps();
for (RexNode rexNode : exps) {
- if (rexNode.getKind() != SqlKind.LITERAL) {
+ if (!rexNode.accept(new HiveCalciteUtil.ConstantFinder())) {
throw new RuntimeException("We expect " + parent.toString()
+ " to contain only constants. However, " + rexNode.toString() + " is "
+ rexNode.getKind());
@@ -377,7 +400,7 @@ public class PlanModifierForASTConv {
RelDataType longType = TypeConverter.convert(TypeInfoFactory.longTypeInfo, typeFactory);
RelDataType intType = TypeConverter.convert(TypeInfoFactory.intTypeInfo, typeFactory);
// Create the dummy aggregation.
- SqlAggFunction countFn = (SqlAggFunction) SqlFunctionConverter.getCalciteAggFn("count",
+ SqlAggFunction countFn = SqlFunctionConverter.getCalciteAggFn("count",
ImmutableList.of(intType), longType);
// TODO: Using 0 might be wrong; might need to walk down to find the
// proper index of a dummy.
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java Tue Mar 31 01:48:43 2015
@@ -69,6 +69,7 @@ import org.apache.calcite.rel.rules.Filt
import org.apache.calcite.rel.rules.JoinPushTransitivePredicatesRule;
import org.apache.calcite.rel.rules.JoinToMultiJoinRule;
import org.apache.calcite.rel.rules.LoptOptimizeJoinRule;
+import org.apache.calcite.rel.rules.ProjectMergeRule;
import org.apache.calcite.rel.rules.ProjectRemoveRule;
import org.apache.calcite.rel.rules.ReduceExpressionsRule;
import org.apache.calcite.rel.rules.SemiJoinFilterTransposeRule;
@@ -721,6 +722,7 @@ public class CalcitePlanner extends Sema
hepPgmBldr.addRuleInstance(ReduceExpressionsRule.PROJECT_INSTANCE);
hepPgmBldr.addRuleInstance(ProjectRemoveRule.INSTANCE);
hepPgmBldr.addRuleInstance(UnionMergeRule.INSTANCE);
+ hepPgmBldr.addRuleInstance(new ProjectMergeRule(false, HiveProject.DEFAULT_PROJECT_FACTORY));
hepPgm = hepPgmBldr.build();
HepPlanner hepPlanner = new HepPlanner(hepPgm);
@@ -785,8 +787,6 @@ public class CalcitePlanner extends Sema
// 3. Transitive inference & Partition Pruning
basePlan = hepPlan(basePlan, false, mdProvider, new JoinPushTransitivePredicatesRule(
Join.class, HiveFilter.DEFAULT_FILTER_FACTORY),
- // TODO: Enable it after CALCITE-407 is fixed
- // RemoveTrivialProjectRule.INSTANCE,
new HivePartitionPruneRule(conf));
// 4. Projection Pruning
Modified: hive/trunk/ql/src/test/queries/clientpositive/leadlag.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/leadlag.q?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/leadlag.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/leadlag.q Tue Mar 31 01:48:43 2015
@@ -36,7 +36,10 @@ sum(p_size - lag(p_size,1)) over w1 as d
from part
window w1 as (distribute by p_mfgr sort by p_name rows between 2 preceding and 2 following) ;
+set hive.cbo.enable=false;
-- 6. testRankInLead
+-- disable cbo because of CALCITE-653
+
select p_mfgr, p_name, p_size, r1,
lead(r1,1,r1) over (distribute by p_mfgr sort by p_name) as deltaRank
from (
@@ -45,6 +48,7 @@ rank() over(distribute by p_mfgr sort b
from part
) a;
+set hive.cbo.enable=true;
-- 7. testLeadWithPTF
select p_mfgr, p_name,
rank() over(distribute by p_mfgr sort by p_name) as r,
Modified: hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Tue Mar 31 01:48:43 2015
@@ -568,7 +568,7 @@ STAGE PLANS:
name: default.alter_coltype
name: default.alter_coltype
Truncated Path -> Alias:
- /alter_coltype/dt=100/ts=3.0 [$hdt$_0:$hdt$_0:alter_coltype]
+ /alter_coltype/dt=100/ts=3.0 [$hdt$_0:alter_coltype]
Needs Tagging: false
Reduce Operator Tree:
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out Tue Mar 31 01:48:43 2015
@@ -556,10 +556,10 @@ STAGE PLANS:
Select Operator
expressions: array(1,2,3) (type: array<int>)
outputColumnNames: _col0
- Statistics: Num rows: 2 Data size: 240 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
compressed: false
- Statistics: Num rows: 2 Data size: 240 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE Column stats: COMPLETE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -591,10 +591,10 @@ STAGE PLANS:
Select Operator
expressions: str_to_map('a=1 b=2 c=3',' ','=') (type: map<string,string>)
outputColumnNames: _col0
- Statistics: Num rows: 2 Data size: 1840 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 2 Data size: 1508 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
compressed: false
- Statistics: Num rows: 2 Data size: 1840 Basic stats: COMPLETE Column stats: COMPLETE
+ Statistics: Num rows: 2 Data size: 1508 Basic stats: COMPLETE Column stats: COMPLETE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out Tue Mar 31 01:48:43 2015
@@ -24,11 +24,11 @@ STAGE PLANS:
Stage: Stage-5
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:src1
+ $hdt$_0:src1
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:src1
+ $hdt$_0:src1
TableScan
alias: src1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out Tue Mar 31 01:48:43 2015
@@ -23,11 +23,11 @@ STAGE PLANS:
Stage: Stage-5
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:$hdt$_0:src
+ $hdt$_0:$hdt$_0:src
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:$hdt$_0:src
+ $hdt$_0:$hdt$_0:src
TableScan
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out Tue Mar 31 01:48:43 2015
@@ -23,11 +23,11 @@ STAGE PLANS:
Stage: Stage-5
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:$hdt$_0:src
+ $hdt$_0:$hdt$_0:src
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:$hdt$_0:src
+ $hdt$_0:$hdt$_0:src
TableScan
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out Tue Mar 31 01:48:43 2015
@@ -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$_1:$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 _col0 (type: string)
1 _col0 (type: string)
- $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:src
+ $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
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out Tue Mar 31 01:48:43 2015
@@ -29,14 +29,14 @@ STAGE PLANS:
Stage: Stage-7
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:$hdt$_0:src
+ $hdt$_0:$hdt$_0:src
Fetch Operator
limit: -1
- $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:src
+ $hdt$_0:$hdt$_1:$hdt$_1:src
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:$hdt$_0:src
+ $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:src
+ $hdt$_0:$hdt$_1:$hdt$_1:src
TableScan
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out Tue Mar 31 01:48:43 2015
@@ -28,11 +28,11 @@ STAGE PLANS:
Stage: Stage-5
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_1:src
+ $hdt$_1:src
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_1:src
+ $hdt$_1:src
TableScan
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out Tue Mar 31 01:48:43 2015
@@ -13,14 +13,14 @@ STAGE PLANS:
Stage: Stage-8
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src4
+ $hdt$_0:$hdt$_0:$hdt$_0:src4
Fetch Operator
limit: -1
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:src4
+ $hdt$_0:$hdt$_1:src4
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:src4
+ $hdt$_0:$hdt$_0:$hdt$_0:src4
TableScan
alias: src4
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -35,7 +35,7 @@ STAGE PLANS:
keys:
0 _col0 (type: string)
1 _col0 (type: string)
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:src4
+ $hdt$_0:$hdt$_1:src4
TableScan
alias: src4
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out Tue Mar 31 01:48:43 2015
@@ -28,11 +28,11 @@ STAGE PLANS:
Stage: Stage-6
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:$hdt$_1:x
+ $hdt$_0:$hdt$_1:x
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:$hdt$_1:x
+ $hdt$_0:$hdt$_1:x
TableScan
alias: x
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join_nulls.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join_nulls.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join_nulls.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join_nulls.q.out Tue Mar 31 01:48:43 2015
@@ -34,7 +34,7 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@myinput1
#### A masked pattern was here ####
13630578
-Warning: Map Join MAPJOIN[18][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-2:MAPRED' is a cross product
PREHOOK: query: SELECT sum(hash(a.key,a.value,b.key,b.value)) FROM myinput1 a RIGHT OUTER JOIN myinput1 b
PREHOOK: type: QUERY
PREHOOK: Input: default@myinput1
Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out Tue Mar 31 01:48:43 2015
@@ -270,11 +270,11 @@ STAGE PLANS:
Stage: Stage-14
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_1:a
+ $hdt$_1:a
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_1:a
+ $hdt$_1:a
TableScan
alias: a
Filter Operator
@@ -319,11 +319,11 @@ STAGE PLANS:
Stage: Stage-12
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_2:a
+ $hdt$_2:a
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_2:a
+ $hdt$_2:a
TableScan
alias: a
Filter Operator
@@ -406,11 +406,11 @@ STAGE PLANS:
Local Work:
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$INTNAME
+ $INTNAME
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$INTNAME
+ $INTNAME
TableScan
Stage: Stage-2
@@ -457,11 +457,11 @@ STAGE PLANS:
Stage: Stage-15
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:a
+ $hdt$_0:a
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:a
+ $hdt$_0:a
TableScan
alias: a
Filter Operator
@@ -639,11 +639,11 @@ STAGE PLANS:
Stage: Stage-13
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_1:$hdt$_2:a
+ $hdt$_1:$hdt$_2:a
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_1:$hdt$_2:a
+ $hdt$_1:$hdt$_2:a
TableScan
alias: a
Filter Operator
@@ -714,11 +714,11 @@ STAGE PLANS:
Local Work:
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$INTNAME
+ $INTNAME
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$INTNAME
+ $INTNAME
TableScan
Stage: Stage-2
@@ -748,11 +748,11 @@ STAGE PLANS:
Stage: Stage-12
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:a
+ $hdt$_0:a
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:a
+ $hdt$_0:a
TableScan
alias: a
Filter Operator
@@ -836,11 +836,11 @@ STAGE PLANS:
Stage: Stage-14
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_1:$hdt$_1:a
+ $hdt$_1:$hdt$_1:a
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_1:$hdt$_1:a
+ $hdt$_1:$hdt$_1:a
TableScan
alias: a
Filter Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/combine2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/combine2.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/combine2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/combine2.q.out Tue Mar 31 01:48:43 2015
@@ -564,14 +564,14 @@ STAGE PLANS:
name: default.combine2
name: default.combine2
Truncated Path -> Alias:
- /combine2/value=2010-04-21 09%3A45%3A00 [$hdt$_0:$hdt$_0:combine2]
- /combine2/value=val_0 [$hdt$_0:$hdt$_0:combine2]
- /combine2/value=val_2 [$hdt$_0:$hdt$_0:combine2]
- /combine2/value=val_4 [$hdt$_0:$hdt$_0:combine2]
- /combine2/value=val_5 [$hdt$_0:$hdt$_0:combine2]
- /combine2/value=val_8 [$hdt$_0:$hdt$_0:combine2]
- /combine2/value=val_9 [$hdt$_0:$hdt$_0:combine2]
- /combine2/value=| [$hdt$_0:$hdt$_0:combine2]
+ /combine2/value=2010-04-21 09%3A45%3A00 [$hdt$_0:combine2]
+ /combine2/value=val_0 [$hdt$_0:combine2]
+ /combine2/value=val_2 [$hdt$_0:combine2]
+ /combine2/value=val_4 [$hdt$_0:combine2]
+ /combine2/value=val_5 [$hdt$_0:combine2]
+ /combine2/value=val_8 [$hdt$_0:combine2]
+ /combine2/value=val_9 [$hdt$_0:combine2]
+ /combine2/value=| [$hdt$_0:combine2]
Needs Tagging: false
Reduce Operator Tree:
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out Tue Mar 31 01:48:43 2015
@@ -329,11 +329,11 @@ STAGE PLANS:
Stage: Stage-6
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x
+ $hdt$_0:$hdt$_0:$hdt$_1:x
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x
+ $hdt$_0:$hdt$_0:$hdt$_1:x
TableScan
alias: x
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out Tue Mar 31 01:48:43 2015
@@ -27,16 +27,12 @@ STAGE PLANS:
TableScan
alias: x
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Select Operator
- expressions: key (type: string), value (type: string)
- outputColumnNames: _col0, _col1
+ Reduce Output Operator
+ key expressions: key (type: string)
+ sort order: +
+ Map-reduce partition columns: key (type: string)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Reduce Output Operator
- key expressions: _col0 (type: string)
- sort order: +
- Map-reduce partition columns: _col0 (type: string)
- Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col1 (type: string)
+ value expressions: value (type: string)
Reduce Operator Tree:
Select Operator
expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string)
@@ -116,16 +112,12 @@ STAGE PLANS:
TableScan
alias: y
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
- Select Operator
- expressions: key (type: string), value (type: string)
- outputColumnNames: _col0, _col1
+ Reduce Output Operator
+ key expressions: key (type: string)
+ sort order: +
+ Map-reduce partition columns: key (type: string)
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
- Reduce Output Operator
- key expressions: _col0 (type: string)
- sort order: +
- Map-reduce partition columns: _col0 (type: string)
- Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col1 (type: string)
+ value expressions: value (type: string)
Reduce Operator Tree:
Select Operator
expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string)
Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out Tue Mar 31 01:48:43 2015
@@ -504,14 +504,14 @@ STAGE PLANS:
Stage: Stage-9
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x
+ $hdt$_0:$hdt$_0:$hdt$_1:x
Fetch Operator
limit: -1
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_2:x
+ $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_2:x
Fetch Operator
limit: -1
Alias -> Map Local Operator Tree:
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x
+ $hdt$_0:$hdt$_0:$hdt$_1:x
TableScan
alias: x
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
@@ -526,7 +526,7 @@ STAGE PLANS:
keys:
0 _col0 (type: string)
1 _col0 (type: string)
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_2:x
+ $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_2:x
TableScan
alias: x
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
@@ -1208,14 +1208,14 @@ STAGE PLANS:
Stage: Stage-9
Map Reduce Local Work
Alias -> Map Local Tables:
- $hdt$_0:$hdt$_0:$hdt$_0:$hdt$_0:$hdt$_1:x
+ $hdt$_0:$hdt$_0:$hdt$_1:x
Fetch Operator
limit: -1
- $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_2:x
+ $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_2: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$_1:x
TableScan
alias: x
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
@@ -1230,7 +1230,7 @@ STAGE PLANS:
keys:
0 _col0 (type: string)
1 _col0 (type: string)
- $hdt$_0:$hdt$_0:$hdt$_1:$hdt$_1:$hdt$_1:$hdt$_2:x
+ $hdt$_0:$hdt$_1:$hdt$_1:$hdt$_2:x
TableScan
alias: x
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
Modified: hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out Tue Mar 31 01:48:43 2015
@@ -174,15 +174,11 @@ STAGE PLANS:
TableScan
alias: src1
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
- Select Operator
- expressions: key (type: string), value (type: string)
- outputColumnNames: _col0, _col1
+ Reduce Output Operator
+ key expressions: key (type: string), value (type: string)
+ sort order: ++
+ Map-reduce partition columns: key (type: string)
Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
- Reduce Output Operator
- key expressions: _col0 (type: string), _col1 (type: string)
- sort order: ++
- Map-reduce partition columns: _col0 (type: string)
- Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
Reduce Operator Tree:
Select Operator
expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
@@ -340,15 +336,11 @@ STAGE PLANS:
TableScan
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Select Operator
- expressions: key (type: string), value (type: string)
- outputColumnNames: _col0, _col1
+ Reduce Output Operator
+ key expressions: key (type: string), value (type: string)
+ sort order: ++
+ Map-reduce partition columns: key (type: string)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Reduce Output Operator
- key expressions: _col0 (type: string), _col1 (type: string)
- sort order: ++
- Map-reduce partition columns: _col0 (type: string)
- Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
Reduce Operator Tree:
Select Operator
expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
Modified: hive/trunk/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out Tue Mar 31 01:48:43 2015
@@ -338,7 +338,7 @@ STAGE PLANS:
name: default.src
name: default.src
Truncated Path -> Alias:
- /src [$hdt$_0:src]
+ /src [src]
Needs Tagging: false
Reduce Operator Tree:
Select Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out Tue Mar 31 01:48:43 2015
@@ -100,7 +100,7 @@ TOK_QUERY
LOGICAL PLAN:
-$hdt$_0:$hdt$_0:srcpart
+$hdt$_0:srcpart
TableScan (TS_0)
alias: srcpart
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
@@ -108,25 +108,25 @@ $hdt$_0:$hdt$_0:srcpart
expressions: key (type: string)
outputColumnNames: _col0
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
- Group By Operator (GBY_5)
+ Group By Operator (GBY_4)
aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
- Reduce Output Operator (RS_6)
+ Reduce Output Operator (RS_5)
key expressions: _col0 (type: string)
sort order: +
Map-reduce partition columns: _col0 (type: string)
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: bigint)
- Group By Operator (GBY_7)
+ Group By Operator (GBY_6)
aggregations: count(VALUE._col0)
keys: KEY._col0 (type: string)
mode: mergepartial
outputColumnNames: _col0, _col1
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
- File Output Operator (FS_9)
+ File Output Operator (FS_8)
compressed: false
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
table:
@@ -180,7 +180,7 @@ TOK_QUERY
LOGICAL PLAN:
-$hdt$_0:$hdt$_0:src
+$hdt$_0:src
TableScan (TS_0)
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -188,25 +188,25 @@ $hdt$_0:$hdt$_0:src
expressions: key (type: string)
outputColumnNames: _col0
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Group By Operator (GBY_4)
+ Group By Operator (GBY_3)
aggregations: count(1)
keys: _col0 (type: string)
mode: hash
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Reduce Output Operator (RS_5)
+ Reduce Output Operator (RS_4)
key expressions: _col0 (type: string)
sort order: +
Map-reduce partition columns: _col0 (type: string)
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: bigint)
- Group By Operator (GBY_6)
+ Group By Operator (GBY_5)
aggregations: count(VALUE._col0)
keys: KEY._col0 (type: string)
mode: mergepartial
outputColumnNames: _col0, _col1
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
- File Output Operator (FS_8)
+ File Output Operator (FS_7)
compressed: false
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
table:
@@ -286,16 +286,16 @@ null-subquery1:$hdt$_0-subquery1:src
expressions: key (type: string), value (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Union (UNION_6)
+ Union (UNION_5)
Statistics: Num rows: 2500 Data size: 26560 Basic stats: COMPLETE Column stats: NONE
- File Output Operator (FS_8)
+ File Output Operator (FS_7)
compressed: false
Statistics: Num rows: 2500 Data size: 26560 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
-null-subquery2:$hdt$_0-subquery2:$hdt$_0:srcpart
+null-subquery2:$hdt$_0-subquery2:srcpart
TableScan (TS_2)
alias: srcpart
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
@@ -303,7 +303,7 @@ null-subquery2:$hdt$_0-subquery2:$hdt$_0
expressions: key (type: string), value (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
- Union (UNION_6)
+ Union (UNION_5)
Statistics: Num rows: 2500 Data size: 26560 Basic stats: COMPLETE Column stats: NONE
PREHOOK: query: EXPLAIN LOGICAL
@@ -357,11 +357,11 @@ TOK_QUERY
LOGICAL PLAN:
-$hdt$_0:$hdt$_0:s2
+$hdt$_0:s2
TableScan (TS_0)
alias: s2
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
- Filter Operator (FIL_13)
+ Filter Operator (FIL_12)
predicate: key is not null (type: boolean)
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Select Operator (SEL_2)
@@ -386,18 +386,18 @@ $hdt$_0:$hdt$_0:s2
expressions: _col3 (type: string), _col1 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
- File Output Operator (FS_12)
+ File Output Operator (FS_11)
compressed: false
Statistics: Num rows: 1100 Data size: 11686 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:s1
+$hdt$_1:s1
TableScan (TS_3)
alias: s1
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Filter Operator (FIL_14)
+ Filter Operator (FIL_13)
predicate: key is not null (type: boolean)
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Select Operator (SEL_4)
@@ -472,7 +472,7 @@ TOK_QUERY
LOGICAL PLAN:
-$hdt$_0:srcpart
+srcpart
TableScan (TS_0)
alias: srcpart
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
@@ -480,7 +480,7 @@ $hdt$_0:srcpart
expressions: ds (type: string), key (type: string), value (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
- ListSink (OP_6)
+ ListSink (OP_5)
PREHOOK: query: EXPLAIN LOGICAL SELECT * FROM V3
PREHOOK: type: QUERY
@@ -503,23 +503,23 @@ TOK_QUERY
LOGICAL PLAN:
-$hdt$_0:$hdt$_0:srcpart
+$hdt$_0:srcpart
TableScan (TS_0)
alias: srcpart
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
- Filter Operator (FIL_13)
+ Filter Operator (FIL_12)
predicate: key is not null (type: boolean)
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Select Operator (SEL_2)
expressions: key (type: string)
outputColumnNames: _col0
Statistics: Num rows: 1000 Data size: 10624 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: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
- Join Operator (JOIN_10)
+ Join Operator (JOIN_9)
condition map:
Inner Join 0 to 1
keys:
@@ -527,11 +527,11 @@ $hdt$_0:$hdt$_0:srcpart
1 _col0 (type: string)
outputColumnNames: _col0, _col2
Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
- Select Operator (SEL_11)
+ Select Operator (SEL_10)
expressions: _col0 (type: string), _col2 (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
- File Output Operator (FS_12)
+ File Output Operator (FS_11)
compressed: false
Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
table:
@@ -539,23 +539,23 @@ $hdt$_0:$hdt$_0:srcpart
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
$hdt$_1:src2
- TableScan (TS_4)
+ TableScan (TS_3)
alias: src2
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Filter Operator (FIL_14)
+ Filter Operator (FIL_13)
predicate: key is not null (type: boolean)
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
- Select Operator (SEL_5)
+ Select Operator (SEL_4)
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_9)
+ Reduce Output Operator (RS_8)
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_10)
+ Join Operator (JOIN_9)
condition map:
Inner Join 0 to 1
keys:
@@ -585,24 +585,24 @@ TOK_QUERY
LOGICAL PLAN:
-$hdt$_0:$hdt$_0:$hdt$_0:srcpart
+$hdt$_0:srcpart
TableScan (TS_0)
alias: srcpart
Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE
- Filter Operator (FIL_18)
+ Filter Operator (FIL_16)
predicate: key is not null (type: boolean)
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
Select Operator (SEL_2)
expressions: key (type: string), value (type: string)
outputColumnNames: _col0, _col1
Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
- Reduce Output Operator (RS_9)
+ Reduce Output Operator (RS_8)
key expressions: _col0 (type: string)
sort order: +
Map-reduce partition columns: _col0 (type: string)
Statistics: Num rows: 1000 Data size: 10624 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
Inner Join 0 to 2
@@ -612,34 +612,34 @@ $hdt$_0:$hdt$_0:$hdt$_0:srcpart
2 _col0 (type: string)
outputColumnNames: _col1, _col2, _col4
Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
- Select Operator (SEL_15)
+ Select Operator (SEL_14)
expressions: _col2 (type: string), _col1 (type: string), _col4 (type: string)
outputColumnNames: _col0, _col1, _col2
Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
- File Output Operator (FS_17)
+ File Output Operator (FS_15)
compressed: false
Statistics: Num rows: 2200 Data size: 23372 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:src
- TableScan (TS_4)
+$hdt$_1:src
+ TableScan (TS_3)
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Filter Operator (FIL_19)
+ Filter Operator (FIL_17)
predicate: key is not null (type: boolean)
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
- Select Operator (SEL_5)
+ Select Operator (SEL_4)
expressions: key (type: string)
outputColumnNames: _col0
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
- Join Operator (JOIN_14)
+ Join Operator (JOIN_13)
condition map:
Inner Join 0 to 1
Inner Join 0 to 2
@@ -649,24 +649,24 @@ $hdt$_0:$hdt$_1:src
2 _col0 (type: string)
outputColumnNames: _col1, _col2, _col4
Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-$hdt$_0:$hdt$_2:src
- TableScan (TS_6)
+$hdt$_2:src
+ TableScan (TS_5)
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Filter Operator (FIL_20)
+ Filter Operator (FIL_18)
predicate: key is not null (type: boolean)
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
- Select Operator (SEL_7)
+ Select Operator (SEL_6)
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_13)
+ Reduce Output Operator (RS_12)
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
Inner Join 0 to 2
@@ -800,11 +800,11 @@ TOK_QUERY
LOGICAL PLAN:
-$hdt$_0:$hdt$_0:src
+$hdt$_0:src
TableScan (TS_0)
alias: src
Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
- Filter Operator (FIL_19)
+ Filter Operator (FIL_18)
predicate: key is not null (type: boolean)
Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
Select Operator (SEL_1)
@@ -829,27 +829,27 @@ $hdt$_0:$hdt$_0:src
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_16)
+ Reduce Output Operator (RS_15)
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_17)
+ Select Operator (SEL_16)
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_18)
+ File Output Operator (FS_17)
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:src
+$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_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_3)
Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr.q.out Tue Mar 31 01:48:43 2015
@@ -222,8 +222,8 @@ STAGE PLANS:
name: default.srcpart
name: default.srcpart
Truncated Path -> Alias:
- /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:$hdt$_0:src]
- /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:$hdt$_0:src]
+ /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:src]
+ /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:src]
Needs Tagging: false
Reduce Operator Tree:
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out Tue Mar 31 01:48:43 2015
@@ -239,8 +239,8 @@ STAGE PLANS:
name: default.srcpart
name: default.srcpart
Truncated Path -> Alias:
- /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:$hdt$_0:src]
- /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:$hdt$_0:src]
+ /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:src]
+ /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:src]
Needs Tagging: false
Reduce Operator Tree:
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out Tue Mar 31 01:48:43 2015
@@ -215,8 +215,8 @@ STAGE PLANS:
name: default.srcpart
name: default.srcpart
Truncated Path -> Alias:
- /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:$hdt$_0:src]
- /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:$hdt$_0:src]
+ /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:src]
+ /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:src]
Needs Tagging: false
Reduce Operator Tree:
Group By Operator
Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out?rev=1670236&r1=1670235&r2=1670236&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out Tue Mar 31 01:48:43 2015
@@ -228,8 +228,8 @@ STAGE PLANS:
name: default.srcpart
name: default.srcpart
Truncated Path -> Alias:
- /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:$hdt$_0:src]
- /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:$hdt$_0:src]
+ /srcpart/ds=2008-04-08/hr=11 [$hdt$_0:src]
+ /srcpart/ds=2008-04-08/hr=12 [$hdt$_0:src]
Needs Tagging: false
Reduce Operator Tree:
Group By Operator