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:40:23 UTC

svn commit: r1584410 [3/6] - in /hive/trunk: common/src/java/org/apache/hadoop/hive/conf/ conf/ ql/src/test/results/clientnegative/ ql/src/test/results/clientpositive/

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out Thu Apr  3 21:40:21 2014
@@ -453,11 +453,45 @@ FROM (SELECT b.key AS key, b.cnt AS cnt,
       ON b.key = d.key) tmp
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-9 is a root stage
+  Stage-2 depends on stages: Stage-9
   Stage-3 depends on stages: Stage-2
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        tmp:b:x 
+          Fetch Operator
+            limit: -1
+        tmp:d:x 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        tmp:b: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)
+        tmp:d:x 
+          TableScan
+            alias: x
+            Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -517,22 +551,6 @@ STAGE PLANS:
                   value expressions: _col1 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            tmp:b:x 
-              Fetch Operator
-                limit: -1
-            tmp:d:x 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            tmp:b:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-            tmp:d:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Demux Operator
           Statistics: Num rows: 126 Data size: 12786 Basic stats: COMPLETE Column stats: NONE
@@ -1087,11 +1105,45 @@ FROM (SELECT d.key AS key, d.cnt AS cnt,
       ON b.key = d.key) tmp
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-9 is a root stage
+  Stage-2 depends on stages: Stage-9
   Stage-3 depends on stages: Stage-2
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        tmp:b:x 
+          Fetch Operator
+            limit: -1
+        tmp:d:x 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        tmp:b:x 
+          TableScan
+            alias: x
+            Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+        tmp:d: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:
@@ -1151,22 +1203,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            tmp:b:x 
-              Fetch Operator
-                limit: -1
-            tmp:d:x 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            tmp:b:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-            tmp:d:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Demux Operator
           Statistics: Num rows: 126 Data size: 12786 Basic stats: COMPLETE Column stats: NONE

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer4.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer4.q.out Thu Apr  3 21:40:21 2014
@@ -359,11 +359,49 @@ FROM (SELECT y.key AS key, count(1) AS c
       GROUP BY y.key) tmp
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-7 is a root stage
+  Stage-2 depends on stages: Stage-7
   Stage-3 depends on stages: Stage-2
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-7
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        tmp:x 
+          Fetch Operator
+            limit: -1
+        tmp:y 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        tmp:x 
+          TableScan
+            alias: x
+            Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {key}
+                2 
+              keys:
+                0 key (type: int)
+                1 key (type: int)
+                2 key (type: int)
+        tmp:y 
+          TableScan
+            alias: y
+            Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 
+                1 {key}
+                2 
+              keys:
+                0 key (type: int)
+                1 key (type: int)
+                2 key (type: int)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -402,22 +440,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            tmp:x 
-              Fetch Operator
-                limit: -1
-            tmp:y 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            tmp:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE Column stats: NONE
-            tmp:y 
-              TableScan
-                alias: y
-                Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer5.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer5.q.out Thu Apr  3 21:40:21 2014
@@ -474,16 +474,39 @@ POSTHOOK: Lineage: dest_co1.val SIMPLE [
 POSTHOOK: Lineage: dest_co2.key EXPRESSION [(t1)x.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: dest_co2.val SIMPLE [(t4)n.FieldSchema(name:val, type:string, comment:null), ]
 STAGE DEPENDENCIES:
-  Stage-10 is a root stage
-  Stage-9 depends on stages: Stage-10, Stage-11 , consists of Stage-7, Stage-8, Stage-2
-  Stage-7 has a backup stage: Stage-2
+  Stage-14 is a root stage
+  Stage-10 depends on stages: Stage-14
+  Stage-9 depends on stages: Stage-10, Stage-11 , consists of Stage-12, Stage-13, Stage-2
+  Stage-12 has a backup stage: Stage-2
+  Stage-7 depends on stages: Stage-12
   Stage-0 depends on stages: Stage-2, Stage-7, Stage-8
   Stage-3 depends on stages: Stage-0
-  Stage-8 has a backup stage: Stage-2
+  Stage-13 has a backup stage: Stage-2
+  Stage-8 depends on stages: Stage-13
   Stage-2
-  Stage-11 is a root stage
+  Stage-15 is a root stage
+  Stage-11 depends on stages: Stage-15
 
 STAGE PLANS:
+  Stage: Stage-14
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        d:m 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        d:m 
+          TableScan
+            alias: m
+            Statistics: Num rows: 54 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 {val}
+              keys:
+                0 key (type: int)
+                1 key (type: int)
+
   Stage: Stage-10
     Map Reduce
       Map Operator Tree:
@@ -513,19 +536,27 @@ STAGE PLANS:
                       serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            d:m 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            d:m 
-              TableScan
-                alias: m
-                Statistics: Num rows: 54 Data size: 216 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-9
     Conditional Operator
 
+  Stage: Stage-12
+    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 {_col0}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+
   Stage: Stage-7
     Map Reduce
       Map Operator Tree:
@@ -552,13 +583,6 @@ STAGE PLANS:
                       name: default.dest_co3
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
 
   Stage: Stage-0
     Move Operator
@@ -573,6 +597,23 @@ STAGE PLANS:
   Stage: Stage-3
     Stats-Aggr Operator
 
+  Stage: Stage-13
+    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 {_col0}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+
   Stage: Stage-8
     Map Reduce
       Map Operator Tree:
@@ -599,13 +640,6 @@ STAGE PLANS:
                       name: default.dest_co3
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME1 
-              TableScan
 
   Stage: Stage-2
     Map Reduce
@@ -646,6 +680,25 @@ STAGE PLANS:
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.dest_co3
 
+  Stage: Stage-15
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        b:y 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        b:y 
+          TableScan
+            alias: y
+            Statistics: Num rows: 1447 Data size: 5791 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 
+              keys:
+                0 key (type: int)
+                1 key (type: int)
+
   Stage: Stage-11
     Map Reduce
       Map Operator Tree:
@@ -675,15 +728,6 @@ STAGE PLANS:
                       serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            b:y 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            b:y 
-              TableScan
-                alias: y
-                Statistics: Num rows: 1447 Data size: 5791 Basic stats: COMPLETE Column stats: NONE
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_co3
 SELECT b.key, d.val

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer6.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer6.q.out Thu Apr  3 21:40:21 2014
@@ -503,11 +503,45 @@ JOIN
 ON xx.key=yy.key ORDER BY xx.key, xx.cnt, yy.key, yy.cnt
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-9 is a root stage
+  Stage-2 depends on stages: Stage-9
   Stage-3 depends on stages: Stage-2
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        xx:x 
+          Fetch Operator
+            limit: -1
+        yy:x 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        xx: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)
+        yy:x 
+          TableScan
+            alias: x
+            Statistics: Num rows: 58 Data size: 5812 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:
@@ -573,22 +607,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            xx:x 
-              Fetch Operator
-                limit: -1
-            yy:x 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            xx:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-            yy:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Demux Operator
           Statistics: Num rows: 65 Data size: 6630 Basic stats: COMPLETE Column stats: NONE
@@ -3886,12 +3904,33 @@ JOIN
 ON xx.key=yy.key ORDER BY xx.key, xx.cnt, yy.key, yy.value, yy.cnt
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
-  Stage-3 depends on stages: Stage-2
+  Stage-11 is a root stage
+  Stage-2 depends on stages: Stage-11
+  Stage-10 depends on stages: Stage-2
+  Stage-3 depends on stages: Stage-10
   Stage-4 depends on stages: Stage-3
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-11
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        yy:x 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        yy:x 
+          TableScan
+            alias: x
+            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)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -3927,15 +3966,6 @@ STAGE PLANS:
                     value expressions: _col2 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            yy:x 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            yy:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
@@ -3954,6 +3984,25 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
+  Stage: Stage-10
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        xx:x 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        xx: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-3
     Map Reduce
       Map Operator Tree:
@@ -3996,15 +4045,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            xx:x 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            xx:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Demux Operator
           Statistics: Num rows: 33 Data size: 3382 Basic stats: COMPLETE Column stats: NONE

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer7.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer7.q.out Thu Apr  3 21:40:21 2014
@@ -15,11 +15,32 @@ JOIN src1 yy
 ON xx.key=yy.key ORDER BY xx.key, xx.cnt, yy.key, yy.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-4 is a root stage
-  Stage-2 depends on stages: Stage-4
+  Stage-9 is a root stage
+  Stage-4 depends on stages: Stage-9
+  Stage-8 depends on stages: Stage-4
+  Stage-2 depends on stages: Stage-8
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        xx:y 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        xx:y 
+          TableScan
+            alias: y
+            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-4
     Map Reduce
       Map Operator Tree:
@@ -55,15 +76,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            xx:y 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            xx:y 
-              TableScan
-                alias: y
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
@@ -82,6 +94,25 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
+  Stage: Stage-8
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        yy 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        yy 
+          TableScan
+            alias: yy
+            Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {_col0} {_col1}
+                1 {key} {value}
+              keys:
+                0 _col0 (type: string)
+                1 key (type: string)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -108,15 +139,6 @@ STAGE PLANS:
                   value expressions: _col0 (type: string), _col1 (type: bigint), _col2 (type: string), _col3 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            yy 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            yy 
-              TableScan
-                alias: yy
-                Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 34 Data size: 3459 Basic stats: COMPLETE Column stats: NONE
@@ -184,11 +206,31 @@ JOIN src1 yy
 ON xx.key=yy.key ORDER BY xx.key, xx.cnt, yy.key, yy.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-6 is a root stage
+  Stage-1 depends on stages: Stage-6
   Stage-2 depends on stages: Stage-1
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-6
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        xx:y 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        xx:y 
+          TableScan
+            alias: y
+            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-1
     Map Reduce
       Map Operator Tree:
@@ -233,15 +275,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            xx:y 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            xx:y 
-              TableScan
-                alias: y
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Demux Operator
           Statistics: Num rows: 64 Data size: 6609 Basic stats: COMPLETE Column stats: NONE
@@ -384,11 +417,32 @@ JOIN src1 yy
 ON xx.key=yy.key ORDER BY xx.key, xx.cnt, yy.key, yy.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-4 is a root stage
-  Stage-2 depends on stages: Stage-4
+  Stage-9 is a root stage
+  Stage-4 depends on stages: Stage-9
+  Stage-8 depends on stages: Stage-4
+  Stage-2 depends on stages: Stage-8
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        xx:y 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        xx:y 
+          TableScan
+            alias: y
+            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-4
     Map Reduce
       Map Operator Tree:
@@ -424,15 +478,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            xx:y 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            xx:y 
-              TableScan
-                alias: y
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
@@ -451,6 +496,25 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
+  Stage: Stage-8
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        yy 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        yy 
+          TableScan
+            alias: yy
+            Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {_col0} {_col1}
+                1 {key} {value}
+              keys:
+                0 _col0 (type: string)
+                1 key (type: string)
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -477,15 +541,6 @@ STAGE PLANS:
                   value expressions: _col0 (type: string), _col1 (type: bigint), _col2 (type: string), _col3 (type: string)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            yy 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            yy 
-              TableScan
-                alias: yy
-                Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Extract
           Statistics: Num rows: 34 Data size: 3459 Basic stats: COMPLETE Column stats: NONE
@@ -553,11 +608,31 @@ JOIN src1 yy
 ON xx.key=yy.key ORDER BY xx.key, xx.cnt, yy.key, yy.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-6 is a root stage
+  Stage-1 depends on stages: Stage-6
   Stage-2 depends on stages: Stage-1
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-6
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        xx:y 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        xx:y 
+          TableScan
+            alias: y
+            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-1
     Map Reduce
       Map Operator Tree:
@@ -602,15 +677,6 @@ STAGE PLANS:
                     value expressions: _col1 (type: bigint)
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            xx:y 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            xx:y 
-              TableScan
-                alias: y
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Demux Operator
           Statistics: Num rows: 64 Data size: 6609 Basic stats: COMPLETE Column stats: NONE

Modified: hive/trunk/ql/src/test/results/clientpositive/cross_product_check_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/cross_product_check_2.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/cross_product_check_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/cross_product_check_2.q.out Thu Apr  3 21:40:21 2014
@@ -24,10 +24,30 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join B
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-3 is a root stage
+  Stage-4 is a root stage
+  Stage-3 depends on stages: Stage-4
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-4
+    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: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {key} {value}
+              keys:
+                0 
+                1 
+
   Stage: Stage-3
     Map Reduce
       Map Operator Tree:
@@ -58,15 +78,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: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Fetch Operator
@@ -78,10 +89,44 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
+  Stage-7 is a root stage
+  Stage-5 depends on stages: Stage-7
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-7
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        a 
+          Fetch Operator
+            limit: -1
+        d1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        a 
+          TableScan
+            alias: a
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {_col0} {_col1} {_col4} {_col5}
+                1 {key} {value}
+              keys:
+                0 
+                1 
+        d1 
+          TableScan
+            alias: d1
+            Statistics: Num rows: 10 Data size: 104 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-5
     Map Reduce
       Map Operator Tree:
@@ -123,22 +168,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
-            d1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            a 
-              TableScan
-                alias: a
-                Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
-            d1 
-              TableScan
-                alias: d1
-                Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Fetch Operator
@@ -156,11 +185,32 @@ POSTHOOK: query: explain select * from A
           where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
-  Stage-6 depends on stages: Stage-2
+  Stage-9 is a root stage
+  Stage-2 depends on stages: Stage-9
+  Stage-8 depends on stages: Stage-2
+  Stage-6 depends on stages: Stage-8
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        od1:d1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        od1:d1 
+          TableScan
+            alias: d1
+            Statistics: Num rows: 10 Data size: 104 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:
@@ -197,15 +247,6 @@ STAGE PLANS:
                       Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            od1:d1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            od1:d1 
-              TableScan
-                alias: d1
-                Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string)
@@ -223,6 +264,25 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
+  Stage: Stage-8
+    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: 5312 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {_col0}
+              keys:
+                0 
+                1 
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -251,15 +311,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: 5312 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Fetch Operator
@@ -272,11 +323,32 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
-  Stage-6 depends on stages: Stage-2
+  Stage-9 is a root stage
+  Stage-2 depends on stages: Stage-9
+  Stage-8 depends on stages: Stage-2
+  Stage-6 depends on stages: Stage-8
   Stage-0 is a root stage
 
 STAGE PLANS:
+  Stage: Stage-9
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        od1:d1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        od1:d1 
+          TableScan
+            alias: d1
+            Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key}
+                1 
+              keys:
+                0 
+                1 
+
   Stage: Stage-2
     Map Reduce
       Map Operator Tree:
@@ -313,15 +385,6 @@ STAGE PLANS:
                       Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            od1:d1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            od1:d1 
-              TableScan
-                alias: d1
-                Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string)
@@ -339,6 +402,25 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
+  Stage: Stage-8
+    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: 5312 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {_col0}
+              keys:
+                0 
+                1 
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -367,22 +449,13 @@ 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: 5312 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Fetch Operator
       limit: -1
 
-Warning: Map Join MAPJOIN[58][bigTable=?] in task 'Stage-6:MAPRED' is a cross product
 Warning: Map Join MAPJOIN[88][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[58][bigTable=?] in task 'Stage-6:MAPRED' is a cross product
 Warning: Shuffle Join JOIN[19][tables = [ss, od1]] in Stage 'Stage-3:MAPRED' is a cross product
 PREHOOK: query: explain select * from 
 (select A.key from A group by key) ss join 
@@ -394,11 +467,14 @@ POSTHOOK: query: explain select * from 
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-5 is a root stage
-  Stage-8 depends on stages: Stage-2, Stage-5 , consists of Stage-6, Stage-7, Stage-3
-  Stage-6 has a backup stage: Stage-3
-  Stage-7 has a backup stage: Stage-3
+  Stage-8 depends on stages: Stage-2, Stage-5 , consists of Stage-10, Stage-11, Stage-3
+  Stage-10 has a backup stage: Stage-3
+  Stage-6 depends on stages: Stage-10
+  Stage-11 has a backup stage: Stage-3
+  Stage-7 depends on stages: Stage-11
   Stage-3
-  Stage-2 is a root stage
+  Stage-12 is a root stage
+  Stage-2 depends on stages: Stage-12
   Stage-0 is a root stage
 
 STAGE PLANS:
@@ -442,6 +518,23 @@ STAGE PLANS:
   Stage: Stage-8
     Conditional Operator
 
+  Stage: Stage-10
+    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 {_col0}
+                1 {_col0}
+              keys:
+                0 
+                1 
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -467,13 +560,23 @@ STAGE PLANS:
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
+
+  Stage: Stage-11
+    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 {_col0}
+                1 {_col0}
+              keys:
+                0 
+                1 
 
   Stage: Stage-7
     Map Reduce
@@ -500,13 +603,6 @@ STAGE PLANS:
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
       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
@@ -542,6 +638,25 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
+  Stage: Stage-12
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        od1:d1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        od1:d1 
+          TableScan
+            alias: d1
+            Statistics: Num rows: 10 Data size: 104 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:
@@ -578,15 +693,6 @@ STAGE PLANS:
                       Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            od1:d1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            od1:d1 
-              TableScan
-                alias: d1
-                Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out Thu Apr  3 21:40:21 2014
@@ -58,10 +58,12 @@ order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
-  Stage-9 depends on stages: Stage-1, Stage-5 , consists of Stage-7, Stage-8, Stage-3 [CONDITIONAL]
-  Stage-7 has a backup stage: Stage-3 [MAPRED]
+  Stage-9 depends on stages: Stage-1, Stage-5 , consists of Stage-10, Stage-11, Stage-3 [CONDITIONAL]
+  Stage-10 has a backup stage: Stage-3 [MAPREDLOCAL]
+  Stage-7 depends on stages: Stage-10 [MAPRED]
   Stage-4 depends on stages: Stage-3, Stage-7, Stage-8 [MAPRED]
-  Stage-8 has a backup stage: Stage-3 [MAPRED]
+  Stage-11 has a backup stage: Stage-3 [MAPREDLOCAL]
+  Stage-8 depends on stages: Stage-11 [MAPRED]
   Stage-3 [MAPRED]
   Stage-5 is a root stage [MAPRED]
   Stage-0 is a root stage [FETCH]
@@ -115,6 +117,23 @@ STAGE PLANS:
   Stage: Stage-9
     Conditional Operator
 
+  Stage: Stage-10
+    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 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+
   Stage: Stage-7
     Map Reduce
       Map Operator Tree:
@@ -140,13 +159,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-4
     Map Reduce
@@ -165,6 +177,23 @@ 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
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
+          TableScan
+            HashTable Sink Operator
+              condition expressions:
+                0 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+
   Stage: Stage-8
     Map Reduce
       Map Operator Tree:
@@ -190,13 +219,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
@@ -322,13 +344,15 @@ order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
-  Stage-2 depends on stages: Stage-1, Stage-7 , consists of Stage-3, Stage-5, Stage-6 [CONDITIONAL]
-  Stage-3 has a backup stage: Stage-6 [MAPRED]
-  Stage-4 depends on stages: Stage-6, Stage-3, Stage-5 [MAPRED]
-  Stage-5 has a backup stage: Stage-6 [MAPRED]
-  Stage-6 [MAPRED]
-  Stage-7 is a root stage [MAPRED]
-  Stage-8 is a root stage [FETCH]
+  Stage-2 depends on stages: Stage-1, Stage-9 , consists of Stage-3, Stage-6, Stage-8 [CONDITIONAL]
+  Stage-3 has a backup stage: Stage-8 [MAPREDLOCAL]
+  Stage-4 depends on stages: Stage-3 [MAPRED]
+  Stage-5 depends on stages: Stage-8, Stage-4, Stage-7 [MAPRED]
+  Stage-6 has a backup stage: Stage-8 [MAPREDLOCAL]
+  Stage-7 depends on stages: Stage-6 [MAPRED]
+  Stage-8 [MAPRED]
+  Stage-9 is a root stage [MAPRED]
+  Stage-10 is a root stage [FETCH]
 
 STAGE PLANS:
   Stage: Stage-1
@@ -380,6 +404,23 @@ STAGE PLANS:
     Conditional Operator
 
   Stage: Stage-3
+    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 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+
+  Stage: Stage-4
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -404,15 +445,8 @@ 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-4
+  Stage: Stage-5
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -429,7 +463,24 @@ STAGE PLANS:
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
-  Stage: Stage-5
+  Stage: Stage-6
+    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 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+
+  Stage: Stage-7
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -454,15 +505,8 @@ 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-6
+  Stage: Stage-8
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -495,7 +539,7 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-7
+  Stage: Stage-9
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -540,7 +584,7 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-8
+  Stage: Stage-10
     Fetch Operator
       limit: -1
 
@@ -587,12 +631,14 @@ POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-2 is a root stage [MAPRED]
-  Stage-3 depends on stages: Stage-1, Stage-2 , consists of Stage-4, Stage-5, Stage-6 [CONDITIONAL]
-  Stage-4 has a backup stage: Stage-6 [MAPRED]
-  Stage-5 has a backup stage: Stage-6 [MAPRED]
-  Stage-6 [MAPRED]
-  Stage-7 depends on stages: Stage-6, Stage-4, Stage-5 [MAPRED]
-  Stage-8 is a root stage [FETCH]
+  Stage-3 depends on stages: Stage-1, Stage-2 , consists of Stage-4, Stage-6, Stage-8 [CONDITIONAL]
+  Stage-4 has a backup stage: Stage-8 [MAPREDLOCAL]
+  Stage-5 depends on stages: Stage-4 [MAPRED]
+  Stage-6 has a backup stage: Stage-8 [MAPREDLOCAL]
+  Stage-7 depends on stages: Stage-6 [MAPRED]
+  Stage-8 [MAPRED]
+  Stage-9 depends on stages: Stage-8, Stage-5, Stage-7 [MAPRED]
+  Stage-10 is a root stage [FETCH]
 
 STAGE PLANS:
   Stage: Stage-1
@@ -689,6 +735,23 @@ STAGE PLANS:
     Conditional Operator
 
   Stage: Stage-4
+    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 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+
+  Stage: Stage-5
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -713,15 +776,25 @@ 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-5
+  Stage: Stage-6
+    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 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+
+  Stage: Stage-7
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -746,15 +819,8 @@ 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-6
+  Stage: Stage-8
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -787,7 +853,7 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-7
+  Stage: Stage-9
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -804,7 +870,7 @@ STAGE PLANS:
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
-  Stage: Stage-8
+  Stage: Stage-10
     Fetch Operator
       limit: -1
 
@@ -852,11 +918,13 @@ STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
   Stage-2 is a root stage [MAPRED]
   Stage-3 depends on stages: Stage-1, Stage-2 , consists of Stage-4, Stage-5, Stage-6 [CONDITIONAL]
-  Stage-4 has a backup stage: Stage-6 [MAPRED]
-  Stage-5 has a backup stage: Stage-6 [MAPRED]
+  Stage-4 has a backup stage: Stage-6 [MAPREDLOCAL]
+  Stage-5 has a backup stage: Stage-6 [MAPREDLOCAL]
   Stage-6 [MAPRED]
-  Stage-7 depends on stages: Stage-6, Stage-4, Stage-5 [MAPRED]
-  Stage-8 is a root stage [FETCH]
+  Stage-7 depends on stages: Stage-4 [MAPRED]
+  Stage-8 depends on stages: Stage-5 [MAPRED]
+  Stage-9 depends on stages: Stage-6, Stage-7, Stage-8 [MAPRED]
+  Stage-10 is a root stage [FETCH]
 
 STAGE PLANS:
   Stage: Stage-1
@@ -953,70 +1021,38 @@ STAGE PLANS:
     Conditional Operator
 
   Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME1 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME1 
           TableScan
-            Map Join Operator
-              condition map:
-                   Inner Join 0 to 1
+            HashTable Sink Operator
               condition expressions:
                 0 {_col0} {_col1}
                 1 {_col1}
               keys:
                 0 _col0 (type: int)
                 1 _col0 (type: int)
-              outputColumnNames: _col0, _col1, _col3
-              Select Operator
-                expressions: _col0 (type: int), _col1 (type: bigint), _col3 (type: bigint)
-                outputColumnNames: _col0, _col1, _col2
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      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-5
-    Map Reduce
-      Map Operator Tree:
+    Map Reduce Local Work
+      Alias -> Map Local Tables:
+        $INTNAME 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        $INTNAME 
           TableScan
-            Map Join Operator
-              condition map:
-                   Inner Join 0 to 1
+            HashTable Sink Operator
               condition expressions:
                 0 {_col0} {_col1}
                 1 {_col1}
               keys:
                 0 _col0 (type: int)
                 1 _col0 (type: int)
-              outputColumnNames: _col0, _col1, _col3
-              Select Operator
-                expressions: _col0 (type: int), _col1 (type: bigint), _col3 (type: bigint)
-                outputColumnNames: _col0, _col1, _col2
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      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-6
     Map Reduce
@@ -1055,6 +1091,58 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
+            Map Join Operator
+              condition map:
+                   Inner Join 0 to 1
+              condition expressions:
+                0 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+              outputColumnNames: _col0, _col1, _col3
+              Select Operator
+                expressions: _col0 (type: int), _col1 (type: bigint), _col3 (type: bigint)
+                outputColumnNames: _col0, _col1, _col2
+                File Output Operator
+                  compressed: false
+                  table:
+                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+      Local Work:
+        Map Reduce Local Work
+
+  Stage: Stage-8
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            Map Join Operator
+              condition map:
+                   Inner Join 0 to 1
+              condition expressions:
+                0 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: int)
+                1 _col0 (type: int)
+              outputColumnNames: _col0, _col1, _col3
+              Select Operator
+                expressions: _col0 (type: int), _col1 (type: bigint), _col3 (type: bigint)
+                outputColumnNames: _col0, _col1, _col2
+                File Output Operator
+                  compressed: false
+                  table:
+                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+      Local Work:
+        Map Reduce Local Work
+
+  Stage: Stage-9
+    Map Reduce
+      Map Operator Tree:
+          TableScan
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
               sort order: +++
@@ -1068,7 +1156,7 @@ STAGE PLANS:
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
-  Stage: Stage-8
+  Stage: Stage-10
     Fetch Operator
       limit: -1
 

Modified: hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out Thu Apr  3 21:40:21 2014
@@ -76,17 +76,17 @@ SELECT a.key, b.value FROM src a JOIN sr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@test_table@part=1
-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: -- This test tests the scenario when the mapper dies. So, create a conditional task for the mapjoin.
 -- Tests a join which is not converted to a map join, the output should be bucketed and sorted.

Modified: hive/trunk/ql/src/test/results/clientpositive/join25.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join25.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join25.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join25.q.out Thu Apr  3 21:40:21 2014
@@ -16,7 +16,8 @@ SELECT /*+ MAPJOIN(x) */ x.key, x.value,
 FROM src1 x JOIN src y ON (x.key = y.key)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-9 is a root stage
+  Stage-1 depends on stages: Stage-9
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
   Stage-4
   Stage-0 depends on stages: Stage-4, Stage-3, Stage-6
@@ -26,6 +27,25 @@ STAGE DEPENDENCIES:
   Stage-6 depends on stages: Stage-5
 
 STAGE PLANS:
+  Stage: Stage-9
+    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: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -57,15 +77,6 @@ STAGE PLANS:
                       name: default.dest_j1
       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: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-7
     Conditional Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/join26.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join26.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join26.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/join26.q.out Thu Apr  3 21:40:21 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/join27.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join27.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join27.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join27.q.out Thu Apr  3 21:40:21 2014
@@ -16,7 +16,8 @@ SELECT /*+ MAPJOIN(x) */ x.key, x.value,
 FROM src1 x JOIN src y ON (x.value = y.value)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-9 is a root stage
+  Stage-1 depends on stages: Stage-9
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
   Stage-4
   Stage-0 depends on stages: Stage-4, Stage-3, Stage-6
@@ -26,6 +27,25 @@ STAGE DEPENDENCIES:
   Stage-6 depends on stages: Stage-5
 
 STAGE PLANS:
+  Stage: Stage-9
+    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: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {value}
+              keys:
+                0 value (type: string)
+                1 value (type: string)
+
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -57,15 +77,6 @@ STAGE PLANS:
                       name: default.dest_j1
       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: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-7
     Conditional Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/join28.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join28.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join28.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join28.q.out Thu Apr  3 21:40:21 2014
@@ -26,11 +26,45 @@ FROM
  JOIN srcpart z ON (subq.key1 = z.key and z.ds='2008-04-08' and z.hr=11)
 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:
+        subq:x 
+          Fetch Operator
+            limit: -1
+        z 
+          Fetch Operator
+            limit: -1
+      Alias -> Map Local Operator Tree:
+        subq: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)
+        z 
+          TableScan
+            alias: z
+            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 (type: string)
+                1 key (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -77,22 +111,6 @@ STAGE PLANS:
                           name: default.dest_j1
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            subq:x 
-              Fetch Operator
-                limit: -1
-            z 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            subq:x 
-              TableScan
-                alias: x
-                Statistics: Num rows: 2 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-            z 
-              TableScan
-                alias: z
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Move Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/join29.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join29.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join29.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join29.q.out Thu Apr  3 21:40:21 2014
@@ -23,11 +23,13 @@ FROM (select x.key, count(1) as cnt from
 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-0 depends on stages: Stage-2, Stage-5, Stage-6
   Stage-3 depends on stages: Stage-0
-  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
 
@@ -75,6 +77,23 @@ STAGE PLANS:
   Stage: Stage-7
     Conditional Operator
 
+  Stage: Stage-8
+    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 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+
   Stage: Stage-5
     Map Reduce
       Map Operator Tree:
@@ -101,13 +120,6 @@ STAGE PLANS:
                       name: default.dest_j1
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
 
   Stage: Stage-0
     Move Operator
@@ -122,6 +134,23 @@ STAGE PLANS:
   Stage: Stage-3
     Stats-Aggr Operator
 
+  Stage: Stage-9
+    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 {_col0} {_col1}
+                1 {_col1}
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -148,13 +177,6 @@ STAGE PLANS:
                       name: default.dest_j1
       Local Work:
         Map Reduce Local Work
-          Alias -> Map Local Tables:
-            $INTNAME1 
-              Fetch Operator
-                limit: -1
-          Alias -> Map Local Operator Tree:
-            $INTNAME1 
-              TableScan
 
   Stage: Stage-2
     Map Reduce

Modified: hive/trunk/ql/src/test/results/clientpositive/join30.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join30.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join30.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join30.q.out Thu Apr  3 21:40:21 2014
@@ -14,11 +14,31 @@ INSERT OVERWRITE TABLE dest_j1 
 SELECT /*+ MAPJOIN(x) */ 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-1 is a root stage
+  Stage-4 is a root stage
+  Stage-1 depends on stages: Stage-4
   Stage-0 depends on stages: Stage-1
   Stage-2 depends on stages: Stage-0
 
 STAGE PLANS:
+  Stage: Stage-4
+    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-1
     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/trunk/ql/src/test/results/clientpositive/join31.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join31.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join31.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join31.q.out Thu Apr  3 21:40:21 2014
@@ -25,12 +25,14 @@ group by subq1.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-8 depends on stages: Stage-1, 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-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-0 depends on stages: Stage-3
   Stage-4 depends on stages: Stage-0
-  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-5 is a root stage
 
@@ -78,6 +80,23 @@ STAGE PLANS:
   Stage: Stage-8
     Conditional Operator
 
+  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 {_col0}
+                1 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+
   Stage: Stage-6
     Map Reduce
       Map Operator Tree:
@@ -108,13 +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
-          Alias -> Map Local Operator Tree:
-            $INTNAME 
-              TableScan
 
   Stage: Stage-3
     Map Reduce
@@ -159,6 +171,23 @@ STAGE PLANS:
   Stage: Stage-4
     Stats-Aggr Operator
 
+  Stage: Stage-10
+    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 {_col0}
+                1 
+              keys:
+                0 _col0 (type: string)
+                1 _col0 (type: string)
+
   Stage: Stage-7
     Map Reduce
       Map Operator Tree:
@@ -189,13 +218,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-2
     Map Reduce

Modified: hive/trunk/ql/src/test/results/clientpositive/join32.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join32.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join32.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/join32.q.out Thu Apr  3 21:40:21 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/join32_lessSize.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join32_lessSize.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join32_lessSize.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/join32_lessSize.q.out Thu Apr  3 21:40:21 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/join33.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join33.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join33.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/join33.q.out Thu Apr  3 21:40:21 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/join34.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join34.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join34.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/join34.q.out Thu Apr  3 21:40:21 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/join35.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join35.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join35.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/join35.q.out Thu Apr  3 21:40:21 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/join36.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join36.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join36.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join36.q.out Thu Apr  3 21:40:21 2014
@@ -60,7 +60,8 @@ POSTHOOK: Lineage: tmp1.key EXPRESSION [
 POSTHOOK: Lineage: tmp2.cnt EXPRESSION [(src)src.null, ]
 POSTHOOK: Lineage: tmp2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-9 is a root stage
+  Stage-1 depends on stages: Stage-9
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
   Stage-4
   Stage-0 depends on stages: Stage-4, Stage-3, Stage-6
@@ -70,6 +71,25 @@ STAGE DEPENDENCIES:
   Stage-6 depends on stages: Stage-5
 
 STAGE PLANS:
+  Stage: Stage-9
+    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: 309 Data size: 1482 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {cnt}
+                1 {cnt}
+              keys:
+                0 key (type: int)
+                1 key (type: int)
+
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -101,15 +121,6 @@ STAGE PLANS:
                       name: default.dest_j1
       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: 309 Data size: 1482 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-7
     Conditional Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/join37.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join37.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join37.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join37.q.out Thu Apr  3 21:40:21 2014
@@ -16,7 +16,8 @@ SELECT /*+ MAPJOIN(X) */ x.key, x.value,
 FROM src1 x JOIN src y ON (x.key = y.key)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-9 is a root stage
+  Stage-1 depends on stages: Stage-9
   Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
   Stage-4
   Stage-0 depends on stages: Stage-4, Stage-3, Stage-6
@@ -26,6 +27,25 @@ STAGE DEPENDENCIES:
   Stage-6 depends on stages: Stage-5
 
 STAGE PLANS:
+  Stage: Stage-9
+    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: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
+            HashTable Sink Operator
+              condition expressions:
+                0 {key} {value}
+                1 {value}
+              keys:
+                0 key (type: string)
+                1 key (type: string)
+
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -57,15 +77,6 @@ STAGE PLANS:
                       name: default.dest_j1
       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: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
 
   Stage: Stage-7
     Conditional Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out?rev=1584410&r1=1584409&r2=1584410&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out Thu Apr  3 21:40:21 2014 differ