http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
 
b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
index 4fb2326..6ec3eb7 100644
--- 
a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
@@ -1358,12 +1358,12 @@ STAGE PLANS:
                       outputColumnNames: _col0
                       Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: UDFToDouble(UDFToInteger((_col0 / 
2.0))) (type: double)
+                        key expressions: UDFToDouble(UDFToInteger((_col0 / 
UDFToDouble(2)))) (type: double)
                         sort order: +
-                        Map-reduce partition columns: 
UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: double)
+                        Map-reduce partition columns: 
UDFToDouble(UDFToInteger((_col0 / UDFToDouble(2)))) (type: double)
                         Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
-                        expressions: UDFToDouble(UDFToInteger((_col0 / 2.0))) 
(type: double)
+                        expressions: UDFToDouble(UDFToInteger((_col0 / 
UDFToDouble(2)))) (type: double)
                         outputColumnNames: _col0
                         Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                         Group By Operator
@@ -1386,7 +1386,7 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 UDFToDouble(_col0) (type: double)
-                  1 UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: double)
+                  1 UDFToDouble(UDFToInteger((_col0 / UDFToDouble(2)))) (type: 
double)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
@@ -1612,9 +1612,9 @@ STAGE PLANS:
                       outputColumnNames: _col0
                       Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: UDFToDouble(UDFToInteger((_col0 / 
2.0))) (type: double)
+                        key expressions: UDFToDouble(UDFToInteger((_col0 / 
UDFToDouble(2)))) (type: double)
                         sort order: +
-                        Map-reduce partition columns: 
UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: double)
+                        Map-reduce partition columns: 
UDFToDouble(UDFToInteger((_col0 / UDFToDouble(2)))) (type: double)
                         Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
             Execution mode: vectorized, llap
         Reducer 2 
@@ -1625,7 +1625,7 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 UDFToDouble(_col0) (type: double)
-                  1 UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: double)
+                  1 UDFToDouble(UDFToInteger((_col0 / UDFToDouble(2)))) (type: 
double)
                 Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
@@ -2714,14 +2714,15 @@ STAGE PLANS:
                   alias: srcpart
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: ds (type: string)
-                    outputColumnNames: _col0
+                    expressions: ds (type: string), hr (type: string)
+                    outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: string)
                       sort order: +
                       Map-reduce partition columns: _col0 (type: string)
                       Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
+                      value expressions: _col1 (type: string)
             Execution mode: llap
         Map 5 
             Map Operator Tree:
@@ -2767,12 +2768,29 @@ STAGE PLANS:
                     predicate: ((UDFToDouble(hour) = 11.0) and 
(UDFToDouble(hr) = 11.0)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
+                      expressions: hr (type: string)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: '11' (type: string)
+                        key expressions: _col0 (type: string)
                         sort order: +
-                        Map-reduce partition columns: '11' (type: string)
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                      Select Operator
+                        expressions: _col0 (type: string)
+                        outputColumnNames: _col0
+                        Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                        Group By Operator
+                          keys: _col0 (type: string)
+                          mode: hash
+                          outputColumnNames: _col0
+                          Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                          Dynamic Partitioning Event Operator
+                            Target column: hr (string)
+                            Target Input: srcpart
+                            Partition key expr: hr
+                            Statistics: Num rows: 1 Data size: 172 Basic 
stats: COMPLETE Column stats: NONE
+                            Target Vertex: Map 1
             Execution mode: vectorized, llap
         Reducer 2 
             Execution mode: llap
@@ -2783,11 +2801,12 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
+                outputColumnNames: _col1
                 Statistics: Num rows: 1100 Data size: 11686 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '11' (type: string)
+                  key expressions: _col1 (type: string)
                   sort order: +
-                  Map-reduce partition columns: '11' (type: string)
+                  Map-reduce partition columns: _col1 (type: string)
                   Statistics: Num rows: 1100 Data size: 11686 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 3 
             Execution mode: llap
@@ -2796,8 +2815,8 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 '11' (type: string)
-                  1 '11' (type: string)
+                  0 _col1 (type: string)
+                  1 _col0 (type: string)
                 Statistics: Num rows: 1210 Data size: 12854 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
@@ -2879,14 +2898,15 @@ STAGE PLANS:
                     predicate: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
-                      expressions: ds (type: string)
-                      outputColumnNames: _col0
+                      expressions: ds (type: string), hr (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
+                        value expressions: _col1 (type: string)
             Execution mode: vectorized, llap
         Map 5 
             Map Operator Tree:
@@ -2917,11 +2937,13 @@ STAGE PLANS:
                     predicate: (UDFToDouble(hr) = 13.0) (type: boolean)
                     Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
+                      expressions: hr (type: string)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: '13' (type: string)
+                        key expressions: _col0 (type: string)
                         sort order: +
-                        Map-reduce partition columns: '13' (type: string)
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
             Execution mode: vectorized, llap
         Reducer 2 
@@ -2933,11 +2955,12 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
+                outputColumnNames: _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '13' (type: string)
+                  key expressions: _col1 (type: string)
                   sort order: +
-                  Map-reduce partition columns: '13' (type: string)
+                  Map-reduce partition columns: _col1 (type: string)
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
         Reducer 3 
             Execution mode: llap
@@ -2946,8 +2969,8 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 '13' (type: string)
-                  1 '13' (type: string)
+                  0 _col1 (type: string)
+                  1 _col0 (type: string)
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 Group By Operator
                   aggregations: count()
@@ -4295,7 +4318,7 @@ STAGE PLANS:
                            Inner Join 0 to 1
                       keys:
                         0 UDFToDouble(_col0) (type: double)
-                        1 UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: 
double)
+                        1 UDFToDouble(UDFToInteger((_col0 / UDFToDouble(2)))) 
(type: double)
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
@@ -4324,12 +4347,12 @@ STAGE PLANS:
                       outputColumnNames: _col0
                       Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: UDFToDouble(UDFToInteger((_col0 / 
2.0))) (type: double)
+                        key expressions: UDFToDouble(UDFToInteger((_col0 / 
UDFToDouble(2)))) (type: double)
                         sort order: +
-                        Map-reduce partition columns: 
UDFToDouble(UDFToInteger((_col0 / 2.0))) (type: double)
+                        Map-reduce partition columns: 
UDFToDouble(UDFToInteger((_col0 / UDFToDouble(2)))) (type: double)
                         Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
-                        expressions: UDFToDouble(UDFToInteger((_col0 / 2.0))) 
(type: double)
+                        expressions: UDFToDouble(UDFToInteger((_col0 / 
UDFToDouble(2)))) (type: double)
                         outputColumnNames: _col0
                         Statistics: Num rows: 1 Data size: 94 Basic stats: 
COMPLETE Column stats: NONE
                         Group By Operator
@@ -4963,8 +4986,8 @@ STAGE PLANS:
                   alias: srcpart
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: ds (type: string)
-                    outputColumnNames: _col0
+                    expressions: ds (type: string), hr (type: string)
+                    outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
@@ -4972,6 +4995,7 @@ STAGE PLANS:
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
+                      outputColumnNames: _col1
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: 
COMPLETE Column stats: NONE
@@ -4980,8 +5004,8 @@ STAGE PLANS:
                         condition map:
                              Inner Join 0 to 1
                         keys:
-                          0 '11' (type: string)
-                          1 '11' (type: string)
+                          0 _col1 (type: string)
+                          1 _col0 (type: string)
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 1210 Data size: 12854 Basic 
stats: COMPLETE Column stats: NONE
@@ -5040,12 +5064,29 @@ STAGE PLANS:
                     predicate: ((UDFToDouble(hour) = 11.0) and 
(UDFToDouble(hr) = 11.0)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
+                      expressions: hr (type: string)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: '11' (type: string)
+                        key expressions: _col0 (type: string)
                         sort order: +
-                        Map-reduce partition columns: '11' (type: string)
+                        Map-reduce partition columns: _col0 (type: string)
+                        Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                      Select Operator
+                        expressions: _col0 (type: string)
+                        outputColumnNames: _col0
                         Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                        Group By Operator
+                          keys: _col0 (type: string)
+                          mode: hash
+                          outputColumnNames: _col0
+                          Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                          Dynamic Partitioning Event Operator
+                            Target column: hr (string)
+                            Target Input: srcpart
+                            Partition key expr: hr
+                            Statistics: Num rows: 1 Data size: 172 Basic 
stats: COMPLETE Column stats: NONE
+                            Target Vertex: Map 1
             Execution mode: vectorized, llap
         Reducer 2 
             Execution mode: vectorized, uber
@@ -5117,14 +5158,15 @@ STAGE PLANS:
                     predicate: ((UDFToDouble(hr) = 13.0) and ds is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
-                      expressions: ds (type: string)
-                      outputColumnNames: _col0
+                      expressions: ds (type: string), hr (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
+                        value expressions: _col1 (type: string)
             Execution mode: vectorized, llap
         Map 2 
             Map Operator Tree:
@@ -5145,6 +5187,7 @@ STAGE PLANS:
                         keys:
                           0 _col0 (type: string)
                           1 _col0 (type: string)
+                        outputColumnNames: _col1
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
@@ -5153,8 +5196,8 @@ STAGE PLANS:
                           condition map:
                                Inner Join 0 to 1
                           keys:
-                            0 '13' (type: string)
-                            1 '13' (type: string)
+                            0 _col1 (type: string)
+                            1 _col0 (type: string)
                           input vertices:
                             1 Map 4
                           Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
@@ -5179,11 +5222,13 @@ STAGE PLANS:
                     predicate: (UDFToDouble(hr) = 13.0) (type: boolean)
                     Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
+                      expressions: hr (type: string)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: '13' (type: string)
+                        key expressions: _col0 (type: string)
                         sort order: +
-                        Map-reduce partition columns: '13' (type: string)
+                        Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
             Execution mode: vectorized, llap
         Reducer 3 

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/multi_insert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/multi_insert.q.out 
b/ql/src/test/results/clientpositive/multi_insert.q.out
index f8fc172..3d26b69 100644
--- a/ql/src/test/results/clientpositive/multi_insert.q.out
+++ b/ql/src/test/results/clientpositive/multi_insert.q.out
@@ -2396,7 +2396,7 @@ STAGE PLANS:
               predicate: (key = 0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '0' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2410,7 +2410,7 @@ STAGE PLANS:
               predicate: (key = 2) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '2' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2424,7 +2424,7 @@ STAGE PLANS:
               predicate: (key = 4) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '4' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2490,7 +2490,7 @@ STAGE PLANS:
               predicate: (key = 0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '0' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2504,7 +2504,7 @@ STAGE PLANS:
               predicate: (key = 2) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '2' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2518,7 +2518,7 @@ STAGE PLANS:
               predicate: (key = 4) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '4' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2584,7 +2584,7 @@ STAGE PLANS:
               predicate: (key = 0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '0' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2598,7 +2598,7 @@ STAGE PLANS:
               predicate: (key = 2) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '2' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2612,7 +2612,7 @@ STAGE PLANS:
               predicate: (key = 4) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '4' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2678,7 +2678,7 @@ STAGE PLANS:
               predicate: (key = 0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '0' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2692,7 +2692,7 @@ STAGE PLANS:
               predicate: (key = 2) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '2' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2706,7 +2706,7 @@ STAGE PLANS:
               predicate: (key = 4) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '4' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out
 
b/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out
index 81d9808..c302dea 100644
--- 
a/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out
+++ 
b/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out
@@ -2445,7 +2445,7 @@ STAGE PLANS:
               predicate: (key = 0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '0' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2459,7 +2459,7 @@ STAGE PLANS:
               predicate: (key = 2) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '2' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2473,7 +2473,7 @@ STAGE PLANS:
               predicate: (key = 4) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '4' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2543,7 +2543,7 @@ STAGE PLANS:
               predicate: (key = 0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '0' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2557,7 +2557,7 @@ STAGE PLANS:
               predicate: (key = 2) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '2' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2571,7 +2571,7 @@ STAGE PLANS:
               predicate: (key = 4) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '4' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2641,7 +2641,7 @@ STAGE PLANS:
               predicate: (key = 0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '0' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2655,7 +2655,7 @@ STAGE PLANS:
               predicate: (key = 2) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '2' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2669,7 +2669,7 @@ STAGE PLANS:
               predicate: (key = 4) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '4' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2739,7 +2739,7 @@ STAGE PLANS:
               predicate: (key = 0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '0' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2753,7 +2753,7 @@ STAGE PLANS:
               predicate: (key = 2) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '2' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
@@ -2767,7 +2767,7 @@ STAGE PLANS:
               predicate: (key = 4) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '4' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/partition_coltype_literals.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/partition_coltype_literals.q.out 
b/ql/src/test/results/clientpositive/partition_coltype_literals.q.out
index bc159eb..6293806 100644
--- a/ql/src/test/results/clientpositive/partition_coltype_literals.q.out
+++ b/ql/src/test/results/clientpositive/partition_coltype_literals.q.out
@@ -359,7 +359,7 @@ Database:                   default
 Table:                 partcoltypenum           
 #### A masked pattern was here ####
 Partition Parameters:           
-       COLUMN_STATS_ACCURATE   
{\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"},\"BASIC_STATS\":\"true\"}
+       COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
 #### A masked pattern was here ####
        numFiles                2                   
        numRows                 30                  
@@ -410,7 +410,7 @@ Database:                   default
 Table:                 partcoltypenum           
 #### A masked pattern was here ####
 Partition Parameters:           
-       COLUMN_STATS_ACCURATE   
{\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"},\"BASIC_STATS\":\"true\"}
+       COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
 #### A masked pattern was here ####
        numFiles                2                   
        numRows                 30                  

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/pcr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pcr.q.out 
b/ql/src/test/results/clientpositive/pcr.q.out
index 010acfd..e796360 100644
--- a/ql/src/test/results/clientpositive/pcr.q.out
+++ b/ql/src/test/results/clientpositive/pcr.q.out
@@ -5311,7 +5311,7 @@ STAGE PLANS:
               ds 2008-04-08
               hr 11
             properties:
-              COLUMN_STATS_ACCURATE 
{"COLUMN_STATS":{"key":"true","value":"true"},"BASIC_STATS":"true"}
+              COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
               columns key,value
               columns.comments 'default','default'
@@ -5473,11 +5473,11 @@ STAGE PLANS:
               predicate: (UDFToDouble(key) = 11.0) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: value (type: string), hr (type: string)
-                outputColumnNames: _col1, _col3
+                expressions: key (type: string), value (type: string), hr 
(type: string)
+                outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '11' (type: string), '2008-04-08' (type: 
string), _col3 (type: string)
+                  key expressions: _col0 (type: string), '2008-04-08' (type: 
string), _col3 (type: string)
                   sort order: +++
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -5495,7 +5495,7 @@ STAGE PLANS:
               ds 2008-04-08
               hr 11
             properties:
-              COLUMN_STATS_ACCURATE 
{"COLUMN_STATS":{"key":"true","value":"true"},"BASIC_STATS":"true"}
+              COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
               columns key,value
               columns.comments 'default','default'
@@ -5541,7 +5541,7 @@ STAGE PLANS:
               ds 2008-04-08
               hr 12
             properties:
-              COLUMN_STATS_ACCURATE 
{"COLUMN_STATS":{"key":"true","value":"true"},"BASIC_STATS":"true"}
+              COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
               columns key,value
               columns.comments 'default','default'
@@ -5584,7 +5584,7 @@ STAGE PLANS:
       Needs Tagging: false
       Reduce Operator Tree:
         Select Operator
-          expressions: '11' (type: string), VALUE._col0 (type: string), 
'2008-04-08' (type: string), KEY.reducesinkkey2 (type: string)
+          expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: 
string), '2008-04-08' (type: string), KEY.reducesinkkey2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
@@ -5697,11 +5697,11 @@ STAGE PLANS:
               predicate: (UDFToDouble(key) = 11.0) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: value (type: string), ds (type: string)
-                outputColumnNames: _col1, _col2
+                expressions: key (type: string), value (type: string), ds 
(type: string)
+                outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '11' (type: string), _col2 (type: string), 
'11' (type: string)
+                  key expressions: _col0 (type: string), _col2 (type: string), 
'11' (type: string)
                   sort order: +++
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
@@ -5719,7 +5719,7 @@ STAGE PLANS:
               ds 2008-04-08
               hr 11
             properties:
-              COLUMN_STATS_ACCURATE 
{"COLUMN_STATS":{"key":"true","value":"true"},"BASIC_STATS":"true"}
+              COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
               columns key,value
               columns.comments 'default','default'
@@ -5765,7 +5765,7 @@ STAGE PLANS:
               ds 2008-04-09
               hr 11
             properties:
-              COLUMN_STATS_ACCURATE 
{"COLUMN_STATS":{"key":"true","value":"true"},"BASIC_STATS":"true"}
+              COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
               columns key,value
               columns.comments 'default','default'
@@ -5808,7 +5808,7 @@ STAGE PLANS:
       Needs Tagging: false
       Reduce Operator Tree:
         Select Operator
-          expressions: '11' (type: string), VALUE._col0 (type: string), 
KEY.reducesinkkey1 (type: string), '11' (type: string)
+          expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: 
string), KEY.reducesinkkey1 (type: string), '11' (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/ppd2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd2.q.out 
b/ql/src/test/results/clientpositive/ppd2.q.out
index d583b17..aa63a15 100644
--- a/ql/src/test/results/clientpositive/ppd2.q.out
+++ b/ql/src/test/results/clientpositive/ppd2.q.out
@@ -345,9 +345,9 @@ STAGE PLANS:
               predicate: (key = 20) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
-                key expressions: '20' (type: string)
+                key expressions: key (type: string)
                 sort order: +
-                Map-reduce partition columns: '20' (type: string)
+                Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
@@ -357,9 +357,9 @@ STAGE PLANS:
               predicate: (key = 20) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
-                key expressions: '20' (type: string)
+                key expressions: key (type: string)
                 sort order: +
-                Map-reduce partition columns: '20' (type: string)
+                Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
@@ -368,14 +368,18 @@ STAGE PLANS:
           keys:
             0 key (type: string)
             1 key (type: string)
-          outputColumnNames: _col1
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 275 Data size: 2921 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
+          Select Operator
+            expressions: _col0 (type: string), _col1 (type: string), _col5 
(type: string)
+            outputColumnNames: _col0, _col1, _col2
+            Statistics: Num rows: 275 Data size: 2921 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
 
   Stage: Stage-2
     Map Reduce
@@ -386,9 +390,10 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
               Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
+              value expressions: _col0 (type: string), _col2 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: '20' (type: string), KEY.reducesinkkey0 (type: string), 
'20' (type: string)
+          expressions: VALUE._col0 (type: string), KEY.reducesinkkey0 (type: 
string), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/ppd_clusterby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_clusterby.q.out 
b/ql/src/test/results/clientpositive/ppd_clusterby.q.out
index b21835f..170636c 100644
--- a/ql/src/test/results/clientpositive/ppd_clusterby.q.out
+++ b/ql/src/test/results/clientpositive/ppd_clusterby.q.out
@@ -19,18 +19,18 @@ STAGE PLANS:
               predicate: (key = 10) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: value (type: string)
-                outputColumnNames: _col1
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '10' (type: string)
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns: '10' (type: string)
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: '10' (type: string), VALUE._col0 (type: string)
+          expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: 
string)
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
@@ -75,24 +75,24 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key = 20) (type: boolean)
+              predicate: (key is not null and (key = 20)) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
-                key expressions: '20' (type: string)
+                key expressions: key (type: string)
                 sort order: +
-                Map-reduce partition columns: '20' (type: string)
+                Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key = 20) (type: boolean)
+              predicate: (key is not null and (key = 20)) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
-                key expressions: '20' (type: string)
+                key expressions: key (type: string)
                 sort order: +
-                Map-reduce partition columns: '20' (type: string)
+                Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
@@ -101,14 +101,21 @@ STAGE PLANS:
           keys:
             0 key (type: string)
             1 key (type: string)
-          outputColumnNames: _col1
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 275 Data size: 2921 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
+          Filter Operator
+            predicate: (_col0 = 20) (type: boolean)
+            Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE 
Column stats: NONE
+            Select Operator
+              expressions: _col0 (type: string), _col1 (type: string), _col5 
(type: string)
+              outputColumnNames: _col0, _col1, _col2
+              Statistics: Num rows: 137 Data size: 1455 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
 
   Stage: Stage-2
     Map Reduce
@@ -118,15 +125,16 @@ STAGE PLANS:
               key expressions: _col1 (type: string)
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
-              Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE 
Column stats: NONE
+              value expressions: _col0 (type: string), _col2 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: '20' (type: string), KEY.reducesinkkey0 (type: string), 
'20' (type: string)
+          expressions: VALUE._col0 (type: string), KEY.reducesinkkey0 (type: 
string), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 137 Data size: 1455 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -168,18 +176,18 @@ STAGE PLANS:
               predicate: (key = 10) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: value (type: string)
-                outputColumnNames: _col1
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '10' (type: string)
+                  key expressions: _col0 (type: string)
                   sort order: +
-                  Map-reduce partition columns: '10' (type: string)
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: '10' (type: string), VALUE._col0 (type: string)
+          expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: 
string)
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
@@ -227,9 +235,9 @@ STAGE PLANS:
               predicate: (key = 20) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
-                key expressions: '20' (type: string)
+                key expressions: key (type: string)
                 sort order: +
-                Map-reduce partition columns: '20' (type: string)
+                Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
@@ -239,9 +247,9 @@ STAGE PLANS:
               predicate: (key = 20) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
-                key expressions: '20' (type: string)
+                key expressions: key (type: string)
                 sort order: +
-                Map-reduce partition columns: '20' (type: string)
+                Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
@@ -250,14 +258,18 @@ STAGE PLANS:
           keys:
             0 key (type: string)
             1 key (type: string)
-          outputColumnNames: _col1
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 275 Data size: 2921 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
+          Select Operator
+            expressions: _col0 (type: string), _col1 (type: string), _col5 
(type: string)
+            outputColumnNames: _col0, _col1, _col2
+            Statistics: Num rows: 275 Data size: 2921 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
 
   Stage: Stage-2
     Map Reduce
@@ -268,9 +280,10 @@ STAGE PLANS:
               sort order: +
               Map-reduce partition columns: _col1 (type: string)
               Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
+              value expressions: _col0 (type: string), _col2 (type: string)
       Reduce Operator Tree:
         Select Operator
-          expressions: '20' (type: string), KEY.reducesinkkey0 (type: string), 
'20' (type: string)
+          expressions: VALUE._col0 (type: string), KEY.reducesinkkey0 (type: 
string), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/ppd_udf_col.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_udf_col.q.out 
b/ql/src/test/results/clientpositive/ppd_udf_col.q.out
index 9f1ec73..5af88b5 100644
--- a/ql/src/test/results/clientpositive/ppd_udf_col.q.out
+++ b/ql/src/test/results/clientpositive/ppd_udf_col.q.out
@@ -23,7 +23,7 @@ STAGE PLANS:
               predicate: ((UDFToDouble(key) = 100.0) and (rand() <= 0.1)) 
(type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '100' (type: string), rand() (type: double)
+                expressions: key (type: string), rand() (type: double)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -69,7 +69,7 @@ STAGE PLANS:
               predicate: ((UDFToDouble(key) = 100.0) and (rand() <= 0.1) and 
(rand() > 0.1)) (type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '100' (type: string), rand() (type: double)
+                expressions: key (type: string), rand() (type: double)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
                 Limit
@@ -153,10 +153,10 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(value) * 10.0) <= 200.0) and 
(UDFToDouble(key) = 100.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) = 100.0) and ((UDFToDouble(value) 
* 10.0) <= 200.0)) (type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '100' (type: string), rand() (type: double), 
(UDFToDouble(value) * 10.0) (type: double)
+                expressions: key (type: string), rand() (type: double), 
(UDFToDouble(value) * 10.0) (type: double)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -198,7 +198,7 @@ STAGE PLANS:
               predicate: ((UDFToDouble(key) = 100.0) and (rand() <= 0.1)) 
(type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '100' (type: string), rand() (type: double)
+                expressions: key (type: string), rand() (type: double)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -244,7 +244,7 @@ STAGE PLANS:
               predicate: ((UDFToDouble(key) = 100.0) and (rand() <= 0.1) and 
(rand() > 0.1)) (type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '100' (type: string), rand() (type: double)
+                expressions: key (type: string), rand() (type: double)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
                 Limit
@@ -331,7 +331,7 @@ STAGE PLANS:
               predicate: ((UDFToDouble(key) = 100.0) and ((UDFToDouble(value) 
* 10.0) <= 200.0)) (type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '100' (type: string), rand() (type: double), 
(UDFToDouble(value) * 10.0) (type: double)
+                expressions: key (type: string), rand() (type: double), 
(UDFToDouble(value) * 10.0) (type: double)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/ptf_matchpath.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ptf_matchpath.q.out 
b/ql/src/test/results/clientpositive/ptf_matchpath.q.out
index dd4b65f..d8c1a30 100644
--- a/ql/src/test/results/clientpositive/ptf_matchpath.q.out
+++ b/ql/src/test/results/clientpositive/ptf_matchpath.q.out
@@ -224,7 +224,7 @@ STAGE PLANS:
               predicate: (fl_num = 1142) (type: boolean)
               Statistics: Num rows: 12 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: origin_city_name (type: string), '1142' (type: 
string), year (type: int), month (type: int), day_of_month (type: int), sz 
(type: int), tpath (type: int)
+                expressions: origin_city_name (type: string), fl_num (type: 
string), year (type: int), month (type: int), day_of_month (type: int), sz 
(type: int), tpath (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Statistics: Num rows: 12 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -302,25 +302,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: flights_tiny
-            Statistics: Num rows: 44 Data size: 5379 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 24 Data size: 5379 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (fl_num = -1142) (type: boolean)
-              Statistics: Num rows: 22 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 12 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: origin_city_name (type: string), year (type: 
int), month (type: int), day_of_month (type: int), arr_delay (type: float)
-                outputColumnNames: _col0, _col2, _col3, _col4, _col5
-                Statistics: Num rows: 22 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
+                expressions: origin_city_name (type: string), year (type: 
int), month (type: int), day_of_month (type: int), arr_delay (type: float), 
fl_num (type: string)
+                outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6
+                Statistics: Num rows: 12 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 0 (type: int), '-1142' (type: string), 
_col2 (type: int), _col3 (type: int), _col4 (type: int)
+                  key expressions: 0 (type: int), _col6 (type: string), _col2 
(type: int), _col3 (type: int), _col4 (type: int)
                   sort order: +++++
                   Map-reduce partition columns: 0 (type: int)
-                  Statistics: Num rows: 22 Data size: 2689 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 12 Data size: 2689 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col0 (type: string), _col5 (type: float)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: string), KEY.reducesinkkey2 (type: 
int), KEY.reducesinkkey3 (type: int), KEY.reducesinkkey4 (type: int), 
VALUE._col2 (type: float), '-1142' (type: string)
+          expressions: VALUE._col0 (type: string), KEY.reducesinkkey2 (type: 
int), KEY.reducesinkkey3 (type: int), KEY.reducesinkkey4 (type: int), 
VALUE._col2 (type: float), KEY.reducesinkkey1 (type: string)
           outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6
-          Statistics: Num rows: 22 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 12 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Function definitions:
                 Input definition
@@ -336,14 +336,14 @@ STAGE PLANS:
                   partition by: 0
                   raw input shape:
                   referenced columns: _col0, _col6, _col2, _col3, _col4, 
tpath, _col5
-            Statistics: Num rows: 22 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 12 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: origin_city_name (type: string), '-1142' (type: 
string), year (type: int), month (type: int), day_of_month (type: int), sz 
(type: int), tpath (type: int)
+              expressions: origin_city_name (type: string), fl_num (type: 
string), year (type: int), month (type: int), day_of_month (type: int), sz 
(type: int), tpath (type: int)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
-              Statistics: Num rows: 22 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 12 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 22 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 12 Data size: 2689 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/regex_col.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/regex_col.q.out 
b/ql/src/test/results/clientpositive/regex_col.q.out
index 33e1a12..d27dd4f 100644
--- a/ql/src/test/results/clientpositive/regex_col.q.out
+++ b/ql/src/test/results/clientpositive/regex_col.q.out
@@ -168,13 +168,13 @@ STAGE PLANS:
               predicate: (UDFToDouble(key) = 103.0) (type: boolean)
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: ds (type: string), hr (type: string)
-                outputColumnNames: _col1, _col2
+                expressions: key (type: string), ds (type: string), hr (type: 
string)
+                outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '103' (type: string), _col2 (type: string), 
_col1 (type: string)
+                  key expressions: _col0 (type: string), _col2 (type: string), 
_col1 (type: string)
                   sort order: +++
-                  Map-reduce partition columns: '103' (type: string), _col2 
(type: string), _col1 (type: string)
+                  Map-reduce partition columns: _col0 (type: string), _col2 
(type: string), _col1 (type: string)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             alias: a
@@ -183,13 +183,13 @@ STAGE PLANS:
               predicate: (UDFToDouble(key) = 103.0) (type: boolean)
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: ds (type: string), hr (type: string)
-                outputColumnNames: _col1, _col2
+                expressions: key (type: string), ds (type: string), hr (type: 
string)
+                outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: '103' (type: string), _col2 (type: string), 
_col1 (type: string)
+                  key expressions: _col0 (type: string), _col2 (type: string), 
_col1 (type: string)
                   sort order: +++
-                  Map-reduce partition columns: '103' (type: string), _col2 
(type: string), _col1 (type: string)
+                  Map-reduce partition columns: _col0 (type: string), _col2 
(type: string), _col1 (type: string)
                   Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/set_processor_namespaces.q.out 
b/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
index 3c67727..08e92ec 100644
--- a/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
+++ b/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
@@ -22,7 +22,7 @@ STAGE PLANS:
               predicate: (UDFToDouble(key) = 5.0) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: '5' (type: string), value (type: string)
+                expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/spark/column_access_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/column_access_stats.q.out 
b/ql/src/test/results/clientpositive/spark/column_access_stats.q.out
index 495e449..3ed7622 100644
--- a/ql/src/test/results/clientpositive/spark/column_access_stats.q.out
+++ b/ql/src/test/results/clientpositive/spark/column_access_stats.q.out
@@ -506,14 +506,15 @@ STAGE PLANS:
                     predicate: ((UDFToDouble(val) = 3.0) and key is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
+                      expressions: key (type: string), val (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 1 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
+                        value expressions: _col1 (type: string)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -523,14 +524,15 @@ STAGE PLANS:
                     predicate: ((UDFToDouble(val) = 3.0) and key is not null) 
(type: boolean)
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
+                      expressions: key (type: string), val (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
+                        value expressions: _col1 (type: string)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -539,19 +541,15 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
-                outputColumnNames: _col0, _col2
+                outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
-                Select Operator
-                  expressions: _col0 (type: string), '3' (type: string), _col2 
(type: string), '3' (type: string)
-                  outputColumnNames: _col0, _col1, _col2, _col3
+                File Output Operator
+                  compressed: false
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
-                    table:
-                        input format: org.apache.hadoop.mapred.TextInputFormat
-                        output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
index 78bb42a..66165da 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
@@ -4756,11 +4756,11 @@ STAGE PLANS:
                     predicate: (key = 8) (type: boolean)
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: val (type: string)
-                      outputColumnNames: _col1
+                      expressions: key (type: string), val (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
-                        expressions: '8' (type: string)
+                        expressions: _col0 (type: string)
                         outputColumnNames: _col0
                         Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                         Group By Operator
@@ -4776,28 +4776,24 @@ STAGE PLANS:
                             Map-reduce partition columns: _col0 (type: string)
                             Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col1 (type: bigint)
-                      Select Operator
-                        expressions: '8' (type: string), _col1 (type: string)
-                        outputColumnNames: _col0, _col1
-                        Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
-                        Group By Operator
-                          aggregations: count(1)
-                          keys: _col0 (type: string), _col1 (type: string)
-                          mode: final
+                      Group By Operator
+                        aggregations: count(1)
+                        keys: _col0 (type: string), _col1 (type: string)
+                        mode: final
+                        outputColumnNames: _col0, _col1, _col2
+                        Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
+                        Select Operator
+                          expressions: UDFToInteger(_col0) (type: int), _col1 
(type: string), UDFToInteger(_col2) (type: int)
                           outputColumnNames: _col0, _col1, _col2
                           Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
-                          Select Operator
-                            expressions: UDFToInteger(_col0) (type: int), 
_col1 (type: string), UDFToInteger(_col2) (type: int)
-                            outputColumnNames: _col0, _col1, _col2
+                          File Output Operator
+                            compressed: true
                             Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
-                            File Output Operator
-                              compressed: true
-                              Statistics: Num rows: 1 Data size: 4 Basic 
stats: COMPLETE Column stats: NONE
-                              table:
-                                  input format: 
org.apache.hadoop.mapred.TextInputFormat
-                                  output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                  serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                                  name: default.dest2
+                            table:
+                                input format: 
org.apache.hadoop.mapred.TextInputFormat
+                                output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                                name: default.dest2
         Reducer 2 
             Reduce Operator Tree:
               Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
index ebfef47..c5d2ed3 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
@@ -4898,11 +4898,11 @@ STAGE PLANS:
                     predicate: (key = 8) (type: boolean)
                     Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: val (type: string)
-                      outputColumnNames: _col1
+                      expressions: key (type: string), val (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
-                        expressions: '8' (type: string)
+                        expressions: _col0 (type: string)
                         outputColumnNames: _col0
                         Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                         Group By Operator
@@ -4918,28 +4918,24 @@ STAGE PLANS:
                             Map-reduce partition columns: rand() (type: double)
                             Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                             value expressions: _col1 (type: bigint)
-                      Select Operator
-                        expressions: '8' (type: string), _col1 (type: string)
-                        outputColumnNames: _col0, _col1
-                        Statistics: Num rows: 3 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
-                        Group By Operator
-                          aggregations: count(1)
-                          keys: _col0 (type: string), _col1 (type: string)
-                          mode: final
+                      Group By Operator
+                        aggregations: count(1)
+                        keys: _col0 (type: string), _col1 (type: string)
+                        mode: final
+                        outputColumnNames: _col0, _col1, _col2
+                        Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
+                        Select Operator
+                          expressions: UDFToInteger(_col0) (type: int), _col1 
(type: string), UDFToInteger(_col2) (type: int)
                           outputColumnNames: _col0, _col1, _col2
                           Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
-                          Select Operator
-                            expressions: UDFToInteger(_col0) (type: int), 
_col1 (type: string), UDFToInteger(_col2) (type: int)
-                            outputColumnNames: _col0, _col1, _col2
+                          File Output Operator
+                            compressed: true
                             Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
-                            File Output Operator
-                              compressed: true
-                              Statistics: Num rows: 1 Data size: 4 Basic 
stats: COMPLETE Column stats: NONE
-                              table:
-                                  input format: 
org.apache.hadoop.mapred.TextInputFormat
-                                  output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                                  serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                                  name: default.dest2
+                            table:
+                                input format: 
org.apache.hadoop.mapred.TextInputFormat
+                                output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                                serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                                name: default.dest2
         Reducer 2 
             Reduce Operator Tree:
               Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/a99f890d/ql/src/test/results/clientpositive/spark/join38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join38.q.out 
b/ql/src/test/results/clientpositive/spark/join38.q.out
index 402c530..2ec541d 100644
--- a/ql/src/test/results/clientpositive/spark/join38.q.out
+++ b/ql/src/test/results/clientpositive/spark/join38.q.out
@@ -68,8 +68,8 @@ STAGE PLANS:
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       keys:
-                        0 '111' (type: string)
-                        1 '111' (type: string)
+                        0 key (type: string)
+                        1 col11 (type: string)
             Local Work:
               Map Reduce Local Work
 
@@ -91,8 +91,8 @@ STAGE PLANS:
                       condition map:
                            Inner Join 0 to 1
                       keys:
-                        0 '111' (type: string)
-                        1 '111' (type: string)
+                        0 key (type: string)
+                        1 col11 (type: string)
                       outputColumnNames: _col1, _col10
                       input vertices:
                         0 Map 1

Reply via email to