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 2014/04/03 23:53:35 UTC

svn commit: r1584419 [1/6] - in /hive/branches/branch-0.13: common/src/java/org/apache/hadoop/hive/conf/ conf/ ql/src/test/results/clientnegative/ ql/src/test/results/clientpositive/

Author: hashutosh
Date: Thu Apr  3 21:53:33 2014
New Revision: 1584419

URL: http://svn.apache.org/r1584419
Log:
HIVE-6749 : Turn hive.auto.convert.join.use.nonstaged off by default (Ashutosh Chauhan via Navis)

Modified:
    hive/branches/branch-0.13/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/branch-0.13/conf/hive-default.xml.template
    hive/branches/branch-0.13/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join15.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join17.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join19.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join21.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join22.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join24.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join25.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join26.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join28.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join29.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join3.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join30.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join31.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join32.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join9.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketcontext_6.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin3.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin4.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/correlationoptimizer3.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/correlationoptimizer4.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/correlationoptimizer5.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/correlationoptimizer6.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/correlationoptimizer7.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/cross_product_check_2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/explain_rearrange.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join25.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join26.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join27.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join28.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join29.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join30.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join31.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join32.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join32_lessSize.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join33.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join34.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join35.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join36.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join37.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join_map_ppr.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join_reorder4.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/join_star.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/mapjoin1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/mapjoin_distinct.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/mapjoin_hook.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/mapjoin_memcheck.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/mapjoin_subquery.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/mapjoin_subquery2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/multiMapJoin1.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/multiMapJoin2.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/multi_join_union.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_join.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/select_transform_hint.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats11.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/subq_where_serialization.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/subquery_in_having.q.out
    hive/branches/branch-0.13/ql/src/test/results/clientpositive/subquery_multiinsert.q.out

Modified: hive/branches/branch-0.13/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/branch-0.13/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Thu Apr  3 21:53:33 2014
@@ -545,7 +545,7 @@ public class HiveConf extends Configurat
     HIVECONVERTJOINNOCONDITIONALTASK("hive.auto.convert.join.noconditionaltask", true),
     HIVECONVERTJOINNOCONDITIONALTASKTHRESHOLD("hive.auto.convert.join.noconditionaltask.size",
         10000000L),
-    HIVECONVERTJOINUSENONSTAGED("hive.auto.convert.join.use.nonstaged", true),
+    HIVECONVERTJOINUSENONSTAGED("hive.auto.convert.join.use.nonstaged", false),
     HIVESKEWJOINKEY("hive.skewjoin.key", 100000),
     HIVESKEWJOINMAPJOINNUMMAPTASK("hive.skewjoin.mapjoin.map.tasks", 10000),
     HIVESKEWJOINMAPJOINMINSPLIT("hive.skewjoin.mapjoin.min.split", 33554432L), //32M

Modified: hive/branches/branch-0.13/conf/hive-default.xml.template
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/conf/hive-default.xml.template?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/conf/hive-default.xml.template (original)
+++ hive/branches/branch-0.13/conf/hive-default.xml.template Thu Apr  3 21:53:33 2014
@@ -881,7 +881,7 @@
 
 <property>
   <name>hive.auto.convert.join.use.nonstaged</name>
-  <value>true</value>
+  <value>false</value>
   <description>For conditional joins, if input stream from a small alias can be directly applied to join operator without
     filtering or projection, the alias need not to be pre-staged in distributed cache via mapred local task.
     Currently, this is not working with vectorization or tez execution engine.

Modified: hive/branches/branch-0.13/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out Thu Apr  3 21:53:33 2014
@@ -154,10 +154,30 @@ from srcbucket_mapjoin_part a join srcbu
 on a.key=b.key and a.ds="2008-04-08" and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-3 is a root stage
+  Stage-1 depends on stages: Stage-3
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-3
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        b 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        b 
+          TableScan
+            alias: b
+            Statistics: Num rows: 29 Data size: 3062 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {value}
+              keys:
+                0 key (type: int)
+                1 key (type: int)
+
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -188,15 +208,6 @@ STAGE PLANS:
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            b 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            b 
-              TableScan
-                alias: b
-                Statistics: Num rows: 29 Data size: 3062 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/branches/branch-0.13/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out Thu Apr  3 21:53:33 2014
@@ -63,10 +63,30 @@ POSTHOOK: Lineage: table_asc.value SIMPL
 POSTHOOK: Lineage: table_desc.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: table_desc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-3 is a root stage
+  Stage-1 depends on stages: Stage-3
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-3
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        a 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        a 
+          TableScan
+            alias: a
+            Statistics: Num rows: 500 Data size: 4812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+              keys:
+                0 key (type: int)
+                1 key (type: int)
+
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -97,15 +117,6 @@ STAGE PLANS:
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            a 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            a 
-              TableScan
-                alias: a
-                Statistics: Num rows: 500 Data size: 4812 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Fetch Operator

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join1.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join1.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join1.q.out Thu Apr  3 21:53:33 2014
@@ -14,11 +14,31 @@ FROM src src1 JOIN src src2 ON (src1.key
 INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-4 is a root stage
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
   Stage-0 depends on stages: Stage-4
   Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
+  Stage: Stage-5
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        src1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-4
     Map Reduce
       Map Operator Tree:
@@ -50,15 +70,6 @@ STAGE PLANS:
                       name: default.dest_j1
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Move Operator

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join15.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join15.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join15.q.out Thu Apr  3 21:53:33 2014
@@ -15,11 +15,31 @@ SORT BY k1, v1, k2, v2
 ) a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-6 is a root stage
+  Stage-2 depends on stages: Stage-6
   Stage-3 depends on stages: Stage-2
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-6
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        a:src1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        a:src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -48,15 +68,6 @@ STAGE PLANS:
                   value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            a:src1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            a:src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join17.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join17.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join17.q.out Thu Apr  3 21:53:33 2014
@@ -14,11 +14,31 @@ FROM src src1 JOIN src src2 ON (src1.key
 INSERT OVERWRITE TABLE dest1 SELECT src1.*, src2.*
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-4 is a root stage
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
   Stage-0 depends on stages: Stage-4
   Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
+  Stage: Stage-5
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        src1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-4
     Map Reduce
       Map Operator Tree:
@@ -50,15 +70,6 @@ STAGE PLANS:
                       name: default.dest1
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Move Operator

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join19.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join19.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join19.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join19.q.out Thu Apr  3 21:53:33 2014
@@ -16,11 +16,31 @@ INSERT OVERWRITE TABLE dest1 SELECT src1
 where (src1.ds = '2008-04-08' or src1.ds = '2008-04-09' )and (src1.hr = '12' or src1.hr = '11')
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-4 is a root stage
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
   Stage-0 depends on stages: Stage-4
   Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
+  Stage: Stage-5
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        src2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        src2 
+          TableScan
+            alias: src2
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-4
     Map Reduce
       Map Operator Tree:
@@ -52,15 +72,6 @@ STAGE PLANS:
                       name: default.dest1
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src2 
-              TableScan
-                alias: src2
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Move Operator

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join2.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join2.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join2.q.out Thu Apr  3 21:53:33 2014
@@ -14,11 +14,45 @@ FROM src src1 JOIN src src2 ON (src1.key
 INSERT OVERWRITE TABLE dest_j2 SELECT src1.key, src3.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-6 is a root stage
+  Stage-8 is a root stage
+  Stage-6 depends on stages: Stage-8
   Stage-0 depends on stages: Stage-6
   Stage-3 depends on stages: Stage-0
 
 STAGE PLANS:
+  Stage: Stage-8
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        src1 
+          Fetch Operator
+            limit: -1
+        src3 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 {key}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+        src3 
+          TableScan
+            alias: src3
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {_col0}
+                1 {value}
+              keys:
+                0 (_col0 + _col4) (type: double)
+                1 UDFToDouble(key) (type: double)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -61,22 +95,6 @@ STAGE PLANS:
                         name: default.dest_j2
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-              Fetch Operator
-                limit: -1
-            src3 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-            src3 
-              TableScan
-                alias: src3
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Move Operator

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join21.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join21.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join21.q.out Thu Apr  3 21:53:33 2014
@@ -13,10 +13,30 @@ STAGE PLANS:
   Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
+        src1 
+          Fetch Operator
+            limit: -1
         src2 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
+        src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+                2 {key} {value}
+              filter predicates:
+                0 {(key < 10)}
+                1 
+                2 {(key < 10)}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+                2 key (type: string)
         src2 
           TableScan
             alias: src2
@@ -26,13 +46,17 @@ STAGE PLANS:
               Statistics: Num rows: 9 Data size: 1803 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
-                  0 
+                  0 {key} {value}
                   1 {key} {value}
                   2 {key} {value}
                 filter predicates:
-                  0 
+                  0 {(key < 10)}
                   1 
                   2 {(key < 10)}
+                keys:
+                  0 key (type: string)
+                  1 key (type: string)
+                  2 key (type: string)
 
   Stage: Stage-2
     Map Reduce
@@ -69,17 +93,6 @@ STAGE PLANS:
                   value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-              Fetch Operator
-                limit: -1
-            src2 
-          Alias -> Map Local Operator Tree:
-            src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-            src2 
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 63 Data size: 12786 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join22.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join22.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join22.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join22.q.out Thu Apr  3 21:53:33 2014
@@ -5,10 +5,44 @@ POSTHOOK: query: explain
 SELECT sum(hash(src5.src1_value)) FROM (SELECT src3.*, src4.value as src4_value, src4.key as src4_key FROM src src4 JOIN (SELECT src2.*, src1.key as src1_key, src1.value as src1_value FROM src src1 JOIN src src2 ON src1.key = src2.key) src3 ON src3.src1_key = src4.key) src5
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-3 is a root stage
+  Stage-8 is a root stage
+  Stage-3 depends on stages: Stage-8
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-8
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        src5:src3:src1 
+          Fetch Operator
+            limit: -1
+        src5:src4 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        src5:src3:src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+        src5:src4 
+          TableScan
+            alias: src4
+            Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col3}
+              keys:
+                0 key (type: string)
+                1 _col2 (type: string)
+
   Stage: Stage-3
     Map Reduce
       Map Operator Tree:
@@ -56,22 +90,6 @@ STAGE PLANS:
                         value expressions: _col0 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src5:src3:src1 
-              Fetch Operator
-                limit: -1
-            src5:src4 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src5:src3:src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-            src5:src4 
-              TableScan
-                alias: src4
-                Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(VALUE._col0)

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join24.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join24.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join24.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join24.q.out Thu Apr  3 21:53:33 2014
@@ -26,10 +26,30 @@ POSTHOOK: type: QUERY
 POSTHOOK: Lineage: tst1.cnt EXPRESSION [(src)a.null, ]
 POSTHOOK: Lineage: tst1.key SIMPLE [(src)a.FieldSchema(name:key, type:string, comment:default), ]
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-5 is a root stage
+  Stage-2 depends on stages: Stage-5
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-5
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        a 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        a 
+          TableScan
+            alias: a
+            Statistics: Num rows: 309 Data size: 1482 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {cnt}
+                1 
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -62,15 +82,6 @@ STAGE PLANS:
                     value expressions: _col0 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            a 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            a 
-              TableScan
-                alias: a
-                Statistics: Num rows: 309 Data size: 1482 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(VALUE._col0)

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join25.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join25.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join25.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join25.q.out Thu Apr  3 21:53:33 2014
@@ -19,17 +19,17 @@ PREHOOK: Input: default@srcpart@ds=2008-
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 PREHOOK: Output: default@dest1
-Execution failed with exit status: 2
+Execution failed with exit status: 3
 Obtaining error information
 
 Task failed!
 Task ID:
-  Stage-4
+  Stage-7
 
 Logs:
 
 #### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask
+FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 POSTHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value 
@@ -45,7 +45,7 @@ POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key EXPRESSION [(srcpart)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ]
 RUN: Stage-6:CONDITIONAL
-RUN: Stage-4:MAPRED
+RUN: Stage-7:MAPREDLOCAL
 RUN: Stage-1:MAPRED
 RUN: Stage-0:MOVE
 RUN: Stage-2:STATS
@@ -76,29 +76,29 @@ INSERT OVERWRITE TABLE dest_j2 SELECT sr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dest_j2
-Execution failed with exit status: 2
+Execution failed with exit status: 3
 Obtaining error information
 
 Task failed!
 Task ID:
-  Stage-10
+  Stage-14
 
 Logs:
 
 #### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask
+FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
-Execution failed with exit status: 2
+Execution failed with exit status: 3
 Obtaining error information
 
 Task failed!
 Task ID:
-  Stage-6
+  Stage-12
 
 Logs:
 
 #### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask
+FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key + src2.key = src3.key)
 INSERT OVERWRITE TABLE dest_j2 SELECT src1.key, src3.value
@@ -110,10 +110,10 @@ POSTHOOK: Lineage: dest1.value SIMPLE [(
 POSTHOOK: Lineage: dest_j2.key EXPRESSION [(src)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_j2.value SIMPLE [(src)src3.FieldSchema(name:value, type:string, comment:default), ]
 RUN: Stage-11:CONDITIONAL
-RUN: Stage-10:MAPRED
+RUN: Stage-14:MAPREDLOCAL
 RUN: Stage-1:MAPRED
 RUN: Stage-8:CONDITIONAL
-RUN: Stage-6:MAPRED
+RUN: Stage-12:MAPREDLOCAL
 RUN: Stage-2:MAPRED
 RUN: Stage-0:MOVE
 RUN: Stage-3:STATS
@@ -148,17 +148,17 @@ INSERT OVERWRITE TABLE dest_j1 SELECT sr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@dest_j1
-Execution failed with exit status: 2
+Execution failed with exit status: 3
 Obtaining error information
 
 Task failed!
 Task ID:
-  Stage-4
+  Stage-7
 
 Logs:
 
 #### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask
+FAILED: Execution Error, return code 3 from org.apache.hadoop.hive.ql.exec.mr.MapredLocalTask
 ATTEMPT: Execute BackupTask: org.apache.hadoop.hive.ql.exec.mr.MapRedTask
 POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value
@@ -172,7 +172,7 @@ POSTHOOK: Lineage: dest_j1.value SIMPLE 
 POSTHOOK: Lineage: dest_j2.key EXPRESSION [(src)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_j2.value SIMPLE [(src)src3.FieldSchema(name:value, type:string, comment:default), ]
 RUN: Stage-6:CONDITIONAL
-RUN: Stage-4:MAPRED
+RUN: Stage-7:MAPREDLOCAL
 RUN: Stage-1:MAPRED
 RUN: Stage-0:MOVE
 RUN: Stage-2:STATS

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join26.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join26.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join26.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join26.q.out Thu Apr  3 21:53:33 2014
@@ -14,11 +14,31 @@ INSERT OVERWRITE TABLE dest_j1 
 SELECT x.key, count(1) FROM src1 x JOIN src y ON (x.key = y.key) group by x.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-6 is a root stage
+  Stage-2 depends on stages: Stage-6
   Stage-0 depends on stages: Stage-2
   Stage-3 depends on stages: Stage-0
 
 STAGE PLANS:
+  Stage: Stage-6
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        x 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        x 
+          TableScan
+            alias: x
+            Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -54,15 +74,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            x 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join28.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join28.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join28.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join28.q.out Thu Apr  3 21:53:33 2014
@@ -13,10 +13,30 @@ STAGE PLANS:
   Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
+        src1 
+          Fetch Operator
+            limit: -1
         src2 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
+        src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+                2 {key} {value}
+              filter predicates:
+                0 {(key < 10)}
+                1 
+                2 {(key < 10)}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+                2 key (type: string)
         src2 
           TableScan
             alias: src2
@@ -26,13 +46,17 @@ STAGE PLANS:
               Statistics: Num rows: 9 Data size: 1803 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
-                  0 
+                  0 {key} {value}
                   1 {key} {value}
                   2 {key} {value}
                 filter predicates:
-                  0 
+                  0 {(key < 10)}
                   1 
                   2 {(key < 10)}
+                keys:
+                  0 key (type: string)
+                  1 key (type: string)
+                  2 key (type: string)
 
   Stage: Stage-2
     Map Reduce
@@ -69,17 +93,6 @@ STAGE PLANS:
                   value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-              Fetch Operator
-                limit: -1
-            src2 
-          Alias -> Map Local Operator Tree:
-            src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-            src2 
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 63 Data size: 12786 Basic stats: COMPLETE Column stats: NONE
@@ -339,6 +352,9 @@ STAGE PLANS:
         src1 
           Fetch Operator
             limit: -1
+        src2 
+          Fetch Operator
+            limit: -1
       Alias -> Map Local Operator Tree:
         src1 
           TableScan
@@ -350,12 +366,33 @@ STAGE PLANS:
               HashTable Sink Operator
                 condition expressions:
                   0 {key} {value}
-                  1 
+                  1 {key} {value}
                   2 {key} {value}
                 filter predicates:
                   0 
-                  1 
+                  1 {(key > 10)}
                   2 {(key < 10)}
+                keys:
+                  0 key (type: string)
+                  1 key (type: string)
+                  2 key (type: string)
+        src2 
+          TableScan
+            alias: src2
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+                2 {key} {value}
+              filter predicates:
+                0 
+                1 {(key > 10)}
+                2 {(key < 10)}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+                2 key (type: string)
 
   Stage: Stage-2
     Map Reduce
@@ -392,17 +429,6 @@ STAGE PLANS:
                   value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-            src2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src1 
-            src2 
-              TableScan
-                alias: src2
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 63 Data size: 12786 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join29.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join29.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join29.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join29.q.out Thu Apr  3 21:53:33 2014
@@ -13,10 +13,30 @@ STAGE PLANS:
   Stage: Stage-6
     Map Reduce Local Work
       Alias -> Map Local Tables:
+        src1 
+          Fetch Operator
+            limit: -1
         src2 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
+        src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+                2 {key} {value}
+              filter predicates:
+                0 {(key < 10)}
+                1 
+                2 {(key < 10)}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+                2 key (type: string)
         src2 
           TableScan
             alias: src2
@@ -26,13 +46,17 @@ STAGE PLANS:
               Statistics: Num rows: 9 Data size: 1803 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
-                  0 
+                  0 {key} {value}
                   1 {key} {value}
                   2 {key} {value}
                 filter predicates:
-                  0 
+                  0 {(key < 10)}
                   1 
                   2 {(key < 10)}
+                keys:
+                  0 key (type: string)
+                  1 key (type: string)
+                  2 key (type: string)
 
   Stage: Stage-2
     Map Reduce
@@ -69,17 +93,6 @@ STAGE PLANS:
                   value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-              Fetch Operator
-                limit: -1
-            src2 
-          Alias -> Map Local Operator Tree:
-            src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-            src2 
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 63 Data size: 12786 Basic stats: COMPLETE Column stats: NONE
@@ -1875,6 +1888,9 @@ STAGE PLANS:
         src1 
           Fetch Operator
             limit: -1
+        src2 
+          Fetch Operator
+            limit: -1
       Alias -> Map Local Operator Tree:
         src1 
           TableScan
@@ -1886,12 +1902,33 @@ STAGE PLANS:
               HashTable Sink Operator
                 condition expressions:
                   0 {key} {value}
-                  1 
+                  1 {key} {value}
                   2 {key} {value}
                 filter predicates:
                   0 
-                  1 
+                  1 {(key > 10)}
                   2 {(key < 10)}
+                keys:
+                  0 key (type: string)
+                  1 key (type: string)
+                  2 key (type: string)
+        src2 
+          TableScan
+            alias: src2
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+                2 {key} {value}
+              filter predicates:
+                0 
+                1 {(key > 10)}
+                2 {(key < 10)}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+                2 key (type: string)
 
   Stage: Stage-2
     Map Reduce
@@ -1928,17 +1965,6 @@ STAGE PLANS:
                   value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-            src2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src1 
-            src2 
-              TableScan
-                alias: src2
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 63 Data size: 12786 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join3.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join3.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join3.q.out Thu Apr  3 21:53:33 2014
@@ -14,11 +14,49 @@ FROM src src1 JOIN src src2 ON (src1.key
 INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
+  Stage-6 is a root stage
+  Stage-5 depends on stages: Stage-6
   Stage-0 depends on stages: Stage-5
   Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
+  Stage: Stage-6
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        src1 
+          Fetch Operator
+            limit: -1
+        src2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 
+                2 {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+                2 key (type: string)
+        src2 
+          TableScan
+            alias: src2
+            Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 
+                2 {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+                2 key (type: string)
+
   Stage: Stage-5
     Map Reduce
       Map Operator Tree:
@@ -53,22 +91,6 @@ STAGE PLANS:
                       name: default.dest1
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-              Fetch Operator
-                limit: -1
-            src2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-            src2 
-              TableScan
-                alias: src2
-                Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Move Operator

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join30.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join30.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join30.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join30.q.out Thu Apr  3 21:53:33 2014
@@ -16,10 +16,12 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-7 depends on stages: Stage-1, Stage-4 , consists of Stage-5, Stage-6, Stage-2
-  Stage-5 has a backup stage: Stage-2
+  Stage-7 depends on stages: Stage-1, Stage-4 , consists of Stage-8, Stage-9, Stage-2
+  Stage-8 has a backup stage: Stage-2
+  Stage-5 depends on stages: Stage-8
   Stage-3 depends on stages: Stage-2, Stage-5, Stage-6
-  Stage-6 has a backup stage: Stage-2
+  Stage-9 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-9
   Stage-2
   Stage-4 is a root stage
   Stage-0 is a root stage
@@ -53,6 +55,23 @@ STAGE PLANS:
   Stage: Stage-7
     Conditional Operator
 
+  Stage: Stage-8
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+
   Stage: Stage-5
     Map Reduce
       Map Operator Tree:
@@ -82,13 +101,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME1 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -116,6 +128,23 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -145,13 +174,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
 
   Stage: Stage-2
     Map Reduce
@@ -260,8 +282,9 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-6 depends on stages: Stage-1, Stage-4 , consists of Stage-5, Stage-2
-  Stage-5 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-1, Stage-4 , consists of Stage-7, Stage-2
+  Stage-7 has a backup stage: Stage-2
+  Stage-5 depends on stages: Stage-7
   Stage-3 depends on stages: Stage-2, Stage-5
   Stage-2
   Stage-4 is a root stage
@@ -296,6 +319,23 @@ STAGE PLANS:
   Stage: Stage-6
     Conditional Operator
 
+  Stage: Stage-7
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+
   Stage: Stage-5
     Map Reduce
       Map Operator Tree:
@@ -325,13 +365,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME1 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -466,8 +499,9 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-6 depends on stages: Stage-1, Stage-4 , consists of Stage-5, Stage-2
-  Stage-5 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-1, Stage-4 , consists of Stage-7, Stage-2
+  Stage-7 has a backup stage: Stage-2
+  Stage-5 depends on stages: Stage-7
   Stage-3 depends on stages: Stage-2, Stage-5
   Stage-2
   Stage-4 is a root stage
@@ -502,6 +536,23 @@ STAGE PLANS:
   Stage: Stage-6
     Conditional Operator
 
+  Stage: Stage-7
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+
   Stage: Stage-5
     Map Reduce
       Map Operator Tree:
@@ -531,13 +582,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -678,11 +722,14 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-9 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-6, Stage-7, Stage-8, Stage-2
-  Stage-6 has a backup stage: Stage-2
+  Stage-9 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-10, Stage-11, Stage-12, Stage-2
+  Stage-10 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-10
   Stage-3 depends on stages: Stage-2, Stage-6, Stage-7, Stage-8
-  Stage-7 has a backup stage: Stage-2
-  Stage-8 has a backup stage: Stage-2
+  Stage-11 has a backup stage: Stage-2
+  Stage-7 depends on stages: Stage-11
+  Stage-12 has a backup stage: Stage-2
+  Stage-8 depends on stages: Stage-12
   Stage-2
   Stage-4 is a root stage
   Stage-5 is a root stage
@@ -717,6 +764,39 @@ STAGE PLANS:
   Stage: Stage-9
     Conditional Operator
 
+  Stage: Stage-10
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+        $INTNAME2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME2 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -749,18 +829,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-            $INTNAME2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
-            $INTNAME2 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -788,6 +856,39 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
+  Stage: Stage-11
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-7
     Map Reduce
       Map Operator Tree:
@@ -820,18 +921,39 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
-            $INTNAME1 
-              TableScan
+
+  Stage: Stage-12
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+        $INTNAME2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME2 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
 
   Stage: Stage-8
     Map Reduce
@@ -865,18 +987,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-            $INTNAME2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME1 
-              TableScan
-            $INTNAME2 
-              TableScan
 
   Stage: Stage-2
     Map Reduce
@@ -1030,10 +1140,12 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-8 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-6, Stage-7, Stage-2
-  Stage-6 has a backup stage: Stage-2
+  Stage-8 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-9, Stage-10, Stage-2
+  Stage-9 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-9
   Stage-3 depends on stages: Stage-2, Stage-6, Stage-7
-  Stage-7 has a backup stage: Stage-2
+  Stage-10 has a backup stage: Stage-2
+  Stage-7 depends on stages: Stage-10
   Stage-2
   Stage-4 is a root stage
   Stage-5 is a root stage
@@ -1068,6 +1180,39 @@ STAGE PLANS:
   Stage: Stage-8
     Conditional Operator
 
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+        $INTNAME2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME2 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -1100,18 +1245,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-            $INTNAME2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
-            $INTNAME2 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -1139,6 +1272,39 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
+  Stage: Stage-10
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-7
     Map Reduce
       Map Operator Tree:
@@ -1171,18 +1337,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
-            $INTNAME1 
-              TableScan
 
   Stage: Stage-2
     Map Reduce
@@ -1336,8 +1490,9 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-7 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-6, Stage-2
-  Stage-6 has a backup stage: Stage-2
+  Stage-7 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-8, Stage-2
+  Stage-8 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-8
   Stage-3 depends on stages: Stage-2, Stage-6
   Stage-2
   Stage-4 is a root stage
@@ -1373,6 +1528,39 @@ STAGE PLANS:
   Stage: Stage-7
     Conditional Operator
 
+  Stage: Stage-8
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+        $INTNAME2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME2 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -1405,18 +1593,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-            $INTNAME2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
-            $INTNAME2 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -1596,8 +1772,9 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-7 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-6, Stage-2
-  Stage-6 has a backup stage: Stage-2
+  Stage-7 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-8, Stage-2
+  Stage-8 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-8
   Stage-3 depends on stages: Stage-2, Stage-6
   Stage-2
   Stage-4 is a root stage
@@ -1633,6 +1810,39 @@ STAGE PLANS:
   Stage: Stage-7
     Conditional Operator
 
+  Stage: Stage-8
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+        $INTNAME2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME2 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -1665,18 +1875,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-            $INTNAME2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME1 
-              TableScan
-            $INTNAME2 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -1856,8 +2054,9 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-7 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-6, Stage-2
-  Stage-6 has a backup stage: Stage-2
+  Stage-7 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-8, Stage-2
+  Stage-8 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-8
   Stage-3 depends on stages: Stage-2, Stage-6
   Stage-2
   Stage-4 is a root stage
@@ -1893,6 +2092,39 @@ STAGE PLANS:
   Stage: Stage-7
     Conditional Operator
 
+  Stage: Stage-8
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+        $INTNAME2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME2 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -1925,18 +2157,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-            $INTNAME2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME1 
-              TableScan
-            $INTNAME2 
-              TableScan
 
   Stage: Stage-3
     Map Reduce

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join31.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join31.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join31.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join31.q.out Thu Apr  3 21:53:33 2014
@@ -22,10 +22,12 @@ select sum(hash(Y.key,Y.value))
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-8 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-6, Stage-7, Stage-2
-  Stage-6 has a backup stage: Stage-2
+  Stage-8 depends on stages: Stage-1, Stage-4, Stage-5 , consists of Stage-9, Stage-10, Stage-2
+  Stage-9 has a backup stage: Stage-2
+  Stage-6 depends on stages: Stage-9
   Stage-3 depends on stages: Stage-2, Stage-6, Stage-7
-  Stage-7 has a backup stage: Stage-2
+  Stage-10 has a backup stage: Stage-2
+  Stage-7 depends on stages: Stage-10
   Stage-2
   Stage-4 is a root stage
   Stage-5 is a root stage
@@ -60,6 +62,39 @@ STAGE PLANS:
   Stage: Stage-8
     Conditional Operator
 
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -92,18 +127,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
-            $INTNAME1 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -131,6 +154,39 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
+  Stage: Stage-10
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+        $INTNAME2 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME1 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+        $INTNAME2 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {_col0} {_col1}
+                2 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+                2 _col0 (type: string)
+
   Stage: Stage-7
     Map Reduce
       Map Operator Tree:
@@ -163,18 +219,6 @@ STAGE PLANS:
                         serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-            $INTNAME2 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME1 
-              TableScan
-            $INTNAME2 
-              TableScan
 
   Stage: Stage-2
     Map Reduce

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join32.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join32.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join32.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join32.q.out Thu Apr  3 21:53:33 2014
@@ -25,10 +25,30 @@ on (s.name = v.name)
 group by s.name
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-5 is a root stage
+  Stage-2 depends on stages: Stage-5
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-5
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        s 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        s 
+          TableScan
+            alias: s
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {name}
+                1 {registration}
+              keys:
+                0 name (type: string)
+                1 name (type: string)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -64,15 +84,6 @@ STAGE PLANS:
                     value expressions: _col2 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            s 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            s 
-              TableScan
-                alias: s
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(DISTINCT KEY._col1:0._col0)

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join9.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join9.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_join9.q.out Thu Apr  3 21:53:33 2014
@@ -14,11 +14,31 @@ FROM srcpart src1 JOIN src src2 ON (src1
 INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value where src1.ds = '2008-04-08' and src1.hr = '12'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-4 is a root stage
+  Stage-5 is a root stage
+  Stage-4 depends on stages: Stage-5
   Stage-0 depends on stages: Stage-4
   Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
+  Stage: Stage-5
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        src1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        src1 
+          TableScan
+            alias: src1
+            Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-4
     Map Reduce
       Map Operator Tree:
@@ -50,15 +70,6 @@ STAGE PLANS:
                       name: default.dest1
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            src1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            src1 
-              TableScan
-                alias: src1
-                Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Move Operator

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out Thu Apr  3 21:53:33 2014 differ

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out Thu Apr  3 21:53:33 2014 differ

Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out?rev=1584419&r1=1584418&r2=1584419&view=diff
==============================================================================
Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out Thu Apr  3 21:53:33 2014 differ