http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/llap/vector_groupby_rollup1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_rollup1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_rollup1.q.out
index d1263cd..717c218 100644
--- a/ql/src/test/results/clientpositive/llap/vector_groupby_rollup1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_groupby_rollup1.q.out
@@ -70,18 +70,18 @@ STAGE PLANS:
                           aggregators: VectorUDAFCountStar(*) -> bigint
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 0:string, col 1:string, 
ConstantVectorExpression(val 0) -> 3:int
+                          keyExpressions: col 0:string, col 1:string, 
ConstantVectorExpression(val 0) -> 3:bigint
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), val (type: string), 0 (type: 
int)
+                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                         sort order: +++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
                             keyColumnNums: [0, 1, 2]
@@ -119,7 +119,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:bigint
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:bigint, VALUE._col0:bigint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
             Reduce Operator Tree:
@@ -129,11 +129,11 @@ STAGE PLANS:
                     aggregators: VectorUDAFCountMerge(col 3:bigint) -> bigint
                     className: VectorGroupByOperator
                     groupByMode: MERGEPARTIAL
-                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    keyExpressions: col 0:string, col 1:string, col 2:bigint
                     native: false
                     vectorProcessingMode: MERGE_PARTIAL
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 9 Data size: 3312 Basic stats: COMPLETE 
Column stats: NONE
@@ -227,18 +227,18 @@ STAGE PLANS:
                           aggregators: VectorUDAFCount(col 1:string) -> bigint
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 0:string, 
ConstantVectorExpression(val 0) -> 3:int, col 1:string
+                          keyExpressions: col 0:string, 
ConstantVectorExpression(val 0) -> 3:bigint, col 1:string
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), 0 (type: int), val (type: 
string)
+                      keys: key (type: string), 0 (type: bigint), val (type: 
string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 12 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
int), _col2 (type: string)
+                        key expressions: _col0 (type: string), _col1 (type: 
bigint), _col2 (type: string)
                         sort order: +++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: bigint)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkOperator
                             native: false
@@ -272,7 +272,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(DISTINCT KEY._col2:0._col0)
-                keys: KEY._col0 (type: string), KEY._col1 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col2
                 Statistics: Num rows: 6 Data size: 2208 Basic stats: COMPLETE 
Column stats: NONE
@@ -354,16 +354,16 @@ STAGE PLANS:
                           aggregators: VectorUDAFCountStar(*) -> bigint
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 0:string, col 1:string, 
ConstantVectorExpression(val 0) -> 3:int
+                          keyExpressions: col 0:string, col 1:string, 
ConstantVectorExpression(val 0) -> 3:bigint
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), val (type: string), 0 (type: 
int)
+                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                         sort order: +++
                         Map-reduce partition columns: rand() (type: double)
                         Reduce Sink Vectorization:
@@ -404,7 +404,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:bigint
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:bigint, VALUE._col0:bigint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
             Reduce Operator Tree:
@@ -414,16 +414,16 @@ STAGE PLANS:
                     aggregators: VectorUDAFCountMerge(col 3:bigint) -> bigint
                     className: VectorGroupByOperator
                     groupByMode: PARTIALS
-                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    keyExpressions: col 0:string, col 1:string, col 2:bigint
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 18 Data size: 6624 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: bigint)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
                   Reduce Sink Vectorization:
@@ -447,7 +447,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:bigint
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:bigint, VALUE._col0:bigint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
             Reduce Operator Tree:
@@ -457,11 +457,11 @@ STAGE PLANS:
                     aggregators: VectorUDAFCountMerge(col 3:bigint) -> bigint
                     className: VectorGroupByOperator
                     groupByMode: FINAL
-                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    keyExpressions: col 0:string, col 1:string, col 2:bigint
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: final
                 outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 9 Data size: 3312 Basic stats: COMPLETE 
Column stats: NONE
@@ -556,16 +556,16 @@ STAGE PLANS:
                           aggregators: VectorUDAFCount(col 1:string) -> bigint
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 0:string, 
ConstantVectorExpression(val 0) -> 3:int, col 1:string
+                          keyExpressions: col 0:string, 
ConstantVectorExpression(val 0) -> 3:bigint, col 1:string
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), 0 (type: int), val (type: 
string)
+                      keys: key (type: string), 0 (type: bigint), val (type: 
string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 12 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
int), _col2 (type: string)
+                        key expressions: _col0 (type: string), _col1 (type: 
bigint), _col2 (type: string)
                         sort order: +++
                         Map-reduce partition columns: _col0 (type: string)
                         Reduce Sink Vectorization:
@@ -601,12 +601,12 @@ STAGE PLANS:
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(DISTINCT KEY._col2:0._col0)
-                keys: KEY._col0 (type: string), KEY._col1 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 12 Data size: 4416 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: bigint)
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 12 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
@@ -621,7 +621,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
-                keys: KEY._col0 (type: string), KEY._col1 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: bigint)
                 mode: final
                 outputColumnNames: _col0, _col2
                 Statistics: Num rows: 6 Data size: 2208 Basic stats: COMPLETE 
Column stats: NONE
@@ -729,16 +729,16 @@ STAGE PLANS:
                           aggregators: 
VectorUDAFCount(ConstantVectorExpression(val 1) -> 4:int) -> bigint
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 0:string, col 1:string, 
ConstantVectorExpression(val 0) -> 3:int
+                          keyExpressions: col 0:string, col 1:string, 
ConstantVectorExpression(val 0) -> 3:bigint
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), val (type: string), 0 (type: 
int)
+                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                         sort order: +++
                         Map-reduce partition columns: rand() (type: double)
                         Reduce Sink Vectorization:
@@ -764,16 +764,16 @@ STAGE PLANS:
                           aggregators: 
VectorUDAFSumLong(ConstantVectorExpression(val 1) -> 6:int) -> bigint
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 0:string, col 1:string, 
ConstantVectorExpression(val 0) -> 5:int
+                          keyExpressions: col 0:string, col 1:string, 
ConstantVectorExpression(val 0) -> 5:bigint
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), val (type: string), 0 (type: 
int)
+                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                         sort order: +++
                         Map-reduce partition columns: rand() (type: double)
                         Reduce Sink Vectorization:
@@ -814,7 +814,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:bigint
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:bigint, VALUE._col0:bigint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
             Reduce Operator Tree:
@@ -824,16 +824,16 @@ STAGE PLANS:
                     aggregators: VectorUDAFCountMerge(col 3:bigint) -> bigint
                     className: VectorGroupByOperator
                     groupByMode: PARTIALS
-                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    keyExpressions: col 0:string, col 1:string, col 2:bigint
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 18 Data size: 6624 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: bigint)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
                   Reduce Sink Vectorization:
@@ -857,7 +857,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:bigint
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:bigint, VALUE._col0:bigint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
             Reduce Operator Tree:
@@ -867,11 +867,11 @@ STAGE PLANS:
                     aggregators: VectorUDAFCountMerge(col 3:bigint) -> bigint
                     className: VectorGroupByOperator
                     groupByMode: FINAL
-                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    keyExpressions: col 0:string, col 1:string, col 2:bigint
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: final
                 outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 9 Data size: 3312 Basic stats: COMPLETE 
Column stats: NONE
@@ -907,7 +907,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:bigint
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:bigint, VALUE._col0:bigint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
             Reduce Operator Tree:
@@ -917,16 +917,16 @@ STAGE PLANS:
                     aggregators: VectorUDAFSumLong(col 3:bigint) -> bigint
                     className: VectorGroupByOperator
                     groupByMode: PARTIALS
-                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    keyExpressions: col 0:string, col 1:string, col 2:bigint
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 18 Data size: 6624 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: bigint)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
                   Reduce Sink Vectorization:
@@ -950,7 +950,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:int, VALUE._col0:bigint
+                    dataColumns: KEY._col0:string, KEY._col1:string, 
KEY._col2:bigint, VALUE._col0:bigint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: []
             Reduce Operator Tree:
@@ -960,11 +960,11 @@ STAGE PLANS:
                     aggregators: VectorUDAFSumLong(col 3:bigint) -> bigint
                     className: VectorGroupByOperator
                     groupByMode: FINAL
-                    keyExpressions: col 0:string, col 1:string, col 2:int
+                    keyExpressions: col 0:string, col 1:string, col 2:bigint
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: final
                 outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 9 Data size: 3312 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out 
b/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out
index 0fc4b06..172e003 100644
--- a/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out
@@ -168,18 +168,18 @@ STAGE PLANS:
                       Group By Vectorization:
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 1:string, 
ConstantVectorExpression(val 0) -> 30:int
+                          keyExpressions: col 1:string, 
ConstantVectorExpression(val 0) -> 30:bigint
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: s_store_id (type: string), 0 (type: int)
+                      keys: s_store_id (type: string), 0 (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 24 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
int)
+                        key expressions: _col0 (type: string), _col1 (type: 
bigint)
                         sort order: ++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: bigint)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
                             native: true
@@ -209,11 +209,11 @@ STAGE PLANS:
                 Group By Vectorization:
                     className: VectorGroupByOperator
                     groupByMode: MERGEPARTIAL
-                    keyExpressions: col 0:string, col 1:int
+                    keyExpressions: col 0:string, col 1:bigint
                     native: false
                     vectorProcessingMode: MERGE_PARTIAL
                     projectedOutputColumnNums: []
-                keys: KEY._col0 (type: string), KEY._col1 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0
                 Statistics: Num rows: 12 Data size: 2208 Basic stats: COMPLETE 
Column stats: NONE
@@ -247,12 +247,12 @@ POSTHOOK: query: select s_store_id
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@store
 #### A masked pattern was here ####
-NULL
+AAAAAAAABAAAAAAA
 AAAAAAAAEAAAAAAA
 AAAAAAAAHAAAAAAA
+NULL
 AAAAAAAAIAAAAAAA
 AAAAAAAAKAAAAAAA
-AAAAAAAABAAAAAAA
 AAAAAAAACAAAAAAA
 PREHOOK: query: explain vectorization expression
 select s_store_id, GROUPING__ID
@@ -299,18 +299,18 @@ STAGE PLANS:
                       Group By Vectorization:
                           className: VectorGroupByOperator
                           groupByMode: HASH
-                          keyExpressions: col 1:string, 
ConstantVectorExpression(val 0) -> 30:int
+                          keyExpressions: col 1:string, 
ConstantVectorExpression(val 0) -> 30:bigint
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: string), 0 (type: int)
+                      keys: _col0 (type: string), 0 (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 24 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
int)
+                        key expressions: _col0 (type: string), _col1 (type: 
bigint)
                         sort order: ++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: bigint)
                         Reduce Sink Vectorization:
                             className: VectorReduceSinkMultiKeyOperator
                             native: true
@@ -340,16 +340,16 @@ STAGE PLANS:
                 Group By Vectorization:
                     className: VectorGroupByOperator
                     groupByMode: MERGEPARTIAL
-                    keyExpressions: col 0:string, col 1:int
+                    keyExpressions: col 0:string, col 1:bigint
                     native: false
                     vectorProcessingMode: MERGE_PARTIAL
                     projectedOutputColumnNums: []
-                keys: KEY._col0 (type: string), KEY._col1 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 12 Data size: 2208 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: int)
+                  expressions: _col0 (type: string), _col1 (type: bigint)
                   outputColumnNames: _col0, _col1
                   Select Vectorization:
                       className: VectorSelectOperator
@@ -385,12 +385,12 @@ POSTHOOK: query: select s_store_id, GROUPING__ID
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@store
 #### A masked pattern was here ####
-NULL   1
+AAAAAAAABAAAAAAA       0
 AAAAAAAAEAAAAAAA       0
 AAAAAAAAHAAAAAAA       0
+NULL   1
 AAAAAAAAIAAAAAAA       0
 AAAAAAAAKAAAAAAA       0
-AAAAAAAABAAAAAAA       0
 AAAAAAAACAAAAAAA       0
 PREHOOK: query: explain
 select s_store_id, GROUPING__ID
@@ -424,14 +424,14 @@ STAGE PLANS:
                     outputColumnNames: _col0
                     Statistics: Num rows: 12 Data size: 2208 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
-                      keys: _col0 (type: string), 0 (type: int)
+                      keys: _col0 (type: string), 0 (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 24 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
int)
+                        key expressions: _col0 (type: string), _col1 (type: 
bigint)
                         sort order: ++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: bigint)
                         Statistics: Num rows: 24 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
             Execution mode: vectorized, llap
             LLAP IO: all inputs
@@ -439,12 +439,12 @@ STAGE PLANS:
             Execution mode: vectorized, llap
             Reduce Operator Tree:
               Group By Operator
-                keys: KEY._col0 (type: string), KEY._col1 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 12 Data size: 2208 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: int)
+                  expressions: _col0 (type: string), _col1 (type: bigint)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 12 Data size: 2208 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query18.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query18.q.out
index 88d289c..33b2f62 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query18.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query18.q.out
@@ -306,21 +306,21 @@ STAGE PLANS:
                   Statistics: Num rows: 421645953 Data size: 57099332415 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: avg(_col4), avg(_col5), avg(_col6), 
avg(_col7), avg(_col8), avg(_col9), avg(_col10)
-                    keys: _col0 (type: string), _col1 (type: string), _col2 
(type: string), _col3 (type: string), 0 (type: int)
+                    keys: _col0 (type: string), _col1 (type: string), _col2 
(type: string), _col3 (type: string), 0 (type: bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11
                     Statistics: Num rows: 2108229765 Data size: 285496662075 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), _col4 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), _col4 (type: bigint)
                       sort order: +++++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: 
int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: 
bigint)
                       Statistics: Num rows: 2108229765 Data size: 285496662075 
Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col5 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col6 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col7 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col8 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col9 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col10 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>), _col11 (type: 
struct<count:bigint,sum:decimal(22,2),input:decimal(12,2)>)
         Reducer 5 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: avg(VALUE._col0), avg(VALUE._col1), 
avg(VALUE._col2), avg(VALUE._col3), avg(VALUE._col4), avg(VALUE._col5), 
avg(VALUE._col6)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, 
_col7, _col8, _col9, _col10, _col11
                 Statistics: Num rows: 1054114882 Data size: 142748330969 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query22.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query22.q.out
index 15fe441..38e4119 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query22.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query22.q.out
@@ -165,21 +165,21 @@ STAGE PLANS:
                 Statistics: Num rows: 50024305 Data size: 790375939 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: avg(_col3)
-                  keys: _col8 (type: string), _col9 (type: string), _col10 
(type: string), _col11 (type: string), 0 (type: int)
+                  keys: _col8 (type: string), _col9 (type: string), _col10 
(type: string), _col11 (type: string), 0 (type: bigint)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                   Statistics: Num rows: 250121525 Data size: 3951879695 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), _col4 (type: int)
+                    key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), _col4 (type: bigint)
                     sort order: +++++
-                    Map-reduce partition columns: _col0 (type: string), _col1 
(type: string), _col2 (type: string), _col3 (type: string), _col4 (type: int)
+                    Map-reduce partition columns: _col0 (type: string), _col1 
(type: string), _col2 (type: string), _col3 (type: string), _col4 (type: bigint)
                     Statistics: Num rows: 250121525 Data size: 3951879695 
Basic stats: COMPLETE Column stats: NONE
                     value expressions: _col5 (type: 
struct<count:bigint,sum:double,input:int>)
         Reducer 3 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: avg(VALUE._col0)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 125060762 Data size: 1975939839 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query27.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query27.q.out
index 627821f..a87ec45 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query27.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query27.q.out
@@ -211,14 +211,14 @@ STAGE PLANS:
                   Statistics: Num rows: 843315281 Data size: 74397518956 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: avg(_col2), avg(_col3), avg(_col4), 
avg(_col5)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6
                     Statistics: Num rows: 2529945843 Data size: 223192556868 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2529945843 Data size: 223192556868 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: 
struct<count:bigint,sum:double,input:int>), _col4 (type: 
struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col5 (type: 
struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>), _col6 (type: 
struct<count:bigint,sum:decimal(17,2),input:decimal(7,2)>)
@@ -226,12 +226,12 @@ STAGE PLANS:
             Reduce Operator Tree:
               Group By Operator
                 aggregations: avg(VALUE._col0), avg(VALUE._col1), 
avg(VALUE._col2), avg(VALUE._col3)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Statistics: Num rows: 1264972921 Data size: 111596278389 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: string), 
grouping(_col2, 0) (type: int), _col3 (type: double), _col4 (type: 
decimal(11,6)), _col5 (type: decimal(11,6)), _col6 (type: decimal(11,6))
+                  expressions: _col0 (type: string), _col1 (type: string), 
grouping(_col2, 0) (type: bigint), _col3 (type: double), _col4 (type: 
decimal(11,6)), _col5 (type: decimal(11,6)), _col6 (type: decimal(11,6))
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                   Statistics: Num rows: 1264972921 Data size: 111596278389 
Basic stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
@@ -239,11 +239,11 @@ STAGE PLANS:
                     sort order: ++
                     Statistics: Num rows: 1264972921 Data size: 111596278389 
Basic stats: COMPLETE Column stats: NONE
                     TopN Hash Memory Usage: 0.1
-                    value expressions: _col2 (type: int), _col3 (type: 
double), _col4 (type: decimal(11,6)), _col5 (type: decimal(11,6)), _col6 (type: 
decimal(11,6))
+                    value expressions: _col2 (type: bigint), _col3 (type: 
double), _col4 (type: decimal(11,6)), _col5 (type: decimal(11,6)), _col6 (type: 
decimal(11,6))
         Reducer 6 
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), 
KEY.reducesinkkey1 (type: string), VALUE._col0 (type: int), VALUE._col1 (type: 
double), VALUE._col2 (type: decimal(11,6)), VALUE._col3 (type: decimal(11,6)), 
VALUE._col4 (type: decimal(11,6))
+                expressions: KEY.reducesinkkey0 (type: string), 
KEY.reducesinkkey1 (type: string), VALUE._col0 (type: bigint), VALUE._col1 
(type: double), VALUE._col2 (type: decimal(11,6)), VALUE._col3 (type: 
decimal(11,6)), VALUE._col4 (type: decimal(11,6))
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Statistics: Num rows: 1264972921 Data size: 111596278389 Basic 
stats: COMPLETE Column stats: NONE
                 Limit

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query36.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query36.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query36.q.out
index d313337..1a1a991 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query36.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query36.q.out
@@ -192,45 +192,45 @@ STAGE PLANS:
                   Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4
                     Statistics: Num rows: 2299950717 Data size: 202902320028 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2299950717 Data size: 202902320028 
Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col3 (type: decimal(17,2)), _col4 
(type: decimal(17,2))
         Reducer 4 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0), sum(VALUE._col1)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 1149975358 Data size: 101451159969 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: decimal(17,2)), _col4 (type: decimal(17,2)), _col2 (type: int)
+                  expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: decimal(17,2)), _col4 (type: decimal(17,2)), _col2 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: (grouping(_col4, 1) + grouping(_col4, 0)) 
(type: int), CASE WHEN ((grouping(_col4, 0) = 0)) THEN (_col0) ELSE 
(UDFToString(null)) END (type: string), (_col2 / _col3) (type: decimal(37,20))
+                    key expressions: (grouping(_col4, 1) + grouping(_col4, 0)) 
(type: bigint), CASE WHEN ((grouping(_col4, 0) = 0)) THEN (_col0) ELSE 
(UDFToString(null)) END (type: string), (_col2 / _col3) (type: decimal(37,20))
                     sort order: +++
-                    Map-reduce partition columns: (grouping(_col4, 1) + 
grouping(_col4, 0)) (type: int), CASE WHEN ((grouping(_col4, 0) = 0)) THEN 
(_col0) ELSE (UDFToString(null)) END (type: string)
+                    Map-reduce partition columns: (grouping(_col4, 1) + 
grouping(_col4, 0)) (type: bigint), CASE WHEN ((grouping(_col4, 0) = 0)) THEN 
(_col0) ELSE (UDFToString(null)) END (type: string)
                     Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: decimal(17,2)), _col3 (type: decimal(17,2)), _col4 (type: 
int)
+                    value expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: decimal(17,2)), _col3 (type: decimal(17,2)), _col4 (type: 
bigint)
         Reducer 5 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string), VALUE._col2 (type: decimal(17,2)), VALUE._col3 (type: decimal(17,2)), 
VALUE._col4 (type: int)
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string), VALUE._col2 (type: decimal(17,2)), VALUE._col3 (type: decimal(17,2)), 
VALUE._col4 (type: bigint)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 1149975358 Data size: 101451159969 Basic 
stats: COMPLETE Column stats: NONE
                 PTF Operator
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: 
decimal(17,2), _col3: decimal(17,2), _col4: int
+                        output shape: _col0: string, _col1: string, _col2: 
decimal(17,2), _col3: decimal(17,2), _col4: bigint
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -248,11 +248,11 @@ STAGE PLANS:
                               isPivotResult: true
                   Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: (_col2 / _col3) (type: decimal(37,20)), _col0 
(type: string), _col1 (type: string), (grouping(_col4, 1) + grouping(_col4, 0)) 
(type: int), rank_window_0 (type: int), CASE WHEN (((grouping(_col4, 1) + 
grouping(_col4, 0)) = 0)) THEN (_col0) ELSE (null) END (type: string)
+                    expressions: (_col2 / _col3) (type: decimal(37,20)), _col0 
(type: string), _col1 (type: string), (grouping(_col4, 1) + grouping(_col4, 0)) 
(type: bigint), rank_window_0 (type: int), CASE WHEN (((grouping(_col4, 1) + 
grouping(_col4, 0)) = 0)) THEN (_col0) ELSE (null) END (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col3 (type: int), _col5 (type: 
string), _col4 (type: int)
+                      key expressions: _col3 (type: bigint), _col5 (type: 
string), _col4 (type: int)
                       sort order: -++
                       Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
@@ -260,7 +260,7 @@ STAGE PLANS:
         Reducer 6 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: decimal(37,20)), VALUE._col1 
(type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: int), 
KEY.reducesinkkey2 (type: int)
+                expressions: VALUE._col0 (type: decimal(37,20)), VALUE._col1 
(type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: bigint), 
KEY.reducesinkkey2 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 1149975358 Data size: 101451159969 Basic 
stats: COMPLETE Column stats: NONE
                 Limit

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query5.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query5.q.out
index 14e0bdb..1ba37e0 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query5.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query5.q.out
@@ -550,14 +550,14 @@ STAGE PLANS:
                   Statistics: Num rows: 191657181 Data size: 25444391433 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2273797803 Data size: 251290313118 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2273797803 Data size: 251290313118 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(27,2)), _col5 (type: decimal(28,2))
@@ -609,14 +609,14 @@ STAGE PLANS:
                   Statistics: Num rows: 182955399 Data size: 24876643188 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2273797803 Data size: 251290313118 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2273797803 Data size: 251290313118 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(27,2)), _col5 (type: decimal(28,2))
@@ -685,14 +685,14 @@ STAGE PLANS:
                   Statistics: Num rows: 383320021 Data size: 33442403085 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2273797803 Data size: 251290313118 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2273797803 Data size: 251290313118 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(27,2)), _col5 (type: decimal(28,2))
@@ -700,7 +700,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col3, _col4, _col5
                 Statistics: Num rows: 1136898901 Data size: 125645156503 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query67.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query67.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query67.q.out
index 25d37bd..b0fc41c 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query67.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query67.q.out
@@ -221,21 +221,21 @@ STAGE PLANS:
                   Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col8)
-                    keys: _col0 (type: string), _col1 (type: string), _col2 
(type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), 
_col6 (type: int), _col7 (type: string), 0 (type: int)
+                    keys: _col0 (type: string), _col1 (type: string), _col2 
(type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), 
_col6 (type: int), _col7 (type: string), 0 (type: bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9
                     Statistics: Num rows: 6899852151 Data size: 608706960084 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), _col4 (type: int), _col5 
(type: int), _col6 (type: int), _col7 (type: string), _col8 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), _col4 (type: int), _col5 
(type: int), _col6 (type: int), _col7 (type: string), _col8 (type: bigint)
                       sort order: +++++++++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: 
int), _col5 (type: int), _col6 (type: int), _col7 (type: string), _col8 (type: 
int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: 
int), _col5 (type: int), _col6 (type: int), _col7 (type: string), _col8 (type: 
bigint)
                       Statistics: Num rows: 6899852151 Data size: 608706960084 
Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col9 (type: decimal(28,2))
         Reducer 4 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: int), 
KEY._col5 (type: int), KEY._col6 (type: int), KEY._col7 (type: string), 
KEY._col8 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: int), 
KEY._col5 (type: int), KEY._col6 (type: int), KEY._col7 (type: string), 
KEY._col8 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col9
                 Statistics: Num rows: 3449926075 Data size: 304353479997 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query70.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query70.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query70.q.out
index 862bdb0..7ebb776 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query70.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query70.q.out
@@ -339,45 +339,45 @@ STAGE PLANS:
                   Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 2299950717 Data size: 202902320028 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2299950717 Data size: 202902320028 
Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col3 (type: decimal(17,2))
         Reducer 4 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1149975358 Data size: 101451159969 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: decimal(17,2)), _col2 (type: int)
+                  expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: decimal(17,2)), _col2 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: (grouping(_col3, 1) + grouping(_col3, 0)) 
(type: int), CASE WHEN ((grouping(_col3, 0) = 0)) THEN (_col0) ELSE 
(UDFToString(null)) END (type: string), _col2 (type: decimal(17,2))
+                    key expressions: (grouping(_col3, 1) + grouping(_col3, 0)) 
(type: bigint), CASE WHEN ((grouping(_col3, 0) = 0)) THEN (_col0) ELSE 
(UDFToString(null)) END (type: string), _col2 (type: decimal(17,2))
                     sort order: ++-
-                    Map-reduce partition columns: (grouping(_col3, 1) + 
grouping(_col3, 0)) (type: int), CASE WHEN ((grouping(_col3, 0) = 0)) THEN 
(_col0) ELSE (UDFToString(null)) END (type: string)
+                    Map-reduce partition columns: (grouping(_col3, 1) + 
grouping(_col3, 0)) (type: bigint), CASE WHEN ((grouping(_col3, 0) = 0)) THEN 
(_col0) ELSE (UDFToString(null)) END (type: string)
                     Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col0 (type: string), _col1 (type: 
string), _col3 (type: int)
+                    value expressions: _col0 (type: string), _col1 (type: 
string), _col3 (type: bigint)
         Reducer 5 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string), KEY.reducesinkkey2 (type: decimal(17,2)), VALUE._col2 (type: int)
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string), KEY.reducesinkkey2 (type: decimal(17,2)), VALUE._col2 (type: bigint)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1149975358 Data size: 101451159969 Basic 
stats: COMPLETE Column stats: NONE
                 PTF Operator
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: 
decimal(17,2), _col3: int
+                        output shape: _col0: string, _col1: string, _col2: 
decimal(17,2), _col3: bigint
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -395,11 +395,11 @@ STAGE PLANS:
                               isPivotResult: true
                   Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col2 (type: decimal(17,2)), _col0 (type: 
string), _col1 (type: string), (grouping(_col3, 1) + grouping(_col3, 0)) (type: 
int), rank_window_0 (type: int), CASE WHEN (((grouping(_col3, 1) + 
grouping(_col3, 0)) = 0)) THEN (_col0) ELSE (null) END (type: string)
+                    expressions: _col2 (type: decimal(17,2)), _col0 (type: 
string), _col1 (type: string), (grouping(_col3, 1) + grouping(_col3, 0)) (type: 
bigint), rank_window_0 (type: int), CASE WHEN (((grouping(_col3, 1) + 
grouping(_col3, 0)) = 0)) THEN (_col0) ELSE (null) END (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col3 (type: int), _col5 (type: 
string), _col4 (type: int)
+                      key expressions: _col3 (type: bigint), _col5 (type: 
string), _col4 (type: int)
                       sort order: -++
                       Statistics: Num rows: 1149975358 Data size: 101451159969 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
@@ -407,7 +407,7 @@ STAGE PLANS:
         Reducer 6 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: decimal(17,2)), VALUE._col1 
(type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: int), 
KEY.reducesinkkey2 (type: int)
+                expressions: VALUE._col0 (type: decimal(17,2)), VALUE._col1 
(type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: bigint), 
KEY.reducesinkkey2 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 1149975358 Data size: 101451159969 Basic 
stats: COMPLETE Column stats: NONE
                 Limit

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query77.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query77.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query77.q.out
index 6dcaf7c..9a77a7b 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query77.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query77.q.out
@@ -665,14 +665,14 @@ STAGE PLANS:
                     Statistics: Num rows: 158394413 Data size: 57088528313 
Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: sum(_col2), sum(_col3), sum(_col4)
-                      keys: _col0 (type: string), _col1 (type: int), 0 (type: 
int)
+                      keys: _col0 (type: string), _col1 (type: int), 0 (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5
                       Statistics: Num rows: 1912659936 Data size: 311808612993 
Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
int), _col2 (type: int)
+                        key expressions: _col0 (type: string), _col1 (type: 
int), _col2 (type: bigint)
                         sort order: +++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int), _col2 (type: int)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int), _col2 (type: bigint)
                         Statistics: Num rows: 1912659936 Data size: 
311808612993 Basic stats: COMPLETE Column stats: NONE
                         TopN Hash Memory Usage: 0.1
                         value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(27,2)), _col5 (type: decimal(28,2))
@@ -771,14 +771,14 @@ STAGE PLANS:
                   Statistics: Num rows: 95833780 Data size: 13030622681 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: int), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: int), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 1912659936 Data size: 311808612993 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
int), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
int), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int), _col2 (type: bigint)
                       Statistics: Num rows: 1912659936 Data size: 311808612993 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(27,2)), _col5 (type: decimal(28,2))
@@ -857,14 +857,14 @@ STAGE PLANS:
                   Statistics: Num rows: 383325119 Data size: 33817053337 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: int), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: int), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 1912659936 Data size: 311808612993 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
int), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
int), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: int), _col2 (type: bigint)
                       Statistics: Num rows: 1912659936 Data size: 311808612993 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(27,2)), _col5 (type: decimal(28,2))
@@ -872,7 +872,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2)
-                keys: KEY._col0 (type: string), KEY._col1 (type: int), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: int), 
KEY._col2 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col3, _col4, _col5
                 Statistics: Num rows: 956329968 Data size: 155904306496 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query80.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query80.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query80.q.out
index 606d23c..ee769f9 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query80.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query80.q.out
@@ -646,14 +646,14 @@ STAGE PLANS:
                   Statistics: Num rows: 231905279 Data size: 31404633508 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(32,2)), _col5 (type: decimal(33,2))
@@ -775,14 +775,14 @@ STAGE PLANS:
                   Statistics: Num rows: 115958879 Data size: 15767054151 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(32,2)), _col5 (type: decimal(33,2))
@@ -848,14 +848,14 @@ STAGE PLANS:
                   Statistics: Num rows: 463823414 Data size: 40918636268 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
                       value expressions: _col3 (type: decimal(27,2)), _col4 
(type: decimal(32,2)), _col5 (type: decimal(33,2))
@@ -863,7 +863,7 @@ STAGE PLANS:
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0), sum(VALUE._col1), 
sum(VALUE._col2)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col3, _col4, _col5
                 Statistics: Num rows: 1217531358 Data size: 132135485890 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/perf/spark/query86.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query86.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query86.q.out
index 8e159fd..80a24d3 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query86.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query86.q.out
@@ -150,45 +150,45 @@ STAGE PLANS:
                   Statistics: Num rows: 174243235 Data size: 23692040863 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
int)
+                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 522729705 Data size: 71076122589 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: int)
+                      key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)
                       sort order: +++
-                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: int)
+                      Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: bigint)
                       Statistics: Num rows: 522729705 Data size: 71076122589 
Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col3 (type: decimal(17,2))
         Reducer 3 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: int)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 
KEY._col2 (type: bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 261364852 Data size: 35538061226 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: decimal(17,2)), _col2 (type: int)
+                  expressions: _col0 (type: string), _col1 (type: string), 
_col3 (type: decimal(17,2)), _col2 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 261364852 Data size: 35538061226 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: (grouping(_col3, 1) + grouping(_col3, 0)) 
(type: int), CASE WHEN ((grouping(_col3, 0) = 0)) THEN (_col0) ELSE 
(UDFToString(null)) END (type: string), _col2 (type: decimal(17,2))
+                    key expressions: (grouping(_col3, 1) + grouping(_col3, 0)) 
(type: bigint), CASE WHEN ((grouping(_col3, 0) = 0)) THEN (_col0) ELSE 
(UDFToString(null)) END (type: string), _col2 (type: decimal(17,2))
                     sort order: ++-
-                    Map-reduce partition columns: (grouping(_col3, 1) + 
grouping(_col3, 0)) (type: int), CASE WHEN ((grouping(_col3, 0) = 0)) THEN 
(_col0) ELSE (UDFToString(null)) END (type: string)
+                    Map-reduce partition columns: (grouping(_col3, 1) + 
grouping(_col3, 0)) (type: bigint), CASE WHEN ((grouping(_col3, 0) = 0)) THEN 
(_col0) ELSE (UDFToString(null)) END (type: string)
                     Statistics: Num rows: 261364852 Data size: 35538061226 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col0 (type: string), _col1 (type: 
string), _col3 (type: int)
+                    value expressions: _col0 (type: string), _col1 (type: 
string), _col3 (type: bigint)
         Reducer 4 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string), KEY.reducesinkkey2 (type: decimal(17,2)), VALUE._col2 (type: int)
+                expressions: VALUE._col0 (type: string), VALUE._col1 (type: 
string), KEY.reducesinkkey2 (type: decimal(17,2)), VALUE._col2 (type: bigint)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 261364852 Data size: 35538061226 Basic 
stats: COMPLETE Column stats: NONE
                 PTF Operator
                   Function definitions:
                       Input definition
                         input alias: ptf_0
-                        output shape: _col0: string, _col1: string, _col2: 
decimal(17,2), _col3: int
+                        output shape: _col0: string, _col1: string, _col2: 
decimal(17,2), _col3: bigint
                         type: WINDOWING
                       Windowing table definition
                         input alias: ptf_1
@@ -206,11 +206,11 @@ STAGE PLANS:
                               isPivotResult: true
                   Statistics: Num rows: 261364852 Data size: 35538061226 Basic 
stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col2 (type: decimal(17,2)), _col0 (type: 
string), _col1 (type: string), (grouping(_col3, 1) + grouping(_col3, 0)) (type: 
int), rank_window_0 (type: int), CASE WHEN (((grouping(_col3, 1) + 
grouping(_col3, 0)) = 0)) THEN (_col0) ELSE (null) END (type: string)
+                    expressions: _col2 (type: decimal(17,2)), _col0 (type: 
string), _col1 (type: string), (grouping(_col3, 1) + grouping(_col3, 0)) (type: 
bigint), rank_window_0 (type: int), CASE WHEN (((grouping(_col3, 1) + 
grouping(_col3, 0)) = 0)) THEN (_col0) ELSE (null) END (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 261364852 Data size: 35538061226 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col3 (type: int), _col5 (type: 
string), _col4 (type: int)
+                      key expressions: _col3 (type: bigint), _col5 (type: 
string), _col4 (type: int)
                       sort order: -++
                       Statistics: Num rows: 261364852 Data size: 35538061226 
Basic stats: COMPLETE Column stats: NONE
                       TopN Hash Memory Usage: 0.1
@@ -218,7 +218,7 @@ STAGE PLANS:
         Reducer 5 
             Reduce Operator Tree:
               Select Operator
-                expressions: VALUE._col0 (type: decimal(17,2)), VALUE._col1 
(type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: int), 
KEY.reducesinkkey2 (type: int)
+                expressions: VALUE._col0 (type: decimal(17,2)), VALUE._col1 
(type: string), VALUE._col2 (type: string), KEY.reducesinkkey0 (type: bigint), 
KEY.reducesinkkey2 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 261364852 Data size: 35538061226 Basic 
stats: COMPLETE Column stats: NONE
                 Limit

Reply via email to