http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
index ed3d594..25efe1e 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
@@ -304,25 +304,25 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 32 Data size: 3008 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 32 Data size: 3136 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 32 Data size: 3008 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
+                  Statistics: Num rows: 32 Data size: 3136 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 32 Data size: 3008 Basic stats: COMPLETE 
Column stats: COMPLETE
+          Statistics: Num rows: 32 Data size: 3136 Basic stats: COMPLETE 
Column stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 32 Data size: 3008 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 32 Data size: 3136 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -354,25 +354,25 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 24 Data size: 2256 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
+                  Statistics: Num rows: 24 Data size: 2352 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+          Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -404,25 +404,25 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 24 Data size: 2256 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
+                  Statistics: Num rows: 24 Data size: 2352 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+          Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -454,25 +454,25 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 8 Data size: 752 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 8 Data size: 784 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 8 Data size: 752 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
+                  Statistics: Num rows: 8 Data size: 784 Basic stats: COMPLETE 
Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 8 Data size: 752 Basic stats: COMPLETE Column 
stats: COMPLETE
+          Statistics: Num rows: 8 Data size: 784 Basic stats: COMPLETE Column 
stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 8 Data size: 752 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 8 Data size: 784 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -504,25 +504,25 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 16 Data size: 1504 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 16 Data size: 1568 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 16 Data size: 1504 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
+                  Statistics: Num rows: 16 Data size: 1568 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 16 Data size: 1504 Basic stats: COMPLETE 
Column stats: COMPLETE
+          Statistics: Num rows: 16 Data size: 1568 Basic stats: COMPLETE 
Column stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 16 Data size: 1504 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 16 Data size: 1568 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -554,25 +554,25 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 24 Data size: 2256 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
+                  Statistics: Num rows: 24 Data size: 2352 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+          Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 24 Data size: 2256 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -604,25 +604,25 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 32 Data size: 3008 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 32 Data size: 3136 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 32 Data size: 3008 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
+                  Statistics: Num rows: 32 Data size: 3136 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 32 Data size: 3008 Basic stats: COMPLETE 
Column stats: COMPLETE
+          Statistics: Num rows: 32 Data size: 3136 Basic stats: COMPLETE 
Column stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 32 Data size: 3008 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 32 Data size: 3136 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -703,25 +703,25 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 16 Data size: 1504 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 16 Data size: 1568 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 16 Data size: 1504 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
+                  Statistics: Num rows: 16 Data size: 1568 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 16 Data size: 1504 Basic stats: COMPLETE 
Column stats: COMPLETE
+          Statistics: Num rows: 16 Data size: 1568 Basic stats: COMPLETE 
Column stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 16 Data size: 1504 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 16 Data size: 1568 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -802,18 +802,18 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 32 Data size: 3184 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 16 Data size: 1592 Basic stats: COMPLETE 
Column stats: NONE
@@ -852,18 +852,18 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 24 Data size: 2388 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 12 Data size: 1194 Basic stats: COMPLETE 
Column stats: NONE
@@ -902,18 +902,18 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 24 Data size: 2388 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 12 Data size: 1194 Basic stats: COMPLETE 
Column stats: NONE
@@ -952,18 +952,18 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 4 Data size: 398 Basic stats: COMPLETE Column 
stats: NONE
@@ -1002,18 +1002,18 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 16 Data size: 1592 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 16 Data size: 1592 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE Column 
stats: NONE
@@ -1052,18 +1052,18 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 24 Data size: 2388 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 12 Data size: 1194 Basic stats: COMPLETE 
Column stats: NONE
@@ -1102,18 +1102,18 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 32 Data size: 3184 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 16 Data size: 1592 Basic stats: COMPLETE 
Column stats: NONE
@@ -1201,18 +1201,18 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: int)
+                keys: state (type: string), locid (type: int), 0 (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: int)
+                  key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: bigint)
                   sort order: +++
-                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: int)
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: int), _col2 (type: bigint)
                   Statistics: Num rows: 32 Data size: 3184 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: int)
+          keys: KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 
(type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 16 Data size: 1592 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
index ffcb20f..78c4808 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
@@ -105,18 +105,18 @@ STAGE PLANS:
               outputColumnNames: state, country
               Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), country (type: string), 0 (type: 
int)
+                keys: state (type: string), country (type: string), 0 (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 80 Data size: 800 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: 80 Data size: 800 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: 40 Data size: 400 Basic stats: COMPLETE Column 
stats: NONE
@@ -253,25 +253,25 @@ STAGE PLANS:
               outputColumnNames: state, country
               Statistics: Num rows: 20 Data size: 3460 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), country (type: string), 0 (type: 
int)
+                keys: state (type: string), country (type: string), 0 (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 40 Data size: 7080 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 40 Data size: 7240 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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)
-                  Statistics: Num rows: 40 Data size: 7080 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: string), _col2 (type: bigint)
+                  Statistics: Num rows: 40 Data size: 7240 Basic stats: 
COMPLETE Column stats: COMPLETE
       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: 8 Data size: 1416 Basic stats: COMPLETE Column 
stats: COMPLETE
+          Statistics: Num rows: 8 Data size: 1448 Basic stats: COMPLETE Column 
stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 8 Data size: 1416 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 8 Data size: 1448 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -352,25 +352,25 @@ STAGE PLANS:
               outputColumnNames: state, country
               Statistics: Num rows: 20 Data size: 3460 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), country (type: string), 0 (type: 
int)
+                keys: state (type: string), country (type: string), 0 (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 80 Data size: 14160 Basic stats: 
COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 80 Data size: 14480 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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)
-                  Statistics: Num rows: 80 Data size: 14160 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Map-reduce partition columns: _col0 (type: string), _col1 
(type: string), _col2 (type: bigint)
+                  Statistics: Num rows: 80 Data size: 14480 Basic stats: 
COMPLETE Column stats: COMPLETE
       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: 8 Data size: 1416 Basic stats: COMPLETE Column 
stats: COMPLETE
+          Statistics: Num rows: 8 Data size: 1448 Basic stats: COMPLETE Column 
stats: COMPLETE
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            Statistics: Num rows: 8 Data size: 1416 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 8 Data size: 1448 Basic stats: COMPLETE 
Column stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
index 3d92a0d..63ecd8b 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_annotate_stats_groupby.q.out
@@ -304,15 +304,15 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 32 Data size: 5600 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 32 Data size: 5632 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: string)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: int)
-                  Statistics: Num rows: 32 Data size: 5600 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 32 Data size: 5632 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: int)
@@ -353,15 +353,15 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 24 Data size: 4200 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 24 Data size: 4224 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: string)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: int)
-                  Statistics: Num rows: 24 Data size: 4200 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 24 Data size: 4224 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: int)
@@ -402,15 +402,15 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 24 Data size: 4200 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 24 Data size: 4224 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: string)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: int)
-                  Statistics: Num rows: 24 Data size: 4200 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 24 Data size: 4224 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: int)
@@ -451,15 +451,15 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 8 Data size: 1400 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 8 Data size: 1408 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: string)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: int)
-                  Statistics: Num rows: 8 Data size: 1400 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 8 Data size: 1408 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: int)
@@ -500,15 +500,15 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 16 Data size: 2800 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 16 Data size: 2816 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: string)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: int)
-                  Statistics: Num rows: 16 Data size: 2800 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 16 Data size: 2816 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: int)
@@ -549,15 +549,15 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 24 Data size: 4200 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 24 Data size: 4224 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: string)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: int)
-                  Statistics: Num rows: 24 Data size: 4200 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 24 Data size: 4224 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: int)
@@ -598,15 +598,15 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 32 Data size: 5600 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 32 Data size: 5632 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: string)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: int)
-                  Statistics: Num rows: 32 Data size: 5600 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 32 Data size: 5632 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: int)
@@ -696,15 +696,15 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 16 Data size: 2800 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 16 Data size: 2816 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: int), 
_col2 (type: string)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: int)
-                  Statistics: Num rows: 16 Data size: 2800 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 16 Data size: 2816 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string), KEY._col1 (type: int)
@@ -794,7 +794,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE
@@ -843,7 +843,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
@@ -892,7 +892,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
@@ -941,7 +941,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
@@ -990,7 +990,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 16 Data size: 1592 Basic stats: COMPLETE 
Column stats: NONE
@@ -1039,7 +1039,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
@@ -1088,7 +1088,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE
@@ -1186,7 +1186,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), '0' (type: 
string)
+                keys: state (type: string), locid (type: int), '0L' (type: 
string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_cube1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_cube1.q.out 
b/ql/src/test/results/clientpositive/groupby_cube1.q.out
index e5ece81..37b8c62 100644
--- a/ql/src/test/results/clientpositive/groupby_cube1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_cube1.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: 4 Data size: 1200 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: 1200 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: 600 Basic stats: COMPLETE Column 
stats: NONE
@@ -96,20 +96,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: 4 Data size: 1200 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: 1200 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: 600 Basic stats: COMPLETE Column 
stats: NONE
@@ -181,25 +181,25 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 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: 1200 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: 1200 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, _col2, _col3
           Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: int), _col3 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), _col2 
(type: bigint), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -265,19 +265,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
@@ -338,12 +338,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: 4 Data size: 1200 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: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
@@ -351,7 +351,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: 4 Data size: 1200 Basic stats: COMPLETE Column 
stats: NONE
@@ -367,7 +367,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: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -375,7 +375,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: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
@@ -448,19 +448,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
@@ -476,7 +476,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
@@ -484,7 +484,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
@@ -572,12 +572,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: 4 Data size: 1200 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: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
@@ -588,7 +588,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: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -601,7 +601,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: 4 Data size: 1200 Basic stats: COMPLETE Column 
stats: NONE
@@ -617,7 +617,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: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -625,7 +625,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: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE
@@ -711,7 +711,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: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -719,7 +719,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: 4 Data size: 1200 Basic stats: COMPLETE Column 
stats: NONE
@@ -735,7 +735,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: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -743,7 +743,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: 2 Data size: 600 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out 
b/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
index 9a6457c..e6126ab 100644
--- a/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
+++ b/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
@@ -52,21 +52,21 @@ STAGE PLANS:
               outputColumnNames: key, value
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: string), value (type: string), 0 (type: int)
+                keys: key (type: string), value (type: string), 0 (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 2000 Data size: 21248 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: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
               outputColumnNames: key, value
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: key (type: string), value (type: string), 0 (type: int)
+                keys: key (type: string), value (type: string), 0 (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
@@ -78,7 +78,7 @@ STAGE PLANS:
                       serde: 
org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
       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, _col2
           Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
@@ -163,13 +163,13 @@ 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: 1000 Data size: 10624 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: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/ddd4c9ae/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
index f13b6e5..ac43413 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
@@ -45,7 +45,7 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                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, _col3
                 Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
@@ -53,21 +53,21 @@ STAGE PLANS:
                   predicate: (_col2 = 1) (type: boolean)
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col0 (type: int), _col1 (type: int), 1 
(type: int)
+                    key expressions: _col0 (type: int), _col1 (type: int), 1 
(type: bigint)
                     sort order: +++
-                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), 1 (type: int)
+                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), 1 (type: bigint)
                     Statistics: Num rows: 1 Data size: 300 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: int), KEY._col1 (type: int), 1 (type: int)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), 1 (type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           pruneGroupingSetId: true
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: int), 1 (type: int), 
_col3 (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), 1 (type: 
bigint), _col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -135,20 +135,20 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                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: 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
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(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: 300 Basic stats: COMPLETE Column 
stats: NONE
@@ -156,7 +156,7 @@ STAGE PLANS:
             predicate: (_col2 = 1) (type: boolean)
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: _col0 (type: int), _col1 (type: int), 1 (type: 
int), _col3 (type: bigint)
+              expressions: _col0 (type: int), _col1 (type: int), 1 (type: 
bigint), _col3 (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_sets1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
index d70f065..62fc9fb 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
@@ -53,20 +53,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
@@ -137,20 +137,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
@@ -221,20 +221,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
@@ -305,20 +305,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: 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
                   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
@@ -384,18 +384,18 @@ 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
       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

Reply via email to