http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/druid_timeseries.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_timeseries.q.out 
b/ql/src/test/results/clientpositive/druid_timeseries.q.out
index 785cbd2..19a5af3 100644
--- a/ql/src/test/results/clientpositive/druid_timeseries.q.out
+++ b/ql/src/test/results/clientpositive/druid_timeseries.q.out
@@ -24,13 +24,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: druid_table_1
-            filterExpr: (((__time >= 2009-12-31 16:00:00.0 US/Pacific) and 
(__time <= 2012-02-29 16:00:00.0 US/Pacific)) or (added <= 0)) (type: boolean)
+            filterExpr: (((__time >= TIMESTAMPLOCALTZ'2009-12-31 16:00:00.0 
US/Pacific') and (__time <= TIMESTAMPLOCALTZ'2012-02-29 16:00:00.0 
US/Pacific')) or (added <= 0)) (type: boolean)
             properties:
               druid.query.json 
{"queryType":"select","dataSource":"wikipedia","descending":false,"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"dimensions":["robot","namespace","anonymous","unpatrolled","page","language","newpage","user"],"metrics":["count","added","delta","variation","deleted"],"granularity":"all","pagingSpec":{"threshold":16384,"fromNext":true},"context":{"druid.query.fetch":false}}
               druid.query.type select
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (((__time >= 2009-12-31 16:00:00.0 US/Pacific) and 
(__time <= 2012-02-29 16:00:00.0 US/Pacific)) or (added <= 0)) (type: boolean)
+              predicate: (((__time >= TIMESTAMPLOCALTZ'2009-12-31 16:00:00.0 
US/Pacific') and (__time <= TIMESTAMPLOCALTZ'2012-02-29 16:00:00.0 
US/Pacific')) or (added <= 0)) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
@@ -443,13 +443,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: druid_table_1
-            filterExpr: floor_hour(__time) BETWEEN 2010-01-01 00:00:00.0 
US/Pacific AND 2014-01-01 00:00:00.0 US/Pacific (type: boolean)
+            filterExpr: floor_hour(__time) BETWEEN TIMESTAMPLOCALTZ'2010-01-01 
00:00:00.0 US/Pacific' AND TIMESTAMPLOCALTZ'2014-01-01 00:00:00.0 US/Pacific' 
(type: boolean)
             properties:
               druid.query.json 
{"queryType":"select","dataSource":"wikipedia","descending":false,"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"dimensions":[],"metrics":["added","variation"],"granularity":"all","pagingSpec":{"threshold":16384,"fromNext":true},"context":{"druid.query.fetch":false}}
               druid.query.type select
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: floor_hour(__time) BETWEEN 2010-01-01 00:00:00.0 
US/Pacific AND 2014-01-01 00:00:00.0 US/Pacific (type: boolean)
+              predicate: floor_hour(__time) BETWEEN 
TIMESTAMPLOCALTZ'2010-01-01 00:00:00.0 US/Pacific' AND 
TIMESTAMPLOCALTZ'2014-01-01 00:00:00.0 US/Pacific' (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: floor_hour(__time) (type: timestamp with local 
time zone), added (type: float), variation (type: float)
@@ -520,13 +520,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: druid_table_1
-            filterExpr: floor_hour(__time) BETWEEN 2010-01-01 00:00:00.0 
US/Pacific AND 2014-01-01 00:00:00.0 US/Pacific (type: boolean)
+            filterExpr: floor_hour(__time) BETWEEN TIMESTAMPLOCALTZ'2010-01-01 
00:00:00.0 US/Pacific' AND TIMESTAMPLOCALTZ'2014-01-01 00:00:00.0 US/Pacific' 
(type: boolean)
             properties:
               druid.query.json 
{"queryType":"select","dataSource":"wikipedia","descending":false,"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"dimensions":[],"metrics":["added","variation"],"granularity":"all","pagingSpec":{"threshold":16384,"fromNext":true},"context":{"druid.query.fetch":false}}
               druid.query.type select
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: floor_hour(__time) BETWEEN 2010-01-01 00:00:00.0 
US/Pacific AND 2014-01-01 00:00:00.0 US/Pacific (type: boolean)
+              predicate: floor_hour(__time) BETWEEN 
TIMESTAMPLOCALTZ'2010-01-01 00:00:00.0 US/Pacific' AND 
TIMESTAMPLOCALTZ'2014-01-01 00:00:00.0 US/Pacific' (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: floor_hour(__time) (type: timestamp with local 
time zone), added (type: float), variation (type: float)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/druid_topn.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_topn.q.out 
b/ql/src/test/results/clientpositive/druid_topn.q.out
index 90eec3d..7a4c1f9 100644
--- a/ql/src/test/results/clientpositive/druid_topn.q.out
+++ b/ql/src/test/results/clientpositive/druid_topn.q.out
@@ -360,13 +360,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: druid_table_1
-            filterExpr: floor_hour(__time) BETWEEN 2010-01-01 00:00:00.0 
US/Pacific AND 2014-01-01 00:00:00.0 US/Pacific (type: boolean)
+            filterExpr: floor_hour(__time) BETWEEN TIMESTAMPLOCALTZ'2010-01-01 
00:00:00.0 US/Pacific' AND TIMESTAMPLOCALTZ'2014-01-01 00:00:00.0 US/Pacific' 
(type: boolean)
             properties:
               druid.query.json 
{"queryType":"select","dataSource":"wikipedia","descending":false,"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"],"dimensions":["robot"],"metrics":["added","variation"],"granularity":"all","pagingSpec":{"threshold":16384,"fromNext":true},"context":{"druid.query.fetch":false}}
               druid.query.type select
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: floor_hour(__time) BETWEEN 2010-01-01 00:00:00.0 
US/Pacific AND 2014-01-01 00:00:00.0 US/Pacific (type: boolean)
+              predicate: floor_hour(__time) BETWEEN 
TIMESTAMPLOCALTZ'2010-01-01 00:00:00.0 US/Pacific' AND 
TIMESTAMPLOCALTZ'2014-01-01 00:00:00.0 US/Pacific' (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: robot (type: string), floor_hour(__time) (type: 
timestamp with local time zone), added (type: float), variation (type: float)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/except_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/except_all.q.out 
b/ql/src/test/results/clientpositive/except_all.q.out
index c3310f5..ae8e92f 100644
--- a/ql/src/test/results/clientpositive/except_all.q.out
+++ b/ql/src/test/results/clientpositive/except_all.q.out
@@ -251,7 +251,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), 2 (type: 
bigint), _col2 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), 2L (type: 
bigint), _col2 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -358,7 +358,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), 1 (type: 
bigint), _col2 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), 1L (type: 
bigint), _col2 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -428,7 +428,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), 2 (type: 
bigint), _col2 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), 2L (type: 
bigint), _col2 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -528,7 +528,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), 2 (type: 
bigint), _col2 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), 2L (type: 
bigint), _col2 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 125 Data size: 1328 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -587,7 +587,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 187 Data size: 1986 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (((_col2 * 2) = _col3) and (_col2 > 0)) (type: boolean)
+            predicate: (((_col2 * 2) = _col3) and (_col2 > 0L)) (type: boolean)
             Statistics: Num rows: 31 Data size: 329 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
@@ -600,7 +600,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 15 Data size: 159 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: string), 2 
(type: bigint), _col2 (type: bigint)
+                  expressions: _col0 (type: string), _col1 (type: string), 2L 
(type: bigint), _col2 (type: bigint)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 15 Data size: 159 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -659,7 +659,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 132 Data size: 1402 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (((_col2 * 2) = _col3) and (_col2 > 0)) (type: boolean)
+            predicate: (((_col2 * 2) = _col3) and (_col2 > 0L)) (type: boolean)
             Statistics: Num rows: 22 Data size: 233 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
@@ -703,7 +703,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), 1 (type: 
bigint), _col2 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), 1L (type: 
bigint), _col2 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -743,7 +743,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), 1 (type: 
bigint), _col2 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), 1L (type: 
bigint), _col2 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -783,7 +783,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), 1 (type: 
bigint), _col2 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), 1L (type: 
bigint), _col2 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -851,7 +851,7 @@ STAGE PLANS:
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
-              expressions: _col0 (type: int), 2 (type: bigint), _col1 (type: 
bigint)
+              expressions: _col0 (type: int), 2L (type: bigint), _col1 (type: 
bigint)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
@@ -910,7 +910,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
-            predicate: (((_col1 * 2) = _col2) and (_col1 > 0)) (type: boolean)
+            predicate: (((_col1 * 2) = _col2) and (_col1 > 0L)) (type: boolean)
             Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: int)
@@ -957,7 +957,7 @@ STAGE PLANS:
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
-              expressions: _col0 (type: int), 1 (type: bigint), _col1 (type: 
bigint)
+              expressions: _col0 (type: int), 1L (type: bigint), _col1 (type: 
bigint)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out 
b/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out
index 8fea7fd..25c620b 100644
--- a/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out
+++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out
@@ -71,7 +71,7 @@ STAGE PLANS:
             alias: date_dim
             Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE Column 
stats: COMPLETE
             Filter Operator
-              predicate: (d_date > 1900-01-02) (type: boolean)
+              predicate: (d_date > DATE'1900-01-02') (type: boolean)
               Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE 
Column stats: COMPLETE
               Select Operator
                 Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE 
Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out 
b/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
index 8b95287..6ab11b1 100644
--- a/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/filter_cond_pushdown.q.out
@@ -275,7 +275,7 @@ STAGE PLANS:
             alias: t2
             Statistics: Num rows: 20 Data size: 262 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 1.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 1.0D) (type: boolean)
               Statistics: Num rows: 10 Data size: 131 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), c_int (type: int), c_float 
(type: float)
@@ -291,7 +291,7 @@ STAGE PLANS:
             alias: t3
             Statistics: Num rows: 20 Data size: 262 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) = 1.0) and (c_int = 1)) (type: 
boolean)
+              predicate: ((UDFToDouble(key) = 1.0D) and (c_int = 1)) (type: 
boolean)
               Statistics: Num rows: 5 Data size: 65 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), c_float (type: float)
@@ -333,7 +333,7 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 20 Data size: 262 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 1.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 1.0D) (type: boolean)
               Statistics: Num rows: 10 Data size: 131 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out 
b/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out
index 49e0d35..fc9a8ae 100644
--- a/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out
+++ b/ql/src/test/results/clientpositive/fold_eq_with_case_when.q.out
@@ -42,10 +42,10 @@ STAGE PLANS:
             alias: lineitem
             Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (('RAIL' = l_shipmode) and (1996-03-30 = 
to_date(l_shipdate))) (type: boolean)
+              predicate: (('RAIL' = l_shipmode) and (DATE'1996-03-30' = 
to_date(l_shipdate))) (type: boolean)
               Statistics: Num rows: 25 Data size: 2999 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: l_orderkey (type: int), (UDFToDouble(l_partkey) / 
1000000.0) (type: double)
+                expressions: l_orderkey (type: int), (UDFToDouble(l_partkey) / 
1000000.0D) (type: double)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 25 Data size: 2999 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out 
b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
index 55d2a4d..8532178 100644
--- a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out
@@ -30,7 +30,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -51,7 +51,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -324,7 +324,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -345,7 +345,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -622,7 +622,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -643,7 +643,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -916,7 +916,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 111 Data size: 1179 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -937,7 +937,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out 
b/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out
index 19b078a..e343fd6 100644
--- a/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out
+++ b/ql/src/test/results/clientpositive/fp_literal_arithmetic.q.out
@@ -18,7 +18,7 @@ STAGE PLANS:
             alias: q0
             Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: l_discount BETWEEN 0.05 AND 0.07 (type: boolean)
+              predicate: l_discount BETWEEN 0.05D AND 0.07D (type: boolean)
               Statistics: Num rows: 11 Data size: 1319 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: l_extendedprice (type: double)
@@ -84,7 +84,7 @@ STAGE PLANS:
             alias: q1
             Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: l_discount BETWEEN 0.05 AND 0.07 (type: boolean)
+              predicate: l_discount BETWEEN 0.05D AND 0.07D (type: boolean)
               Statistics: Num rows: 11 Data size: 1319 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: l_extendedprice (type: double)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/gby_star.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/gby_star.q.out 
b/ql/src/test/results/clientpositive/gby_star.q.out
index ade6d73..5c190f7 100644
--- a/ql/src/test/results/clientpositive/gby_star.q.out
+++ b/ql/src/test/results/clientpositive/gby_star.q.out
@@ -92,7 +92,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: sum(key)
@@ -167,7 +167,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: sum(key)
@@ -245,7 +245,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -260,7 +260,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 37b8c62..0ea39f6 100644
--- a/ql/src/test/results/clientpositive/groupby_cube1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_cube1.q.out
@@ -37,7 +37,7 @@ 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -96,7 +96,7 @@ 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -181,7 +181,7 @@ 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: 
bigint)
+                keys: _col0 (type: string), _col1 (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -265,7 +265,7 @@ 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: bigint), val (type: string)
+                keys: key (type: string), 0L (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
@@ -338,7 +338,7 @@ 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -448,7 +448,7 @@ 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: bigint), val (type: string)
+                keys: key (type: string), 0L (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
@@ -572,7 +572,7 @@ 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 e6126ab..fbc0b65 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,7 +52,7 @@ 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: 
bigint)
+                keys: key (type: string), value (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
@@ -66,7 +66,7 @@ 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: 
bigint)
+                keys: key (type: string), value (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 ac43413..f3f2458 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
@@ -45,29 +45,29 @@ 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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (_col2 = 1) (type: boolean)
+                  predicate: (_col2 = 1L) (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: bigint)
+                    key expressions: _col0 (type: int), _col1 (type: int), 1L 
(type: bigint)
                     sort order: +++
-                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), 1 (type: bigint)
+                    Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), 1L (type: bigint)
                     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: bigint)
+          keys: KEY._col0 (type: int), KEY._col1 (type: int), 1L (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: 
bigint), _col3 (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), 1L (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,7 +135,7 @@ 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: bigint)
+                keys: _col0 (type: int), _col1 (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
@@ -153,10 +153,10 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
-            predicate: (_col2 = 1) (type: boolean)
+            predicate: (_col2 = 1L) (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: 
bigint), _col3 (type: bigint)
+              expressions: _col0 (type: int), _col1 (type: int), 1L (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/17441e48/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 62fc9fb..50ede04 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets1.q.out
@@ -53,7 +53,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -137,7 +137,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -221,7 +221,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -305,7 +305,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE
@@ -384,7 +384,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), c (type: string), 0L 
(type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 3 Data size: 1080 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 43e17ec..a41c7b8 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: 
bigint)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 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: 
bigint)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 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: 
bigint)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 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: 
bigint)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 24 Data size: 168 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 352d4be..e894205 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets3.q.out
@@ -46,7 +46,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 4 Data size: 2880 Basic stats: COMPLETE 
Column stats: NONE
@@ -106,7 +106,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 4 Data size: 2880 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: 
bigint)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 4 Data size: 2880 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 e368e1e..0caaf67 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
@@ -42,11 +42,11 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+              predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
               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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -119,11 +119,11 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+              predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
               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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -189,11 +189,11 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+              predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
               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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -266,11 +266,11 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+              predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
               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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -367,7 +367,7 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+              predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
@@ -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: 
bigint)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE
@@ -468,7 +468,7 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(a) < 3.0) (type: boolean)
+              predicate: (UDFToDouble(a) < 3.0D) (type: boolean)
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
@@ -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: 
bigint)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 1766fb9..fcd3941 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: bigint)
+            keys: _col0 (type: string), _col1 (type: string), 0L (type: bigint)
             mode: hash
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 4 Data size: 1440 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: bigint)
+            keys: _col0 (type: string), _col1 (type: string), 0L (type: bigint)
             mode: hash
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 4 Data size: 1440 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: 
bigint)
+          keys: KEY._col0 (type: string), KEY._col1 (type: string), 0L (type: 
bigint)
           mode: partials
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 563b110..6e7c568 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out
@@ -36,10 +36,10 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(a) = 5.0) (type: boolean)
+              predicate: (UDFToDouble(a) = 5.0D) (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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE
@@ -105,10 +105,10 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(a) = 5.0) (type: boolean)
+              predicate: (UDFToDouble(a) = 5.0D) (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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 1f2cd45..9e0c9cb 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,7 +40,7 @@ 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: bigint)
+                keys: _col0 (type: int), _col1 (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -122,7 +122,7 @@ 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: bigint)
+                keys: _col0 (type: int), _col1 (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -211,7 +211,7 @@ 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: bigint)
+                keys: _col0 (type: int), _col1 (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -298,7 +298,7 @@ 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: bigint)
+                keys: _col0 (type: int), _col1 (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -407,7 +407,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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -423,7 +423,7 @@ STAGE PLANS:
           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: 
bigint), grouping(_col2, 1) (type: bigint), grouping(_col2, 0) (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1L) (type: bigint), grouping(_col2, 0L) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -489,7 +489,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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -505,7 +505,7 @@ STAGE PLANS:
           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: 
bigint), grouping(_col2, 1) (type: bigint), grouping(_col2, 0) (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1L) (type: bigint), grouping(_col2, 0L) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -578,12 +578,12 @@ 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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (grouping(_col2, 1) = 1) (type: boolean)
+                  predicate: (grouping(_col2, 1L) = 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: bigint)
@@ -662,12 +662,12 @@ 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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((grouping(_col2, 0) = 1) or (grouping(_col2, 1) 
= 1)) (type: boolean)
+                  predicate: ((grouping(_col2, 0L) = 1) or (grouping(_col2, 
1L) = 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: bigint)
@@ -681,7 +681,7 @@ STAGE PLANS:
           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: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1L) + grouping(_col2, 0L)) (type: bigint)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -696,7 +696,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              key expressions: _col2 (type: bigint), CASE WHEN ((_col2 = 1)) 
THEN (_col0) END (type: int)
+              key expressions: _col2 (type: bigint), CASE WHEN ((_col2 = 1L)) 
THEN (_col0) END (type: int)
               sort order: -+
               Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: int), _col1 (type: int)
@@ -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: 
bigint), 0 (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint), 0L (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: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1002,7 +1002,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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -1018,7 +1018,7 @@ STAGE PLANS:
           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: 
bigint), grouping(_col2, 1, 0) (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1L, 0L) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1089,7 +1089,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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 4 Data size: 1200 Basic stats: COMPLETE 
Column stats: NONE
@@ -1105,7 +1105,7 @@ STAGE PLANS:
           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: 
bigint), grouping(_col2, 0, 1) (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 0L, 1L) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1176,7 +1176,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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -1192,7 +1192,7 @@ STAGE PLANS:
           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: 
bigint), grouping(_col2, 1, 0) (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 1L, 0L) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -1258,7 +1258,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: bigint)
+                keys: key (type: int), value (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -1274,7 +1274,7 @@ STAGE PLANS:
           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: 
bigint), grouping(_col2, 0, 1) (type: bigint)
+            expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
bigint), grouping(_col2, 0L, 1L) (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             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/17441e48/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 efa1802..65159e6 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,7 +37,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -118,7 +118,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 4 Data size: 1440 Basic stats: COMPLETE 
Column stats: NONE
@@ -199,7 +199,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2 Data size: 720 Basic stats: COMPLETE 
Column stats: NONE
@@ -279,7 +279,7 @@ 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: bigint)
+                keys: a (type: string), b (type: string), c (type: string), 0L 
(type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 3 Data size: 1080 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 0f58f51..89330d0 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_window.q.out
@@ -49,7 +49,7 @@ 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: bigint)
+                keys: category (type: int), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 6 Data size: 40 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/groupby_position.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_position.q.out 
b/ql/src/test/results/clientpositive/groupby_position.q.out
index d959df1..3cd91e0 100644
--- a/ql/src/test/results/clientpositive/groupby_position.q.out
+++ b/ql/src/test/results/clientpositive/groupby_position.q.out
@@ -589,7 +589,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) <= 20.0) (type: boolean)
+              predicate: (UDFToDouble(key) <= 20.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
@@ -717,7 +717,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: key (type: string), value (type: string)
@@ -803,7 +803,7 @@ STAGE PLANS:
             alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 20.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
15.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 a849a8d..0c622db 100644
--- a/ql/src/test/results/clientpositive/groupby_rollup1.q.out
+++ b/ql/src/test/results/clientpositive/groupby_rollup1.q.out
@@ -37,7 +37,7 @@ 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -116,7 +116,7 @@ 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: bigint), val (type: string)
+                keys: key (type: string), 0L (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
@@ -189,7 +189,7 @@ 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
@@ -293,7 +293,7 @@ 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: bigint), val (type: string)
+                keys: key (type: string), 0L (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
@@ -417,7 +417,7 @@ 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 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: bigint)
+                keys: key (type: string), val (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/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 dd53fe2..8263dbd 100644
--- a/ql/src/test/results/clientpositive/groupby_rollup_empty.q.out
+++ b/ql/src/test/results/clientpositive/groupby_rollup_empty.q.out
@@ -169,7 +169,7 @@ 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: bigint)
+                  keys: _col0 (type: int), _col1 (type: int), 0L (type: bigint)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 3 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out 
b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
index 068b201..0982c6d 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
@@ -2387,7 +2387,7 @@ STAGE PLANS:
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             GatherStats: false
             Select Operator
-              expressions: key (type: string), (UDFToDouble(key) + 1.0) (type: 
double)
+              expressions: key (type: string), (UDFToDouble(key) + 1.0D) 
(type: double)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -7118,7 +7118,7 @@ STAGE PLANS:
             alias: t2
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 8.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 8.0D) (type: boolean)
               Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out 
b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
index 4ccfbb8..4ddc74b 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
@@ -2526,7 +2526,7 @@ STAGE PLANS:
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             GatherStats: false
             Select Operator
-              expressions: key (type: string), (UDFToDouble(key) + 1.0) (type: 
double)
+              expressions: key (type: string), (UDFToDouble(key) + 1.0D) 
(type: double)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -7627,7 +7627,7 @@ STAGE PLANS:
             alias: t2
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 8.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 8.0D) (type: boolean)
               Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/having.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/having.q.out 
b/ql/src/test/results/clientpositive/having.q.out
index 8a63075..c6f34c9 100644
--- a/ql/src/test/results/clientpositive/having.q.out
+++ b/ql/src/test/results/clientpositive/having.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
             outputColumnNames: _col1
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (_col1 > 3) (type: boolean)
+              predicate: (_col1 > 3L) (type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: _col1 (type: bigint)
@@ -95,7 +95,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) <> 302.0) (type: boolean)
+              predicate: (UDFToDouble(key) <> 302.0D) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: max(value)
@@ -728,7 +728,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) > 300.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 300.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: max(value)
@@ -1204,7 +1204,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col1 >= 4) (type: boolean)
+            predicate: (_col1 >= 4L) (type: boolean)
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false

Reply via email to