http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id2.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id2.q.out
index 74f6289..058006c 100644
--- a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id2.q.out
@@ -77,7 +77,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -279,7 +279,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -491,7 +491,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -798,7 +798,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -1101,7 +1101,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -1429,7 +1429,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -1750,7 +1750,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -1916,7 +1916,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -2134,7 +2134,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id3.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id3.q.out
index da4ba84..4fc9b8a 100644
--- a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id3.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_id3.q.out
@@ -84,7 +84,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 12 Data size: 96 Basic stats: 
COMPLETE Column stats: NONE
@@ -93,12 +93,12 @@ STAGE PLANS:
                             className: VectorFilterOperator
                             native: true
                             predicateExpression: 
FilterLongColEqualLongScalar(col 2:bigint, val 1)
-                        predicate: (_col2 = 1) (type: boolean)
+                        predicate: (_col2 = 1L) (type: boolean)
                         Statistics: Num rows: 6 Data size: 48 Basic stats: 
COMPLETE Column stats: NONE
                         Reduce Output Operator
-                          key expressions: _col0 (type: int), _col1 (type: 
int), 1 (type: bigint)
+                          key expressions: _col0 (type: int), _col1 (type: 
int), 1L (type: bigint)
                           sort order: +++
-                          Map-reduce partition columns: _col0 (type: int), 
_col1 (type: int), 1 (type: bigint)
+                          Map-reduce partition columns: _col0 (type: int), 
_col1 (type: int), 1L (type: bigint)
                           Reduce Sink Vectorization:
                               className: VectorReduceSinkMultiKeyOperator
                               keyColumnNums: [0, 1, 4]
@@ -151,13 +151,13 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: MERGE_PARTIAL
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: int), KEY._col1 (type: int), 1 (type: 
bigint)
+                keys: KEY._col0 (type: int), KEY._col1 (type: int), 1L (type: 
bigint)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col3
                 Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                 pruneGroupingSetId: true
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), 1 (type: 
bigint), _col3 (type: bigint)
+                  expressions: _col0 (type: int), _col1 (type: int), 1L (type: 
bigint), _col3 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Select Vectorization:
                       className: VectorSelectOperator
@@ -260,7 +260,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 12 Data size: 96 Basic stats: 
COMPLETE Column stats: NONE
@@ -328,10 +328,10 @@ STAGE PLANS:
                       className: VectorFilterOperator
                       native: true
                       predicateExpression: FilterLongColEqualLongScalar(col 
2:bigint, val 1)
-                  predicate: (_col2 = 1) (type: boolean)
+                  predicate: (_col2 = 1L) (type: boolean)
                   Statistics: Num rows: 3 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: int), _col1 (type: int), 1 
(type: bigint), _col3 (type: bigint)
+                    expressions: _col0 (type: int), _col1 (type: int), 1L 
(type: bigint), _col3 (type: bigint)
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Select Vectorization:
                         className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets1.q.out
index 137e06a..a4820d9 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets1.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets1.q.out
@@ -92,7 +92,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 24 Data size: 8832 Basic stats: 
COMPLETE Column stats: NONE
@@ -254,7 +254,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 24 Data size: 8832 Basic stats: 
COMPLETE Column stats: NONE
@@ -416,7 +416,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 24 Data size: 8832 Basic stats: 
COMPLETE Column stats: NONE
@@ -578,7 +578,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 12 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
@@ -734,7 +734,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: a (type: string), b (type: string), c (type: 
string), 0 (type: bigint)
+                      keys: a (type: string), b (type: string), c (type: 
string), 0L (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 9936 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets2.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets2.q.out
index d8da29a..c522822 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets2.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets2.q.out
@@ -137,7 +137,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 
(type: bigint)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L 
(type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 24 Data size: 8832 Basic stats: COMPLETE 
Column stats: NONE
@@ -318,7 +318,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 
(type: bigint)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L 
(type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 24 Data size: 8832 Basic stats: COMPLETE 
Column stats: NONE
@@ -493,7 +493,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 
(type: bigint)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L 
(type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 24 Data size: 13248 Basic stats: 
COMPLETE Column stats: NONE
@@ -722,7 +722,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 
(type: bigint)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L 
(type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 12 Data size: 2232 Basic stats: COMPLETE 
Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3.q.out
index 7911611..80ecd59 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3.q.out
@@ -70,7 +70,7 @@ STAGE PLANS:
                     Statistics: Num rows: 12 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: avg(c), count()
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 48 Data size: 26496 Basic stats: 
COMPLETE Column stats: NONE
@@ -178,7 +178,7 @@ STAGE PLANS:
                     Statistics: Num rows: 12 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: avg(c), count()
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 48 Data size: 26496 Basic stats: 
COMPLETE Column stats: NONE
@@ -356,7 +356,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0, 1]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 
(type: bigint)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L 
(type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 48 Data size: 26496 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3_dec.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3_dec.q.out
 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3_dec.q.out
index 8d2247d..b7f0825 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3_dec.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets3_dec.q.out
@@ -85,7 +85,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0, 1]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 48 Data size: 23040 Basic stats: 
COMPLETE Column stats: NONE
@@ -223,7 +223,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0, 1]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 48 Data size: 23040 Basic stats: 
COMPLETE Column stats: NONE
@@ -446,7 +446,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0, 1]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 
(type: bigint)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L 
(type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 48 Data size: 23040 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets4.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets4.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets4.q.out
index 55c18fa..2463f2d 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets4.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets4.q.out
@@ -74,7 +74,7 @@ STAGE PLANS:
                         className: VectorFilterOperator
                         native: true
                         predicateExpression: 
FilterDoubleColLessDoubleScalar(col 4:double, val 3.0)(children: 
CastStringToDouble(col 0:string) -> 4:double)
-                    predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+                    predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
                     Statistics: Num rows: 2 Data size: 736 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -86,7 +86,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 8 Data size: 2944 Basic stats: 
COMPLETE Column stats: NONE
@@ -318,7 +318,7 @@ STAGE PLANS:
                         className: VectorFilterOperator
                         native: true
                         predicateExpression: 
FilterDoubleColLessDoubleScalar(col 4:double, val 3.0)(children: 
CastStringToDouble(col 0:string) -> 4:double)
-                    predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+                    predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
                     Statistics: Num rows: 2 Data size: 736 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -330,7 +330,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 8 Data size: 2944 Basic stats: 
COMPLETE Column stats: NONE
@@ -593,7 +593,7 @@ STAGE PLANS:
                         className: VectorFilterOperator
                         native: true
                         predicateExpression: 
FilterDoubleColLessDoubleScalar(col 4:double, val 3.0)(children: 
CastStringToDouble(col 0:string) -> 4:double)
-                    predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+                    predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
                     Statistics: Num rows: 2 Data size: 736 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -664,7 +664,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 
(type: bigint)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L 
(type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 8 Data size: 2944 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets5.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets5.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets5.q.out
index 4e57988..78a8e5b 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets5.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets5.q.out
@@ -148,7 +148,7 @@ STAGE PLANS:
                       native: false
                       vectorProcessingMode: HASH
                       projectedOutputColumnNums: [0]
-                  keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                  keys: _col0 (type: string), _col1 (type: string), 0L (type: 
bigint)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 12 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
@@ -340,7 +340,7 @@ STAGE PLANS:
                       native: false
                       vectorProcessingMode: HASH
                       projectedOutputColumnNums: [0]
-                  keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                  keys: _col0 (type: string), _col1 (type: string), 0L (type: 
bigint)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 12 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
@@ -601,7 +601,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: STREAMING
                     projectedOutputColumnNums: [0]
-                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 
(type: bigint)
+                keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L 
(type: bigint)
                 mode: partials
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 12 Data size: 4416 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets6.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets6.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets6.q.out
index 83c7ad8..1132a4f 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets6.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets6.q.out
@@ -68,7 +68,7 @@ STAGE PLANS:
                         className: VectorFilterOperator
                         native: true
                         predicateExpression: 
FilterDoubleColEqualDoubleScalar(col 4:double, val 5.0)(children: 
CastStringToDouble(col 0:string) -> 4:double)
-                    predicate: (UDFToDouble(a) = 5.0) (type: boolean)
+                    predicate: (UDFToDouble(a) = 5.0D) (type: boolean)
                     Statistics: Num rows: 3 Data size: 1104 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       Group By Vectorization:
@@ -78,7 +78,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 6 Data size: 2208 Basic stats: 
COMPLETE Column stats: NONE
@@ -211,7 +211,7 @@ STAGE PLANS:
                         className: VectorFilterOperator
                         native: true
                         predicateExpression: 
FilterDoubleColEqualDoubleScalar(col 4:double, val 5.0)(children: 
CastStringToDouble(col 0:string) -> 4:double)
-                    predicate: (UDFToDouble(a) = 5.0) (type: boolean)
+                    predicate: (UDFToDouble(a) = 5.0D) (type: boolean)
                     Statistics: Num rows: 3 Data size: 1104 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       Group By Vectorization:
@@ -221,7 +221,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 6 Data size: 2208 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out
 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out
index 8dd5cf0..0d147a1 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_grouping.q.out
@@ -78,7 +78,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -239,7 +239,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
@@ -407,7 +407,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
@@ -576,7 +576,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
@@ -782,7 +782,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -843,13 +843,13 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 9 Data size: 72 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 1) (type: bigint), grouping(_col2, 0) (type: 
bigint)
+                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 1L) (type: bigint), grouping(_col2, 0L) (type: 
bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [0, 1, 2, 3, 4]
-                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 1)) 
-> 3:bigint, VectorUDFAdaptor(grouping(_col2, 0)) -> 4:bigint
+                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 1L)) 
-> 3:bigint, VectorUDFAdaptor(grouping(_col2, 0L)) -> 4:bigint
                   Statistics: Num rows: 9 Data size: 72 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
@@ -943,7 +943,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
@@ -1004,13 +1004,13 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 1) (type: bigint), grouping(_col2, 0) (type: 
bigint)
+                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 1L) (type: bigint), grouping(_col2, 0L) (type: 
bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [0, 1, 2, 3, 4]
-                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 1)) 
-> 3:bigint, VectorUDFAdaptor(grouping(_col2, 0)) -> 4:bigint
+                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 1L)) 
-> 3:bigint, VectorUDFAdaptor(grouping(_col2, 0L)) -> 4:bigint
                   Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
@@ -1111,7 +1111,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
@@ -1119,8 +1119,8 @@ STAGE PLANS:
                         Filter Vectorization:
                             className: VectorFilterOperator
                             native: true
-                            predicateExpression: 
FilterLongColEqualLongScalar(col 3:bigint, val 1)(children: 
VectorUDFAdaptor(grouping(_col2, 1)) -> 3:bigint)
-                        predicate: (grouping(_col2, 1) = 1) (type: boolean)
+                            predicateExpression: 
FilterLongColEqualLongScalar(col 3:bigint, val 1)(children: 
VectorUDFAdaptor(grouping(_col2, 1L)) -> 3:bigint)
+                        predicate: (grouping(_col2, 1L) = 1) (type: boolean)
                         Statistics: Num rows: 12 Data size: 96 Basic stats: 
COMPLETE Column stats: NONE
                         Reduce Output Operator
                           key expressions: _col0 (type: int), _col1 (type: 
int), _col2 (type: bigint)
@@ -1273,7 +1273,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
@@ -1281,8 +1281,8 @@ STAGE PLANS:
                         Filter Vectorization:
                             className: VectorFilterOperator
                             native: true
-                            predicateExpression: FilterExprOrExpr(children: 
FilterLongColEqualLongScalar(col 3:bigint, val 1)(children: 
VectorUDFAdaptor(grouping(_col2, 1)) -> 3:bigint), 
FilterLongColEqualLongScalar(col 3:bigint, val 1)(children: 
VectorUDFAdaptor(grouping(_col2, 0)) -> 3:bigint))
-                        predicate: ((grouping(_col2, 0) = 1) or 
(grouping(_col2, 1) = 1)) (type: boolean)
+                            predicateExpression: FilterExprOrExpr(children: 
FilterLongColEqualLongScalar(col 3:bigint, val 1)(children: 
VectorUDFAdaptor(grouping(_col2, 1L)) -> 3:bigint), 
FilterLongColEqualLongScalar(col 3:bigint, val 1)(children: 
VectorUDFAdaptor(grouping(_col2, 0L)) -> 3:bigint))
+                        predicate: ((grouping(_col2, 0L) = 1) or 
(grouping(_col2, 1L) = 1)) (type: boolean)
                         Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
                         Reduce Output Operator
                           key expressions: _col0 (type: int), _col1 (type: 
int), _col2 (type: bigint)
@@ -1341,16 +1341,16 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1) + grouping(_col2, 0)) (type: bigint)
+                  expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1L) + grouping(_col2, 0L)) (type: bigint)
                   outputColumnNames: _col0, _col1, _col2
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [0, 1, 5]
-                      selectExpressions: LongColAddLongColumn(col 3:bigint, 
col 4:bigint)(children: VectorUDFAdaptor(grouping(_col2, 1)) -> 3:bigint, 
VectorUDFAdaptor(grouping(_col2, 0)) -> 4:bigint) -> 5:bigint
+                      selectExpressions: LongColAddLongColumn(col 3:bigint, 
col 4:bigint)(children: VectorUDFAdaptor(grouping(_col2, 1L)) -> 3:bigint, 
VectorUDFAdaptor(grouping(_col2, 0L)) -> 4:bigint) -> 5:bigint
                   Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col2 (type: bigint), CASE WHEN ((_col2 = 
1)) THEN (_col0) END (type: int)
+                    key expressions: _col2 (type: bigint), CASE WHEN ((_col2 = 
1L)) THEN (_col0) END (type: int)
                     sort order: -+
                     Reduce Sink Vectorization:
                         className: VectorReduceSinkObjectHashOperator
@@ -1480,7 +1480,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
@@ -1541,13 +1541,13 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 1, 0) (type: bigint)
+                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 1L, 0L) (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [0, 1, 2, 3]
-                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 1, 
0)) -> 3:bigint
+                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 1L, 
0L)) -> 3:bigint
                   Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
@@ -1646,7 +1646,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 24 Data size: 192 Basic stats: 
COMPLETE Column stats: NONE
@@ -1707,13 +1707,13 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 0, 1) (type: bigint)
+                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 0L, 1L) (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [0, 1, 2, 3]
-                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 0, 
1)) -> 3:bigint
+                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 0L, 
1L)) -> 3:bigint
                   Statistics: Num rows: 12 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
@@ -1812,7 +1812,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -1873,13 +1873,13 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 9 Data size: 72 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 1, 0) (type: bigint)
+                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 1L, 0L) (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [0, 1, 2, 3]
-                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 1, 
0)) -> 3:bigint
+                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 1L, 
0L)) -> 3:bigint
                   Statistics: Num rows: 9 Data size: 72 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
@@ -1973,7 +1973,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: key (type: int), value (type: int), 0 (type: 
bigint)
+                      keys: key (type: int), value (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 18 Data size: 144 Basic stats: 
COMPLETE Column stats: NONE
@@ -2034,13 +2034,13 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 9 Data size: 72 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 0, 1) (type: bigint)
+                  expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint), grouping(_col2, 0L, 1L) (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [0, 1, 2, 3]
-                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 0, 
1)) -> 3:bigint
+                      selectExpressions: VectorUDFAdaptor(grouping(_col2, 0L, 
1L)) -> 3:bigint
                   Statistics: Num rows: 9 Data size: 72 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_limit.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_limit.q.out
 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_limit.q.out
index f7f3014..030734d 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_limit.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_sets_limit.q.out
@@ -78,7 +78,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 24 Data size: 8832 Basic stats: 
COMPLETE Column stats: NONE
@@ -279,7 +279,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 24 Data size: 8832 Basic stats: 
COMPLETE Column stats: NONE
@@ -480,7 +480,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: a (type: string), b (type: string), 0 (type: 
bigint)
+                      keys: a (type: string), b (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 12 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
@@ -679,7 +679,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: a (type: string), b (type: string), c (type: 
string), 0 (type: bigint)
+                      keys: a (type: string), b (type: string), c (type: 
string), 0L (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 9936 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_window.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_window.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_window.q.out
index 9374bcc..a3fbde4 100644
--- 
a/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_window.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vector_groupby_grouping_window.q.out
@@ -76,7 +76,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0, 1]
-                      keys: category (type: int), 0 (type: bigint)
+                      keys: category (type: int), 0L (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 3 Data size: 60 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out 
b/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out
index 82b6ba0..98e6e54 100644
--- a/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_groupby_mapjoin.q.out
@@ -157,7 +157,7 @@ STAGE PLANS:
                     1 Reducer 6
                   Statistics: Num rows: 500 Data size: 98620 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((_col2 = 0) or (_col5 is null and _col0 is not 
null and (_col3 >= _col2))) (type: boolean)
+                    predicate: ((_col2 = 0L) or (_col5 is null and _col0 is 
not null and (_col3 >= _col2))) (type: boolean)
                     Statistics: Num rows: 500 Data size: 98620 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: _col0 (type: string), _col1 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 717c218..8a98ce6 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
@@ -74,7 +74,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
@@ -231,7 +231,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), 0 (type: bigint), val (type: 
string)
+                      keys: key (type: string), 0L (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
@@ -358,7 +358,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
@@ -560,7 +560,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), 0 (type: bigint), val (type: 
string)
+                      keys: key (type: string), 0L (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
@@ -733,7 +733,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE
@@ -768,7 +768,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: [0]
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 6624 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 172e003..ec3e2b8 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
@@ -172,7 +172,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: s_store_id (type: string), 0 (type: bigint)
+                      keys: s_store_id (type: string), 0L (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 24 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
@@ -303,7 +303,7 @@ STAGE PLANS:
                           native: false
                           vectorProcessingMode: HASH
                           projectedOutputColumnNums: []
-                      keys: _col0 (type: string), 0 (type: bigint)
+                      keys: _col0 (type: string), 0L (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 24 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE
@@ -424,7 +424,7 @@ 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: bigint)
+                      keys: _col0 (type: string), 0L (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 24 Data size: 4416 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out
index 7d891db..dcedca8 100644
--- a/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_interval_1.q.out
@@ -128,7 +128,7 @@ STAGE PLANS:
                 vectorized: true
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), 1-2 (type: 
interval_year_month), VALUE._col0 (type: interval_year_month), 1 
02:03:04.000000000 (type: interval_day_time), VALUE._col1 (type: 
interval_day_time)
+                expressions: KEY.reducesinkkey0 (type: string), INTERVAL'1-2' 
(type: interval_year_month), VALUE._col0 (type: interval_year_month), 
INTERVAL'1 02:03:04.000000000' (type: interval_day_time), VALUE._col1 (type: 
interval_day_time)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Select Vectorization:
                     className: VectorSelectOperator
@@ -219,7 +219,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: dt (type: date), (CAST( str1 AS INTERVAL YEAR 
TO MONTH) + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: interval_year_month), 
(1-2 + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: interval_year_month), 
(CAST( str1 AS INTERVAL YEAR TO MONTH) - CAST( str1 AS INTERVAL YEAR TO MONTH)) 
(type: interval_year_month), (1-2 - CAST( str1 AS INTERVAL YEAR TO MONTH)) 
(type: interval_year_month)
+                    expressions: dt (type: date), (CAST( str1 AS INTERVAL YEAR 
TO MONTH) + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: interval_year_month), 
(INTERVAL'1-2' + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: 
interval_year_month), (CAST( str1 AS INTERVAL YEAR TO MONTH) - CAST( str1 AS 
INTERVAL YEAR TO MONTH)) (type: interval_year_month), (INTERVAL'1-2' - CAST( 
str1 AS INTERVAL YEAR TO MONTH)) (type: interval_year_month)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -257,7 +257,7 @@ STAGE PLANS:
                 vectorized: true
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: date), 2-4 (type: 
interval_year_month), VALUE._col0 (type: interval_year_month), VALUE._col1 
(type: interval_year_month), 0-0 (type: interval_year_month), VALUE._col2 
(type: interval_year_month), VALUE._col3 (type: interval_year_month)
+                expressions: KEY.reducesinkkey0 (type: date), INTERVAL'2-4' 
(type: interval_year_month), VALUE._col0 (type: interval_year_month), 
VALUE._col1 (type: interval_year_month), INTERVAL'0-0' (type: 
interval_year_month), VALUE._col2 (type: interval_year_month), VALUE._col3 
(type: interval_year_month)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Select Vectorization:
                     className: VectorSelectOperator
@@ -356,7 +356,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: dt (type: date), (CAST( str2 AS INTERVAL DAY 
TO SECOND) + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: interval_day_time), 
(1 02:03:04.000000000 + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: 
interval_day_time), (CAST( str2 AS INTERVAL DAY TO SECOND) - CAST( str2 AS 
INTERVAL DAY TO SECOND)) (type: interval_day_time), (1 02:03:04.000000000 - 
CAST( str2 AS INTERVAL DAY TO SECOND)) (type: interval_day_time)
+                    expressions: dt (type: date), (CAST( str2 AS INTERVAL DAY 
TO SECOND) + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: interval_day_time), 
(INTERVAL'1 02:03:04.000000000' + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: 
interval_day_time), (CAST( str2 AS INTERVAL DAY TO SECOND) - CAST( str2 AS 
INTERVAL DAY TO SECOND)) (type: interval_day_time), (INTERVAL'1 
02:03:04.000000000' - CAST( str2 AS INTERVAL DAY TO SECOND)) (type: 
interval_day_time)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -394,7 +394,7 @@ STAGE PLANS:
                 vectorized: true
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: date), 2 
04:06:08.000000000 (type: interval_day_time), VALUE._col0 (type: 
interval_day_time), VALUE._col1 (type: interval_day_time), 0 00:00:00.000000000 
(type: interval_day_time), VALUE._col2 (type: interval_day_time), VALUE._col3 
(type: interval_day_time)
+                expressions: KEY.reducesinkkey0 (type: date), INTERVAL'2 
04:06:08.000000000' (type: interval_day_time), VALUE._col0 (type: 
interval_day_time), VALUE._col1 (type: interval_day_time), INTERVAL'0 
00:00:00.000000000' (type: interval_day_time), VALUE._col2 (type: 
interval_day_time), VALUE._col3 (type: interval_day_time)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Select Vectorization:
                     className: VectorSelectOperator
@@ -505,7 +505,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: dt (type: date), (dt + 1-2) (type: date), (dt 
+ CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: date), (1-2 + dt) (type: date), 
(CAST( str1 AS INTERVAL YEAR TO MONTH) + dt) (type: date), (dt - 1-2) (type: 
date), (dt - CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: date), (dt + 1 
02:03:04.000000000) (type: timestamp), (dt + CAST( str2 AS INTERVAL DAY TO 
SECOND)) (type: timestamp), (1 02:03:04.000000000 + dt) (type: timestamp), 
(CAST( str2 AS INTERVAL DAY TO SECOND) + dt) (type: timestamp), (dt - 1 
02:03:04.000000000) (type: timestamp), (dt - CAST( str2 AS INTERVAL DAY TO 
SECOND)) (type: timestamp)
+                    expressions: dt (type: date), (dt + INTERVAL'1-2') (type: 
date), (dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: date), 
(INTERVAL'1-2' + dt) (type: date), (CAST( str1 AS INTERVAL YEAR TO MONTH) + dt) 
(type: date), (dt - INTERVAL'1-2') (type: date), (dt - CAST( str1 AS INTERVAL 
YEAR TO MONTH)) (type: date), (dt + INTERVAL'1 02:03:04.000000000') (type: 
timestamp), (dt + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: timestamp), 
(INTERVAL'1 02:03:04.000000000' + dt) (type: timestamp), (CAST( str2 AS 
INTERVAL DAY TO SECOND) + dt) (type: timestamp), (dt - INTERVAL'1 
02:03:04.000000000') (type: timestamp), (dt - CAST( str2 AS INTERVAL DAY TO 
SECOND)) (type: timestamp)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -665,7 +665,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: ts (type: timestamp), (ts + 1-2) (type: 
timestamp), (ts + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: timestamp), 
(1-2 + ts) (type: timestamp), (CAST( str1 AS INTERVAL YEAR TO MONTH) + ts) 
(type: timestamp), (ts - 1-2) (type: timestamp), (ts - CAST( str1 AS INTERVAL 
YEAR TO MONTH)) (type: timestamp), (ts + 1 02:03:04.000000000) (type: 
timestamp), (ts + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: timestamp), (1 
02:03:04.000000000 + ts) (type: timestamp), (CAST( str2 AS INTERVAL DAY TO 
SECOND) + ts) (type: timestamp), (ts - 1 02:03:04.000000000) (type: timestamp), 
(ts - CAST( str2 AS INTERVAL DAY TO SECOND)) (type: timestamp)
+                    expressions: ts (type: timestamp), (ts + INTERVAL'1-2') 
(type: timestamp), (ts + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: 
timestamp), (INTERVAL'1-2' + ts) (type: timestamp), (CAST( str1 AS INTERVAL 
YEAR TO MONTH) + ts) (type: timestamp), (ts - INTERVAL'1-2') (type: timestamp), 
(ts - CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: timestamp), (ts + 
INTERVAL'1 02:03:04.000000000') (type: timestamp), (ts + CAST( str2 AS INTERVAL 
DAY TO SECOND)) (type: timestamp), (INTERVAL'1 02:03:04.000000000' + ts) (type: 
timestamp), (CAST( str2 AS INTERVAL DAY TO SECOND) + ts) (type: timestamp), (ts 
- INTERVAL'1 02:03:04.000000000') (type: timestamp), (ts - CAST( str2 AS 
INTERVAL DAY TO SECOND)) (type: timestamp)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -807,7 +807,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: ts (type: timestamp), (ts - ts) (type: 
interval_day_time), (2001-01-01 01:02:03.0 - ts) (type: interval_day_time), (ts 
- 2001-01-01 01:02:03.0) (type: interval_day_time)
+                    expressions: ts (type: timestamp), (ts - ts) (type: 
interval_day_time), (TIMESTAMP'2001-01-01 01:02:03.0' - ts) (type: 
interval_day_time), (ts - TIMESTAMP'2001-01-01 01:02:03.0') (type: 
interval_day_time)
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -931,7 +931,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: dt (type: date), (dt - dt) (type: 
interval_day_time), (2001-01-01 - dt) (type: interval_day_time), (dt - 
2001-01-01) (type: interval_day_time)
+                    expressions: dt (type: date), (dt - dt) (type: 
interval_day_time), (DATE'2001-01-01' - dt) (type: interval_day_time), (dt - 
DATE'2001-01-01') (type: interval_day_time)
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -1061,7 +1061,7 @@ STAGE PLANS:
                   TableScan Vectorization:
                       native: true
                   Select Operator
-                    expressions: dt (type: date), (ts - dt) (type: 
interval_day_time), (2001-01-01 01:02:03.0 - dt) (type: interval_day_time), (ts 
- 2001-01-01) (type: interval_day_time), (dt - ts) (type: interval_day_time), 
(dt - 2001-01-01 01:02:03.0) (type: interval_day_time), (2001-01-01 - ts) 
(type: interval_day_time)
+                    expressions: dt (type: date), (ts - dt) (type: 
interval_day_time), (TIMESTAMP'2001-01-01 01:02:03.0' - dt) (type: 
interval_day_time), (ts - DATE'2001-01-01') (type: interval_day_time), (dt - 
ts) (type: interval_day_time), (dt - TIMESTAMP'2001-01-01 01:02:03.0') (type: 
interval_day_time), (DATE'2001-01-01' - ts) (type: interval_day_time)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6
                     Select Vectorization:
                         className: VectorSelectOperator

Reply via email to