http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_merge.q.out 
b/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
index cf86a32..654cd64 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
@@ -58,11 +58,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -81,11 +81,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -104,11 +104,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -127,11 +127,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -150,11 +150,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -330,11 +330,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -353,11 +353,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -376,11 +376,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -399,11 +399,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -559,11 +559,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -582,11 +582,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -605,11 +605,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -628,11 +628,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -651,11 +651,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -832,11 +832,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -855,11 +855,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -878,11 +878,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -901,11 +901,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -924,11 +924,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -1105,11 +1105,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -1128,11 +1128,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -1151,11 +1151,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -1174,11 +1174,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -1197,11 +1197,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -1376,11 +1376,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -1399,11 +1399,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -1422,11 +1422,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -1559,11 +1559,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -1582,11 +1582,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -1605,11 +1605,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -1750,11 +1750,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 2 Data size: 6 Basic stats: 
COMPLETE Column stats: NONE
@@ -1779,11 +1779,11 @@ STAGE PLANS:
                   Statistics: Num rows: 4 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: int), value (type: int)
-                    outputColumnNames: _col0, _col1
+                    outputColumnNames: key, value
                     Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: int), _col1 (type: int)
+                      aggregations: count()
+                      keys: key (type: int), value (type: int)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 4 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
@@ -1884,7 +1884,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
-                      aggregations: count(1)
+                      aggregations: count()
                       keys: _col0 (type: int), _col1 (type: int)
                       mode: complete
                       outputColumnNames: _col0, _col1, _col2

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out 
b/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
index d1d6664..93315e6 100644
--- a/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
@@ -917,11 +917,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 205 Data size: 19475 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/lineage2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lineage2.q.out 
b/ql/src/test/results/clientpositive/llap/lineage2.q.out
index 79590a7..051cba9 100644
--- a/ql/src/test/results/clientpositive/llap/lineage2.q.out
+++ b/ql/src/test/results/clientpositive/llap/lineage2.q.out
@@ -140,7 +140,7 @@ PREHOOK: query: select key, count(1) a from dest1 group by 
key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"3901b5e3a164064736b3234355046340","queryText":"select
 key, count(1) a from dest1 group by 
key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"expression":"count(1)","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"a"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest1.key"},{"id":3,"vertexType":"TABLE","vertexId":"default.dest1"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"3901b5e3a164064736b3234355046340","queryText":"select
 key, count(1) a from dest1 group by 
key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"expression":"count(*)","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"a"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest1.key"},{"id":3,"vertexType":"TABLE","vertexId":"default.dest1"}]}
 128    2
 213    2
 278    2

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/merge1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/merge1.q.out 
b/ql/src/test/results/clientpositive/llap/merge1.q.out
index 4bcb728..8021b67 100644
--- a/ql/src/test/results/clientpositive/llap/merge1.q.out
+++ b/ql/src/test/results/clientpositive/llap/merge1.q.out
@@ -35,11 +35,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 205 Data size: 19475 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/merge2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/merge2.q.out 
b/ql/src/test/results/clientpositive/llap/merge2.q.out
index aa0567b..7bcdd2d 100644
--- a/ql/src/test/results/clientpositive/llap/merge2.q.out
+++ b/ql/src/test/results/clientpositive/llap/merge2.q.out
@@ -35,11 +35,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
-                      aggregations: count(1)
-                      keys: _col0 (type: string)
+                      aggregations: count()
+                      keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 250 Data size: 23750 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out 
b/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out
index 81483f1..594e7e7 100644
--- a/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out
+++ b/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out
@@ -204,31 +204,35 @@ STAGE PLANS:
                     outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7
                     Statistics: Num rows: 9999 Data size: 1030908 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(), sum(1), sum(0.2), count(1), 
count(_col2), count(_col3), count(_col4), count(_col5), max(_col6), min(_col7)
+                      aggregations: count(), sum(1), sum(0.2), count(_col2), 
count(_col3), count(_col4), count(_col5), max(_col6), min(_col7)
                       mode: hash
-                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9
-                      Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
+                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
+                      Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: decimal(11,1)), _col3 (type: bigint), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: bigint), 
_col8 (type: int), _col9 (type: bigint)
+                        Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                        value expressions: _col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: decimal(11,1)), _col3 (type: bigint), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int), _col8 
(type: bigint)
             Execution mode: llap
             LLAP IO: no inputs
         Reducer 2 
             Execution mode: llap
             Reduce Operator Tree:
               Group By Operator
-                aggregations: count(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), 
count(VALUE._col6), count(VALUE._col7), max(VALUE._col8), min(VALUE._col9)
+                aggregations: count(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), 
count(VALUE._col6), max(VALUE._col7), min(VALUE._col8)
                 mode: mergepartial
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
-                Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE 
Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE 
Column stats: NONE
-                  table:
-                      input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
+                Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE 
Column stats: NONE
+                Select Operator
+                  expressions: _col0 (type: bigint), _col1 (type: bigint), 
_col2 (type: decimal(11,1)), _col0 (type: bigint), _col3 (type: bigint), _col4 
(type: bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int), 
_col8 (type: bigint)
+                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
+                  Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE 
Column stats: NONE
+                  File Output Operator
+                    compressed: false
+                    Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                    table:
+                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -264,31 +268,35 @@ STAGE PLANS:
                     outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7
                     Statistics: Num rows: 9489 Data size: 1054697 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(), sum(1), sum(0.2), count(1), 
count(_col2), count(_col3), count(_col4), count(_col5), max(_col6), min(_col7)
+                      aggregations: count(), sum(1), sum(0.2), count(_col2), 
count(_col3), count(_col4), count(_col5), max(_col6), min(_col7)
                       mode: hash
-                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9
-                      Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
+                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
+                      Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: decimal(11,1)), _col3 (type: bigint), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: bigint), 
_col8 (type: int), _col9 (type: bigint)
+                        Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                        value expressions: _col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: decimal(11,1)), _col3 (type: bigint), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int), _col8 
(type: bigint)
             Execution mode: llap
             LLAP IO: no inputs
         Reducer 2 
             Execution mode: llap
             Reduce Operator Tree:
               Group By Operator
-                aggregations: count(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), 
count(VALUE._col6), count(VALUE._col7), max(VALUE._col8), min(VALUE._col9)
+                aggregations: count(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), 
count(VALUE._col6), max(VALUE._col7), min(VALUE._col8)
                 mode: mergepartial
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
-                Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE 
Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE 
Column stats: NONE
-                  table:
-                      input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
+                Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE 
Column stats: NONE
+                Select Operator
+                  expressions: _col0 (type: bigint), _col1 (type: bigint), 
_col2 (type: decimal(11,1)), _col0 (type: bigint), _col3 (type: bigint), _col4 
(type: bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int), 
_col8 (type: bigint)
+                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
+                  Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE 
Column stats: NONE
+                  File Output Operator
+                    compressed: false
+                    Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                    table:
+                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -324,31 +332,31 @@ STAGE PLANS:
                     outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7
                     Statistics: Num rows: 9999 Data size: 1030908 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(), sum(1), sum(0.2), count(1), 
count(_col2), count(_col3), count(_col4), count(_col5), max(_col6), min(_col7)
+                      aggregations: count(), sum(1), sum(0.2), count(_col2), 
count(_col3), count(_col4), count(_col5), max(_col6), min(_col7)
                       mode: hash
-                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9
-                      Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
+                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
+                      Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: decimal(11,1)), _col3 (type: bigint), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: bigint), 
_col8 (type: int), _col9 (type: bigint)
+                        Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                        value expressions: _col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: decimal(11,1)), _col3 (type: bigint), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int), _col8 
(type: bigint)
             Execution mode: llap
             LLAP IO: no inputs
         Reducer 2 
             Execution mode: llap
             Reduce Operator Tree:
               Group By Operator
-                aggregations: count(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), 
count(VALUE._col6), count(VALUE._col7), max(VALUE._col8), min(VALUE._col9)
+                aggregations: count(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), 
count(VALUE._col6), max(VALUE._col7), min(VALUE._col8)
                 mode: mergepartial
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
-                Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE 
Column stats: NONE
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
+                Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: bigint), '1' (type: string), _col1 
(type: bigint), _col2 (type: decimal(11,1)), 2 (type: int), _col3 (type: 
bigint), _col4 (type: bigint), 7 (type: decimal(2,0)), _col5 (type: bigint), 
_col6 (type: bigint), _col7 (type: bigint), _col8 (type: int), _col9 (type: 
bigint)
+                  expressions: _col0 (type: bigint), '1' (type: string), _col1 
(type: bigint), _col2 (type: decimal(11,1)), 2 (type: int), _col0 (type: 
bigint), _col3 (type: bigint), 7 (type: decimal(2,0)), _col4 (type: bigint), 
_col5 (type: bigint), _col6 (type: bigint), _col7 (type: int), _col8 (type: 
bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12
-                  Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -388,31 +396,31 @@ STAGE PLANS:
                     outputColumnNames: _col2, _col3, _col4, _col5, _col6, _col7
                     Statistics: Num rows: 9489 Data size: 1054697 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      aggregations: count(), sum(1), sum(0.2), count(1), 
count(_col2), count(_col3), count(_col4), count(_col5), max(_col6), min(_col7)
+                      aggregations: count(), sum(1), sum(0.2), count(_col2), 
count(_col3), count(_col4), count(_col5), max(_col6), min(_col7)
                       mode: hash
-                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9
-                      Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
+                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
+                      Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: decimal(11,1)), _col3 (type: bigint), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: bigint), 
_col8 (type: int), _col9 (type: bigint)
+                        Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
+                        value expressions: _col0 (type: bigint), _col1 (type: 
bigint), _col2 (type: decimal(11,1)), _col3 (type: bigint), _col4 (type: 
bigint), _col5 (type: bigint), _col6 (type: bigint), _col7 (type: int), _col8 
(type: bigint)
             Execution mode: llap
             LLAP IO: no inputs
         Reducer 2 
             Execution mode: llap
             Reduce Operator Tree:
               Group By Operator
-                aggregations: count(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), 
count(VALUE._col6), count(VALUE._col7), max(VALUE._col8), min(VALUE._col9)
+                aggregations: count(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2), count(VALUE._col3), count(VALUE._col4), count(VALUE._col5), 
count(VALUE._col6), max(VALUE._col7), min(VALUE._col8)
                 mode: mergepartial
-                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
-                Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE 
Column stats: NONE
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
+                Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: bigint), '1' (type: string), _col1 
(type: bigint), _col2 (type: decimal(11,1)), 2 (type: int), _col3 (type: 
bigint), _col4 (type: bigint), 7 (type: decimal(2,0)), _col5 (type: bigint), 
_col6 (type: bigint), _col7 (type: bigint), _col8 (type: int), _col9 (type: 
bigint)
+                  expressions: _col0 (type: bigint), '1' (type: string), _col1 
(type: bigint), _col2 (type: decimal(11,1)), 2 (type: int), _col0 (type: 
bigint), _col3 (type: bigint), 7 (type: decimal(2,0)), _col4 (type: bigint), 
_col5 (type: bigint), _col6 (type: bigint), _col7 (type: int), _col8 (type: 
bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12
-                  Statistics: Num rows: 1 Data size: 180 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 172 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 1 Data size: 180 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 172 Basic stats: 
COMPLETE Column stats: NONE
                     table:
                         input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out 
b/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out
index daf0189..25378d3 100644
--- a/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out
+++ b/ql/src/test/results/clientpositive/llap/multiMapJoin2.q.out
@@ -722,11 +722,11 @@ STAGE PLANS:
     Tez
 #### A masked pattern was here ####
       Edges:
-        Map 1 <- Map 6 (BROADCAST_EDGE)
-        Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 5 (BROADCAST_EDGE)
+        Map 1 <- Map 5 (BROADCAST_EDGE)
+        Map 6 <- Map 5 (BROADCAST_EDGE)
+        Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (BROADCAST_EDGE)
         Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
         Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
-        Reducer 5 <- Map 1 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -749,7 +749,7 @@ STAGE PLANS:
                           1 _col0 (type: string)
                         outputColumnNames: _col0
                         input vertices:
-                          1 Map 6
+                          1 Map 5
                         Statistics: Num rows: 60 Data size: 5220 Basic stats: 
COMPLETE Column stats: COMPLETE
                         Group By Operator
                           keys: _col0 (type: string)
@@ -761,14 +761,9 @@ STAGE PLANS:
                             sort order: +
                             Map-reduce partition columns: _col0 (type: string)
                             Statistics: Num rows: 2 Data size: 174 Basic 
stats: COMPLETE Column stats: COMPLETE
-                          Reduce Output Operator
-                            key expressions: _col0 (type: string)
-                            sort order: +
-                            Map-reduce partition columns: _col0 (type: string)
-                            Statistics: Num rows: 2 Data size: 174 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: llap
             LLAP IO: no inputs
-        Map 6 
+        Map 5 
             Map Operator Tree:
                 TableScan
                   alias: y2
@@ -785,6 +780,45 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 25 Data size: 2150 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
+                        Statistics: Num rows: 25 Data size: 2150 Basic stats: 
COMPLETE Column stats: COMPLETE
+            Execution mode: llap
+            LLAP IO: no inputs
+        Map 6 
+            Map Operator Tree:
+                TableScan
+                  alias: x1
+                  Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Select Operator
+                      expressions: key (type: string)
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Map Join Operator
+                        condition map:
+                             Inner Join 0 to 1
+                        keys:
+                          0 _col0 (type: string)
+                          1 _col0 (type: string)
+                        outputColumnNames: _col0
+                        input vertices:
+                          1 Map 5
+                        Statistics: Num rows: 60 Data size: 5220 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Group By Operator
+                          keys: _col0 (type: string)
+                          mode: hash
+                          outputColumnNames: _col0
+                          Statistics: Num rows: 2 Data size: 174 Basic stats: 
COMPLETE Column stats: COMPLETE
+                          Reduce Output Operator
+                            key expressions: _col0 (type: string)
+                            sort order: +
+                            Map-reduce partition columns: _col0 (type: string)
+                            Statistics: Num rows: 2 Data size: 174 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: llap
             LLAP IO: no inputs
         Reducer 2 
@@ -797,13 +831,13 @@ STAGE PLANS:
                 Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Map Join Operator
                   condition map:
-                       Inner Join 0 to 1
+                       Left Semi Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
                   outputColumnNames: _col0
                   input vertices:
-                    1 Reducer 5
+                    1 Map 6
                   Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Group By Operator
                     aggregations: count()
@@ -844,19 +878,6 @@ STAGE PLANS:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-        Reducer 5 
-            Execution mode: llap
-            Reduce Operator Tree:
-              Group By Operator
-                keys: KEY._col0 (type: string)
-                mode: mergepartial
-                outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE 
Column stats: COMPLETE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
-                  Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE 
Column stats: COMPLETE
 
   Stage: Stage-0
     Fetch Operator
@@ -941,11 +962,11 @@ STAGE PLANS:
     Tez
 #### A masked pattern was here ####
       Edges:
-        Map 1 <- Map 6 (BROADCAST_EDGE)
-        Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 5 (BROADCAST_EDGE)
+        Map 1 <- Map 5 (BROADCAST_EDGE)
+        Map 6 <- Map 5 (BROADCAST_EDGE)
+        Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (BROADCAST_EDGE)
         Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
         Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
-        Reducer 5 <- Map 1 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -968,7 +989,7 @@ STAGE PLANS:
                           1 _col0 (type: string)
                         outputColumnNames: _col0
                         input vertices:
-                          1 Map 6
+                          1 Map 5
                         Statistics: Num rows: 60 Data size: 5220 Basic stats: 
COMPLETE Column stats: COMPLETE
                         Group By Operator
                           keys: _col0 (type: string)
@@ -980,14 +1001,9 @@ STAGE PLANS:
                             sort order: +
                             Map-reduce partition columns: _col0 (type: string)
                             Statistics: Num rows: 2 Data size: 174 Basic 
stats: COMPLETE Column stats: COMPLETE
-                          Reduce Output Operator
-                            key expressions: _col0 (type: string)
-                            sort order: +
-                            Map-reduce partition columns: _col0 (type: string)
-                            Statistics: Num rows: 2 Data size: 174 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: llap
             LLAP IO: no inputs
-        Map 6 
+        Map 5 
             Map Operator Tree:
                 TableScan
                   alias: y2
@@ -1004,6 +1020,45 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 25 Data size: 2150 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: string)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: string)
+                        Statistics: Num rows: 25 Data size: 2150 Basic stats: 
COMPLETE Column stats: COMPLETE
+            Execution mode: llap
+            LLAP IO: no inputs
+        Map 6 
+            Map Operator Tree:
+                TableScan
+                  alias: x1
+                  Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Filter Operator
+                    predicate: key is not null (type: boolean)
+                    Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Select Operator
+                      expressions: key (type: string)
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Map Join Operator
+                        condition map:
+                             Inner Join 0 to 1
+                        keys:
+                          0 _col0 (type: string)
+                          1 _col0 (type: string)
+                        outputColumnNames: _col0
+                        input vertices:
+                          1 Map 5
+                        Statistics: Num rows: 60 Data size: 5220 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        Group By Operator
+                          keys: _col0 (type: string)
+                          mode: hash
+                          outputColumnNames: _col0
+                          Statistics: Num rows: 2 Data size: 174 Basic stats: 
COMPLETE Column stats: COMPLETE
+                          Reduce Output Operator
+                            key expressions: _col0 (type: string)
+                            sort order: +
+                            Map-reduce partition columns: _col0 (type: string)
+                            Statistics: Num rows: 2 Data size: 174 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: llap
             LLAP IO: no inputs
         Reducer 2 
@@ -1016,13 +1071,13 @@ STAGE PLANS:
                 Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Map Join Operator
                   condition map:
-                       Inner Join 0 to 1
+                       Left Semi Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
                   outputColumnNames: _col0
                   input vertices:
-                    1 Reducer 5
+                    1 Map 6
                   Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Group By Operator
                     aggregations: count()
@@ -1063,19 +1118,6 @@ STAGE PLANS:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-        Reducer 5 
-            Execution mode: llap
-            Reduce Operator Tree:
-              Group By Operator
-                keys: KEY._col0 (type: string)
-                mode: mergepartial
-                outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE 
Column stats: COMPLETE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
-                  Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 2 Data size: 174 Basic stats: COMPLETE 
Column stats: COMPLETE
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out 
b/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
index 4b3a846..48e58e1 100644
--- a/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
+++ b/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
@@ -1311,18 +1311,18 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: key (type: string)
-                    outputColumnNames: _col0
+                    outputColumnNames: key
                     Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string)
+                      key expressions: key (type: string)
                       sort order: +
-                      Map-reduce partition columns: _col0 (type: string)
+                      Map-reduce partition columns: key (type: string)
                       Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                       TopN Hash Memory Usage: 2.0E-5
                     Reduce Output Operator
-                      key expressions: _col0 (type: string)
+                      key expressions: key (type: string)
                       sort order: +
-                      Map-reduce partition columns: _col0 (type: string)
+                      Map-reduce partition columns: key (type: string)
                       Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                       TopN Hash Memory Usage: 2.0E-5
             Execution mode: llap
@@ -1331,7 +1331,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Group By Operator
-                aggregations: count(1)
+                aggregations: count()
                 keys: KEY._col0 (type: string)
                 mode: complete
                 outputColumnNames: _col0, _col1
@@ -1375,7 +1375,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Group By Operator
-                aggregations: count(1)
+                aggregations: count()
                 keys: KEY._col0 (type: string)
                 mode: complete
                 outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out 
b/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out
index 8aeb029..1f667c0 100644
--- a/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out
+++ b/ql/src/test/results/clientpositive/llap/skewjoinopt15.q.out
@@ -332,7 +332,7 @@ STAGE PLANS:
                   1 _col0 (type: int)
                 Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
-                  aggregations: count(1)
+                  aggregations: count()
                   mode: hash
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
@@ -435,7 +435,7 @@ STAGE PLANS:
                   1 _col0 (type: int)
                 Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
-                  aggregations: count(1)
+                  aggregations: count()
                   mode: hash
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/4ad4ceb6/ql/src/test/results/clientpositive/llap/subquery_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_in.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_in.q.out
index d01b515..b3d735a 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_in.q.out
@@ -2366,11 +2366,10 @@ STAGE PLANS:
     Tez
 #### A masked pattern was here ####
       Edges:
-        Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 6 (SIMPLE_EDGE)
+        Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
         Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
-        Reducer 4 <- Reducer 3 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE)
-        Reducer 6 <- Map 5 (SIMPLE_EDGE)
-        Reducer 8 <- Map 7 (SIMPLE_EDGE)
+        Reducer 4 <- Reducer 3 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
+        Reducer 7 <- Map 6 (SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2401,19 +2400,23 @@ STAGE PLANS:
                   Filter Operator
                     predicate: value is not null (type: boolean)
                     Statistics: Num rows: 500 Data size: 45500 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Group By Operator
-                      keys: value (type: string)
-                      mode: hash
+                    Select Operator
+                      expressions: value (type: string)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 214 Data size: 19474 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: string)
+                      Statistics: Num rows: 500 Data size: 45500 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Group By Operator
+                        keys: _col0 (type: string)
+                        mode: hash
+                        outputColumnNames: _col0
                         Statistics: Num rows: 214 Data size: 19474 Basic 
stats: COMPLETE Column stats: COMPLETE
+                        Reduce Output Operator
+                          key expressions: _col0 (type: string)
+                          sort order: +
+                          Map-reduce partition columns: _col0 (type: string)
+                          Statistics: Num rows: 214 Data size: 19474 Basic 
stats: COMPLETE Column stats: COMPLETE
             Execution mode: llap
             LLAP IO: no inputs
-        Map 7 
+        Map 6 
             Map Operator Tree:
                 TableScan
                   alias: s1
@@ -2442,7 +2445,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Inner Join 0 to 1
+                     Left Semi Join 0 to 1
                 keys:
                   0 _col1 (type: string)
                   1 _col0 (type: string)
@@ -2496,20 +2499,7 @@ STAGE PLANS:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-        Reducer 6 
-            Execution mode: llap
-            Reduce Operator Tree:
-              Group By Operator
-                keys: KEY._col0 (type: string)
-                mode: mergepartial
-                outputColumnNames: _col0
-                Statistics: Num rows: 214 Data size: 19474 Basic stats: 
COMPLETE Column stats: COMPLETE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
-                  Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 214 Data size: 19474 Basic stats: 
COMPLETE Column stats: COMPLETE
-        Reducer 8 
+        Reducer 7 
             Execution mode: llap
             Reduce Operator Tree:
               Group By Operator

Reply via email to