http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query95.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query95.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query95.q.out
index 15920d9..46f9ae2 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query95.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query95.q.out
@@ -225,7 +225,7 @@ Stage-0
                                             Select Operator [SEL_5] (rows=8116 
width=1119)
                                               Output:["_col0"]
                                               Filter Operator [FIL_107] 
(rows=8116 width=1119)
-                                                predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN 1999-05-01 00:00:00.0 AND 1999-06-30 00:00:00.0 and 
d_date_sk is not null)
+                                                predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00.0' AND TIMESTAMP'1999-06-30 
00:00:00.0' and d_date_sk is not null)
                                                 TableScan [TS_3] (rows=73049 
width=1119)
                                                   
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query98.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query98.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query98.q.out
index da534cd..19bb49c 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query98.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query98.q.out
@@ -128,7 +128,7 @@ Stage-0
                                     Select Operator [SEL_5] (rows=8116 
width=1119)
                                       Output:["_col0"]
                                       Filter Operator [FIL_35] (rows=8116 
width=1119)
-                                        predicate:(CAST( d_date AS TIMESTAMP) 
BETWEEN 2001-01-12 00:00:00.0 AND 2001-02-11 00:00:00.0 and d_date_sk is not 
null)
+                                        predicate:(CAST( d_date AS TIMESTAMP) 
BETWEEN TIMESTAMP'2001-01-12 00:00:00.0' AND TIMESTAMP'2001-02-11 00:00:00.0' 
and d_date_sk is not null)
                                         TableScan [TS_3] (rows=73049 
width=1119)
                                           
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ppd2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd2.q.out 
b/ql/src/test/results/clientpositive/ppd2.q.out
index 43119be..ab5a37f 100644
--- a/ql/src/test/results/clientpositive/ppd2.q.out
+++ b/ql/src/test/results/clientpositive/ppd2.q.out
@@ -61,7 +61,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col1 > 1) (type: boolean)
+            predicate: (_col1 > 1L) (type: boolean)
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
@@ -451,7 +451,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col1 > 1) (type: boolean)
+            predicate: (_col1 > 1L) (type: boolean)
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ppd_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_gby.q.out 
b/ql/src/test/results/clientpositive/ppd_gby.q.out
index c21e5a3..1498177 100644
--- a/ql/src/test/results/clientpositive/ppd_gby.q.out
+++ b/ql/src/test/results/clientpositive/ppd_gby.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
-            predicate: ((_col0 < 'val_400') or (_col1 > 30)) (type: boolean)
+            predicate: ((_col0 < 'val_400') or (_col1 > 30L)) (type: boolean)
             Statistics: Num rows: 54 Data size: 573 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string)
@@ -253,7 +253,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
-            predicate: ((_col0 < 'val_400') or (_col1 > 30)) (type: boolean)
+            predicate: ((_col0 < 'val_400') or (_col1 > 30L)) (type: boolean)
             Statistics: Num rows: 54 Data size: 573 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ppd_gby2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_gby2.q.out 
b/ql/src/test/results/clientpositive/ppd_gby2.q.out
index c65e5c9..201f4a7 100644
--- a/ql/src/test/results/clientpositive/ppd_gby2.q.out
+++ b/ql/src/test/results/clientpositive/ppd_gby2.q.out
@@ -47,7 +47,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
-            predicate: ((_col0 < 'val_400') or (_col1 > 30)) (type: boolean)
+            predicate: ((_col0 < 'val_400') or (_col1 > 30L)) (type: boolean)
             Statistics: Num rows: 54 Data size: 573 Basic stats: COMPLETE 
Column stats: NONE
             Group By Operator
               aggregations: max(_col0)
@@ -167,7 +167,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
-            predicate: ((_col0 < 'val_400') or (_col1 > 30)) (type: boolean)
+            predicate: ((_col0 < 'val_400') or (_col1 > 30L)) (type: boolean)
             Statistics: Num rows: 54 Data size: 573 Basic stats: COMPLETE 
Column stats: NONE
             Group By Operator
               aggregations: max(_col0)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ppd_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_join2.q.out 
b/ql/src/test/results/clientpositive/ppd_join2.q.out
index 146478a..3ffd65f 100644
--- a/ql/src/test/results/clientpositive/ppd_join2.q.out
+++ b/ql/src/test/results/clientpositive/ppd_join2.q.out
@@ -96,7 +96,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key <> '306') and (sqrt(key) <> 13.0) and value is 
not null) (type: boolean)
+              predicate: ((key <> '306') and (sqrt(key) <> 13.0D) and value is 
not null) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: value (type: string)
@@ -1776,7 +1776,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key <> '306') and (sqrt(key) <> 13.0) and value is 
not null) (type: boolean)
+              predicate: ((key <> '306') and (sqrt(key) <> 13.0D) and value is 
not null) (type: boolean)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
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/ppd_join_filter.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_join_filter.q.out 
b/ql/src/test/results/clientpositive/ppd_join_filter.q.out
index 20d308e..dd916bc 100644
--- a/ql/src/test/results/clientpositive/ppd_join_filter.q.out
+++ b/ql/src/test/results/clientpositive/ppd_join_filter.q.out
@@ -117,10 +117,10 @@ STAGE PLANS:
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             isSamplingPred: false
-            predicate: ((UDFToDouble(_col1) + 1.0) < 5.0) (type: boolean)
+            predicate: ((UDFToDouble(_col1) + 1.0D) < 5.0D) (type: boolean)
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0) 
(type: double), (UDFToDouble(_col1) + 3.0) (type: double)
+              expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0D) 
(type: double), (UDFToDouble(_col1) + 3.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
@@ -446,10 +446,10 @@ STAGE PLANS:
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             isSamplingPred: false
-            predicate: ((UDFToDouble(_col1) + 1.0) < 5.0) (type: boolean)
+            predicate: ((UDFToDouble(_col1) + 1.0D) < 5.0D) (type: boolean)
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0) 
(type: double), (UDFToDouble(_col1) + 3.0) (type: double)
+              expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0D) 
(type: double), (UDFToDouble(_col1) + 3.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
@@ -775,10 +775,10 @@ STAGE PLANS:
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             isSamplingPred: false
-            predicate: ((UDFToDouble(_col1) + 1.0) < 5.0) (type: boolean)
+            predicate: ((UDFToDouble(_col1) + 1.0D) < 5.0D) (type: boolean)
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0) 
(type: double), (UDFToDouble(_col1) + 3.0) (type: double)
+              expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0D) 
(type: double), (UDFToDouble(_col1) + 3.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
@@ -1104,10 +1104,10 @@ STAGE PLANS:
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             isSamplingPred: false
-            predicate: ((UDFToDouble(_col1) + 1.0) < 5.0) (type: boolean)
+            predicate: ((UDFToDouble(_col1) + 1.0D) < 5.0D) (type: boolean)
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0) 
(type: double), (UDFToDouble(_col1) + 3.0) (type: double)
+              expressions: _col0 (type: string), (UDFToDouble(_col1) + 2.0D) 
(type: double), (UDFToDouble(_col1) + 3.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 83 Data size: 881 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/ppd_outer_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_outer_join1.q.out 
b/ql/src/test/results/clientpositive/ppd_outer_join1.q.out
index 5a8fb32..9ee9a19 100644
--- a/ql/src/test/results/clientpositive/ppd_outer_join1.q.out
+++ b/ql/src/test/results/clientpositive/ppd_outer_join1.q.out
@@ -28,7 +28,7 @@ STAGE PLANS:
             alias: a
             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)
@@ -44,7 +44,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) 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)
@@ -135,7 +135,7 @@ STAGE PLANS:
             alias: a
             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)
@@ -151,7 +151,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) 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/ppd_outer_join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_outer_join4.q.out 
b/ql/src/test/results/clientpositive/ppd_outer_join4.q.out
index 9b6eb6d..1eab7bd 100644
--- a/ql/src/test/results/clientpositive/ppd_outer_join4.q.out
+++ b/ql/src/test/results/clientpositive/ppd_outer_join4.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.0)) (type: boolean)
+              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.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)
@@ -50,7 +50,7 @@ STAGE PLANS:
             alias: c
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.0)) (type: boolean)
+              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -65,7 +65,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.0)) (type: boolean)
+              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.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)
@@ -398,7 +398,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.0)) (type: boolean)
+              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.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)
@@ -414,7 +414,7 @@ STAGE PLANS:
             alias: c
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.0)) (type: boolean)
+              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -429,7 +429,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.0)) (type: boolean)
+              predicate: ((key < '20') and (key > '15') and (sqrt(key) <> 
13.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/ppd_random.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_random.q.out 
b/ql/src/test/results/clientpositive/ppd_random.q.out
index 69c4ed1..ae2a917 100644
--- a/ql/src/test/results/clientpositive/ppd_random.q.out
+++ b/ql/src/test/results/clientpositive/ppd_random.q.out
@@ -65,7 +65,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col2
           Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (rand() > 0.5) (type: boolean)
+            predicate: (rand() > 0.5D) (type: boolean)
             Statistics: Num rows: 60 Data size: 639 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col2 (type: string)
@@ -152,7 +152,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col2
           Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (rand() > 0.5) (type: boolean)
+            predicate: (rand() > 0.5D) (type: boolean)
             Statistics: Num rows: 60 Data size: 639 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col2 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ppd_udf_col.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_udf_col.q.out 
b/ql/src/test/results/clientpositive/ppd_udf_col.q.out
index 9a6f62c..322662c 100644
--- a/ql/src/test/results/clientpositive/ppd_udf_col.q.out
+++ b/ql/src/test/results/clientpositive/ppd_udf_col.q.out
@@ -20,7 +20,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) and (rand() <= 0.1)) 
(type: boolean)
+              predicate: ((UDFToDouble(key) = 100.0D) and (rand() <= 0.1D)) 
(type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), rand() (type: double)
@@ -66,7 +66,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) and (rand() <= 0.1) and 
(rand() > 0.1)) (type: boolean)
+              predicate: ((UDFToDouble(key) = 100.0D) and (rand() <= 0.1D) and 
(rand() > 0.1D)) (type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), rand() (type: double)
@@ -153,10 +153,10 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(value) * 10.0) <= 200.0) and 
(UDFToDouble(key) = 100.0)) (type: boolean)
+              predicate: (((UDFToDouble(value) * 10.0D) <= 200.0D) and 
(UDFToDouble(key) = 100.0D)) (type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), rand() (type: double), 
(UDFToDouble(value) * 10.0) (type: double)
+                expressions: key (type: string), rand() (type: double), 
(UDFToDouble(value) * 10.0D) (type: double)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -195,7 +195,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) and (rand() <= 0.1)) 
(type: boolean)
+              predicate: ((UDFToDouble(key) = 100.0D) and (rand() <= 0.1D)) 
(type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), rand() (type: double)
@@ -241,7 +241,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) and (rand() <= 0.1) and 
(rand() > 0.1)) (type: boolean)
+              predicate: ((UDFToDouble(key) = 100.0D) and (rand() <= 0.1D) and 
(rand() > 0.1D)) (type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), rand() (type: double)
@@ -328,10 +328,10 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(value) * 10.0) <= 200.0) and 
(UDFToDouble(key) = 100.0)) (type: boolean)
+              predicate: (((UDFToDouble(value) * 10.0D) <= 200.0D) and 
(UDFToDouble(key) = 100.0D)) (type: boolean)
               Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), rand() (type: double), 
(UDFToDouble(value) * 10.0) (type: double)
+                expressions: key (type: string), rand() (type: double), 
(UDFToDouble(value) * 10.0D) (type: double)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 83 Data size: 881 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/ppd_udtf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_udtf.q.out 
b/ql/src/test/results/clientpositive/ppd_udtf.q.out
index d008526..409e982 100644
--- a/ql/src/test/results/clientpositive/ppd_udtf.q.out
+++ b/ql/src/test/results/clientpositive/ppd_udtf.q.out
@@ -24,7 +24,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) > 400.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 400.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: array(key,value) (type: array<string>)
@@ -34,7 +34,7 @@ STAGE PLANS:
                   Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                   function name: explode
                   Filter Operator
-                    predicate: (UDFToDouble(col) < 450.0) (type: boolean)
+                    predicate: (UDFToDouble(col) < 450.0D) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: col (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ppd_vc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_vc.q.out 
b/ql/src/test/results/clientpositive/ppd_vc.q.out
index 1569cf6..58b36cf 100644
--- a/ql/src/test/results/clientpositive/ppd_vc.q.out
+++ b/ql/src/test/results/clientpositive/ppd_vc.q.out
@@ -18,7 +18,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (BLOCK__OFFSET__INSIDE__FILE < 100) (type: boolean)
+              predicate: (BLOCK__OFFSET__INSIDE__FILE < 100L) (type: boolean)
               Statistics: Num rows: 666 Data size: 7075 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), ds 
(type: string), hr (type: string)
@@ -350,7 +350,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: ((BLOCK__OFFSET__INSIDE__FILE < 50) and key is not 
null) (type: boolean)
+              predicate: ((BLOCK__OFFSET__INSIDE__FILE < 50L) and key is not 
null) (type: boolean)
               Statistics: Num rows: 666 Data size: 7075 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), ds 
(type: string), hr (type: string), BLOCK__OFFSET__INSIDE__FILE (type: bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ppd_windowing1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_windowing1.q.out 
b/ql/src/test/results/clientpositive/ppd_windowing1.q.out
index 1adc8fc..85843b3 100644
--- a/ql/src/test/results/clientpositive/ppd_windowing1.q.out
+++ b/ql/src/test/results/clientpositive/ppd_windowing1.q.out
@@ -80,7 +80,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) > 2.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 2.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string)
@@ -410,7 +410,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) > 2.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 2.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string), value (type: string)
@@ -788,7 +788,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) > 2.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 2.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string), value (type: string)
@@ -1240,7 +1240,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) > 2.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 2.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string), value (type: string)
@@ -1859,7 +1859,7 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Filter Operator
-                predicate: ((UDFToDouble(_col0) + UDFToDouble(_col1)) > 2.0) 
(type: boolean)
+                predicate: ((UDFToDouble(_col0) + UDFToDouble(_col1)) > 2.0D) 
(type: boolean)
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
@@ -1926,7 +1926,7 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Filter Operator
-                predicate: ((UDFToDouble(_col0) + UDFToDouble(_col1)) > 2.0) 
(type: boolean)
+                predicate: ((UDFToDouble(_col0) + UDFToDouble(_col1)) > 2.0D) 
(type: boolean)
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ppr_pushdown3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppr_pushdown3.q.out 
b/ql/src/test/results/clientpositive/ppr_pushdown3.q.out
index 0d2038b..6b37990 100644
--- a/ql/src/test/results/clientpositive/ppr_pushdown3.q.out
+++ b/ql/src/test/results/clientpositive/ppr_pushdown3.q.out
@@ -14,7 +14,7 @@ STAGE PLANS:
           alias: srcpart
           Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+            predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
             Statistics: Num rows: 666 Data size: 7075 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string), ds (type: 
string), hr (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/quote1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/quote1.q.out 
b/ql/src/test/results/clientpositive/quote1.q.out
index 3ecc12a..26cfd49 100644
--- a/ql/src/test/results/clientpositive/quote1.q.out
+++ b/ql/src/test/results/clientpositive/quote1.q.out
@@ -32,7 +32,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) and (UDFToDouble(key) >= 
200.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) < 300.0D) and (UDFToDouble(key) >= 
200.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: UDFToInteger(key) (type: int), value (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out 
b/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
index b3fa908..b5abb3d 100644
--- a/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
+++ b/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
@@ -16,7 +16,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (rand(1) < 0.1) (type: boolean)
+              predicate: (rand(1) < 0.1D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 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/rand_partitionpruner2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out 
b/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
index 0e8ec13..e0bf5a2 100644
--- a/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
+++ b/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              predicate: (rand(1) < 0.1) (type: boolean)
+              predicate: (rand(1) < 0.1D) (type: boolean)
               Statistics: Num rows: 333 Data size: 3537 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), 
'2008-04-08' (type: string), hr (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out 
b/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
index 96e8e45..ed9635f 100644
--- a/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
+++ b/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
@@ -63,7 +63,7 @@ STAGE PLANS:
           GatherStats: false
           Filter Operator
             isSamplingPred: false
-            predicate: ((UDFToDouble(key) <= 50.0) and (UDFToDouble(key) >= 
10.0) and (rand(1) < 0.1)) (type: boolean)
+            predicate: ((UDFToDouble(key) <= 50.0D) and (UDFToDouble(key) >= 
10.0D) and (rand(1) < 0.1D)) (type: boolean)
             Statistics: Num rows: 18 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string), 
'2008-04-08' (type: string), hr (type: string)
@@ -151,7 +151,7 @@ STAGE PLANS:
           GatherStats: false
           Filter Operator
             isSamplingPred: false
-            predicate: ((UDFToDouble(key) <= 50.0) and (UDFToDouble(key) >= 
10.0)) (type: boolean)
+            predicate: ((UDFToDouble(key) <= 50.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), 
'2008-04-08' (type: string), hr (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/rcfile_null_value.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/rcfile_null_value.q.out 
b/ql/src/test/results/clientpositive/rcfile_null_value.q.out
index 2d2bef9..21b8d84 100644
--- a/ql/src/test/results/clientpositive/rcfile_null_value.q.out
+++ b/ql/src/test/results/clientpositive/rcfile_null_value.q.out
@@ -101,7 +101,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)
@@ -117,7 +117,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/regex_col.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/regex_col.q.out 
b/ql/src/test/results/clientpositive/regex_col.q.out
index 70ec363..5c39748 100644
--- a/ql/src/test/results/clientpositive/regex_col.q.out
+++ b/ql/src/test/results/clientpositive/regex_col.q.out
@@ -165,7 +165,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 103.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 103.0D) (type: boolean)
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), ds (type: string), hr (type: 
string)
@@ -180,7 +180,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 103.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 103.0D) (type: boolean)
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: key (type: string), ds (type: string), hr (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/results_cache_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/results_cache_2.q.out 
b/ql/src/test/results/clientpositive/results_cache_2.q.out
index ab1b0de..40dd71d 100644
--- a/ql/src/test/results/clientpositive/results_cache_2.q.out
+++ b/ql/src/test/results/clientpositive/results_cache_2.q.out
@@ -16,7 +16,7 @@ STAGE PLANS:
           alias: src
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (UDFToDouble(key) = 0.0) (type: boolean)
+            predicate: (UDFToDouble(key) = 0.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)
@@ -54,7 +54,7 @@ STAGE PLANS:
           alias: src
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (UDFToDouble(key) = 0.0) (type: boolean)
+            predicate: (UDFToDouble(key) = 0.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)
@@ -133,13 +133,13 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
-                  keys: 2012-01-01 01:02:03.0 (type: timestamp)
+                  keys: TIMESTAMP'2012-01-01 01:02:03.0' (type: timestamp)
                   mode: hash
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
@@ -157,7 +157,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: 2012-01-01 01:02:03.0 (type: timestamp), _col1 (type: 
bigint)
+            expressions: TIMESTAMP'2012-01-01 01:02:03.0' (type: timestamp), 
_col1 (type: bigint)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 83 Data size: 881 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/results_cache_capacity.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/results_cache_capacity.q.out 
b/ql/src/test/results/clientpositive/results_cache_capacity.q.out
index 695d47d..3951cc2 100644
--- a/ql/src/test/results/clientpositive/results_cache_capacity.q.out
+++ b/ql/src/test/results/clientpositive/results_cache_capacity.q.out
@@ -134,7 +134,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 2.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 2.0D) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
@@ -201,7 +201,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 10.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/results_cache_temptable.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/results_cache_temptable.q.out 
b/ql/src/test/results/clientpositive/results_cache_temptable.q.out
index 5350dba..cc96a0c 100644
--- a/ql/src/test/results/clientpositive/results_cache_temptable.q.out
+++ b/ql/src/test/results/clientpositive/results_cache_temptable.q.out
@@ -78,7 +78,7 @@ STAGE PLANS:
             alias: tmptab
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 0.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 0.0D) (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
@@ -167,7 +167,7 @@ STAGE PLANS:
             alias: rct
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 0.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 0.0D) (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
@@ -258,7 +258,7 @@ STAGE PLANS:
             alias: rct_part
             Statistics: Num rows: 500 Data size: 10812 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) = 0.0) and (ds = '2008-04-08')) 
(type: boolean)
+              predicate: ((UDFToDouble(key) = 0.0D) and (ds = '2008-04-08')) 
(type: boolean)
               Statistics: Num rows: 125 Data size: 2703 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 125 Data size: 2703 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/router_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/router_join_ppr.q.out 
b/ql/src/test/results/clientpositive/router_join_ppr.q.out
index b1fa29c..b599300 100644
--- a/ql/src/test/results/clientpositive/router_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/router_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/select_unquote_and.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/select_unquote_and.q.out 
b/ql/src/test/results/clientpositive/select_unquote_and.q.out
index adf4794..15ab5e5 100644
--- a/ql/src/test/results/clientpositive/select_unquote_and.q.out
+++ b/ql/src/test/results/clientpositive/select_unquote_and.q.out
@@ -55,7 +55,7 @@ STAGE PLANS:
             alias: npe_test
             Statistics: Num rows: 498 Data size: 5290 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(ds) < 1985.0) and (UDFToDouble(ds) > 
1970.0)) (type: boolean)
+              predicate: ((UDFToDouble(ds) < 1985.0D) and (UDFToDouble(ds) > 
1970.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), ds 
(type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/select_unquote_not.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/select_unquote_not.q.out 
b/ql/src/test/results/clientpositive/select_unquote_not.q.out
index 1d2bc5f..de9e400 100644
--- a/ql/src/test/results/clientpositive/select_unquote_not.q.out
+++ b/ql/src/test/results/clientpositive/select_unquote_not.q.out
@@ -55,7 +55,7 @@ STAGE PLANS:
             alias: npe_test
             Statistics: Num rows: 498 Data size: 5290 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(ds) >= 1970.0) (type: boolean)
+              predicate: (UDFToDouble(ds) >= 1970.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), ds 
(type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/select_unquote_or.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/select_unquote_or.q.out 
b/ql/src/test/results/clientpositive/select_unquote_or.q.out
index 2a38996..c50929c 100644
--- a/ql/src/test/results/clientpositive/select_unquote_or.q.out
+++ b/ql/src/test/results/clientpositive/select_unquote_or.q.out
@@ -55,7 +55,7 @@ STAGE PLANS:
             alias: npe_test
             Statistics: Num rows: 498 Data size: 5290 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(ds) < 1985.0) or (UDFToDouble(ds) > 
1970.0)) (type: boolean)
+              predicate: ((UDFToDouble(ds) < 1985.0D) or (UDFToDouble(ds) > 
1970.0D)) (type: boolean)
               Statistics: Num rows: 332 Data size: 3526 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), ds 
(type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/semijoin4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/semijoin4.q.out 
b/ql/src/test/results/clientpositive/semijoin4.q.out
index 46d1d3f..0497a2e 100644
--- a/ql/src/test/results/clientpositive/semijoin4.q.out
+++ b/ql/src/test/results/clientpositive/semijoin4.q.out
@@ -71,7 +71,7 @@ STAGE PLANS:
             alias: t1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: ((-92 = tinyint_col_46) and bigint_col_13 is not null 
and decimal1309_col_65 is not null) (type: boolean)
+              predicate: ((-92Y = tinyint_col_46) and bigint_col_13 is not 
null and decimal1309_col_65 is not null) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: bigint_col_13 (type: bigint), smallint_col_24 
(type: smallint), double_col_60 (type: double), decimal1309_col_65 (type: 
decimal(13,9))
@@ -87,7 +87,7 @@ STAGE PLANS:
             alias: t2
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: ((tinyint_col_21 = -92) and decimal2709_col_9 is not 
null and tinyint_col_18 is not null) (type: boolean)
+              predicate: ((tinyint_col_21 = -92Y) and decimal2709_col_9 is not 
null and tinyint_col_18 is not null) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: decimal2709_col_9 (type: decimal(27,9)), 
tinyint_col_18 (type: tinyint)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/set_processor_namespaces.q.out 
b/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
index c1c8270..ca1d82a 100644
--- a/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
+++ b/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
@@ -19,7 +19,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 5.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 5.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/setop_subq.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/setop_subq.q.out 
b/ql/src/test/results/clientpositive/setop_subq.q.out
index ac20c4c..120f0e5 100644
--- a/ql/src/test/results/clientpositive/setop_subq.q.out
+++ b/ql/src/test/results/clientpositive/setop_subq.q.out
@@ -156,7 +156,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col1 = 2) (type: boolean)
+            predicate: (_col1 = 2L) (type: boolean)
             Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string)
@@ -300,7 +300,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col1 = 2) (type: boolean)
+            predicate: (_col1 = 2L) (type: boolean)
             Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string)
@@ -444,7 +444,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col1 = 2) (type: boolean)
+            predicate: (_col1 = 2L) (type: boolean)
             Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/auto_join11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join11.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join11.q.out
index 4177b9a..4398e0c 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join11.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join11.q.out
@@ -30,7 +30,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), value (type: string)
@@ -55,7 +55,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/spark/auto_join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join12.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join12.q.out
index c56e8da..309ad55 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join12.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join12.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 80.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 80.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -55,7 +55,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 80.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 80.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -81,7 +81,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 80.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 80.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/spark/auto_join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join13.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join13.q.out
index 9f86f6c..e10855d 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join13.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join13.q.out
@@ -36,7 +36,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)
@@ -54,7 +54,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 200.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -79,7 +79,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), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/auto_join14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join14.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join14.q.out
index 356cc85..510988f 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join14.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join14.q.out
@@ -31,7 +31,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)
@@ -54,7 +54,7 @@ STAGE PLANS:
                   alias: srcpart
                   Statistics: Num rows: 1000 Data size: 10624 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: 333 Data size: 3537 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/spark/auto_join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join16.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join16.q.out
index c9ccc9b..e98d217 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join16.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join16.q.out
@@ -30,7 +30,7 @@ STAGE PLANS:
                   alias: tab
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 20.0) and 
(UDFToDouble(value) < 200.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) > 20.0D) and 
(UDFToDouble(value) < 200.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)
@@ -55,7 +55,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 20.0) and 
(UDFToDouble(value) < 200.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) > 20.0D) and 
(UDFToDouble(value) < 200.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/spark/auto_join27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join27.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join27.q.out
index e49335e..1b23ff5 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join27.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join27.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 200.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -58,7 +58,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 200.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string), value (type: string)
@@ -76,7 +76,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 200.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/spark/auto_join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join4.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join4.q.out
index 0502e62..b72f499 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join4.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join4.q.out
@@ -53,7 +53,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)
@@ -76,7 +76,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/spark/auto_join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join5.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join5.q.out
index ae83ebc..099aa6e 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join5.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join5.q.out
@@ -53,7 +53,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)
@@ -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)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/auto_join6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join6.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join6.q.out
index b1ebb16..67bdc58 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join6.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join6.q.out
@@ -54,7 +54,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)
@@ -72,7 +72,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/spark/auto_join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join7.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join7.q.out
index b425750..a410966 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join7.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join7.q.out
@@ -64,7 +64,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)
@@ -82,7 +82,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)
@@ -100,7 +100,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/spark/auto_join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join8.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join8.q.out
index a789e8c..32331cf 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join8.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join8.q.out
@@ -53,7 +53,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)
@@ -76,7 +76,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/spark/auto_join_without_localtask.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
index 2b1b600..24f7ec2 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
@@ -337,7 +337,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)
@@ -355,7 +355,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/spark/column_access_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/column_access_stats.q.out 
b/ql/src/test/results/clientpositive/spark/column_access_stats.q.out
index 48574b9..a9bc746 100644
--- a/ql/src/test/results/clientpositive/spark/column_access_stats.q.out
+++ b/ql/src/test/results/clientpositive/spark/column_access_stats.q.out
@@ -493,7 +493,7 @@ STAGE PLANS:
                   alias: t1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(val) = 3.0) and key is not null) 
(type: boolean)
+                    predicate: ((UDFToDouble(val) = 3.0D) and key is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), val (type: string)
@@ -511,7 +511,7 @@ STAGE PLANS:
                   alias: t2
                   Statistics: Num rows: 5 Data size: 15 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(val) = 3.0) and key is not null) 
(type: boolean)
+                    predicate: ((UDFToDouble(val) = 3.0D) and key is not null) 
(type: boolean)
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: key (type: string), val (type: string)
@@ -589,7 +589,7 @@ STAGE PLANS:
                   alias: t1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) = 5.0) and val is not null) 
(type: boolean)
+                    predicate: ((UDFToDouble(key) = 5.0D) and val is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: val (type: string)
@@ -606,7 +606,7 @@ STAGE PLANS:
                   alias: t2
                   Statistics: Num rows: 5 Data size: 15 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) = 6.0) and val is not null) 
(type: boolean)
+                    predicate: ((UDFToDouble(key) = 6.0D) and val is not null) 
(type: boolean)
                     Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out 
b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
index d3439e4..cf78358 100644
--- a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
+++ b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
@@ -527,7 +527,7 @@ STAGE PLANS:
                   alias: s2
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -561,7 +561,7 @@ STAGE PLANS:
                   alias: s4
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -950,10 +950,10 @@ STAGE PLANS:
                   outputColumnNames: _col1, _col2, _col3, _col4
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE 
(((_col3 / _col4) > 1.0)) END (type: boolean)
+                    predicate: CASE WHEN ((_col4 = 0.0D)) THEN (false) ELSE 
(((_col3 / _col4) > 1.0D)) END (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
-                      expressions: _col1 (type: int), _col2 (type: int), _col4 
(type: double), CASE WHEN ((_col4 = 0.0)) THEN (null) ELSE ((_col3 / _col4)) 
END (type: double)
+                      expressions: _col1 (type: int), _col2 (type: int), _col4 
(type: double), CASE WHEN ((_col4 = 0.0D)) THEN (null) ELSE ((_col3 / _col4)) 
END (type: double)
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Reduce Output Operator
@@ -1029,10 +1029,10 @@ STAGE PLANS:
                   outputColumnNames: _col1, _col2, _col3, _col4
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE 
(((_col3 / _col4) > 1.0)) END (type: boolean)
+                    predicate: CASE WHEN ((_col4 = 0.0D)) THEN (false) ELSE 
(((_col3 / _col4) > 1.0D)) END (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
-                      expressions: _col1 (type: int), _col2 (type: int), _col4 
(type: double), CASE WHEN ((_col4 = 0.0)) THEN (null) ELSE ((_col3 / _col4)) 
END (type: double)
+                      expressions: _col1 (type: int), _col2 (type: int), _col4 
(type: double), CASE WHEN ((_col4 = 0.0D)) THEN (null) ELSE ((_col3 / _col4)) 
END (type: double)
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Reduce Output Operator

Reply via email to