http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/auto_join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join4.q.out 
b/ql/src/test/results/clientpositive/auto_join4.q.out
index 4b08f93..b5efad6 100644
--- a/ql/src/test/results/clientpositive/auto_join4.q.out
+++ b/ql/src/test/results/clientpositive/auto_join4.q.out
@@ -56,7 +56,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
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -74,7 +74,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) > 
10.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
10.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/auto_join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join5.q.out 
b/ql/src/test/results/clientpositive/auto_join5.q.out
index 03262fe..f91cf7a 100644
--- a/ql/src/test/results/clientpositive/auto_join5.q.out
+++ b/ql/src/test/results/clientpositive/auto_join5.q.out
@@ -56,7 +56,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
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -74,7 +74,7 @@ STAGE PLANS:
             alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 25.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 25.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/auto_join6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join6.q.out 
b/ql/src/test/results/clientpositive/auto_join6.q.out
index d8c58d4..166ecda 100644
--- a/ql/src/test/results/clientpositive/auto_join6.q.out
+++ b/ql/src/test/results/clientpositive/auto_join6.q.out
@@ -50,7 +50,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) > 
10.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
10.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)
@@ -66,7 +66,7 @@ STAGE PLANS:
             alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 25.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 25.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/auto_join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join7.q.out 
b/ql/src/test/results/clientpositive/auto_join7.q.out
index b426b8c..c8f7144 100644
--- a/ql/src/test/results/clientpositive/auto_join7.q.out
+++ b/ql/src/test/results/clientpositive/auto_join7.q.out
@@ -60,7 +60,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) > 
10.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
10.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)
@@ -76,7 +76,7 @@ STAGE PLANS:
             alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 25.0) and (UDFToDouble(key) > 
15.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 25.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)
@@ -92,7 +92,7 @@ STAGE PLANS:
             alias: src3
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 25.0) and (UDFToDouble(key) > 
20.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 25.0D) and (UDFToDouble(key) > 
20.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/auto_join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join8.q.out 
b/ql/src/test/results/clientpositive/auto_join8.q.out
index f4544ad..063f2f3 100644
--- a/ql/src/test/results/clientpositive/auto_join8.q.out
+++ b/ql/src/test/results/clientpositive/auto_join8.q.out
@@ -56,7 +56,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
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -74,7 +74,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) > 
10.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 20.0D) and (UDFToDouble(key) > 
10.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/auto_join_without_localtask.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out 
b/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
index a8ae000..ad5e187 100644
--- a/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
+++ b/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
@@ -686,7 +686,7 @@ STAGE PLANS:
             alias: b
             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)
@@ -704,7 +704,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) > 100.0) and value is not null) 
(type: boolean)
+              predicate: ((UDFToDouble(key) > 100.0D) and value is not null) 
(type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -889,7 +889,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) > 100.0) and value is not null) 
(type: boolean)
+              predicate: ((UDFToDouble(key) > 100.0D) and value is not null) 
(type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -907,7 +907,7 @@ STAGE PLANS:
             alias: b
             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)
@@ -937,7 +937,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) > 100.0) and value is not null) 
(type: boolean)
+              predicate: ((UDFToDouble(key) > 100.0D) and value is not null) 
(type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -953,7 +953,7 @@ STAGE PLANS:
             alias: b
             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/cast1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cast1.q.out 
b/ql/src/test/results/clientpositive/cast1.q.out
index 9c23a76..e00e9ed 100644
--- a/ql/src/test/results/clientpositive/cast1.q.out
+++ b/ql/src/test/results/clientpositive/cast1.q.out
@@ -30,10 +30,10 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 86.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 86.0D) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: 5 (type: int), 5.0 (type: double), 5.0 (type: 
double), 5.0 (type: double), 5 (type: int), 'TRUE' (type: string), 1 (type: int)
+                expressions: 5 (type: int), 5.0D (type: double), 5.0D (type: 
double), 5.0D (type: double), 5 (type: int), 'TRUE' (type: string), 1 (type: 
int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Statistics: Num rows: 250 Data size: 2656 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/cast_on_constant.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cast_on_constant.q.out 
b/ql/src/test/results/clientpositive/cast_on_constant.q.out
index 7f920f4..b56da1d 100644
--- a/ql/src/test/results/clientpositive/cast_on_constant.q.out
+++ b/ql/src/test/results/clientpositive/cast_on_constant.q.out
@@ -22,10 +22,10 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (ts_field = 2016-01-23 00:00:00.0) (type: boolean)
+              predicate: (ts_field = TIMESTAMP'2016-01-23 00:00:00.0') (type: 
boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
-                expressions: 2016-01-23 00:00:00.0 (type: timestamp), 
date_field (type: date)
+                expressions: TIMESTAMP'2016-01-23 00:00:00.0' (type: 
timestamp), date_field (type: date)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 File Output Operator
@@ -58,10 +58,10 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (date_field = 2016-01-23) (type: boolean)
+              predicate: (date_field = DATE'2016-01-23') (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
-                expressions: ts_field (type: timestamp), 2016-01-23 (type: 
date)
+                expressions: ts_field (type: timestamp), DATE'2016-01-23' 
(type: date)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 File Output Operator
@@ -94,10 +94,10 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (ts_field = 2016-01-23 00:00:00.0) (type: boolean)
+              predicate: (ts_field = TIMESTAMP'2016-01-23 00:00:00.0') (type: 
boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
-                expressions: 2016-01-23 00:00:00.0 (type: timestamp), 
date_field (type: date)
+                expressions: TIMESTAMP'2016-01-23 00:00:00.0' (type: 
timestamp), date_field (type: date)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 File Output Operator
@@ -130,10 +130,10 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (date_field = 2016-01-23) (type: boolean)
+              predicate: (date_field = DATE'2016-01-23') (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
-                expressions: ts_field (type: timestamp), 2016-01-23 (type: 
date)
+                expressions: ts_field (type: timestamp), DATE'2016-01-23' 
(type: date)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/cbo_const.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_const.q.out 
b/ql/src/test/results/clientpositive/cbo_const.q.out
index cfc7f52..f13d17e 100644
--- a/ql/src/test/results/clientpositive/cbo_const.q.out
+++ b/ql/src/test/results/clientpositive/cbo_const.q.out
@@ -158,7 +158,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 4.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 4.0D) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -235,7 +235,7 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 3.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 3.0D) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -251,7 +251,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) = 3.0) and value is not null) 
(type: boolean)
+              predicate: ((UDFToDouble(key) = 3.0D) and value is not null) 
(type: boolean)
               Statistics: Num rows: 12 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -293,7 +293,7 @@ STAGE PLANS:
             alias: z
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(hr) = 14.0) and (ds = '2008-04-08') and 
value is not null) (type: boolean)
+              predicate: ((UDFToDouble(hr) = 14.0D) and (ds = '2008-04-08') 
and value is not null) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
index 0bc7d87..ec06e0e 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_outer_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)
@@ -328,7 +328,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)
@@ -349,7 +349,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)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out
index c553ce5..d91e3db 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_udaf_percentile_approx_23.q.out
@@ -512,7 +512,7 @@ STAGE PLANS:
             alias: bucket
             Statistics: Num rows: 1 Data size: 58120 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: CASE WHEN ((key < 100.0)) THEN (NaN) ELSE (key) END 
(type: double)
+              expressions: CASE WHEN ((key < 100.0D)) THEN (NaND) ELSE (key) 
END (type: double)
               outputColumnNames: $f0
               Statistics: Num rows: 1 Data size: 58120 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/columnstats_partlvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out 
b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
index 5c9d375..7d1b433 100644
--- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
@@ -53,25 +53,25 @@ STAGE PLANS:
               Statistics: Num rows: 3 Data size: 1050 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: compute_stats(employeeid, 'hll')
-                keys: 2000.0 (type: double)
+                keys: 2000.0D (type: double)
                 mode: hash
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 1050 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 2000.0 (type: double)
+                  key expressions: 2000.0D (type: double)
                   sort order: +
-                  Map-reduce partition columns: 2000.0 (type: double)
+                  Map-reduce partition columns: 2000.0D (type: double)
                   Statistics: Num rows: 3 Data size: 1050 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:binary>)
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0)
-          keys: 2000.0 (type: double)
+          keys: 2000.0D (type: double)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 1 Data size: 350 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 2000.0 (type: double)
+            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 2000.0D (type: double)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1 Data size: 350 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -115,15 +115,15 @@ STAGE PLANS:
               Statistics: Num rows: 3 Data size: 1050 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: compute_stats(employeeid, 'hll')
-                keys: 2000.0 (type: double)
+                keys: 2000.0D (type: double)
                 mode: hash
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 1050 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 2000.0 (type: double)
+                  key expressions: 2000.0D (type: double)
                   null sort order: a
                   sort order: +
-                  Map-reduce partition columns: 2000.0 (type: double)
+                  Map-reduce partition columns: 2000.0D (type: double)
                   Statistics: Num rows: 3 Data size: 1050 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
                   value expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:binary>)
@@ -185,12 +185,12 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0)
-          keys: 2000.0 (type: double)
+          keys: 2000.0D (type: double)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 1 Data size: 350 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 2000.0 (type: double)
+            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 2000.0D (type: double)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1 Data size: 350 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -301,25 +301,25 @@ STAGE PLANS:
               Statistics: Num rows: 3 Data size: 1050 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: compute_stats(employeeid, 'hll')
-                keys: 4000.0 (type: double)
+                keys: 4000.0D (type: double)
                 mode: hash
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 1050 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 4000.0 (type: double)
+                  key expressions: 4000.0D (type: double)
                   sort order: +
-                  Map-reduce partition columns: 4000.0 (type: double)
+                  Map-reduce partition columns: 4000.0D (type: double)
                   Statistics: Num rows: 3 Data size: 1050 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:binary>)
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0)
-          keys: 4000.0 (type: double)
+          keys: 4000.0D (type: double)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 1 Data size: 350 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 4000.0 (type: double)
+            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 4000.0D (type: double)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1 Data size: 350 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -363,15 +363,15 @@ STAGE PLANS:
               Statistics: Num rows: 3 Data size: 1050 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: compute_stats(employeeid, 'hll')
-                keys: 4000.0 (type: double)
+                keys: 4000.0D (type: double)
                 mode: hash
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 3 Data size: 1050 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 4000.0 (type: double)
+                  key expressions: 4000.0D (type: double)
                   null sort order: a
                   sort order: +
-                  Map-reduce partition columns: 4000.0 (type: double)
+                  Map-reduce partition columns: 4000.0D (type: double)
                   Statistics: Num rows: 3 Data size: 1050 Basic stats: 
COMPLETE Column stats: NONE
                   tag: -1
                   value expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:binary>)
@@ -433,12 +433,12 @@ STAGE PLANS:
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0)
-          keys: 4000.0 (type: double)
+          keys: 4000.0D (type: double)
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 1 Data size: 350 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 4000.0 (type: double)
+            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 4000.0D (type: double)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1 Data size: 350 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -511,25 +511,25 @@ STAGE PLANS:
               Statistics: Num rows: 13 Data size: 92 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: compute_stats(employeeid, 'hll'), 
compute_stats(employeename, 'hll')
-                keys: 2000.0 (type: double)
+                keys: 2000.0D (type: double)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 13 Data size: 92 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 2000.0 (type: double)
+                  key expressions: 2000.0D (type: double)
                   sort order: +
-                  Map-reduce partition columns: 2000.0 (type: double)
+                  Map-reduce partition columns: 2000.0D (type: double)
                   Statistics: Num rows: 13 Data size: 92 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>)
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0), compute_stats(VALUE._col1)
-          keys: 2000.0 (type: double)
+          keys: 2000.0D (type: double)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 6 Data size: 42 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 2000.0 (type: double)
+            expressions: _col1 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col2 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 2000.0D (type: double)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 6 Data size: 42 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/columnstats_partlvl_dp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out 
b/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
index d055be2..66b44bf 100644
--- a/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out
@@ -89,25 +89,25 @@ STAGE PLANS:
               Statistics: Num rows: 1 Data size: 640 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: compute_stats(employeename, 'hll'), 
compute_stats(employeeid, 'hll')
-                keys: 4000.0 (type: double), country (type: string)
+                keys: 4000.0D (type: double), country (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1 Data size: 640 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 4000.0 (type: double), _col1 (type: string)
+                  key expressions: 4000.0D (type: double), _col1 (type: string)
                   sort order: ++
-                  Map-reduce partition columns: 4000.0 (type: double), _col1 
(type: string)
+                  Map-reduce partition columns: 4000.0D (type: double), _col1 
(type: string)
                   Statistics: Num rows: 1 Data size: 640 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col2 (type: 
struct<columntype:string,maxlength:bigint,sumlength:bigint,count:bigint,countnulls:bigint,bitvector:binary>),
 _col3 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:binary>)
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0), compute_stats(VALUE._col1)
-          keys: 4000.0 (type: double), KEY._col1 (type: string)
+          keys: 4000.0D (type: double), KEY._col1 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 1 Data size: 640 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col2 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col3 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 4000.0 (type: double), _col1 (type: string)
+            expressions: _col2 (type: 
struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 _col3 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 4000.0D (type: double), _col1 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 1 Data size: 640 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -220,25 +220,25 @@ STAGE PLANS:
               Statistics: Num rows: 3 Data size: 1690 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: compute_stats(employeeid, 'hll')
-                keys: 2000.0 (type: double), country (type: string)
+                keys: 2000.0D (type: double), country (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 1690 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 2000.0 (type: double), _col1 (type: string)
+                  key expressions: 2000.0D (type: double), _col1 (type: string)
                   sort order: ++
-                  Map-reduce partition columns: 2000.0 (type: double), _col1 
(type: string)
+                  Map-reduce partition columns: 2000.0D (type: double), _col1 
(type: string)
                   Statistics: Num rows: 3 Data size: 1690 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col2 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,bitvector:binary>)
       Reduce Operator Tree:
         Group By Operator
           aggregations: compute_stats(VALUE._col0)
-          keys: 2000.0 (type: double), KEY._col1 (type: string)
+          keys: 2000.0D (type: double), KEY._col1 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 1 Data size: 563 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col2 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 2000.0 (type: double), _col1 (type: string)
+            expressions: _col2 (type: 
struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>),
 2000.0D (type: double), _col1 (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 1 Data size: 563 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/comments.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/comments.q.out 
b/ql/src/test/results/clientpositive/comments.q.out
index 53a766f..6f2fa28 100644
--- a/ql/src/test/results/clientpositive/comments.q.out
+++ b/ql/src/test/results/clientpositive/comments.q.out
@@ -95,7 +95,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (UDFToDouble(key) > 0.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 0.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -116,7 +116,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (UDFToDouble(key) > 0.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 0.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/constant_prop_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constant_prop_3.q.out 
b/ql/src/test/results/clientpositive/constant_prop_3.q.out
index b754f8e..516fed7 100644
--- a/ql/src/test/results/clientpositive/constant_prop_3.q.out
+++ b/ql/src/test/results/clientpositive/constant_prop_3.q.out
@@ -275,7 +275,7 @@ STAGE PLANS:
           outputColumnNames: _col1, _col3, _col4, _col5, _col6, _col7, _col9
           Statistics: Num rows: 1 Data size: 18 Basic stats: PARTIAL Column 
stats: NONE
           Filter Operator
-            predicate: ((_col6 = 0) or (_col9 is null and _col1 is not null 
and (_col7 >= _col6))) (type: boolean)
+            predicate: ((_col6 = 0L) or (_col9 is null and _col1 is not null 
and (_col7 >= _col6))) (type: boolean)
             Statistics: Num rows: 1 Data size: 18 Basic stats: PARTIAL Column 
stats: NONE
             Select Operator
               expressions: _col1 (type: int), _col3 (type: string), _col4 
(type: string), _col5 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/constantfolding.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constantfolding.q.out 
b/ql/src/test/results/clientpositive/constantfolding.q.out
index c4fce25..41297eb 100644
--- a/ql/src/test/results/clientpositive/constantfolding.q.out
+++ b/ql/src/test/results/clientpositive/constantfolding.q.out
@@ -192,7 +192,7 @@ STAGE PLANS:
           alias: src
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 1970-12-31 15:59:58.174 (type: timestamp)
+            expressions: TIMESTAMP'1970-12-31 15:59:58.174' (type: timestamp)
             outputColumnNames: _col0
             Statistics: Num rows: 500 Data size: 20000 Basic stats: COMPLETE 
Column stats: COMPLETE
             ListSink
@@ -213,7 +213,7 @@ STAGE PLANS:
           alias: src
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 1970-12-31 (type: date)
+            expressions: DATE'1970-12-31' (type: date)
             outputColumnNames: _col0
             Statistics: Num rows: 500 Data size: 28000 Basic stats: COMPLETE 
Column stats: COMPLETE
             ListSink
@@ -267,7 +267,7 @@ STAGE PLANS:
           alias: dest1
           Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
-            expressions: 1.098612288668 (type: double), null (type: double), 
null (type: double), 1.098612288668 (type: double), null (type: double), null 
(type: double), 1.584962500721 (type: double), null (type: double), null (type: 
double), 0.47712125472 (type: double), null (type: double), null (type: 
double), 1.584962500721 (type: double), null (type: double), null (type: 
double), null (type: double), -1.0 (type: double), 7.389056098931 (type: 
double), 8.0 (type: double), 8.0 (type: double), 0.125 (type: double), 8.0 
(type: double), 2.0 (type: double), NaN (type: double), 1.0 (type: double), 1.0 
(type: double), 8.0 (type: double), 8.0 (type: double)
+            expressions: 1.098612288668D (type: double), null (type: double), 
null (type: double), 1.098612288668D (type: double), null (type: double), null 
(type: double), 1.584962500721D (type: double), null (type: double), null 
(type: double), 0.47712125472D (type: double), null (type: double), null (type: 
double), 1.584962500721D (type: double), null (type: double), null (type: 
double), null (type: double), -1.0D (type: double), 7.389056098931D (type: 
double), 8.0D (type: double), 8.0D (type: double), 0.125D (type: double), 8.0D 
(type: double), 2.0D (type: double), NaND (type: double), 1.0D (type: double), 
1.0D (type: double), 8.0D (type: double), 8.0D (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25, 
_col26, _col27
             Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
             ListSink

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/constprog2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog2.q.out 
b/ql/src/test/results/clientpositive/constprog2.q.out
index cbc5fd2..55603ce 100644
--- a/ql/src/test/results/clientpositive/constprog2.q.out
+++ b/ql/src/test/results/clientpositive/constprog2.q.out
@@ -88,7 +88,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 1000 Data size: 10603 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 86.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 86.0D) (type: boolean)
               Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 500 Data size: 5301 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/constprog_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog_type.q.out 
b/ql/src/test/results/clientpositive/constprog_type.q.out
index 27ef1f4..6c30085 100644
--- a/ql/src/test/results/clientpositive/constprog_type.q.out
+++ b/ql/src/test/results/clientpositive/constprog_type.q.out
@@ -35,7 +35,7 @@ STAGE PLANS:
             Row Limit Per Split: 1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
             Select Operator
-              expressions: 2013-11-17 (type: date), 2011-04-29 20:46:56.4485 
(type: timestamp)
+              expressions: DATE'2013-11-17' (type: date), TIMESTAMP'2011-04-29 
20:46:56.4485' (type: timestamp)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 48000 Basic stats: COMPLETE 
Column stats: COMPLETE
               File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer10.q.out 
b/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
index b5d2fe7..bec6aab 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
@@ -386,7 +386,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
20.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
20.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -401,7 +401,7 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
20.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
20.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -440,7 +440,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
20.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
20.0D)) (type: boolean)
               Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -547,7 +547,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
20.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
20.0D)) (type: boolean)
               Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -563,7 +563,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
20.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
20.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -578,7 +578,7 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
20.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
20.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -706,7 +706,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
180.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
180.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -721,7 +721,7 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
180.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
180.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -760,7 +760,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
180.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
180.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)
@@ -879,7 +879,7 @@ STAGE PLANS:
             alias: xx
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
180.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
180.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)
@@ -895,7 +895,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
180.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
180.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -910,7 +910,7 @@ STAGE PLANS:
             alias: y
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) < 200.0) and (UDFToDouble(key) > 
180.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 200.0D) and (UDFToDouble(key) > 
180.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 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/correlationoptimizer8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer8.q.out 
b/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
index 9dd45f9..34a9216 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
@@ -30,7 +30,7 @@ STAGE PLANS:
             alias: x
             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()
@@ -83,7 +83,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 20.0) or (UDFToDouble(key) > 
100.0)) and key is not null) (type: boolean)
+              predicate: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 
100.0D)) and key is not null) (type: boolean)
               Statistics: Num rows: 16 Data size: 122 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -123,7 +123,7 @@ STAGE PLANS:
             alias: x1
             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: count()
@@ -222,7 +222,7 @@ STAGE PLANS:
             alias: x
             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()
@@ -240,7 +240,7 @@ STAGE PLANS:
             alias: x1
             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: count()
@@ -258,7 +258,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 20.0) or (UDFToDouble(key) > 
100.0)) and key is not null) (type: boolean)
+              predicate: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 
100.0D)) and key is not null) (type: boolean)
               Statistics: Num rows: 16 Data size: 122 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -426,7 +426,7 @@ STAGE PLANS:
             alias: x
             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()
@@ -512,7 +512,7 @@ STAGE PLANS:
             alias: x1
             Statistics: Num rows: 25 Data size: 191 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: 8 Data size: 61 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: value (type: string)
@@ -635,7 +635,7 @@ STAGE PLANS:
             alias: x
             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()
@@ -653,7 +653,7 @@ STAGE PLANS:
             alias: x1
             Statistics: Num rows: 25 Data size: 191 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: 8 Data size: 61 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: value (type: string)
@@ -848,7 +848,7 @@ STAGE PLANS:
             alias: x
             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()
@@ -901,7 +901,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) < 20.0) or (UDFToDouble(key) > 
100.0)) and key is not null) (type: boolean)
+              predicate: (((UDFToDouble(key) < 20.0D) or (UDFToDouble(key) > 
100.0D)) and key is not null) (type: boolean)
               Statistics: Num rows: 16 Data size: 122 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -941,7 +941,7 @@ STAGE PLANS:
             alias: x1
             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: count()
@@ -1012,7 +1012,7 @@ STAGE PLANS:
             alias: x
             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()
@@ -1102,7 +1102,7 @@ STAGE PLANS:
             alias: x1
             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: count()

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/create_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view.q.out 
b/ql/src/test/results/clientpositive/create_view.q.out
index 7461523..9be2f55 100644
--- a/ql/src/test/results/clientpositive/create_view.q.out
+++ b/ql/src/test/results/clientpositive/create_view.q.out
@@ -193,7 +193,7 @@ STAGE PLANS:
               insideView TRUE
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 18.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 18.0D) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 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/cross_join_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_join_merge.q.out 
b/ql/src/test/results/clientpositive/cross_join_merge.q.out
index 7241dfe..c57b2f8 100644
--- a/ql/src/test/results/clientpositive/cross_join_merge.q.out
+++ b/ql/src/test/results/clientpositive/cross_join_merge.q.out
@@ -267,7 +267,7 @@ STAGE PLANS:
             alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (5.0 = UDFToDouble(key)) (type: boolean)
+              predicate: (5.0D = UDFToDouble(key)) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ctas_colname.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas_colname.q.out 
b/ql/src/test/results/clientpositive/ctas_colname.q.out
index 144811d..d2565fc 100644
--- a/ql/src/test/results/clientpositive/ctas_colname.q.out
+++ b/ql/src/test/results/clientpositive/ctas_colname.q.out
@@ -18,7 +18,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0) (type: double), concat(value, value) (type: string)
+              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0D) (type: double), concat(value, value) (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Limit
@@ -517,7 +517,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0) (type: double)
+              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
@@ -1123,7 +1123,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 9.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 9.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(value)
@@ -1253,7 +1253,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 9.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 9.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: max(value)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/cte_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cte_5.q.out 
b/ql/src/test/results/clientpositive/cte_5.q.out
index 1c7812e..e99f1e7 100644
--- a/ql/src/test/results/clientpositive/cte_5.q.out
+++ b/ql/src/test/results/clientpositive/cte_5.q.out
@@ -88,7 +88,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(colnum) = 5.0) (type: boolean)
+              predicate: (UDFToDouble(colnum) = 5.0D) (type: boolean)
               Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/decimal_udf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_udf.q.out 
b/ql/src/test/results/clientpositive/decimal_udf.q.out
index 3f84a00..e451a18 100644
--- a/ql/src/test/results/clientpositive/decimal_udf.q.out
+++ b/ql/src/test/results/clientpositive/decimal_udf.q.out
@@ -174,7 +174,7 @@ STAGE PLANS:
           alias: decimal_udf
           Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: (UDFToDouble(key) + (UDFToDouble(value) / 2.0)) 
(type: double)
+            expressions: (UDFToDouble(key) + (UDFToDouble(value) / 2.0D)) 
(type: double)
             outputColumnNames: _col0
             Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
             ListSink
@@ -241,7 +241,7 @@ STAGE PLANS:
           alias: decimal_udf
           Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: (UDFToDouble(key) + 1.0) (type: double)
+            expressions: (UDFToDouble(key) + 1.0D) (type: double)
             outputColumnNames: _col0
             Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
             ListSink
@@ -442,7 +442,7 @@ STAGE PLANS:
           alias: decimal_udf
           Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: (UDFToDouble(key) - (UDFToDouble(value) / 2.0)) 
(type: double)
+            expressions: (UDFToDouble(key) - (UDFToDouble(value) / 2.0D)) 
(type: double)
             outputColumnNames: _col0
             Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
             ListSink
@@ -509,7 +509,7 @@ STAGE PLANS:
           alias: decimal_udf
           Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: (UDFToDouble(key) - 1.0) (type: double)
+            expressions: (UDFToDouble(key) - 1.0D) (type: double)
             outputColumnNames: _col0
             Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
             ListSink
@@ -765,7 +765,7 @@ STAGE PLANS:
           alias: decimal_udf
           Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: (UDFToDouble(key) * (UDFToDouble(value) / 2.0)) 
(type: double)
+            expressions: (UDFToDouble(key) * (UDFToDouble(value) / 2.0D)) 
(type: double)
             outputColumnNames: _col0
             Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
             ListSink
@@ -832,7 +832,7 @@ STAGE PLANS:
           alias: decimal_udf
           Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: (UDFToDouble(key) * 2.0) (type: double)
+            expressions: (UDFToDouble(key) * 2.0D) (type: double)
             outputColumnNames: _col0
             Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
             ListSink
@@ -1090,7 +1090,7 @@ STAGE PLANS:
             predicate: (value <> 0) (type: boolean)
             Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: (UDFToDouble(key) / (UDFToDouble(value) / 2.0)) 
(type: double)
+              expressions: (UDFToDouble(key) / (UDFToDouble(value) / 2.0D)) 
(type: double)
               outputColumnNames: _col0
               Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
               ListSink
@@ -1143,7 +1143,7 @@ STAGE PLANS:
           alias: decimal_udf
           Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: (1.0 + (UDFToDouble(key) / 2.0)) (type: double)
+            expressions: (1.0D + (UDFToDouble(key) / 2.0D)) (type: double)
             outputColumnNames: _col0
             Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
             ListSink

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/decimal_udf2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_udf2.q.out 
b/ql/src/test/results/clientpositive/decimal_udf2.q.out
index b6c2db5..e873636 100644
--- a/ql/src/test/results/clientpositive/decimal_udf2.q.out
+++ b/ql/src/test/results/clientpositive/decimal_udf2.q.out
@@ -47,7 +47,7 @@ STAGE PLANS:
               predicate: (key = 10) (type: boolean)
               Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: null (type: double), null (type: double), 
1.4711276743037347 (type: double), -0.8390715290764524 (type: double), 
-0.5440211108893698 (type: double), 0.6483608274590866 (type: double), 
0.17453292519943295 (type: double)
+                expressions: null (type: double), null (type: double), 
1.4711276743037347D (type: double), -0.8390715290764524D (type: double), 
-0.5440211108893698D (type: double), 0.6483608274590866D (type: double), 
0.17453292519943295D (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -104,7 +104,7 @@ STAGE PLANS:
               predicate: (key = 10) (type: boolean)
               Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: 22026.465794806718 (type: double), 
2.302585092994046 (type: double), 2.302585092994046 (type: double), 1.0 (type: 
double), log(10, value) (type: double), log(value, 10) (type: double), 1.0 
(type: double), 3.1622776601683795 (type: double)
+                expressions: 22026.465794806718D (type: double), 
2.302585092994046D (type: double), 2.302585092994046D (type: double), 1.0D 
(type: double), log(10, value) (type: double), log(value, 10) (type: double), 
1.0D (type: double), 3.1622776601683795D (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
                 Statistics: Num rows: 1 Data size: 3590 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/druid/druidmini_dynamic_partition.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/druid/druidmini_dynamic_partition.q.out 
b/ql/src/test/results/clientpositive/druid/druidmini_dynamic_partition.q.out
index f82ecff..19d9008 100644
--- a/ql/src/test/results/clientpositive/druid/druidmini_dynamic_partition.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidmini_dynamic_partition.q.out
@@ -127,7 +127,7 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10
                       Statistics: Num rows: 12288 Data size: 2601650 Basic 
stats: COMPLETE Column stats: COMPLETE
                       Select Operator
-                        expressions: _col0 (type: timestamp with local time 
zone), _col1 (type: string), _col2 (type: string), _col3 (type: double), _col4 
(type: float), _col5 (type: tinyint), _col6 (type: smallint), _col7 (type: 
int), _col8 (type: bigint), _col9 (type: boolean), _col10 (type: boolean), 
floor_hour(CAST( GenericUDFEpochMilli(_col0) AS TIMESTAMP)) (type: timestamp), 
(floor((1.0 / rand())) % 6) (type: bigint)
+                        expressions: _col0 (type: timestamp with local time 
zone), _col1 (type: string), _col2 (type: string), _col3 (type: double), _col4 
(type: float), _col5 (type: tinyint), _col6 (type: smallint), _col7 (type: 
int), _col8 (type: bigint), _col9 (type: boolean), _col10 (type: boolean), 
floor_hour(CAST( GenericUDFEpochMilli(_col0) AS TIMESTAMP)) (type: timestamp), 
(floor((1.0D / rand())) % 6) (type: bigint)
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, __time_granularity, 
__druid_extra_partition_key
                         Statistics: Num rows: 12288 Data size: 2601650 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Reduce Output Operator
@@ -355,7 +355,7 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10
                       Statistics: Num rows: 12288 Data size: 2601650 Basic 
stats: COMPLETE Column stats: COMPLETE
                       Select Operator
-                        expressions: _col0 (type: timestamp with local time 
zone), _col1 (type: string), _col2 (type: string), _col3 (type: double), _col4 
(type: float), _col5 (type: tinyint), _col6 (type: smallint), _col7 (type: 
int), _col8 (type: bigint), _col9 (type: boolean), _col10 (type: boolean), 
floor_hour(CAST( GenericUDFEpochMilli(_col0) AS TIMESTAMP)) (type: timestamp), 
(floor((1.0 / rand())) % 6) (type: bigint)
+                        expressions: _col0 (type: timestamp with local time 
zone), _col1 (type: string), _col2 (type: string), _col3 (type: double), _col4 
(type: float), _col5 (type: tinyint), _col6 (type: smallint), _col7 (type: 
int), _col8 (type: bigint), _col9 (type: boolean), _col10 (type: boolean), 
floor_hour(CAST( GenericUDFEpochMilli(_col0) AS TIMESTAMP)) (type: timestamp), 
(floor((1.0D / rand())) % 6) (type: bigint)
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, __time_granularity, 
__druid_extra_partition_key
                         Statistics: Num rows: 12288 Data size: 2601650 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Reduce Output Operator
@@ -492,7 +492,7 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10
                       Statistics: Num rows: 12288 Data size: 2601650 Basic 
stats: COMPLETE Column stats: COMPLETE
                       Select Operator
-                        expressions: _col0 (type: timestamp with local time 
zone), _col1 (type: string), _col2 (type: string), _col3 (type: double), _col4 
(type: float), _col5 (type: tinyint), _col6 (type: smallint), _col7 (type: 
int), _col8 (type: bigint), _col9 (type: boolean), _col10 (type: boolean), 
floor_hour(CAST( GenericUDFEpochMilli(_col0) AS TIMESTAMP)) (type: timestamp), 
(floor((1.0 / rand())) % 6) (type: bigint)
+                        expressions: _col0 (type: timestamp with local time 
zone), _col1 (type: string), _col2 (type: string), _col3 (type: double), _col4 
(type: float), _col5 (type: tinyint), _col6 (type: smallint), _col7 (type: 
int), _col8 (type: bigint), _col9 (type: boolean), _col10 (type: boolean), 
floor_hour(CAST( GenericUDFEpochMilli(_col0) AS TIMESTAMP)) (type: timestamp), 
(floor((1.0D / rand())) % 6) (type: bigint)
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, __time_granularity, 
__druid_extra_partition_key
                         Statistics: Num rows: 12288 Data size: 2601650 Basic 
stats: COMPLETE Column stats: COMPLETE
                         Reduce Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/druid_basic2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_basic2.q.out 
b/ql/src/test/results/clientpositive/druid_basic2.q.out
index 08b64d6..eb2b83f 100644
--- a/ql/src/test/results/clientpositive/druid_basic2.q.out
+++ b/ql/src/test/results/clientpositive/druid_basic2.q.out
@@ -723,13 +723,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: druid_table_1
-            filterExpr: floor_day(__time) BETWEEN 1999-11-01 00:00:00.0 
US/Pacific AND 1999-11-10 00:00:00.0 US/Pacific (type: boolean)
+            filterExpr: floor_day(__time) BETWEEN TIMESTAMPLOCALTZ'1999-11-01 
00:00:00.0 US/Pacific' AND TIMESTAMPLOCALTZ'1999-11-10 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":[],"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_day(__time) BETWEEN 1999-11-01 00:00:00.0 
US/Pacific AND 1999-11-10 00:00:00.0 US/Pacific (type: boolean)
+              predicate: floor_day(__time) BETWEEN TIMESTAMPLOCALTZ'1999-11-01 
00:00:00.0 US/Pacific' AND TIMESTAMPLOCALTZ'1999-11-10 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_day(__time) (type: 
timestamp with local time zone)
@@ -817,13 +817,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: druid_table_1
-            filterExpr: floor_day(extract) BETWEEN 1999-11-01 00:00:00.0 
US/Pacific AND 1999-11-10 00:00:00.0 US/Pacific (type: boolean)
+            filterExpr: floor_day(extract) BETWEEN TIMESTAMPLOCALTZ'1999-11-01 
00:00:00.0 US/Pacific' AND TIMESTAMPLOCALTZ'1999-11-10 00:00:00.0 US/Pacific' 
(type: boolean)
             properties:
               druid.query.json 
{"queryType":"groupBy","dataSource":"wikipedia","granularity":"all","dimensions":[{"type":"extraction","dimension":"__time","outputName":"extract","extractionFn":{"type":"timeFormat","format":"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'","timeZone":"US/Pacific"}},{"type":"default","dimension":"robot"}],"limitSpec":{"type":"default"},"aggregations":[{"type":"longSum","name":"dummy_agg","fieldName":"dummy_agg"}],"intervals":["1900-01-01T00:00:00.000Z/3000-01-01T00:00:00.000Z"]}
               druid.query.type groupBy
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: floor_day(extract) BETWEEN 1999-11-01 00:00:00.0 
US/Pacific AND 1999-11-10 00:00:00.0 US/Pacific (type: boolean)
+              predicate: floor_day(extract) BETWEEN 
TIMESTAMPLOCALTZ'1999-11-01 00:00:00.0 US/Pacific' AND 
TIMESTAMPLOCALTZ'1999-11-10 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), extract (type: timestamp 
with local time zone)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/druid_basic3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_basic3.q.out 
b/ql/src/test/results/clientpositive/druid_basic3.q.out
index ce6d0aa..9c4cbb5 100644
--- a/ql/src/test/results/clientpositive/druid_basic3.q.out
+++ b/ql/src/test/results/clientpositive/druid_basic3.q.out
@@ -197,7 +197,7 @@ STAGE PLANS:
               druid.query.type groupBy
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Select Operator
-              expressions: language (type: string), ($f1 + 100.0) (type: 
double)
+              expressions: language (type: string), ($f1 + 100.0D) (type: 
double)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Reduce Output Operator
@@ -255,7 +255,7 @@ STAGE PLANS:
               druid.query.type groupBy
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Select Operator
-              expressions: language (type: string), (-1.0 * ((($f1 - $f2) / 
UDFToDouble(($f3 * 3))) + $f4)) (type: double)
+              expressions: language (type: string), (-1.0D * ((($f1 - $f2) / 
UDFToDouble(($f3 * 3L))) + $f4)) (type: double)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Reduce Output Operator
@@ -457,7 +457,7 @@ STAGE PLANS:
               druid.query.type groupBy
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Select Operator
-              expressions: language (type: string), ($f1 + 100.0) (type: 
double), (($f1 + 100.0) - $f2) (type: double)
+              expressions: language (type: string), ($f1 + 100.0D) (type: 
double), (($f1 + 100.0D) - $f2) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Reduce Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/druid_intervals.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid_intervals.q.out 
b/ql/src/test/results/clientpositive/druid_intervals.q.out
index c94cbe9..0a0b1d3 100644
--- a/ql/src/test/results/clientpositive/druid_intervals.q.out
+++ b/ql/src/test/results/clientpositive/druid_intervals.q.out
@@ -353,13 +353,13 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: druid_table_1
-            filterExpr: ((__time) IN (2010-01-01 00:00:00.0 US/Pacific, 
2011-01-01 00:00:00.0 US/Pacific) or (robot = 'user1')) (type: boolean)
+            filterExpr: ((__time) IN (TIMESTAMPLOCALTZ'2010-01-01 00:00:00.0 
US/Pacific', TIMESTAMPLOCALTZ'2011-01-01 00:00:00.0 US/Pacific') or (robot = 
'user1')) (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":[],"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) IN (2010-01-01 00:00:00.0 US/Pacific, 
2011-01-01 00:00:00.0 US/Pacific) or (robot = 'user1')) (type: boolean)
+              predicate: ((__time) IN (TIMESTAMPLOCALTZ'2010-01-01 00:00:00.0 
US/Pacific', TIMESTAMPLOCALTZ'2011-01-01 00:00:00.0 US/Pacific') or (robot = 
'user1')) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: __time (type: timestamp with local time zone), 
robot (type: string)

Reply via email to