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/01/20 05:34:05 UTC

svn commit: r1653192 - in /hive/branches/branch-0.14/ql/src: java/org/apache/hadoop/hive/ql/optimizer/ test/results/clientpositive/ test/results/clientpositive/tez/

Author: hashutosh
Date: Tue Jan 20 04:34:05 2015
New Revision: 1653192

URL: http://svn.apache.org/r1653192
Log:
HIVE-9112 : Query may generate different results depending on the number of reducers (Ted Xu via Ashutosh Chauhan)

Modified:
    hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/constprog_partitioner.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/join_nullsafe.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_clusterby.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join4.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_outer_join5.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/union27.q.out

Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java Tue Jan 20 04:34:05 2015
@@ -862,7 +862,7 @@ public final class ConstantPropagateProc
       if (op.getChildOperators().size() == 1
           && op.getChildOperators().get(0) instanceof JoinOperator) {
         JoinOperator joinOp = (JoinOperator) op.getChildOperators().get(0);
-        if (skipFolding(joinOp.getConf(), rsDesc.getTag())) {
+        if (skipFolding(joinOp.getConf())) {
           LOG.debug("Skip folding in outer join " + op);
           cppCtx.getOpToConstantExprs().put(op, new HashMap<ColumnInfo, ExprNodeDesc>());
           return null;
@@ -888,22 +888,16 @@ public final class ConstantPropagateProc
       rsDesc.setKeyCols(newKeyEpxrs);
 
       // partition columns
-      if (!rsDesc.getPartitionCols().isEmpty()) {
-        ArrayList<ExprNodeDesc> newPartExprs = new ArrayList<ExprNodeDesc>();
-        for (ExprNodeDesc desc : rsDesc.getPartitionCols()) {
-          ExprNodeDesc expr = foldExpr(desc, constants, cppCtx, op, 0, false);
-          if (expr instanceof ExprNodeConstantDesc || expr instanceof ExprNodeNullDesc) {
-            continue;
-          }
-          newPartExprs.add(expr);
+      ArrayList<ExprNodeDesc> newPartExprs = new ArrayList<ExprNodeDesc>();
+      for (ExprNodeDesc desc : rsDesc.getPartitionCols()) {
+        ExprNodeDesc expr = foldExpr(desc, constants, cppCtx, op, 0, false);
+        if (expr != desc && desc instanceof ExprNodeColumnDesc
+            && expr instanceof ExprNodeConstantDesc) {
+          ((ExprNodeConstantDesc) expr).setFoldedFromCol(((ExprNodeColumnDesc) desc).getColumn());
         }
-        if (newPartExprs.isEmpty()) {
-          // If all partition columns are removed because of constant, insert an extra column to avoid
-          // random partitioning.
-          newPartExprs.add(new ExprNodeConstantDesc(""));
-        }
-        rsDesc.setPartitionCols(newPartExprs);
+        newPartExprs.add(expr);
       }
+      rsDesc.setPartitionCols(newPartExprs);
 
       // value columns
       ArrayList<ExprNodeDesc> newValExprs = new ArrayList<ExprNodeDesc>();
@@ -915,28 +909,19 @@ public final class ConstantPropagateProc
       return null;
     }
 
-    private boolean skipFolding(JoinDesc joinDesc, int tag) {
-      JoinCondDesc[] conds = joinDesc.getConds();
-      int i;
-      for (i = conds.length - 1; i >= 0; i--) {
-        if (conds[i].getType() == JoinDesc.INNER_JOIN) {
-          if (tag == i + 1)
-            return false;
-        } else if (conds[i].getType() == JoinDesc.FULL_OUTER_JOIN) {
-          return true;
-        } else if (conds[i].getType() == JoinDesc.RIGHT_OUTER_JOIN) {
-          if (tag == i + 1)
-            return false;
-          return true;
-        } else if (conds[i].getType() == JoinDesc.LEFT_OUTER_JOIN) {
-          if (tag == i + 1)
-            return true;
+    /**
+     * Skip folding constants if there is outer join in join tree.
+     * @param joinDesc
+     * @return true if to skip.
+     */
+    private boolean skipFolding(JoinDesc joinDesc) {
+      for (JoinCondDesc cond : joinDesc.getConds()) {
+        if (cond.getType() == JoinDesc.INNER_JOIN || cond.getType() == JoinDesc.UNIQUE_JOIN) {
+          continue;
         }
+        return true;
       }
-      if (tag == 0) {
-        return false;
-      }
-      return true;
+      return false;
     }
 
   }

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/cluster.q.out Tue Jan 20 04:34:05 2015
@@ -25,7 +25,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '10' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '10' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -83,7 +83,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '20' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '20' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -141,7 +141,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '20' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '20' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -199,7 +199,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '20' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '20' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -257,7 +257,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '20' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '20' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -315,7 +315,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '20' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '20' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -430,7 +430,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '20' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '20' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -485,7 +485,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: x
@@ -496,7 +496,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
@@ -580,7 +580,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
@@ -592,7 +592,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
@@ -677,7 +677,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
@@ -689,7 +689,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
@@ -719,7 +719,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: '20' (type: string)
               sort order: +
-              Map-reduce partition columns: '' (type: string)
+              Map-reduce partition columns: '20' (type: string)
               Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col1 (type: string), _col3 (type: string)
       Reduce Operator Tree:
@@ -774,7 +774,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: x
@@ -785,7 +785,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
@@ -815,7 +815,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: '20' (type: string)
               sort order: +
-              Map-reduce partition columns: '' (type: string)
+              Map-reduce partition columns: '20' (type: string)
               Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col1 (type: string), _col2 (type: string)
       Reduce Operator Tree:

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/constprog_partitioner.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/constprog_partitioner.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/constprog_partitioner.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/constprog_partitioner.q.out Tue Jan 20 04:34:05 2015
@@ -23,7 +23,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '100' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '100' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
@@ -35,7 +35,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '100' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '100' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/join_nullsafe.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/join_nullsafe.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/join_nullsafe.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/join_nullsafe.q.out Tue Jan 20 04:34:05 2015
@@ -1525,7 +1525,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: null (type: void)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: null (type: void)
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                 value expressions: key (type: int)
           TableScan
@@ -1537,7 +1537,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: null (type: void)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: null (type: void)
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: int)
       Reduce Operator Tree:

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd2.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd2.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd2.q.out Tue Jan 20 04:34:05 2015
@@ -355,7 +355,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: x
@@ -366,7 +366,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_clusterby.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_clusterby.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_clusterby.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_clusterby.q.out Tue Jan 20 04:34:05 2015
@@ -25,7 +25,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '10' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '10' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -80,7 +80,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: x
@@ -91,7 +91,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:
@@ -178,7 +178,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '10' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '10' (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
@@ -233,7 +233,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: x
@@ -244,7 +244,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '20' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '20' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 value expressions: value (type: string)
       Reduce Operator Tree:

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join4.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join4.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_join4.q.out Tue Jan 20 04:34:05 2015
@@ -87,13 +87,13 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 'a' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 'a' (type: string)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           TableScan
             Reduce Output Operator
               key expressions: 'a' (type: string)
               sort order: +
-              Map-reduce partition columns: '' (type: string)
+              Map-reduce partition columns: 'a' (type: string)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_outer_join5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_outer_join5.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_outer_join5.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_outer_join5.q.out Tue Jan 20 04:34:05 2015
@@ -49,9 +49,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
           TableScan
@@ -138,9 +138,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
           TableScan
@@ -150,9 +150,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
       Reduce Operator Tree:
@@ -161,13 +161,13 @@ STAGE PLANS:
                Inner Join 0 to 1
                Left Outer Join1 to 2
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0} {VALUE._col1}
             2 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1}
-          outputColumnNames: _col1, _col2, _col7, _col8, _col12, _col13, _col14
+          outputColumnNames: _col0, _col1, _col2, _col7, _col8, _col12, _col13, _col14
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: 20 (type: int), _col1 (type: string), _col2 (type: string), 20 (type: int), _col7 (type: string), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string)
+            expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), 20 (type: int), _col7 (type: string), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -215,9 +215,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
           TableScan
@@ -227,9 +227,9 @@ STAGE PLANS:
               predicate: (id = 20) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Reduce Output Operator
-                key expressions: 20 (type: int)
+                key expressions: id (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: id (type: int)
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
       Reduce Operator Tree:
@@ -238,13 +238,13 @@ STAGE PLANS:
                Inner Join 0 to 1
                Left Outer Join0 to 2
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0} {VALUE._col1}
             2 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1}
-          outputColumnNames: _col1, _col2, _col7, _col8, _col12, _col13, _col14
+          outputColumnNames: _col0, _col1, _col2, _col7, _col8, _col12, _col13, _col14
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: 20 (type: int), _col1 (type: string), _col2 (type: string), 20 (type: int), _col7 (type: string), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string)
+            expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string), 20 (type: int), _col7 (type: string), _col8 (type: string), _col12 (type: int), _col13 (type: string), _col14 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_union_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_union_view.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_union_view.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/ppd_union_view.q.out Tue Jan 20 04:34:05 2015
@@ -179,7 +179,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: keymap (type: string), '2011-10-13' (type: string)
                 sort order: ++
-                Map-reduce partition columns: keymap (type: string)
+                Map-reduce partition columns: keymap (type: string), '2011-10-13' (type: string)
                 Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE
                 tag: 1
                 value expressions: key (type: string)
@@ -195,7 +195,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: keymap (type: string), '2011-10-13' (type: string)
                 sort order: ++
-                Map-reduce partition columns: keymap (type: string)
+                Map-reduce partition columns: keymap (type: string), '2011-10-13' (type: string)
                 Statistics: Num rows: 1 Data size: 14 Basic stats: COMPLETE Column stats: NONE
                 tag: 0
                 value expressions: value (type: string)

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out Tue Jan 20 04:34:05 2015
@@ -71,7 +71,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 5 (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 5 (type: int)
                 Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: a
@@ -82,7 +82,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 5 (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 5 (type: int)
                 Statistics: Num rows: 26 Data size: 104 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
@@ -154,7 +154,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 5 (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 5 (type: int)
                 Statistics: Num rows: 27 Data size: 108 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: c
@@ -165,7 +165,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: 5 (type: int)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: 5 (type: int)
                 Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out Tue Jan 20 04:34:05 2015
@@ -2577,7 +2577,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: '11' (type: string)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: '11' (type: string)
                       Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Select Operator
                       expressions: '11' (type: string)
@@ -2635,7 +2635,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '11' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '11' (type: string)
                   Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
@@ -2733,7 +2733,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: '13' (type: string)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: '13' (type: string)
                       Statistics: Num rows: 1 Data size: 5 Basic stats: COMPLETE Column stats: NONE
         Map 6 
             Map Operator Tree:
@@ -2761,7 +2761,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '13' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '13' (type: string)
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
@@ -4793,7 +4793,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: '11' (type: string)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: '11' (type: string)
                       Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Select Operator
                       expressions: '11' (type: string)

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out Tue Jan 20 04:34:05 2015
@@ -592,7 +592,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: 1 (type: int)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: 1 (type: int)
                       Statistics: Num rows: 1 Data size: 5 Basic stats: COMPLETE Column stats: NONE
         Map 2 
             Map Operator Tree:

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out Tue Jan 20 04:34:05 2015
@@ -1578,7 +1578,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: null (type: void)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: null (type: void)
                       Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                       value expressions: key (type: int)
         Map 3 
@@ -1592,7 +1592,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: null (type: void)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: null (type: void)
                       Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                       value expressions: value (type: int)
         Reducer 2 

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out Tue Jan 20 04:34:05 2015
@@ -52,7 +52,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: 6981 (type: int)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: 6981 (type: int)
                       Statistics: Num rows: 6144 Data size: 1082530 Basic stats: COMPLETE Column stats: NONE
                       value expressions: cdecimal2 (type: decimal(23,14))
             Execution mode: vectorized

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out Tue Jan 20 04:34:05 2015
@@ -2607,7 +2607,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: '11' (type: string)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: '11' (type: string)
                       Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Select Operator
                       expressions: '11' (type: string)
@@ -2666,7 +2666,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '11' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '11' (type: string)
                   Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
@@ -2765,7 +2765,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: '13' (type: string)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: '13' (type: string)
                       Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE Column stats: NONE
         Map 6 
             Map Operator Tree:
@@ -2794,7 +2794,7 @@ STAGE PLANS:
                 Reduce Output Operator
                   key expressions: '13' (type: string)
                   sort order: +
-                  Map-reduce partition columns: '' (type: string)
+                  Map-reduce partition columns: '13' (type: string)
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
         Reducer 3 
             Reduce Operator Tree:
@@ -4847,7 +4847,7 @@ STAGE PLANS:
                     Reduce Output Operator
                       key expressions: '11' (type: string)
                       sort order: +
-                      Map-reduce partition columns: '' (type: string)
+                      Map-reduce partition columns: '11' (type: string)
                       Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Select Operator
                       expressions: '11' (type: string)

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/union27.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/union27.q.out?rev=1653192&r1=1653191&r2=1653192&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/union27.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/union27.q.out Tue Jan 20 04:34:05 2015
@@ -51,7 +51,7 @@ STAGE PLANS:
               Reduce Output Operator
                 key expressions: '97' (type: string)
                 sort order: +
-                Map-reduce partition columns: '' (type: string)
+                Map-reduce partition columns: '97' (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           TableScan
             alias: jackson_sev_add
@@ -68,7 +68,7 @@ STAGE PLANS:
                   Reduce Output Operator
                     key expressions: '97' (type: string)
                     sort order: +
-                    Map-reduce partition columns: '' (type: string)
+                    Map-reduce partition columns: '97' (type: string)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col1 (type: string)
           TableScan
@@ -86,7 +86,7 @@ STAGE PLANS:
                   Reduce Output Operator
                     key expressions: '97' (type: string)
                     sort order: +
-                    Map-reduce partition columns: '' (type: string)
+                    Map-reduce partition columns: '97' (type: string)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col1 (type: string)
       Reduce Operator Tree: