http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out
index 453b9f7..43e17ec 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets2.q.out
@@ -52,7 +52,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -68,15 +68,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -137,7 +137,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -153,15 +153,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -246,7 +246,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(VALUE._col0)
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -262,15 +262,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: double)
       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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -378,7 +378,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(VALUE._col0)
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 24 Data size: 168 Basic stats: COMPLETE Column 
stats: NONE
@@ -394,15 +394,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 24 Data size: 168 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: bigint)
       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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 12 Data size: 84 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
index be8d20e..352d4be 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
@@ -46,20 +46,20 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: avg(c), count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 4 Data size: 2880 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: 4 Data size: 2880 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col3 (type: 
struct<count:bigint,sum:double,input:string>), _col4 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: avg(VALUE._col0), count(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, _col3, _col4
           Statistics: Num rows: 2 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -106,20 +106,20 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: avg(c), count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 4 Data size: 2880 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: 4 Data size: 2880 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col3 (type: 
struct<count:bigint,sum:double,input:string>), _col4 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: avg(VALUE._col0), count(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, _col3, _col4
           Statistics: Num rows: 2 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -205,7 +205,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: avg(VALUE._col0), count(VALUE._col1)
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 4 Data size: 2880 Basic stats: COMPLETE Column 
stats: NONE
@@ -221,15 +221,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 2880 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: 
struct<count:bigint,sum:double,input:string>), _col4 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: avg(VALUE._col0), count(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: final
           outputColumnNames: _col0, _col1, _col3, _col4
           Statistics: Num rows: 2 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
index 0c6ead9..e368e1e 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
@@ -46,20 +46,20 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 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: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -123,20 +123,20 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 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: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -193,20 +193,20 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 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: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -270,20 +270,20 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 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: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -384,7 +384,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -400,15 +400,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -485,7 +485,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -501,15 +501,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
index 0bb12e1..1766fb9 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets5.q.out
@@ -56,7 +56,7 @@ STAGE PLANS:
           Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column 
stats: NONE
           Group By Operator
             aggregations: count()
-            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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -72,15 +72,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -145,7 +145,7 @@ STAGE PLANS:
           Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column 
stats: NONE
           Group By Operator
             aggregations: count()
-            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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -161,15 +161,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -284,7 +284,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0 (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -300,15 +300,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
index 5b990a1..563b110 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
@@ -39,18 +39,18 @@ STAGE PLANS:
               predicate: (UDFToDouble(a) = 5.0) (type: boolean)
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 2 Data size: 720 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: 2 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          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
           Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column 
stats: NONE
@@ -108,18 +108,18 @@ STAGE PLANS:
               predicate: (UDFToDouble(a) = 5.0) (type: boolean)
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 2 Data size: 720 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: 2 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          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
           Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
index 1f2f86b..1f2cd45 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
@@ -40,23 +40,23 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
+                keys: _col0 (type: int), _col1 (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1) (type: int), grouping(_col2, 0) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1) (type: bigint), grouping(_col2, 0) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -122,23 +122,23 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
+                keys: _col0 (type: int), _col1 (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1) (type: int), grouping(_col2, 0) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1) (type: bigint), grouping(_col2, 0) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -211,18 +211,18 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
+                keys: _col0 (type: int), _col1 (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
@@ -298,18 +298,18 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
+                keys: _col0 (type: int), _col1 (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
@@ -317,7 +317,7 @@ STAGE PLANS:
             predicate: ((grouping(_col2, 0) = 1) or (grouping(_col2, 1) = 1)) 
(type: boolean)
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1) + grouping(_col2, 0)) (type: int), CASE WHEN 
(((grouping(_col2, 1) + grouping(_col2, 0)) = 1)) THEN (_col0) ELSE (null) END 
(type: int)
+              expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1) + grouping(_col2, 0)) (type: bigint), CASE WHEN 
(((grouping(_col2, 1) + grouping(_col2, 0)) = 1)) THEN (_col0) ELSE (null) END 
(type: int)
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
@@ -332,13 +332,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              key expressions: _col2 (type: int), _col3 (type: int)
+              key expressions: _col2 (type: bigint), _col3 (type: int)
               sort order: -+
               Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: int), _col1 (type: int)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 
KEY.reducesinkkey0 (type: int)
+          expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 
KEY.reducesinkkey0 (type: bigint)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
@@ -407,23 +407,23 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: int), value (type: int), 0 (type: int)
+                keys: key (type: int), value (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1) (type: int), grouping(_col2, 0) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1) (type: bigint), grouping(_col2, 0) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -489,23 +489,23 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: int), value (type: int), 0 (type: int)
+                keys: key (type: int), value (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1) (type: int), grouping(_col2, 0) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1) (type: bigint), grouping(_col2, 0) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -578,7 +578,7 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: int), value (type: int), 0 (type: int)
+                keys: key (type: int), value (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -586,13 +586,13 @@ STAGE PLANS:
                   predicate: (grouping(_col2, 1) = 1) (type: boolean)
                   Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col0 (type: int), _col1 (type: int), 
_col2 (type: int)
+                    key expressions: _col0 (type: int), _col1 (type: int), 
_col2 (type: bigint)
                     sort order: +++
-                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                     Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
@@ -662,7 +662,7 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: int), value (type: int), 0 (type: int)
+                keys: key (type: int), value (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -670,18 +670,18 @@ STAGE PLANS:
                   predicate: ((grouping(_col2, 0) = 1) or (grouping(_col2, 1) 
= 1)) (type: boolean)
                   Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col0 (type: int), _col1 (type: int), 
_col2 (type: int)
+                    key expressions: _col0 (type: int), _col1 (type: int), 
_col2 (type: bigint)
                     sort order: +++
-                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                     Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1) + grouping(_col2, 0)) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1) + grouping(_col2, 0)) (type: bigint)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -696,13 +696,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              key expressions: _col2 (type: int), CASE WHEN ((_col2 = 1)) THEN 
(_col0) END (type: int)
+              key expressions: _col2 (type: bigint), CASE WHEN ((_col2 = 1)) 
THEN (_col0) END (type: int)
               sort order: -+
               Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: int), _col1 (type: int)
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 
KEY.reducesinkkey0 (type: int)
+          expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 
KEY.reducesinkkey0 (type: bigint)
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
@@ -787,7 +787,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), 0 (type: int), 
0 (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint), 0 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -864,7 +864,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), 0 (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), 0 (type: bigint)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1002,23 +1002,23 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: int), value (type: int), 0 (type: int)
+                keys: key (type: int), value (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1, 0) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1, 0) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1089,23 +1089,23 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: int), value (type: int), 0 (type: int)
+                keys: key (type: int), value (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 0, 1) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 0, 1) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1176,23 +1176,23 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: int), value (type: int), 0 (type: int)
+                keys: key (type: int), value (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1, 0) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1, 0) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1258,23 +1258,23 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: int), value (type: int), 0 (type: int)
+                keys: key (type: int), value (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
+                  key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 0, 1) (type: int)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 0, 1) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1 Data size: 300 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/groupby_grouping_sets_limit.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out
index b25b0e5..efa1802 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets_limit.q.out
@@ -37,21 +37,21 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 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: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   TopN Hash Memory Usage: 0.1
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -118,21 +118,21 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 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: 4 Data size: 1440 Basic stats: 
COMPLETE Column stats: NONE
                   TopN Hash Memory Usage: 0.1
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE Column 
stats: NONE
@@ -199,21 +199,21 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: a (type: string), b (type: string), 0 (type: int)
+                keys: a (type: string), b (type: string), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2 Data size: 720 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: 2 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE
                   TopN Hash Memory Usage: 0.1
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column 
stats: NONE
@@ -279,19 +279,19 @@ STAGE PLANS:
               outputColumnNames: a, b, c
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: a (type: string), b (type: string), c (type: string), 0 
(type: int)
+                keys: a (type: string), b (type: string), c (type: string), 0 
(type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 3 Data size: 1080 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), _col3 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), _col3 (type: bigint)
                   sort order: ++++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: string), _col2 (type: string), _col3 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: string), _col2 (type: string), _col3 (type: bigint)
                   Statistics: Num rows: 3 Data size: 1080 Basic stats: 
COMPLETE Column stats: NONE
                   TopN Hash Memory Usage: 0.1
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 
(type: string), KEY._col3 (type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 
(type: string), KEY._col3 (type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_window.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
index 32135e4..0f58f51 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
@@ -49,20 +49,20 @@ STAGE PLANS:
               Statistics: Num rows: 3 Data size: 20 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: max(live), max(comments)
-                keys: category (type: int), 0 (type: int)
+                keys: category (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 6 Data size: 40 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: int), _col1 (type: int)
+                  key expressions: _col0 (type: int), _col1 (type: bigint)
                   sort order: ++
-                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: int)
+                  Map-reduce partition columns: _col0 (type: int), _col1 
(type: bigint)
                   Statistics: Num rows: 6 Data size: 40 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col2 (type: int), _col3 (type: int)
       Reduce Operator Tree:
         Group By Operator
           aggregations: max(VALUE._col0), max(VALUE._col1)
-          keys: KEY._col0 (type: int), KEY._col1 (type: int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col2, _col3
           Statistics: Num rows: 3 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_rollup1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_rollup1.q.out 
b/ql/src/test/results/clientpositive/groupby_rollup1.q.out
index bc1d8a9..a849a8d 100644
--- a/ql/src/test/results/clientpositive/groupby_rollup1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_rollup1.q.out
@@ -37,20 +37,20 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                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: 3 Data size: 900 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: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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, _col3
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
@@ -116,19 +116,19 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(DISTINCT val)
-                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: 2 Data size: 600 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)
                   Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
       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: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
@@ -189,12 +189,12 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                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: 3 Data size: 900 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)
                   Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -202,7 +202,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE Column 
stats: NONE
@@ -218,7 +218,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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)
               Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -226,7 +226,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
@@ -293,19 +293,19 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(DISTINCT val)
-                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: 2 Data size: 600 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)
                   Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
       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: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
@@ -321,7 +321,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
@@ -329,7 +329,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: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
@@ -417,12 +417,12 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(1)
-                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: 3 Data size: 900 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)
                   Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -433,7 +433,7 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: sum(1)
-                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: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -446,7 +446,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE Column 
stats: NONE
@@ -462,7 +462,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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)
               Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -470,7 +470,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
@@ -556,7 +556,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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)
               Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -564,7 +564,7 @@ STAGE PLANS:
       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: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE Column 
stats: NONE
@@ -580,7 +580,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             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)
               Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -588,7 +588,7 @@ STAGE PLANS:
       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: final
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_rollup_empty.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_rollup_empty.q.out 
b/ql/src/test/results/clientpositive/groupby_rollup_empty.q.out
index 2756d38..dd53fe2 100644
--- a/ql/src/test/results/clientpositive/groupby_rollup_empty.q.out
+++ b/ql/src/test/results/clientpositive/groupby_rollup_empty.q.out
@@ -169,26 +169,26 @@ STAGE PLANS:
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col2)
-                  keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
+                  keys: _col0 (type: int), _col1 (type: int), 0 (type: bigint)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 3 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col0 (type: int), _col1 (type: int), 
_col2 (type: int)
+                    key expressions: _col0 (type: int), _col1 (type: int), 
_col2 (type: bigint)
                     sort order: +++
-                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
+                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: bigint)
                     Statistics: Num rows: 3 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     value expressions: _col3 (type: bigint)
       Execution mode: vectorized
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(VALUE._col0)
-          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
           Select Operator
-            expressions: _col3 (type: bigint), grouping(_col2, 0) (type: int), 
'NULL,1' (type: string)
+            expressions: _col3 (type: bigint), grouping(_col2, 0) (type: 
bigint), 'NULL,1' (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             File Output Operator

Reply via email to