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/06/05 20:28:15 UTC

svn commit: r1600719 [6/40] - in /hive/trunk: contrib/src/test/results/clientpositive/ hbase-handler/src/test/results/positive/ ql/src/java/org/apache/hadoop/hive/ql/exec/ ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/ ql/src/java/org/apache/h...

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=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer7.q.out Thu Jun  5 18:28:07 2014
@@ -239,7 +239,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
           TableScan
             alias: x
             Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
@@ -291,8 +291,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {VALUE._col0} {VALUE._col1}
-                    1 {VALUE._col0} {VALUE._col1}
+                    0 {KEY.reducesinkkey0} {VALUE._col0}
+                    1 {KEY.reducesinkkey0} {VALUE._col0}
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   Select Operator
@@ -312,8 +312,8 @@ STAGE PLANS:
               condition map:
                    Inner Join 0 to 1
               condition expressions:
-                0 {VALUE._col0} {VALUE._col1}
-                1 {VALUE._col0} {VALUE._col1}
+                0 {KEY.reducesinkkey0} {VALUE._col0}
+                1 {KEY.reducesinkkey0} {VALUE._col0}
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
@@ -618,7 +618,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
           TableScan
             alias: x
             Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
@@ -670,8 +670,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {VALUE._col0} {VALUE._col1}
-                    1 {VALUE._col0} {VALUE._col1}
+                    0 {KEY.reducesinkkey0} {VALUE._col0}
+                    1 {KEY.reducesinkkey0} {VALUE._col0}
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   Select Operator
@@ -691,8 +691,8 @@ STAGE PLANS:
               condition map:
                    Inner Join 0 to 1
               condition expressions:
-                0 {VALUE._col0} {VALUE._col1}
-                1 {VALUE._col0} {VALUE._col1}
+                0 {KEY.reducesinkkey0} {VALUE._col0}
+                1 {KEY.reducesinkkey0} {VALUE._col0}
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer8.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer8.q.out Thu Jun  5 18:28:07 2014
@@ -111,14 +111,14 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
+            0 {VALUE._col0}
+            1 {KEY.reducesinkkey0} {VALUE._col0}
           outputColumnNames: _col1, _col2, _col3
           Statistics: Num rows: 19 Data size: 1982 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -295,7 +295,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
       Reduce Operator Tree:
         Demux Operator
           Statistics: Num rows: 39 Data size: 4022 Basic stats: COMPLETE Column stats: NONE
@@ -317,8 +317,8 @@ STAGE PLANS:
                     condition map:
                          Inner Join 0 to 1
                     condition expressions:
-                      0 {VALUE._col1}
-                      1 {VALUE._col0} {VALUE._col1}
+                      0 {VALUE._col0}
+                      1 {KEY.reducesinkkey0} {VALUE._col0}
                     outputColumnNames: _col1, _col2, _col3
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Select Operator
@@ -350,8 +350,8 @@ STAGE PLANS:
                     condition map:
                          Inner Join 0 to 1
                     condition expressions:
-                      0 {VALUE._col1}
-                      1 {VALUE._col0} {VALUE._col1}
+                      0 {VALUE._col0}
+                      1 {KEY.reducesinkkey0} {VALUE._col0}
                     outputColumnNames: _col1, _col2, _col3
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Select Operator
@@ -371,8 +371,8 @@ STAGE PLANS:
               condition map:
                    Inner Join 0 to 1
               condition expressions:
-                0 {VALUE._col1}
-                1 {VALUE._col0} {VALUE._col1}
+                0 {VALUE._col0}
+                1 {KEY.reducesinkkey0} {VALUE._col0}
               outputColumnNames: _col1, _col2, _col3
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
@@ -519,7 +519,7 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 9 Data size: 901 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: bigint)
+                value expressions: _col1 (type: bigint)
           TableScan
             Union
               Statistics: Num rows: 9 Data size: 901 Basic stats: COMPLETE Column stats: NONE
@@ -528,7 +528,7 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 9 Data size: 901 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: bigint)
+                value expressions: _col1 (type: bigint)
           TableScan
             alias: x
             Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
@@ -537,14 +537,14 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Left Outer Join0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0}
+            1 {KEY.reducesinkkey0} {VALUE._col0}
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 9 Data size: 991 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -741,7 +741,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
       Reduce Operator Tree:
         Demux Operator
           Statistics: Num rows: 20 Data size: 2119 Basic stats: COMPLETE Column stats: NONE
@@ -763,8 +763,8 @@ STAGE PLANS:
                     condition map:
                          Left Outer Join0 to 1
                     condition expressions:
-                      0 {VALUE._col0} {VALUE._col1}
-                      1 {VALUE._col0} {VALUE._col1}
+                      0 {KEY.reducesinkkey0} {VALUE._col0}
+                      1 {KEY.reducesinkkey0} {VALUE._col0}
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Select Operator
@@ -796,8 +796,8 @@ STAGE PLANS:
                     condition map:
                          Left Outer Join0 to 1
                     condition expressions:
-                      0 {VALUE._col0} {VALUE._col1}
-                      1 {VALUE._col0} {VALUE._col1}
+                      0 {KEY.reducesinkkey0} {VALUE._col0}
+                      1 {KEY.reducesinkkey0} {VALUE._col0}
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                     Select Operator
@@ -817,8 +817,8 @@ STAGE PLANS:
               condition map:
                    Left Outer Join0 to 1
               condition expressions:
-                0 {VALUE._col0} {VALUE._col1}
-                1 {VALUE._col0} {VALUE._col1}
+                0 {KEY.reducesinkkey0} {VALUE._col0}
+                1 {KEY.reducesinkkey0} {VALUE._col0}
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
               Select Operator
@@ -997,14 +997,14 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 1 Data size: 216 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
+            0 {VALUE._col0}
+            1 {KEY.reducesinkkey0} {VALUE._col0}
           outputColumnNames: _col1, _col2, _col3
           Statistics: Num rows: 14 Data size: 1872 Basic stats: COMPLETE Column stats: NONE
           Select Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer9.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer9.q.out Thu Jun  5 18:28:07 2014
@@ -98,21 +98,21 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
               Statistics: Num rows: 171 Data size: 3819 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: int), _col1 (type: bigint)
+              value expressions: _col1 (type: bigint)
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
               Statistics: Num rows: 171 Data size: 3819 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: int), _col1 (type: bigint)
+              value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0}
+            1 {KEY.reducesinkkey0} {VALUE._col0}
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 188 Data size: 4200 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -292,8 +292,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {VALUE._col0} {VALUE._col1}
-                    1 {VALUE._col0} {VALUE._col1}
+                    0 {KEY.reducesinkkey0} {VALUE._col0}
+                    1 {KEY.reducesinkkey0} {VALUE._col0}
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   Select Operator
@@ -323,8 +323,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {VALUE._col0} {VALUE._col1}
-                    1 {VALUE._col0} {VALUE._col1}
+                    0 {KEY.reducesinkkey0} {VALUE._col0}
+                    1 {KEY.reducesinkkey0} {VALUE._col0}
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   Select Operator
@@ -447,21 +447,21 @@ STAGE PLANS:
               sort order: ++
               Map-reduce partition columns: _col0 (type: int), _col1 (type: string)
               Statistics: Num rows: 171 Data size: 3819 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: bigint)
+              value expressions: _col2 (type: bigint)
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: string)
               sort order: ++
               Map-reduce partition columns: _col0 (type: int), _col1 (type: string)
               Statistics: Num rows: 171 Data size: 3819 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: bigint)
+              value expressions: _col2 (type: bigint)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1} {VALUE._col2}
-            1 {VALUE._col0} {VALUE._col1} {VALUE._col2}
+            0 {KEY.reducesinkkey0} {KEY.reducesinkkey1} {VALUE._col0}
+            1 {KEY.reducesinkkey0} {KEY.reducesinkkey1} {VALUE._col0}
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 188 Data size: 4200 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -639,8 +639,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {VALUE._col0} {VALUE._col1} {VALUE._col2}
-                    1 {VALUE._col0} {VALUE._col1} {VALUE._col2}
+                    0 {KEY.reducesinkkey0} {KEY.reducesinkkey1} {VALUE._col0}
+                    1 {KEY.reducesinkkey0} {KEY.reducesinkkey1} {VALUE._col0}
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   Select Operator
@@ -670,8 +670,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {VALUE._col0} {VALUE._col1} {VALUE._col2}
-                    1 {VALUE._col0} {VALUE._col1} {VALUE._col2}
+                    0 {KEY.reducesinkkey0} {KEY.reducesinkkey1} {VALUE._col0}
+                    1 {KEY.reducesinkkey0} {KEY.reducesinkkey1} {VALUE._col0}
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
                   Select Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/count.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/count.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/count.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/count.q.out Thu Jun  5 18:28:07 2014
@@ -125,7 +125,7 @@ STAGE PLANS:
                   key expressions: _col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: int)
                   sort order: ++++
                   Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col4 (type: bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: bigint), _col8 (type: bigint), _col9 (type: bigint), _col10 (type: bigint), _col11 (type: bigint), _col12 (type: bigint), _col13 (type: bigint), _col14 (type: bigint), _col15 (type: bigint), _col16 (type: bigint), _col17 (type: bigint), _col18 (type: bigint), _col19 (type: bigint), _col20 (type: bigint), _col21 (type: bigint), _col22 (type: bigint), _col23 (type: bigint), _col24 (type: bigint)
+                  value expressions: _col4 (type: bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: bigint), _col8 (type: bigint), _col9 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0), count(VALUE._col1), count(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), count(DISTINCT KEY._col0:0._col0), count(DISTINCT KEY._col0:1._col0), count(DISTINCT KEY._col0:2._col0), count(DISTINCT KEY._col0:3._col0), count(DISTINCT KEY._col0:4._col0, KEY._col0:4._col1), count(DISTINCT KEY._col0:5._col0, KEY._col0:5._col1), count(DISTINCT KEY._col0:6._col0, KEY._col0:6._col1), count(DISTINCT KEY._col0:7._col0, KEY._col0:7._col1), count(DISTINCT KEY._col0:8._col0, KEY._col0:8._col1), count(DISTINCT KEY._col0:9._col0, KEY._col0:9._col1), count(DISTINCT KEY._col0:10._col0, KEY._col0:10._col1, KEY._col0:10._col2), count(DISTINCT KEY._col0:11._col0, KEY._col0:11._col1, KEY._col0:11._col2), count(DISTINCT KEY._col0:12._col0, KEY._col0:12._col1, KEY._col0:12._col2), count(DISTINCT KEY._col0:13._col0, KEY._col0:13._col1, KEY._col0:13._col2), count(DISTINCT KEY._col0:14._col0, KEY._col0:14._col1, KEY._col0:14._col2, KEY._col0:
 14._col3)
@@ -244,7 +244,6 @@ STAGE PLANS:
                 key expressions: a (type: int), b (type: int), c (type: int), d (type: int)
                 sort order: ++++
                 Statistics: Num rows: 4 Data size: 78 Basic stats: COMPLETE Column stats: NONE
-                value expressions: 1 (type: int)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(1), count(), count(KEY._col0:0._col0), count(KEY._col0:1._col0), count(KEY._col0:2._col0), count(KEY._col0:3._col0), count(DISTINCT KEY._col0:0._col0), count(DISTINCT KEY._col0:1._col0), count(DISTINCT KEY._col0:2._col0), count(DISTINCT KEY._col0:3._col0), count(DISTINCT KEY._col0:4._col0, KEY._col0:4._col1), count(DISTINCT KEY._col0:5._col0, KEY._col0:5._col1), count(DISTINCT KEY._col0:6._col0, KEY._col0:6._col1), count(DISTINCT KEY._col0:7._col0, KEY._col0:7._col1), count(DISTINCT KEY._col0:8._col0, KEY._col0:8._col1), count(DISTINCT KEY._col0:9._col0, KEY._col0:9._col1), count(DISTINCT KEY._col0:10._col0, KEY._col0:10._col1, KEY._col0:10._col2), count(DISTINCT KEY._col0:11._col0, KEY._col0:11._col1, KEY._col0:11._col2), count(DISTINCT KEY._col0:12._col0, KEY._col0:12._col1, KEY._col0:12._col2), count(DISTINCT KEY._col0:13._col0, KEY._col0:13._col1, KEY._col0:13._col2), count(DISTINCT KEY._col0:14._col0, KEY._col0:14._col1, KEY._col0:14._col2, KEY._co
 l0:14._col3)

Modified: hive/trunk/ql/src/test/results/clientpositive/create_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_view.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_view.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_view.q.out Thu Jun  5 18:28:07 2014
@@ -1274,8 +1274,8 @@ JOIN	 	 
      (select 'tst1' as key, cast(count(1) as string) as value from src s3	 	 
                          UNION  ALL	 	 
       select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2	 	 
-ON (unionsrc1.key = unionsrc2.key), viewExpandedText:SELECT `unionsrc1`.`key` as `k1`, `unionsrc1`.`value` as `v1`,	 	 
-       `unionsrc2`.`key` as `k2`, `unionsrc2`.`value` as `v2`	 	 
+ON (unionsrc1.key = unionsrc2.key), viewExpandedText:SELECT unionsrc1.key as `k1`, unionsrc1.value as `v1`,	 	 
+       unionsrc2.key as `k2`, unionsrc2.value as `v2`	 	 
 FROM (select 'tst1' as `key`, cast(count(1) as string) as `value` from `default`.`src` `s1`	 	 
                          UNION  ALL	 	 
       select `s2`.`key` as `key`, `s2`.`value` as `value` from `default`.`src` `s2` where `s2`.`key` < 10) `unionsrc1`	 	 
@@ -1326,8 +1326,8 @@ JOIN	 	 
                          UNION  ALL	 	 
       select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2	 	 
 ON (unionsrc1.key = unionsrc2.key)	 	 
-View Expanded Text: 	SELECT `unionsrc1`.`key` as `k1`, `unionsrc1`.`value` as `v1`,	 
-       `unionsrc2`.`key` as `k2`, `unionsrc2`.`value` as `v2`	 	 
+View Expanded Text: 	SELECT unionsrc1.key as `k1`, unionsrc1.value as `v1`,	 
+       unionsrc2.key as `k2`, unionsrc2.value as `v2`	 	 
 FROM (select 'tst1' as `key`, cast(count(1) as string) as `value` from `default`.`src` `s1`	 	 
                          UNION  ALL	 	 
       select `s2`.`key` as `key`, `s2`.`value` as `value` from `default`.`src` `s2` where `s2`.`key` < 10) `unionsrc1`	 	 

Modified: hive/trunk/ql/src/test/results/clientpositive/cross_join.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/cross_join.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/cross_join.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/cross_join.q.out Thu Jun  5 18:28:07 2014
@@ -138,13 +138,12 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0}
+            0 {KEY.reducesinkkey0}
             1 
           outputColumnNames: _col0
           Statistics: Num rows: 63 Data size: 6393 Basic stats: COMPLETE Column stats: NONE

Modified: hive/trunk/ql/src/test/results/clientpositive/cross_product_check_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/cross_product_check_1.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/cross_product_check_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/cross_product_check_1.q.out Thu Jun  5 18:28:07 2014
@@ -94,7 +94,7 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
           TableScan
             alias: d2
             Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
@@ -103,14 +103,14 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string), value (type: string)
+              value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0}
+            1 {KEY.reducesinkkey0} {VALUE._col0}
           outputColumnNames: _col0, _col1, _col4, _col5
           Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
@@ -191,7 +191,6 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string)
           TableScan
             alias: d2
             Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
@@ -205,7 +204,7 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0}
+            0 {KEY.reducesinkkey0}
             1 
           outputColumnNames: _col0
           Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE
@@ -449,7 +448,6 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
-              value expressions: key (type: string)
           TableScan
             alias: d2
             Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
@@ -463,7 +461,7 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0}
+            0 {KEY.reducesinkkey0}
             1 
           outputColumnNames: _col0
           Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE

Modified: hive/trunk/ql/src/test/results/clientpositive/ctas.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ctas.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ctas.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ctas.q.out Thu Jun  5 18:28:07 2014
@@ -43,9 +43,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -65,9 +66,10 @@ STAGE PLANS:
               key expressions: _col0 (type: string), _col1 (type: string)
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -185,9 +187,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -207,9 +210,10 @@ STAGE PLANS:
               key expressions: _col0 (type: string), _col1 (type: string)
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -327,9 +331,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: double), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: double), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: double), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -349,9 +354,10 @@ STAGE PLANS:
               key expressions: _col0 (type: double), _col1 (type: string)
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: double), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: double), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -535,9 +541,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -557,9 +564,10 @@ STAGE PLANS:
               key expressions: _col0 (type: string), _col1 (type: string)
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -721,7 +729,6 @@ STAGE PLANS:
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
                 tag: -1
-                value expressions: _col0 (type: string), _col1 (type: string)
       Path -> Alias:
 #### A masked pattern was here ####
       Path -> Partition:
@@ -773,7 +780,9 @@ STAGE PLANS:
         /src [src]
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -806,7 +815,6 @@ STAGE PLANS:
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
               tag: -1
-              value expressions: _col0 (type: string), _col1 (type: string)
       Path -> Alias:
 #### A masked pattern was here ####
       Path -> Partition:
@@ -834,7 +842,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10

Modified: hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out Thu Jun  5 18:28:07 2014
@@ -323,7 +323,9 @@ STAGE PLANS:
               Statistics: Num rows: 20 Data size: 4000 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string), VALUE._col2 (type: string)
+          outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 20 Data size: 4000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 20

Modified: hive/trunk/ql/src/test/results/clientpositive/ctas_hadoop20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ctas_hadoop20.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ctas_hadoop20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ctas_hadoop20.q.out Thu Jun  5 18:28:07 2014
@@ -43,9 +43,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -65,9 +66,10 @@ STAGE PLANS:
               key expressions: _col0 (type: string), _col1 (type: string)
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -185,9 +187,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -207,9 +210,10 @@ STAGE PLANS:
               key expressions: _col0 (type: string), _col1 (type: string)
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -327,9 +331,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: double), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: double), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: double), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -349,9 +354,10 @@ STAGE PLANS:
               key expressions: _col0 (type: double), _col1 (type: string)
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: double), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: double), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -535,9 +541,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -557,9 +564,10 @@ STAGE PLANS:
               key expressions: _col0 (type: string), _col1 (type: string)
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -721,7 +729,6 @@ STAGE PLANS:
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
                 tag: -1
-                value expressions: _col0 (type: string), _col1 (type: string)
       Path -> Alias:
 #### A masked pattern was here ####
       Path -> Partition:
@@ -773,7 +780,9 @@ STAGE PLANS:
         /src [src]
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -806,7 +815,6 @@ STAGE PLANS:
               sort order: ++
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
               tag: -1
-              value expressions: _col0 (type: string), _col1 (type: string)
       Path -> Alias:
 #### A masked pattern was here ####
       Path -> Partition:
@@ -834,7 +842,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10

Modified: hive/trunk/ql/src/test/results/clientpositive/decimal_udf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/decimal_udf.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/decimal_udf.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/decimal_udf.q.out Thu Jun  5 18:28:07 2014
@@ -1275,9 +1275,11 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Statistics: Num rows: 1 Data size: 119 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: int), _col1 (type: decimal(38,23)), _col2 (type: decimal(24,14)), _col3 (type: decimal(30,10))
+              value expressions: _col1 (type: decimal(38,23)), _col2 (type: decimal(24,14)), _col3 (type: decimal(30,10))
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: decimal(38,23)), VALUE._col1 (type: decimal(24,14)), VALUE._col2 (type: decimal(30,10))
+          outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 1 Data size: 119 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out Thu Jun  5 18:28:07 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out Thu Jun  5 18:28:07 2014
@@ -175,10 +175,12 @@ STAGE PLANS:
                   key expressions: _col0 (type: smallint)
                   sort order: +
                   Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
+                  value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Execution mode: vectorized
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: smallint), VALUE._col0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -258,7 +260,9 @@ STAGE PLANS:
                     value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Execution mode: vectorized
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 10 Data size: 2960 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -520,10 +524,12 @@ STAGE PLANS:
                   key expressions: _col0 (type: smallint)
                   sort order: +
                   Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
+                  value expressions: _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Execution mode: vectorized
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: smallint), VALUE._col0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -603,7 +609,9 @@ STAGE PLANS:
                     value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Execution mode: vectorized
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 10 Data size: 2960 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -1281,10 +1289,12 @@ STAGE PLANS:
                   key expressions: _col1 (type: int)
                   sort order: +
                   Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
+                  value expressions: _col0 (type: smallint), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Execution mode: vectorized
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -1339,10 +1349,12 @@ STAGE PLANS:
                   key expressions: _col1 (type: int)
                   sort order: +
                   Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
+                  value expressions: _col0 (type: smallint), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Execution mode: vectorized
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 1048 Data size: 310873 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out Thu Jun  5 18:28:07 2014
@@ -194,7 +194,9 @@ STAGE PLANS:
                     Statistics: Num rows: 10 Data size: 240 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 10 Data size: 240 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -515,7 +517,9 @@ STAGE PLANS:
                     Statistics: Num rows: 10 Data size: 240 Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: smallint), VALUE._col1 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 10 Data size: 240 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -1191,9 +1195,11 @@ STAGE PLANS:
                   key expressions: _col1 (type: int)
                   sort order: +
                   Statistics: Num rows: 4442 Data size: 106611 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
+                  value expressions: _col0 (type: smallint), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 4442 Data size: 106611 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -1248,9 +1254,11 @@ STAGE PLANS:
                   key expressions: _col1 (type: int)
                   sort order: +
                   Statistics: Num rows: 4442 Data size: 106611 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: smallint), _col1 (type: int), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
+                  value expressions: _col0 (type: smallint), _col2 (type: bigint), _col3 (type: float), _col4 (type: tinyint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col1 (type: bigint), VALUE._col2 (type: float), VALUE._col3 (type: tinyint)
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 4442 Data size: 106611 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/escape_clusterby1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/escape_clusterby1.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/escape_clusterby1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/escape_clusterby1.q.out Thu Jun  5 18:28:07 2014
@@ -26,9 +26,10 @@ STAGE PLANS:
                 sort order: ++
                 Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -70,9 +71,10 @@ STAGE PLANS:
                 sort order: ++
                 Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/escape_distributeby1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/escape_distributeby1.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/escape_distributeby1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/escape_distributeby1.q.out Thu Jun  5 18:28:07 2014
@@ -27,7 +27,9 @@ STAGE PLANS:
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -70,7 +72,9 @@ STAGE PLANS:
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/escape_orderby1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/escape_orderby1.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/escape_orderby1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/escape_orderby1.q.out Thu Jun  5 18:28:07 2014
@@ -25,9 +25,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -68,9 +69,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/escape_sortby1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/escape_sortby1.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/escape_sortby1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/escape_sortby1.q.out Thu Jun  5 18:28:07 2014
@@ -25,9 +25,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
@@ -68,9 +69,10 @@ STAGE PLANS:
                 key expressions: _col0 (type: string), _col1 (type: string)
                 sort order: ++
                 Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false

Modified: hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out Thu Jun  5 18:28:07 2014
@@ -366,13 +366,12 @@ s1 
       sort order: +
       Map-reduce partition columns: key (type: string)
       Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-      value expressions: key (type: string)
       Join Operator (JOIN_4)
         condition map:
              Inner Join 0 to 1
         condition expressions:
-          0 {VALUE._col0}
-          1 {VALUE._col1}
+          0 {KEY.reducesinkkey0}
+          1 {VALUE._col0}
         outputColumnNames: _col0, _col5
         Statistics: Num rows: 127 Data size: 25572 Basic stats: COMPLETE Column stats: NONE
         Select Operator (SEL_6)
@@ -400,8 +399,8 @@ s2 
         condition map:
              Inner Join 0 to 1
         condition expressions:
-          0 {VALUE._col0}
-          1 {VALUE._col1}
+          0 {KEY.reducesinkkey0}
+          1 {VALUE._col0}
         outputColumnNames: _col0, _col5
         Statistics: Num rows: 127 Data size: 25572 Basic stats: COMPLETE Column stats: NONE
 
@@ -515,13 +514,12 @@ v3:src1:srcpart 
         sort order: +
         Map-reduce partition columns: _col1 (type: string)
         Statistics: Num rows: 232 Data size: 23248 Basic stats: COMPLETE Column stats: NONE
-        value expressions: _col1 (type: string)
         Join Operator (JOIN_6)
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col1}
-            1 {VALUE._col1}
+            0 {KEY.reducesinkkey0}
+            1 {VALUE._col0}
           outputColumnNames: _col1, _col4
           Statistics: Num rows: 255 Data size: 25572 Basic stats: COMPLETE Column stats: NONE
           Select Operator (SEL_8)
@@ -549,8 +547,8 @@ v3:src2 
         condition map:
              Inner Join 0 to 1
         condition expressions:
-          0 {VALUE._col1}
-          1 {VALUE._col1}
+          0 {KEY.reducesinkkey0}
+          1 {VALUE._col0}
         outputColumnNames: _col1, _col4
         Statistics: Num rows: 255 Data size: 25572 Basic stats: COMPLETE Column stats: NONE
 
@@ -588,15 +586,14 @@ v4:src1:src 
         sort order: +
         Map-reduce partition columns: _col0 (type: string)
         Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-        value expressions: _col0 (type: string)
         Join Operator (JOIN_9)
           condition map:
                Inner Join 0 to 1
                Inner Join 1 to 2
           condition expressions:
-            0 {VALUE._col0}
-            1 {VALUE._col2}
-            2 {VALUE._col1}
+            0 {KEY.reducesinkkey0}
+            1 {VALUE._col1}
+            2 {VALUE._col0}
           outputColumnNames: _col0, _col4, _col6
           Statistics: Num rows: 255 Data size: 51145 Basic stats: COMPLETE Column stats: NONE
           Select Operator (SEL_10)
@@ -629,9 +626,9 @@ v4:src2:srcpart 
                Inner Join 0 to 1
                Inner Join 1 to 2
           condition expressions:
-            0 {VALUE._col0}
-            1 {VALUE._col2}
-            2 {VALUE._col1}
+            0 {KEY.reducesinkkey0}
+            1 {VALUE._col1}
+            2 {VALUE._col0}
           outputColumnNames: _col0, _col4, _col6
           Statistics: Num rows: 255 Data size: 51145 Basic stats: COMPLETE Column stats: NONE
 v4:src3 
@@ -649,9 +646,9 @@ v4:src3 
              Inner Join 0 to 1
              Inner Join 1 to 2
         condition expressions:
-          0 {VALUE._col0}
-          1 {VALUE._col2}
-          2 {VALUE._col1}
+          0 {KEY.reducesinkkey0}
+          1 {VALUE._col1}
+          2 {VALUE._col0}
         outputColumnNames: _col0, _col4, _col6
         Statistics: Num rows: 255 Data size: 51145 Basic stats: COMPLETE Column stats: NONE
 
@@ -816,13 +813,13 @@ s1:src 
                 sort order: +
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 14 Data size: 2805 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: bigint)
+                value expressions: _col1 (type: bigint)
                 Join Operator (JOIN_9)
                   condition map:
                        Inner Join 0 to 1
                   condition expressions:
-                    0 {VALUE._col0} {VALUE._col1}
-                    1 {VALUE._col1}
+                    0 {KEY.reducesinkkey0} {VALUE._col0}
+                    1 {VALUE._col0}
                   outputColumnNames: _col0, _col1, _col3
                   Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
                   Select Operator (SEL_10)
@@ -833,8 +830,10 @@ s1:src 
                       key expressions: _col0 (type: string)
                       sort order: +
                       Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: string), _col1 (type: bigint), _col2 (type: string)
-                      Extract (EX_12)
+                      value expressions: _col1 (type: bigint), _col2 (type: string)
+                      Select Operator (SEL_12)
+                        expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: bigint), VALUE._col1 (type: string)
+                        outputColumnNames: _col0, _col1, _col2
                         Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
                         File Output Operator (FS_13)
                           compressed: false
@@ -857,8 +856,8 @@ s2 
         condition map:
              Inner Join 0 to 1
         condition expressions:
-          0 {VALUE._col0} {VALUE._col1}
-          1 {VALUE._col1}
+          0 {KEY.reducesinkkey0} {VALUE._col0}
+          1 {VALUE._col0}
         outputColumnNames: _col0, _col1, _col3
         Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
 

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=1600719&r1=1600718&r2=1600719&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 Jun  5 18:28:07 2014
@@ -167,9 +167,10 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
               sort order: +++
-              value expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: bigint), KEY.reducesinkkey2 (type: bigint)
+          outputColumnNames: _col0, _col1, _col2
           File Output Operator
             compressed: false
             table:
@@ -228,7 +229,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              value expressions: _col0 (type: int), _col1 (type: bigint)
+              value expressions: _col1 (type: bigint)
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: int)
@@ -240,8 +241,8 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0}
+            1 {VALUE._col0}
           outputColumnNames: _col0, _col1, _col3
           Select Operator
             expressions: _col0 (type: int), _col1 (type: bigint), _col3 (type: bigint)
@@ -455,9 +456,10 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
               sort order: +++
-              value expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: bigint), KEY.reducesinkkey2 (type: bigint)
+          outputColumnNames: _col0, _col1, _col2
           File Output Operator
             compressed: false
             table:
@@ -516,7 +518,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              value expressions: _col0 (type: int), _col1 (type: bigint)
+              value expressions: _col1 (type: bigint)
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: int)
@@ -528,8 +530,8 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0}
+            1 {VALUE._col0}
           outputColumnNames: _col0, _col1, _col3
           Select Operator
             expressions: _col0 (type: int), _col1 (type: bigint), _col3 (type: bigint)
@@ -832,7 +834,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              value expressions: _col0 (type: int), _col1 (type: bigint)
+              value expressions: _col1 (type: bigint)
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: int)
@@ -844,8 +846,8 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0}
+            1 {VALUE._col0}
           outputColumnNames: _col0, _col1, _col3
           Select Operator
             expressions: _col0 (type: int), _col1 (type: bigint), _col3 (type: bigint)
@@ -864,9 +866,10 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
               sort order: +++
-              value expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: bigint), KEY.reducesinkkey2 (type: bigint)
+          outputColumnNames: _col0, _col1, _col2
           File Output Operator
             compressed: false
             table:
@@ -1068,7 +1071,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              value expressions: _col0 (type: int), _col1 (type: bigint)
+              value expressions: _col1 (type: bigint)
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: int)
@@ -1080,8 +1083,8 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col1}
+            0 {KEY.reducesinkkey0} {VALUE._col0}
+            1 {VALUE._col0}
           outputColumnNames: _col0, _col1, _col3
           Select Operator
             expressions: _col0 (type: int), _col1 (type: bigint), _col3 (type: bigint)
@@ -1152,9 +1155,10 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
               sort order: +++
-              value expressions: _col0 (type: int), _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: bigint), KEY.reducesinkkey2 (type: bigint)
+          outputColumnNames: _col0, _col1, _col2
           File Output Operator
             compressed: false
             table:

Modified: hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out (original) and hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out Thu Jun  5 18:28:07 2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/groupby1_limit.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby1_limit.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby1_limit.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby1_limit.q.out Thu Jun  5 18:28:07 2014
@@ -74,7 +74,9 @@ STAGE PLANS:
               Statistics: Num rows: 5 Data size: 1000 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col0 (type: string), _col1 (type: double)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: double)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 5 Data size: 1000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 5

Modified: hive/trunk/ql/src/test/results/clientpositive/groupby2_limit.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby2_limit.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby2_limit.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby2_limit.q.out Thu Jun  5 18:28:07 2014
@@ -58,9 +58,11 @@ STAGE PLANS:
               key expressions: _col0 (type: string)
               sort order: +
               Statistics: Num rows: 14 Data size: 2805 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string), _col1 (type: double)
+              value expressions: _col1 (type: double)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: double)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 14 Data size: 2805 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 5

Modified: hive/trunk/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out Thu Jun  5 18:28:07 2014
@@ -44,7 +44,7 @@ STAGE PLANS:
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col2 (type: bigint), _col3 (type: double), _col4 (type: double), _col5 (type: bigint)
+                  value expressions: _col3 (type: double), _col5 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(DISTINCT KEY._col1:0._col0), sum(VALUE._col1), sum(DISTINCT KEY._col1:1._col0), count(VALUE._col3)
@@ -150,7 +150,7 @@ STAGE PLANS:
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col2 (type: bigint), _col3 (type: double), _col4 (type: double), _col5 (type: bigint)
+                  value expressions: _col3 (type: double), _col5 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(DISTINCT KEY._col1:0._col0), sum(VALUE._col1), sum(DISTINCT KEY._col1:1._col0), count(VALUE._col3)

Modified: hive/trunk/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out Thu Jun  5 18:28:07 2014
@@ -61,7 +61,7 @@ STAGE PLANS:
                   key expressions: _col0 (type: string)
                   sort order: +
                   Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: double), _col2 (type: struct<count:bigint,sum:double,input:string>), _col3 (type: struct<count:bigint,sum:double,input:string>), _col4 (type: string), _col5 (type: string), _col6 (type: struct<count:bigint,sum:double,variance:double>), _col7 (type: struct<count:bigint,sum:double,variance:double>), _col8 (type: struct<count:bigint,sum:double,variance:double>), _col9 (type: struct<count:bigint,sum:double,variance:double>), _col10 (type: double), _col11 (type: bigint)
+                  value expressions: _col1 (type: double), _col2 (type: struct<count:bigint,sum:double,input:string>), _col4 (type: string), _col5 (type: string), _col6 (type: struct<count:bigint,sum:double,variance:double>), _col7 (type: struct<count:bigint,sum:double,variance:double>), _col8 (type: struct<count:bigint,sum:double,variance:double>), _col9 (type: struct<count:bigint,sum:double,variance:double>)
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(VALUE._col0), avg(VALUE._col1), avg(DISTINCT KEY._col0:0._col0), max(VALUE._col3), min(VALUE._col4), std(VALUE._col5), stddev_samp(VALUE._col6), variance(VALUE._col7), var_samp(VALUE._col8), sum(DISTINCT KEY._col0:1._col0), count(DISTINCT KEY._col0:2._col0)

Modified: hive/trunk/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby7_noskew_multi_single_reducer.q.out Thu Jun  5 18:28:07 2014
@@ -103,7 +103,9 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col0 (type: string), _col1 (type: double)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: double)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -143,7 +145,9 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col0 (type: string), _col1 (type: double)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: string), VALUE._col1 (type: double)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10

Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby_complex_types_multi_single_reducer.q.out Thu Jun  5 18:28:07 2014
@@ -105,7 +105,9 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col0 (type: array<string>), _col1 (type: bigint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: array<string>), VALUE._col1 (type: bigint)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10
@@ -172,7 +174,9 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
               value expressions: _col0 (type: map<string,string>), _col1 (type: bigint)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: map<string,string>), VALUE._col1 (type: bigint)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE Column stats: NONE
           Limit
             Number of rows: 10

Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out?rev=1600719&r1=1600718&r2=1600719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out Thu Jun  5 18:28:07 2014
@@ -49,26 +49,23 @@ STAGE PLANS:
                 key expressions: _col0 (type: int)
                 sort order: +
                 Statistics: Num rows: 8 Data size: 120 Basic stats: COMPLETE Column stats: NONE
-                value expressions: _col0 (type: int)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: int)
+          outputColumnNames: _col0
           Statistics: Num rows: 8 Data size: 120 Basic stats: COMPLETE Column stats: NONE
-          Select Operator
-            expressions: _col0 (type: int)
-            outputColumnNames: _col0
+          Group By Operator
+            aggregations: sum(DISTINCT _col0)
+            keys: _col0 (type: int)
+            mode: hash
+            outputColumnNames: _col0, _col1
             Statistics: Num rows: 8 Data size: 120 Basic stats: COMPLETE Column stats: NONE
-            Group By Operator
-              aggregations: sum(DISTINCT _col0)
-              keys: _col0 (type: int)
-              mode: hash
-              outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 120 Basic stats: COMPLETE Column stats: NONE
-              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
+            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
 
   Stage: Stage-2
     Map Reduce
@@ -79,7 +76,6 @@ STAGE PLANS:
               sort order: ++
               Map-reduce partition columns: _col0 (type: int)
               Statistics: Num rows: 8 Data size: 120 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(DISTINCT KEY._col1:0._col0)
@@ -135,7 +131,6 @@ STAGE PLANS:
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 8 Data size: 120 Basic stats: COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(DISTINCT KEY._col1:0._col0)