http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/having2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/having2.q.out 
b/ql/src/test/results/clientpositive/having2.q.out
index 67f8af8..12fae67 100644
--- a/ql/src/test/results/clientpositive/having2.q.out
+++ b/ql/src/test/results/clientpositive/having2.q.out
@@ -155,7 +155,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
           Filter Operator
-            predicate: ((_col1 <= 4074689.000000041) and (_col3 <= 822)) 
(type: boolean)
+            predicate: ((_col1 <= 4074689.000000041D) and (_col3 <= 822L)) 
(type: boolean)
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: double), _col2 
(type: double)
@@ -222,7 +222,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
           Filter Operator
-            predicate: ((_col1 <= 4074689.000000041) and (_col3 <= 822)) 
(type: boolean)
+            predicate: ((_col1 <= 4074689.000000041D) and (_col3 <= 822L)) 
(type: boolean)
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: double), _col2 
(type: double)
@@ -341,7 +341,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 275 Data size: 2921 Basic stats: PARTIAL 
Column stats: NONE
           Filter Operator
-            predicate: ((_col1 <= 4074689.000000041) and (_col2 <= 822.0) and 
(_col3 > 4)) (type: boolean)
+            predicate: ((_col1 <= 4074689.000000041D) and (_col2 <= 822.0D) 
and (_col3 > 4L)) (type: boolean)
             Statistics: Num rows: 10 Data size: 106 Basic stats: PARTIAL 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string)
@@ -464,7 +464,7 @@ STAGE PLANS:
             outputColumnNames: _col1, _col2, _col3, _col4
             Statistics: Num rows: 275 Data size: 2921 Basic stats: PARTIAL 
Column stats: NONE
             Filter Operator
-              predicate: ((_col2 <= 4074689.000000041) and (_col3 <= 822.0) 
and (_col4 > 4)) (type: boolean)
+              predicate: ((_col2 <= 4074689.000000041D) and (_col3 <= 822.0D) 
and (_col4 > 4L)) (type: boolean)
               Statistics: Num rows: 10 Data size: 106 Basic stats: PARTIAL 
Column stats: NONE
               Select Operator
                 expressions: _col1 (type: string)
@@ -587,7 +587,7 @@ STAGE PLANS:
             outputColumnNames: _col1, _col2, _col3, _col4
             Statistics: Num rows: 275 Data size: 2921 Basic stats: PARTIAL 
Column stats: NONE
             Filter Operator
-              predicate: ((_col2 <= 4074689.000000041) and (_col3 <= 822.0) 
and (_col4 > 4)) (type: boolean)
+              predicate: ((_col2 <= 4074689.000000041D) and (_col3 <= 822.0D) 
and (_col4 > 4L)) (type: boolean)
               Statistics: Num rows: 10 Data size: 106 Basic stats: PARTIAL 
Column stats: NONE
               Select Operator
                 expressions: _col1 (type: string), _col1 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/implicit_cast1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/implicit_cast1.q.out 
b/ql/src/test/results/clientpositive/implicit_cast1.q.out
index 6e1706a..1e62fe3 100644
--- a/ql/src/test/results/clientpositive/implicit_cast1.q.out
+++ b/ql/src/test/results/clientpositive/implicit_cast1.q.out
@@ -28,7 +28,7 @@ STAGE PLANS:
             alias: implicit_test1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (a <> 0) (type: boolean)
+              predicate: (a <> 0L) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: a (type: bigint), b (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
index 80e1455..b1250d3 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
@@ -452,7 +452,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 99 Data size: 58120 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), UDFToString(_col1) (type: 
string), if(((UDFToDouble(_col0) % 100.0) = 0.0), '11', '12') (type: string)
+            expressions: _col0 (type: string), UDFToString(_col1) (type: 
string), if(((UDFToDouble(_col0) % 100.0D) = 0.0D), '11', '12') (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 99 Data size: 58120 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/infer_bucket_sort_grouping_operators.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
index 7224938..701ba2b 100644
--- 
a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
+++ 
b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
@@ -39,7 +39,7 @@ STAGE PLANS:
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: key (type: string), value (type: string), 0 (type: 
bigint)
+                keys: key (type: string), value (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1500 Data size: 15936 Basic stats: 
COMPLETE Column stats: NONE
@@ -1518,7 +1518,7 @@ STAGE PLANS:
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: key (type: string), value (type: string), 0 (type: 
bigint)
+                keys: key (type: string), value (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
@@ -1743,7 +1743,7 @@ STAGE PLANS:
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
-                keys: key (type: string), value (type: string), 0 (type: 
bigint)
+                keys: key (type: string), value (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/infer_const_type.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_const_type.q.out 
b/ql/src/test/results/clientpositive/infer_const_type.q.out
index 647c910..ed9a2aa 100644
--- a/ql/src/test/results/clientpositive/infer_const_type.q.out
+++ b/ql/src/test/results/clientpositive/infer_const_type.q.out
@@ -59,10 +59,10 @@ STAGE PLANS:
             alias: infertypes
             Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(str) = 1234.0) and (bi = -12345) and 
(db = -307.0) and (fl = 906) and (i = 12345) and (si = 32767) and (ti = 127)) 
(type: boolean)
+              predicate: ((UDFToDouble(str) = 1234.0D) and (bi = -12345L) and 
(db = -307.0D) and (fl = 906) and (i = 12345) and (si = 32767S) and (ti = 
127Y)) (type: boolean)
               Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: 127 (type: tinyint), 32767 (type: smallint), 
12345 (type: int), -12345 (type: bigint), 906.0 (type: float), -307.0 (type: 
double), str (type: string)
+                expressions: 127Y (type: tinyint), 32767S (type: smallint), 
12345 (type: int), -12345L (type: bigint), 906.0 (type: float), -307.0D (type: 
double), str (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -131,7 +131,7 @@ STAGE PLANS:
             alias: infertypes
             Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(bi) = 9.223372036854776E18) or 
(UDFToDouble(i) = 2.147483648E9) or (UDFToDouble(ti) = 128.0) or 
(UDFToInteger(si) = 32768)) (type: boolean)
+              predicate: ((UDFToDouble(bi) = 9.223372036854776E18D) or 
(UDFToDouble(i) = 2.147483648E9D) or (UDFToDouble(ti) = 128.0D) or 
(UDFToInteger(si) = 32768)) (type: boolean)
               Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: ti (type: tinyint), si (type: smallint), i (type: 
int), bi (type: bigint), fl (type: float), db (type: double), str (type: string)
@@ -194,7 +194,7 @@ STAGE PLANS:
             alias: infertypes
             Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((CAST( si AS decimal(5,0)) = 327) or (UDFToDouble(i) 
= -100.0) or (UDFToDouble(ti) = 127.0)) (type: boolean)
+              predicate: ((CAST( si AS decimal(5,0)) = 327) or (UDFToDouble(i) 
= -100.0D) or (UDFToDouble(ti) = 127.0D)) (type: boolean)
               Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: ti (type: tinyint), si (type: smallint), i (type: 
int), bi (type: bigint), fl (type: float), db (type: double), str (type: string)
@@ -251,7 +251,7 @@ STAGE PLANS:
             alias: infertypes
             Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(i) > 100.0) and (UDFToDouble(str) = 
1.57) and (UDFToDouble(ti) < 127.0)) (type: boolean)
+              predicate: ((UDFToDouble(i) > 100.0D) and (UDFToDouble(str) = 
1.57D) and (UDFToDouble(ti) < 127.0D)) (type: boolean)
               Statistics: Num rows: 1 Data size: 1170 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: ti (type: tinyint), si (type: smallint), i (type: 
int), bi (type: bigint), fl (type: float), db (type: double), str (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/input11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input11.q.out 
b/ql/src/test/results/clientpositive/input11.q.out
index bb59b4f..1e98764 100644
--- a/ql/src/test/results/clientpositive/input11.q.out
+++ b/ql/src/test/results/clientpositive/input11.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) < 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: UDFToInteger(key) (type: int), value (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/input11_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input11_limit.q.out 
b/ql/src/test/results/clientpositive/input11_limit.q.out
index 8fb7b63..64d5d4f 100644
--- a/ql/src/test/results/clientpositive/input11_limit.q.out
+++ b/ql/src/test/results/clientpositive/input11_limit.q.out
@@ -27,7 +27,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/input2_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input2_limit.q.out 
b/ql/src/test/results/clientpositive/input2_limit.q.out
index 1404349..c11e717 100644
--- a/ql/src/test/results/clientpositive/input2_limit.q.out
+++ b/ql/src/test/results/clientpositive/input2_limit.q.out
@@ -16,7 +16,7 @@ STAGE PLANS:
             alias: x
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 300.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 300.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               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/input42.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input42.q.out 
b/ql/src/test/results/clientpositive/input42.q.out
index 7b9e639..07dcdfa 100644
--- a/ql/src/test/results/clientpositive/input42.q.out
+++ b/ql/src/test/results/clientpositive/input42.q.out
@@ -1240,7 +1240,7 @@ STAGE PLANS:
           GatherStats: false
           Filter Operator
             isSamplingPred: false
-            predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+            predicate: (UDFToDouble(key) < 200.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), 
'2008-04-08' (type: string), hr (type: string)
@@ -1751,7 +1751,7 @@ STAGE PLANS:
           GatherStats: false
           Filter Operator
             isSamplingPred: false
-            predicate: (rand(100) < 0.1) (type: boolean)
+            predicate: (rand(100) < 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/input_part1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part1.q.out 
b/ql/src/test/results/clientpositive/input_part1.q.out
index 31ce924..31f45c2 100644
--- a/ql/src/test/results/clientpositive/input_part1.q.out
+++ b/ql/src/test/results/clientpositive/input_part1.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              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: UDFToInteger(key) (type: int), value (type: 
string), '12' (type: string), '2008-04-08' (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/input_part4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part4.q.out 
b/ql/src/test/results/clientpositive/input_part4.q.out
index 753e268..fd09911 100644
--- a/ql/src/test/results/clientpositive/input_part4.q.out
+++ b/ql/src/test/results/clientpositive/input_part4.q.out
@@ -16,7 +16,7 @@ STAGE PLANS:
           alias: x
           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
           Filter Operator
-            predicate: ((UDFToDouble(hr) = 15.0) and (ds = '2008-04-08')) 
(type: boolean)
+            predicate: ((UDFToDouble(hr) = 15.0D) and (ds = '2008-04-08')) 
(type: boolean)
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 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/input_part5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part5.q.out 
b/ql/src/test/results/clientpositive/input_part5.q.out
index 33ecd59..0a5be8c 100644
--- a/ql/src/test/results/clientpositive/input_part5.q.out
+++ b/ql/src/test/results/clientpositive/input_part5.q.out
@@ -32,7 +32,7 @@ STAGE PLANS:
             alias: x
             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), 
'2008-04-08' (type: string), hr (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/interval_alt.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/interval_alt.q.out 
b/ql/src/test/results/clientpositive/interval_alt.q.out
index 53c1be8..601504c 100644
--- a/ql/src/test/results/clientpositive/interval_alt.q.out
+++ b/ql/src/test/results/clientpositive/interval_alt.q.out
@@ -139,7 +139,7 @@ STAGE PLANS:
             alias: t
             Statistics: Num rows: 2 Data size: 2 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
-              expressions: (2012-01-01 + IntervalDayLiteralProcessor(((- dt) * 
dt))) (type: timestamp), (2012-01-01 - IntervalDayLiteralProcessor(((- dt) * 
dt))) (type: timestamp), 2012-01-04 00:00:00.0 (type: timestamp), (2012-01-01 + 
IntervalYearMonthLiteralProcessor(concat(dt, '-1'))) (type: date)
+              expressions: (DATE'2012-01-01' + IntervalDayLiteralProcessor(((- 
dt) * dt))) (type: timestamp), (DATE'2012-01-01' - 
IntervalDayLiteralProcessor(((- dt) * dt))) (type: timestamp), 
TIMESTAMP'2012-01-04 00:00:00.0' (type: timestamp), (DATE'2012-01-01' + 
IntervalYearMonthLiteralProcessor(concat(dt, '-1'))) (type: date)
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 2 Data size: 2 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/interval_arithmetic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/interval_arithmetic.q.out 
b/ql/src/test/results/clientpositive/interval_arithmetic.q.out
index eba97fa..c7eadea 100644
--- a/ql/src/test/results/clientpositive/interval_arithmetic.q.out
+++ b/ql/src/test/results/clientpositive/interval_arithmetic.q.out
@@ -54,7 +54,7 @@ STAGE PLANS:
             alias: interval_arithmetic_1
             Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
             Select Operator
-              expressions: dateval (type: date), (dateval - 2-2) (type: date), 
(dateval - -2-2) (type: date), (dateval + 2-2) (type: date), (dateval + -2-2) 
(type: date), (-2-2 + dateval) (type: date), (2-2 + dateval) (type: date)
+              expressions: dateval (type: date), (dateval - INTERVAL'2-2') 
(type: date), (dateval - INTERVAL'-2-2') (type: date), (dateval + 
INTERVAL'2-2') (type: date), (dateval + INTERVAL'-2-2') (type: date), 
(INTERVAL'-2-2' + dateval) (type: date), (INTERVAL'2-2' + dateval) (type: date)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
               Limit
@@ -132,7 +132,7 @@ STAGE PLANS:
             alias: interval_arithmetic_1
             Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
             Select Operator
-              expressions: dateval (type: date), (dateval - 1999-06-07) (type: 
interval_day_time), (1999-06-07 - dateval) (type: interval_day_time), (dateval 
- dateval) (type: interval_day_time)
+              expressions: dateval (type: date), (dateval - DATE'1999-06-07') 
(type: interval_day_time), (DATE'1999-06-07' - dateval) (type: 
interval_day_time), (dateval - dateval) (type: interval_day_time)
               outputColumnNames: _col0, _col1, _col2, _col3
               Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
               Limit
@@ -210,7 +210,7 @@ STAGE PLANS:
             alias: interval_arithmetic_1
             Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
             Select Operator
-              expressions: tsval (type: timestamp), (tsval - 2-2) (type: 
timestamp), (tsval - -2-2) (type: timestamp), (tsval + 2-2) (type: timestamp), 
(tsval + -2-2) (type: timestamp), (-2-2 + tsval) (type: timestamp), (2-2 + 
tsval) (type: timestamp)
+              expressions: tsval (type: timestamp), (tsval - INTERVAL'2-2') 
(type: timestamp), (tsval - INTERVAL'-2-2') (type: timestamp), (tsval + 
INTERVAL'2-2') (type: timestamp), (tsval + INTERVAL'-2-2') (type: timestamp), 
(INTERVAL'-2-2' + tsval) (type: timestamp), (INTERVAL'2-2' + tsval) (type: 
timestamp)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
               Limit
@@ -284,7 +284,7 @@ STAGE PLANS:
           alias: interval_arithmetic_1
           Statistics: Num rows: 12288 Data size: 326837 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 5-5 (type: interval_year_month), -1-1 (type: 
interval_year_month)
+            expressions: INTERVAL'5-5' (type: interval_year_month), 
INTERVAL'-1-1' (type: interval_year_month)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 12288 Data size: 196608 Basic stats: 
COMPLETE Column stats: COMPLETE
             Limit
@@ -346,7 +346,7 @@ STAGE PLANS:
             alias: interval_arithmetic_1
             Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
             Select Operator
-              expressions: dateval (type: date), (dateval - 99 
11:22:33.123456789) (type: timestamp), (dateval - -99 11:22:33.123456789) 
(type: timestamp), (dateval + 99 11:22:33.123456789) (type: timestamp), 
(dateval + -99 11:22:33.123456789) (type: timestamp), (-99 11:22:33.123456789 + 
dateval) (type: timestamp), (99 11:22:33.123456789 + dateval) (type: timestamp)
+              expressions: dateval (type: date), (dateval - INTERVAL'99 
11:22:33.123456789') (type: timestamp), (dateval - INTERVAL'-99 
11:22:33.123456789') (type: timestamp), (dateval + INTERVAL'99 
11:22:33.123456789') (type: timestamp), (dateval + INTERVAL'-99 
11:22:33.123456789') (type: timestamp), (INTERVAL'-99 11:22:33.123456789' + 
dateval) (type: timestamp), (INTERVAL'99 11:22:33.123456789' + dateval) (type: 
timestamp)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
               Limit
@@ -506,7 +506,7 @@ STAGE PLANS:
             alias: interval_arithmetic_1
             Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
             Select Operator
-              expressions: tsval (type: timestamp), (tsval - 99 
11:22:33.123456789) (type: timestamp), (tsval - -99 11:22:33.123456789) (type: 
timestamp), (tsval + 99 11:22:33.123456789) (type: timestamp), (tsval + -99 
11:22:33.123456789) (type: timestamp), (-99 11:22:33.123456789 + tsval) (type: 
timestamp), (99 11:22:33.123456789 + tsval) (type: timestamp)
+              expressions: tsval (type: timestamp), (tsval - INTERVAL'99 
11:22:33.123456789') (type: timestamp), (tsval - INTERVAL'-99 
11:22:33.123456789') (type: timestamp), (tsval + INTERVAL'99 
11:22:33.123456789') (type: timestamp), (tsval + INTERVAL'-99 
11:22:33.123456789') (type: timestamp), (INTERVAL'-99 11:22:33.123456789' + 
tsval) (type: timestamp), (INTERVAL'99 11:22:33.123456789' + tsval) (type: 
timestamp)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Statistics: Num rows: 12288 Data size: 326837 Basic stats: 
COMPLETE Column stats: NONE
               Limit
@@ -580,7 +580,7 @@ STAGE PLANS:
           alias: interval_arithmetic_1
           Statistics: Num rows: 12288 Data size: 326837 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 109 20:30:40.246913578 (type: interval_day_time), 89 
02:14:26.000000000 (type: interval_day_time)
+            expressions: INTERVAL'109 20:30:40.246913578' (type: 
interval_day_time), INTERVAL'89 02:14:26.000000000' (type: interval_day_time)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 12288 Data size: 294912 Basic stats: 
COMPLETE Column stats: COMPLETE
             Limit
@@ -624,7 +624,7 @@ STAGE PLANS:
           alias: interval_arithmetic_1
           Statistics: Num rows: 12288 Data size: 326837 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 2016-11-11 03:04:00.0 (type: timestamp)
+            expressions: TIMESTAMP'2016-11-11 03:04:00.0' (type: timestamp)
             outputColumnNames: _col0
             Statistics: Num rows: 12288 Data size: 491520 Basic stats: 
COMPLETE Column stats: COMPLETE
             Limit

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/ivyDownload.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ivyDownload.q.out 
b/ql/src/test/results/clientpositive/ivyDownload.q.out
index 6bc9cb1..eb94712 100644
--- a/ql/src/test/results/clientpositive/ivyDownload.q.out
+++ b/ql/src/test/results/clientpositive/ivyDownload.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
           alias: src
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 3 (type: int), 6 (type: int), 10 (type: int), 
3.3000000000000003 (type: double), 6.6 (type: double), 11.0 (type: double), 
10.4 (type: double)
+            expressions: 3 (type: int), 6 (type: int), 10 (type: int), 
3.3000000000000003D (type: double), 6.6D (type: double), 11.0D (type: double), 
10.4D (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6
             Statistics: Num rows: 500 Data size: 22000 Basic stats: COMPLETE 
Column stats: COMPLETE
             Limit

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/join11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join11.q.out 
b/ql/src/test/results/clientpositive/join11.q.out
index 4b5e4d0..aa717df 100644
--- a/ql/src/test/results/clientpositive/join11.q.out
+++ b/ql/src/test/results/clientpositive/join11.q.out
@@ -26,7 +26,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)
@@ -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) < 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/join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join12.q.out 
b/ql/src/test/results/clientpositive/join12.q.out
index f79e272..29e3b26 100644
--- a/ql/src/test/results/clientpositive/join12.q.out
+++ b/ql/src/test/results/clientpositive/join12.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) < 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)
@@ -47,7 +47,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)
@@ -62,7 +62,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)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join13.q.out 
b/ql/src/test/results/clientpositive/join13.q.out
index f562d69..17c8ca7 100644
--- a/ql/src/test/results/clientpositive/join13.q.out
+++ b/ql/src/test/results/clientpositive/join13.q.out
@@ -33,7 +33,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)
@@ -49,7 +49,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)
@@ -90,7 +90,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/join14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join14.q.out 
b/ql/src/test/results/clientpositive/join14.q.out
index cb456e2..1352237 100644
--- a/ql/src/test/results/clientpositive/join14.q.out
+++ b/ql/src/test/results/clientpositive/join14.q.out
@@ -28,7 +28,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)
@@ -43,7 +43,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/join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join16.q.out 
b/ql/src/test/results/clientpositive/join16.q.out
index 39c6408..cb1d572 100644
--- a/ql/src/test/results/clientpositive/join16.q.out
+++ b/ql/src/test/results/clientpositive/join16.q.out
@@ -14,7 +14,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)
@@ -29,7 +29,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)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/join34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join34.q.out 
b/ql/src/test/results/clientpositive/join34.q.out
index 7675ad9..a28d760 100644
--- a/ql/src/test/results/clientpositive/join34.q.out
+++ b/ql/src/test/results/clientpositive/join34.q.out
@@ -48,7 +48,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              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)
@@ -69,7 +69,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              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
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -155,7 +155,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              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/join35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join35.q.out 
b/ql/src/test/results/clientpositive/join35.q.out
index 4590ef9..4a5b10d 100644
--- a/ql/src/test/results/clientpositive/join35.q.out
+++ b/ql/src/test/results/clientpositive/join35.q.out
@@ -45,7 +45,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              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()
@@ -154,7 +154,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              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)
@@ -535,7 +535,7 @@ STAGE PLANS:
             GatherStats: false
             Filter Operator
               isSamplingPred: false
-              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/join38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join38.q.out 
b/ql/src/test/results/clientpositive/join38.q.out
index 2857de3..1ae4339 100644
--- a/ql/src/test/results/clientpositive/join38.q.out
+++ b/ql/src/test/results/clientpositive/join38.q.out
@@ -66,7 +66,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 2 Data size: 126 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(col11) = 111.0) (type: boolean)
+              predicate: (UDFToDouble(col11) = 111.0D) (type: boolean)
               Statistics: Num rows: 1 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: col5 (type: string), col11 (type: string)
@@ -84,7 +84,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) = 111.0) (type: boolean)
+              predicate: (UDFToDouble(key) = 111.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/join39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join39.q.out 
b/ql/src/test/results/clientpositive/join39.q.out
index 80272a4..f3b4a6d 100644
--- a/ql/src/test/results/clientpositive/join39.q.out
+++ b/ql/src/test/results/clientpositive/join39.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), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join4.q.out 
b/ql/src/test/results/clientpositive/join4.q.out
index 95a4dbf..7204250 100644
--- a/ql/src/test/results/clientpositive/join4.q.out
+++ b/ql/src/test/results/clientpositive/join4.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) < 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/join40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join40.q.out 
b/ql/src/test/results/clientpositive/join40.q.out
index e920bbb..9d699c8 100644
--- a/ql/src/test/results/clientpositive/join40.q.out
+++ b/ql/src/test/results/clientpositive/join40.q.out
@@ -29,7 +29,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)
@@ -3098,7 +3098,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/join41.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join41.q.out 
b/ql/src/test/results/clientpositive/join41.q.out
index 2ea4912..50ce9f6 100644
--- a/ql/src/test/results/clientpositive/join41.q.out
+++ b/ql/src/test/results/clientpositive/join41.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
             alias: src2
             Statistics: Num rows: 3 Data size: 21 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: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -118,7 +118,7 @@ STAGE PLANS:
             alias: src2
             Statistics: Num rows: 3 Data size: 21 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: 1 Data size: 7 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/join45.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join45.q.out 
b/ql/src/test/results/clientpositive/join45.q.out
index 3d49a24..f2cca31 100644
--- a/ql/src/test/results/clientpositive/join45.q.out
+++ b/ql/src/test/results/clientpositive/join45.q.out
@@ -26,7 +26,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(value) BETWEEN 100.0 AND 102.0 and key 
is not null) (type: boolean)
+              predicate: (UDFToDouble(value) BETWEEN 100.0D AND 102.0D and key 
is not null) (type: boolean)
               Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -42,7 +42,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(value) BETWEEN 100.0 AND 102.0 and key 
is not null) (type: boolean)
+              predicate: (UDFToDouble(value) BETWEEN 100.0D AND 102.0D and key 
is not null) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -233,7 +233,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: UDFToDouble(value) BETWEEN 100.0 AND 102.0 (type: 
boolean)
+              predicate: UDFToDouble(value) BETWEEN 100.0D AND 102.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)
@@ -247,7 +247,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: UDFToDouble(value) BETWEEN 100.0 AND 102.0 (type: 
boolean)
+              predicate: UDFToDouble(value) BETWEEN 100.0D AND 102.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)
@@ -361,7 +361,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 12500 Data size: 240800 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: ((_col0 = _col2) or UDFToDouble(_col1) BETWEEN 100.0 
AND 102.0 or UDFToDouble(_col3) BETWEEN 100.0 AND 102.0) (type: boolean)
+            predicate: ((_col0 = _col2) or UDFToDouble(_col1) BETWEEN 100.0D 
AND 102.0D or UDFToDouble(_col3) BETWEEN 100.0D AND 102.0D) (type: boolean)
             Statistics: Num rows: 9026 Data size: 173876 Basic stats: COMPLETE 
Column stats: NONE
             Limit
               Number of rows: 10
@@ -466,7 +466,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 12500 Data size: 240800 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (((UDFToDouble(_col0) + UDFToDouble(_col2)) <= 102.0) 
and ((UDFToDouble(_col0) + UDFToDouble(_col2)) >= 100.0)) (type: boolean)
+            predicate: (((UDFToDouble(_col0) + UDFToDouble(_col2)) <= 102.0D) 
and ((UDFToDouble(_col0) + UDFToDouble(_col2)) >= 100.0D)) (type: boolean)
             Statistics: Num rows: 1388 Data size: 26738 Basic stats: COMPLETE 
Column stats: NONE
             Limit
               Number of rows: 10
@@ -565,7 +565,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 12500 Data size: 240800 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (((UDFToDouble(_col0) + UDFToDouble(_col2)) <= 102.0) 
or ((UDFToDouble(_col0) + UDFToDouble(_col2)) >= 100.0)) (type: boolean)
+            predicate: (((UDFToDouble(_col0) + UDFToDouble(_col2)) <= 102.0D) 
or ((UDFToDouble(_col0) + UDFToDouble(_col2)) >= 100.0D)) (type: boolean)
             Statistics: Num rows: 8332 Data size: 160507 Basic stats: COMPLETE 
Column stats: NONE
             Limit
               Number of rows: 10
@@ -797,7 +797,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 13750 Data size: 264875 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: ((UDFToDouble(_col4) + UDFToDouble(_col0)) >= 100.0) 
(type: boolean)
+            predicate: ((UDFToDouble(_col4) + UDFToDouble(_col0)) >= 100.0D) 
(type: boolean)
             Statistics: Num rows: 4583 Data size: 88285 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string), _col4 
(type: string), _col5 (type: string), _col2 (type: string), _col3 (type: string)
@@ -944,7 +944,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 13750 Data size: 264875 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: ((UDFToDouble(_col4) + UDFToDouble(_col0)) <= 102.0) 
(type: boolean)
+            predicate: ((UDFToDouble(_col4) + UDFToDouble(_col0)) <= 102.0D) 
(type: boolean)
             Statistics: Num rows: 4583 Data size: 88285 Basic stats: COMPLETE 
Column stats: NONE
             Limit
               Number of rows: 10
@@ -1048,7 +1048,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 12500 Data size: 240800 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: ((UDFToDouble(_col2) + UDFToDouble(_col0)) >= 100.0) 
(type: boolean)
+            predicate: ((UDFToDouble(_col2) + UDFToDouble(_col0)) >= 100.0D) 
(type: boolean)
             Statistics: Num rows: 4166 Data size: 80253 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
@@ -1230,7 +1230,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 13750 Data size: 264875 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: ((UDFToDouble(_col4) + UDFToDouble(_col0)) <= 102.0) 
(type: boolean)
+            predicate: ((UDFToDouble(_col4) + UDFToDouble(_col0)) <= 102.0D) 
(type: boolean)
             Statistics: Num rows: 4583 Data size: 88285 Basic stats: COMPLETE 
Column stats: NONE
             Limit
               Number of rows: 10
@@ -1324,7 +1324,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 12500 Data size: 240800 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: ((UDFToDouble(_col2) + UDFToDouble(_col0)) >= 100.0) 
(type: boolean)
+            predicate: ((UDFToDouble(_col2) + UDFToDouble(_col0)) >= 100.0D) 
(type: boolean)
             Statistics: Num rows: 4166 Data size: 80253 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
@@ -1506,7 +1506,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 13750 Data size: 264875 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: ((UDFToDouble(_col4) + UDFToDouble(_col0)) <= 102.0) 
(type: boolean)
+            predicate: ((UDFToDouble(_col4) + UDFToDouble(_col0)) <= 102.0D) 
(type: boolean)
             Statistics: Num rows: 4583 Data size: 88285 Basic stats: COMPLETE 
Column stats: NONE
             Limit
               Number of rows: 10

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/join47.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join47.q.out 
b/ql/src/test/results/clientpositive/join47.q.out
index 20dce5d..4a13df8 100644
--- a/ql/src/test/results/clientpositive/join47.q.out
+++ b/ql/src/test/results/clientpositive/join47.q.out
@@ -26,7 +26,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(value) BETWEEN 100.0 AND 102.0 and key 
is not null) (type: boolean)
+              predicate: (UDFToDouble(value) BETWEEN 100.0D AND 102.0D and key 
is not null) (type: boolean)
               Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -42,7 +42,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(value) BETWEEN 100.0 AND 102.0 and key 
is not null) (type: boolean)
+              predicate: (UDFToDouble(value) BETWEEN 100.0D AND 102.0D and key 
is not null) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -233,7 +233,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: UDFToDouble(value) BETWEEN 100.0 AND 102.0 (type: 
boolean)
+              predicate: UDFToDouble(value) BETWEEN 100.0D AND 102.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)
@@ -247,7 +247,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: UDFToDouble(value) BETWEEN 100.0 AND 102.0 (type: 
boolean)
+              predicate: UDFToDouble(value) BETWEEN 100.0D AND 102.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)
@@ -359,7 +359,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3
-          residual filter predicates: {((_col0 = _col2) or UDFToDouble(_col1) 
BETWEEN 100.0 AND 102.0 or UDFToDouble(_col3) BETWEEN 100.0 AND 102.0)}
+          residual filter predicates: {((_col0 = _col2) or UDFToDouble(_col1) 
BETWEEN 100.0D AND 102.0D or UDFToDouble(_col3) BETWEEN 100.0D AND 102.0D)}
           Statistics: Num rows: 9026 Data size: 173876 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10
@@ -462,7 +462,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3
-          residual filter predicates: {((UDFToDouble(_col0) + 
UDFToDouble(_col2)) >= 100.0)} {((UDFToDouble(_col0) + UDFToDouble(_col2)) <= 
102.0)}
+          residual filter predicates: {((UDFToDouble(_col0) + 
UDFToDouble(_col2)) >= 100.0D)} {((UDFToDouble(_col0) + UDFToDouble(_col2)) <= 
102.0D)}
           Statistics: Num rows: 1388 Data size: 26738 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10
@@ -559,7 +559,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3
-          residual filter predicates: {(((UDFToDouble(_col0) + 
UDFToDouble(_col2)) >= 100.0) or ((UDFToDouble(_col0) + UDFToDouble(_col2)) <= 
102.0))}
+          residual filter predicates: {(((UDFToDouble(_col0) + 
UDFToDouble(_col2)) >= 100.0D) or ((UDFToDouble(_col0) + UDFToDouble(_col2)) <= 
102.0D))}
           Statistics: Num rows: 8332 Data size: 160507 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10
@@ -787,7 +787,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          residual filter predicates: {((UDFToDouble(_col4) + 
UDFToDouble(_col0)) >= 100.0)}
+          residual filter predicates: {((UDFToDouble(_col4) + 
UDFToDouble(_col0)) >= 100.0D)}
           Statistics: Num rows: 4583 Data size: 88285 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
             expressions: _col0 (type: string), _col1 (type: string), _col4 
(type: string), _col5 (type: string), _col2 (type: string), _col3 (type: string)
@@ -932,7 +932,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          residual filter predicates: {((UDFToDouble(_col4) + 
UDFToDouble(_col0)) <= 102.0)}
+          residual filter predicates: {((UDFToDouble(_col4) + 
UDFToDouble(_col0)) <= 102.0D)}
           Statistics: Num rows: 4583 Data size: 88285 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10
@@ -1034,7 +1034,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3
-          residual filter predicates: {((UDFToDouble(_col2) + 
UDFToDouble(_col0)) >= 100.0)}
+          residual filter predicates: {((UDFToDouble(_col2) + 
UDFToDouble(_col0)) >= 100.0D)}
           Statistics: Num rows: 4166 Data size: 80253 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
@@ -1214,7 +1214,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          residual filter predicates: {((UDFToDouble(_col4) + 
UDFToDouble(_col0)) <= 102.0)}
+          residual filter predicates: {((UDFToDouble(_col4) + 
UDFToDouble(_col0)) <= 102.0D)}
           Statistics: Num rows: 4583 Data size: 88285 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10
@@ -1306,7 +1306,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3
-          residual filter predicates: {((UDFToDouble(_col2) + 
UDFToDouble(_col0)) >= 100.0)}
+          residual filter predicates: {((UDFToDouble(_col2) + 
UDFToDouble(_col0)) >= 100.0D)}
           Statistics: Num rows: 4166 Data size: 80253 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
@@ -1486,7 +1486,7 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          residual filter predicates: {((UDFToDouble(_col4) + 
UDFToDouble(_col0)) <= 102.0)}
+          residual filter predicates: {((UDFToDouble(_col4) + 
UDFToDouble(_col0)) <= 102.0D)}
           Statistics: Num rows: 4583 Data size: 88285 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join5.q.out 
b/ql/src/test/results/clientpositive/join5.q.out
index 7ce3b34..87c9efa 100644
--- a/ql/src/test/results/clientpositive/join5.q.out
+++ b/ql/src/test/results/clientpositive/join5.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) > 
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)
@@ -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/join6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join6.q.out 
b/ql/src/test/results/clientpositive/join6.q.out
index 989ae2a..978cc45 100644
--- a/ql/src/test/results/clientpositive/join6.q.out
+++ b/ql/src/test/results/clientpositive/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/join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join7.q.out 
b/ql/src/test/results/clientpositive/join7.q.out
index f34df53..91c4eb7 100644
--- a/ql/src/test/results/clientpositive/join7.q.out
+++ b/ql/src/test/results/clientpositive/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/join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join8.q.out 
b/ql/src/test/results/clientpositive/join8.q.out
index bfe4fd8..346a6a3 100644
--- a/ql/src/test/results/clientpositive/join8.q.out
+++ b/ql/src/test/results/clientpositive/join8.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) < 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/join_vc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_vc.q.out 
b/ql/src/test/results/clientpositive/join_vc.q.out
index 62671f2..963f4eb 100644
--- a/ql/src/test/results/clientpositive/join_vc.q.out
+++ b/ql/src/test/results/clientpositive/join_vc.q.out
@@ -167,7 +167,7 @@ STAGE PLANS:
             alias: t1
             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)
@@ -182,7 +182,7 @@ STAGE PLANS:
             alias: t2
             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), BLOCK__OFFSET__INSIDE__FILE 
(type: bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/limit_pushdown2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/limit_pushdown2.q.out 
b/ql/src/test/results/clientpositive/limit_pushdown2.q.out
index f4cff2b..5aeb521 100644
--- a/ql/src/test/results/clientpositive/limit_pushdown2.q.out
+++ b/ql/src/test/results/clientpositive/limit_pushdown2.q.out
@@ -20,7 +20,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)
+              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -114,7 +114,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)
+              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -208,7 +208,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)
+              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -302,7 +302,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0) (type: double)
+              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -396,7 +396,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0) (type: double)
+              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -490,7 +490,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0) (type: double)
+              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -585,7 +585,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)
+              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -701,7 +701,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)
+              expressions: key (type: string), value (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -817,7 +817,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: value (type: string), (UDFToDouble(key) + 1.0) 
(type: double)
+              expressions: value (type: string), (UDFToDouble(key) + 1.0D) 
(type: double)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
@@ -932,12 +932,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0) (type: double)
+              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: avg(_col2)
-                keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                keys: _col0 (type: string), _col1 (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1500 Data size: 15936 Basic stats: 
COMPLETE Column stats: NONE
@@ -1021,12 +1021,12 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0) (type: double)
+              expressions: value (type: string), key (type: string), 
(UDFToDouble(key) + 1.0D) (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: avg(_col2)
-                keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                keys: _col0 (type: string), _col1 (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1500 Data size: 15936 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out 
b/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
index 7bcde29..b46eb5c 100644
--- a/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
+++ b/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
@@ -107,7 +107,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col1 > 100.0) (type: boolean)
+            predicate: (_col1 > 100.0D) (type: boolean)
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
             Limit
               Number of rows: 20

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
index 5b625f0..40011a7 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Select Operator
-              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0) = 0.0), 'a1', 'b1') (type: string)
+              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0D) = 0.0D), 'a1', 'b1') (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               File Output Operator
@@ -401,7 +401,7 @@ STAGE PLANS:
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Select Operator
-              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0) = 0.0), 'a1', 'b1') (type: string)
+              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0D) = 0.0D), 'a1', 'b1') (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1000 Data size: 10624 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/list_bucket_dml_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
index 4160ad6..83d6c3b 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Select Operator
-              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0) = 0.0), 'a1', 'b1') (type: string)
+              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0D) = 0.0D), 'a1', 'b1') (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               File Output Operator
@@ -401,7 +401,7 @@ STAGE PLANS:
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Select Operator
-              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0) = 0.0), 'a1', 'b1') (type: string)
+              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0D) = 0.0D), 'a1', 'b1') (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1000 Data size: 10624 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/list_bucket_dml_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out 
b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
index 7e9aad4..22096dc 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Select Operator
-              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0) = 0.0), 'a1', 'b1') (type: string)
+              expressions: key (type: string), value (type: string), 
if(((UDFToDouble(key) % 100.0D) = 0.0D), 'a1', 'b1') (type: string)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1000 Data size: 10624 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/literal_double.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/literal_double.q.out 
b/ql/src/test/results/clientpositive/literal_double.q.out
index c127d68..76236ca 100644
--- a/ql/src/test/results/clientpositive/literal_double.q.out
+++ b/ql/src/test/results/clientpositive/literal_double.q.out
@@ -14,7 +14,7 @@ STAGE PLANS:
           alias: src
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 3.14 (type: decimal(3,2)), -3.14 (type: 
decimal(3,2)), 3.14E8 (type: double), 3.14E-8 (type: double), -3.14E8 (type: 
double), -3.14E-8 (type: double), 3.14E8 (type: double), 3.14E8 (type: double), 
3.14E-8 (type: double)
+            expressions: 3.14 (type: decimal(3,2)), -3.14 (type: 
decimal(3,2)), 3.14E8D (type: double), 3.14E-8D (type: double), -3.14E8D (type: 
double), -3.14E-8D (type: double), 3.14E8D (type: double), 3.14E8D (type: 
double), 3.14E-8D (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
             Statistics: Num rows: 500 Data size: 140000 Basic stats: COMPLETE 
Column stats: COMPLETE
             Limit

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/literal_ints.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/literal_ints.q.out 
b/ql/src/test/results/clientpositive/literal_ints.q.out
index 9a56ebd..a3230b9 100644
--- a/ql/src/test/results/clientpositive/literal_ints.q.out
+++ b/ql/src/test/results/clientpositive/literal_ints.q.out
@@ -14,7 +14,7 @@ STAGE PLANS:
           alias: src
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 100 (type: int), 100 (type: tinyint), 100 (type: 
smallint), 100 (type: bigint)
+            expressions: 100 (type: int), 100Y (type: tinyint), 100S (type: 
smallint), 100L (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 500 Data size: 10000 Basic stats: COMPLETE 
Column stats: COMPLETE
             Limit

Reply via email to