http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
index 71ccea5..92bb775 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
@@ -42,7 +42,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
@@ -107,7 +107,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
@@ -198,7 +198,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: _col0 (type: string), _col1 (type: string), 0 
(type: bigint)
+                      keys: _col0 (type: string), _col1 (type: string), 0L 
(type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
@@ -288,7 +288,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count(DISTINCT val)
-                      keys: key (type: string), 0 (type: bigint), val (type: 
string)
+                      keys: key (type: string), 0L (type: bigint), val (type: 
string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
@@ -367,7 +367,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
@@ -473,7 +473,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count(DISTINCT val)
-                      keys: key (type: string), 0 (type: bigint), val (type: 
string)
+                      keys: key (type: string), 0L (type: bigint), val (type: 
string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
@@ -591,7 +591,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count(1)
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE
@@ -612,7 +612,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: sum(1)
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 4 Data size: 1200 Basic stats: 
COMPLETE Column stats: NONE

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

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
index cf3721d..eee15a3 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
@@ -42,7 +42,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
@@ -127,7 +127,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count(DISTINCT val)
-                      keys: key (type: string), 0 (type: bigint), val (type: 
string)
+                      keys: key (type: string), 0L (type: bigint), val (type: 
string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
@@ -206,7 +206,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
@@ -306,7 +306,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count(DISTINCT val)
-                      keys: key (type: string), 0 (type: bigint), val (type: 
string)
+                      keys: key (type: string), 0L (type: bigint), val (type: 
string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
@@ -424,7 +424,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count(1)
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
@@ -445,7 +445,7 @@ STAGE PLANS:
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: sum(1)
-                      keys: key (type: string), val (type: string), 0 (type: 
bigint)
+                      keys: key (type: string), val (type: string), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE

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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/join11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join11.q.out 
b/ql/src/test/results/clientpositive/spark/join11.q.out
index 8e245e9..aa682bc 100644
--- a/ql/src/test/results/clientpositive/spark/join11.q.out
+++ b/ql/src/test/results/clientpositive/spark/join11.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)
@@ -48,7 +48,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/join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join12.q.out 
b/ql/src/test/results/clientpositive/spark/join12.q.out
index efc8fc3..f3cfe0c 100644
--- a/ql/src/test/results/clientpositive/spark/join12.q.out
+++ b/ql/src/test/results/clientpositive/spark/join12.q.out
@@ -37,7 +37,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)
@@ -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) < 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)
@@ -71,7 +71,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/spark/join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join13.q.out 
b/ql/src/test/results/clientpositive/spark/join13.q.out
index 69d64e2..8c2ce61 100644
--- a/ql/src/test/results/clientpositive/spark/join13.q.out
+++ b/ql/src/test/results/clientpositive/spark/join13.q.out
@@ -38,7 +38,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)
@@ -56,7 +56,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)
@@ -73,7 +73,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/join14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join14.q.out 
b/ql/src/test/results/clientpositive/spark/join14.q.out
index 11edde0..463b1d5 100644
--- a/ql/src/test/results/clientpositive/spark/join14.q.out
+++ b/ql/src/test/results/clientpositive/spark/join14.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: key (type: string)
@@ -49,7 +49,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/join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join16.q.out 
b/ql/src/test/results/clientpositive/spark/join16.q.out
index b3ea6d4..cae2fb7 100644
--- a/ql/src/test/results/clientpositive/spark/join16.q.out
+++ b/ql/src/test/results/clientpositive/spark/join16.q.out
@@ -19,7 +19,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)
@@ -36,7 +36,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/spark/join34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join34.q.out 
b/ql/src/test/results/clientpositive/spark/join34.q.out
index 2c9fb99..c2bdb91 100644
--- a/ql/src/test/results/clientpositive/spark/join34.q.out
+++ b/ql/src/test/results/clientpositive/spark/join34.q.out
@@ -46,7 +46,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)
@@ -120,7 +120,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)
@@ -194,7 +194,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)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/join35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join35.q.out 
b/ql/src/test/results/clientpositive/spark/join35.q.out
index 86ccc5a..eec056d 100644
--- a/ql/src/test/results/clientpositive/spark/join35.q.out
+++ b/ql/src/test/results/clientpositive/spark/join35.q.out
@@ -48,7 +48,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()
@@ -124,7 +124,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()
@@ -200,7 +200,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)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/join38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join38.q.out 
b/ql/src/test/results/clientpositive/spark/join38.q.out
index f4f31c0..1bcf759 100644
--- a/ql/src/test/results/clientpositive/spark/join38.q.out
+++ b/ql/src/test/results/clientpositive/spark/join38.q.out
@@ -64,7 +64,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)
@@ -89,7 +89,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/spark/join39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join39.q.out 
b/ql/src/test/results/clientpositive/spark/join39.q.out
index c094dd9..e228165 100644
--- a/ql/src/test/results/clientpositive/spark/join39.q.out
+++ b/ql/src/test/results/clientpositive/spark/join39.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)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join4.q.out 
b/ql/src/test/results/clientpositive/spark/join4.q.out
index 44ec2e0..2396fd8 100644
--- a/ql/src/test/results/clientpositive/spark/join4.q.out
+++ b/ql/src/test/results/clientpositive/spark/join4.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) < 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/spark/join40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join40.q.out 
b/ql/src/test/results/clientpositive/spark/join40.q.out
index cd40042..03c00a9 100644
--- a/ql/src/test/results/clientpositive/spark/join40.q.out
+++ b/ql/src/test/results/clientpositive/spark/join40.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)
@@ -3112,7 +3112,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/join41.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join41.q.out 
b/ql/src/test/results/clientpositive/spark/join41.q.out
index 2099b7c..a2d2c49 100644
--- a/ql/src/test/results/clientpositive/spark/join41.q.out
+++ b/ql/src/test/results/clientpositive/spark/join41.q.out
@@ -48,7 +48,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)
@@ -133,7 +133,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/spark/join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join5.q.out 
b/ql/src/test/results/clientpositive/spark/join5.q.out
index 37a96d7..f9dfbec 100644
--- a/ql/src/test/results/clientpositive/spark/join5.q.out
+++ b/ql/src/test/results/clientpositive/spark/join5.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) > 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)
@@ -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/join6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join6.q.out 
b/ql/src/test/results/clientpositive/spark/join6.q.out
index 563c940..3f884ca 100644
--- a/ql/src/test/results/clientpositive/spark/join6.q.out
+++ b/ql/src/test/results/clientpositive/spark/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/join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join7.q.out 
b/ql/src/test/results/clientpositive/spark/join7.q.out
index 86838cc..d43c5cd 100644
--- a/ql/src/test/results/clientpositive/spark/join7.q.out
+++ b/ql/src/test/results/clientpositive/spark/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/join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join8.q.out 
b/ql/src/test/results/clientpositive/spark/join8.q.out
index e6b7c1f..a6b9c18 100644
--- a/ql/src/test/results/clientpositive/spark/join8.q.out
+++ b/ql/src/test/results/clientpositive/spark/join8.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) < 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/spark/join_vc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join_vc.q.out 
b/ql/src/test/results/clientpositive/spark/join_vc.q.out
index 50762bd..39901eb 100644
--- a/ql/src/test/results/clientpositive/spark/join_vc.q.out
+++ b/ql/src/test/results/clientpositive/spark/join_vc.q.out
@@ -162,7 +162,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)
@@ -179,7 +179,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/spark/limit_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out 
b/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
index a60d8dd..82ba94a 100644
--- a/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
@@ -187,7 +187,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
@@ -279,7 +279,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

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out 
b/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out
index 3bd49b4..62c26e6 100644
--- a/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out
+++ b/ql/src/test/results/clientpositive/spark/limit_pushdown2.q.out
@@ -25,7 +25,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
@@ -125,7 +125,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
@@ -225,7 +225,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
@@ -325,7 +325,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
@@ -425,7 +425,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
@@ -525,7 +525,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
@@ -626,7 +626,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
@@ -738,7 +738,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
@@ -850,7 +850,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
@@ -961,12 +961,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
@@ -1046,12 +1046,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/spark/load_dyn_part13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
index 5c7e63c..8b8b334 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
@@ -71,7 +71,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 20.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 20.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string), 
'22' (type: string)
@@ -91,7 +91,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) < 40.0) and 
(UDFToDouble(key) > 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 40.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), 
'33' (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
index 0762fba..9649f73 100644
--- a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
@@ -35,7 +35,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)
@@ -109,7 +109,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)
@@ -341,7 +341,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)
@@ -466,7 +466,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)
@@ -651,7 +651,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)
@@ -725,7 +725,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)
@@ -957,7 +957,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)
@@ -1082,7 +1082,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/spark/mapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/mapjoin1.q.out 
b/ql/src/test/results/clientpositive/spark/mapjoin1.q.out
index a8ef164..74c51bb 100644
--- a/ql/src/test/results/clientpositive/spark/mapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/spark/mapjoin1.q.out
@@ -141,7 +141,7 @@ STAGE PLANS:
                     Spark HashTable Sink Operator
                       filter predicates:
                         0 
-                        1 {((UDFToDouble(_col0) * 10.0) < 1000.0)}
+                        1 {((UDFToDouble(_col0) * 10.0D) < 1000.0D)}
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
@@ -166,7 +166,7 @@ STAGE PLANS:
                            Right Outer Join 0 to 1
                       filter predicates:
                         0 
-                        1 {((UDFToDouble(_col0) * 10.0) < 1000.0)}
+                        1 {((UDFToDouble(_col0) * 10.0D) < 1000.0D)}
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
@@ -241,7 +241,7 @@ STAGE PLANS:
                     Spark HashTable Sink Operator
                       filter predicates:
                         0 
-                        1 {(UDFToDouble(_col1.key) > 200.0)}
+                        1 {(UDFToDouble(_col1.key) > 200.0D)}
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
@@ -266,7 +266,7 @@ STAGE PLANS:
                            Right Outer Join 0 to 1
                       filter predicates:
                         0 
-                        1 {(UDFToDouble(_col1.key) > 200.0)}
+                        1 {(UDFToDouble(_col1.key) > 200.0D)}
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
@@ -433,7 +433,7 @@ STAGE PLANS:
                     Spark HashTable Sink Operator
                       filter predicates:
                         0 
-                        1 {((UDFToDouble(_col0) * 10.0) < 1000.0)}
+                        1 {((UDFToDouble(_col0) * 10.0D) < 1000.0D)}
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
@@ -458,7 +458,7 @@ STAGE PLANS:
                            Right Outer Join 0 to 1
                       filter predicates:
                         0 
-                        1 {((UDFToDouble(_col0) * 10.0) < 1000.0)}
+                        1 {((UDFToDouble(_col0) * 10.0D) < 1000.0D)}
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
@@ -533,7 +533,7 @@ STAGE PLANS:
                     Spark HashTable Sink Operator
                       filter predicates:
                         0 
-                        1 {(UDFToDouble(_col1.key) > 200.0)}
+                        1 {(UDFToDouble(_col1.key) > 200.0D)}
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)
@@ -558,7 +558,7 @@ STAGE PLANS:
                            Right Outer Join 0 to 1
                       filter predicates:
                         0 
-                        1 {(UDFToDouble(_col1.key) > 200.0)}
+                        1 {(UDFToDouble(_col1.key) > 200.0D)}
                       keys:
                         0 _col0 (type: string)
                         1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/mergejoins.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/mergejoins.q.out 
b/ql/src/test/results/clientpositive/spark/mergejoins.q.out
index ce03008..069a468 100644
--- a/ql/src/test/results/clientpositive/spark/mergejoins.q.out
+++ b/ql/src/test/results/clientpositive/spark/mergejoins.q.out
@@ -265,7 +265,7 @@ STAGE PLANS:
                      Left Outer Join 1 to 2
                 filter predicates:
                   0 
-                  1 {(UDFToDouble(KEY.reducesinkkey0) < 10.0)}
+                  1 {(UDFToDouble(KEY.reducesinkkey0) < 10.0D)}
                   2 
                 keys:
                   0 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/nullgroup.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/nullgroup.q.out 
b/ql/src/test/results/clientpositive/spark/nullgroup.q.out
index aa99ae3..9a98bfb 100644
--- a/ql/src/test/results/clientpositive/spark/nullgroup.q.out
+++ b/ql/src/test/results/clientpositive/spark/nullgroup.q.out
@@ -21,7 +21,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 9999.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
@@ -87,7 +87,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 9999.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
@@ -154,7 +154,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 9999.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
@@ -226,7 +226,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 9999.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

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/nullgroup2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/nullgroup2.q.out 
b/ql/src/test/results/clientpositive/spark/nullgroup2.q.out
index 1c6c505..392f51c 100644
--- a/ql/src/test/results/clientpositive/spark/nullgroup2.q.out
+++ b/ql/src/test/results/clientpositive/spark/nullgroup2.q.out
@@ -22,7 +22,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 9999.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -103,7 +103,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 9999.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -171,7 +171,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 9999.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)
@@ -245,7 +245,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 9999.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/nullgroup4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/nullgroup4.q.out 
b/ql/src/test/results/clientpositive/spark/nullgroup4.q.out
index 061bd1b..4aa4061 100644
--- a/ql/src/test/results/clientpositive/spark/nullgroup4.q.out
+++ b/ql/src/test/results/clientpositive/spark/nullgroup4.q.out
@@ -22,7 +22,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 9999.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string)
@@ -105,7 +105,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 9999.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string)
@@ -194,7 +194,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 9999.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string)
@@ -269,7 +269,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 9999.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 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/spark/nullgroup4_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/nullgroup4_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/spark/nullgroup4_multi_distinct.q.out
index 7f5bfaa..66037c8 100644
--- a/ql/src/test/results/clientpositive/spark/nullgroup4_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/spark/nullgroup4_multi_distinct.q.out
@@ -21,7 +21,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 9999.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string), substr(value, 5) 
(type: string)
@@ -91,7 +91,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 9999.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 9999.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: value (type: string), substr(value, 5) 
(type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/orc_merge5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge5.q.out 
b/ql/src/test/results/clientpositive/spark/orc_merge5.q.out
index c6f06ad..73aeb4c 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge5.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge5.q.out
@@ -40,10 +40,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: orc_merge5
-                  filterExpr: (userid <= 13) (type: boolean)
+                  filterExpr: (userid <= 13L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: userid (type: bigint), string1 (type: 
string), subtype (type: double), decimal1 (type: decimal(10,0)), ts (type: 
timestamp)
@@ -131,10 +131,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: orc_merge5
-                  filterExpr: (userid <= 13) (type: boolean)
+                  filterExpr: (userid <= 13L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: userid (type: bigint), string1 (type: 
string), subtype (type: double), decimal1 (type: decimal(10,0)), ts (type: 
timestamp)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/orc_merge6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge6.q.out 
b/ql/src/test/results/clientpositive/spark/orc_merge6.q.out
index 5c3b25e..f13cdd4 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge6.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge6.q.out
@@ -40,10 +40,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: orc_merge5
-                  filterExpr: (userid <= 13) (type: boolean)
+                  filterExpr: (userid <= 13L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: userid (type: bigint), string1 (type: 
string), subtype (type: double), decimal1 (type: decimal(10,0)), ts (type: 
timestamp)
@@ -178,10 +178,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: orc_merge5
-                  filterExpr: (userid <= 13) (type: boolean)
+                  filterExpr: (userid <= 13L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: userid (type: bigint), string1 (type: 
string), subtype (type: double), decimal1 (type: decimal(10,0)), ts (type: 
timestamp)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out 
b/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out
index d97ac66..7f9ce03 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out
@@ -42,7 +42,7 @@ STAGE PLANS:
                   alias: orc_merge5
                   Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 2464020 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: userid (type: bigint), string1 (type: 
string), subtype (type: double), decimal1 (type: decimal(10,0)), ts (type: 
timestamp)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
index 8bfd8b6..97cd138 100644
--- a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
@@ -35,7 +35,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)
@@ -109,7 +109,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)
@@ -341,7 +341,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)
@@ -415,7 +415,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0D) and 
(UDFToDouble(key) > 15.0D)) (type: boolean)
                     Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out 
b/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out
index 1bbc2a0..19e5317 100644
--- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out
+++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out
@@ -1642,7 +1642,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                 Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: double), (- _col0) (type: double), 
(-6432.0 + _col0) (type: double), _col1 (type: double), (- (-6432.0 + _col0)) 
(type: double), ((- (-6432.0 + _col0)) + (-6432.0 + _col0)) (type: double), 
_col2 (type: double), (- (-6432.0 + _col0)) (type: double), (-6432.0 + (- 
(-6432.0 + _col0))) (type: double), (- (-6432.0 + _col0)) (type: double), ((- 
(-6432.0 + _col0)) / (- (-6432.0 + _col0))) (type: double), _col3 (type: 
bigint), _col4 (type: double), (_col2 % _col1) (type: double), (- _col2) (type: 
double), ((- (-6432.0 + _col0)) * (- _col0)) (type: double), _col5 (type: 
tinyint), (- _col5) (type: tinyint)
+                  expressions: _col0 (type: double), (- _col0) (type: double), 
(-6432.0D + _col0) (type: double), _col1 (type: double), (- (-6432.0D + _col0)) 
(type: double), ((- (-6432.0D + _col0)) + (-6432.0D + _col0)) (type: double), 
_col2 (type: double), (- (-6432.0D + _col0)) (type: double), (-6432.0D + (- 
(-6432.0D + _col0))) (type: double), (- (-6432.0D + _col0)) (type: double), ((- 
(-6432.0D + _col0)) / (- (-6432.0D + _col0))) (type: double), _col3 (type: 
bigint), _col4 (type: double), (_col2 % _col1) (type: double), (- _col2) (type: 
double), ((- (-6432.0D + _col0)) * (- _col0)) (type: double), _col5 (type: 
tinyint), (- _col5) (type: tinyint)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17
                   Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator

Reply via email to