http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/subquery_notin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_notin.q.out 
b/ql/src/test/results/clientpositive/spark/subquery_notin.q.out
index e2f26a9..82a1304 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_notin.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_notin.q.out
@@ -104,7 +104,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 550 Data size: 15193 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: ((_col2 = 0) or (_col5 is null and _col0 is not 
null and (_col3 >= _col2))) (type: boolean)
+                  predicate: ((_col2 = 0L) or (_col5 is null and _col0 is not 
null and (_col3 >= _col2))) (type: boolean)
                   Statistics: Num rows: 366 Data size: 10110 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
@@ -377,7 +377,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col8
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col4 = 0)) THEN (false) WHEN 
(_col4 is null) THEN (false) WHEN (_col8 is not null) THEN (true) WHEN (_col0 
is null) THEN (null) WHEN ((_col5 < _col4)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col4 = 0L)) THEN (false) WHEN 
(_col4 is null) THEN (false) WHEN (_col8 is not null) THEN (true) WHEN (_col0 
is null) THEN (null) WHEN ((_col5 < _col4)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col1 (type: string), _col0 (type: string), 
_col2 (type: int)
@@ -645,7 +645,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 28 Data size: 5892 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col2 = 0) or (_col5 is null and _col1 is not 
null and (_col3 >= _col2))) (type: boolean)
+                  predicate: ((_col2 = 0L) or (_col5 is null and _col1 is not 
null and (_col3 >= _col2))) (type: boolean)
                   Statistics: Num rows: 18 Data size: 3787 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: int)
@@ -1036,7 +1036,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col10
                 Statistics: Num rows: 9 Data size: 1345 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col6 = 0)) THEN (false) WHEN 
(_col6 is null) THEN (false) WHEN (_col10 is not null) THEN (true) WHEN (_col2 
is null) THEN (null) WHEN ((_col7 < _col6)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col6 = 0L)) THEN (false) WHEN 
(_col6 is null) THEN (false) WHEN (_col10 is not null) THEN (true) WHEN (_col2 
is null) THEN (null) WHEN ((_col7 < _col6)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 5 Data size: 747 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col1 (type: string), _col0 (type: string), 
_col2 (type: int)
@@ -1513,7 +1513,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 182 Data size: 5043 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: ((_col1 = 0) or (_col4 is null and _col0 is not 
null and (_col2 >= _col1))) (type: boolean)
+                  predicate: ((_col1 = 0L) or (_col4 is null and _col0 is not 
null and (_col2 >= _col1))) (type: boolean)
                   Statistics: Num rows: 121 Data size: 3352 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -1685,7 +1685,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col14
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col10 = 0)) THEN (false) WHEN 
(_col10 is null) THEN (false) WHEN (_col14 is not null) THEN (true) WHEN (_col5 
is null) THEN (null) WHEN ((_col11 < _col10)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col10 = 0L)) THEN (false) WHEN 
(_col10 is null) THEN (false) WHEN (_col14 is not null) THEN (true) WHEN (_col5 
is null) THEN (null) WHEN ((_col11 < _col10)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: 
int), _col6 (type: string), _col7 (type: double), _col8 (type: string)
@@ -1874,7 +1874,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col12 is null and _col5 is not null and 
(_col10 >= _col9)) or (_col9 = 0)) (type: boolean)
+                  predicate: ((_col12 is null and _col5 is not null and 
(_col10 >= _col9)) or (_col9 = 0L)) (type: boolean)
                   Statistics: Num rows: 18 Data size: 2537 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: 
int), _col6 (type: string), _col7 (type: double), _col8 (type: string)
@@ -2066,7 +2066,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col12 is null and _col0 is not null and _col5 
is not null and (_col10 >= _col9)) or (_col9 = 0)) (type: boolean)
+                  predicate: ((_col12 is null and _col0 is not null and _col5 
is not null and (_col10 >= _col9)) or (_col9 = 0L)) (type: boolean)
                   Statistics: Num rows: 18 Data size: 2537 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: 
int), _col6 (type: string), _col7 (type: double), _col8 (type: string)
@@ -2324,7 +2324,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col3, _col4, _col7
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN ((_col1 
+ 100) is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) 
END) (type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN ((_col1 
+ 100) is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) 
END) (type: boolean)
                   Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
@@ -2496,7 +2496,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col12 is null and _col7 is not null and 
(_col10 >= _col9)) or (_col9 = 0)) (type: boolean)
+                  predicate: ((_col12 is null and _col7 is not null and 
(_col10 >= _col9)) or (_col9 = 0L)) (type: boolean)
                   Statistics: Num rows: 18 Data size: 2537 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: 
int), _col6 (type: string), _col7 (type: double), _col8 (type: string)
@@ -2762,7 +2762,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col14
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col10 = 0)) THEN (false) WHEN 
(_col10 is null) THEN (false) WHEN (_col14 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col11 < _col10)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col10 = 0L)) THEN (false) WHEN 
(_col10 is null) THEN (false) WHEN (_col14 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col11 < _col10)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: 
int), _col6 (type: string), _col7 (type: double), _col8 (type: string)
@@ -2960,7 +2960,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col11, _col12, _col16
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col11 = 0)) THEN (false) WHEN 
(_col11 is null) THEN (false) WHEN (_col16 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col12 < _col11)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col11 = 0L)) THEN (false) WHEN 
(_col11 is null) THEN (false) WHEN (_col16 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col12 < _col11)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: 
int), _col6 (type: string), _col7 (type: double), _col8 (type: string)
@@ -3068,7 +3068,7 @@ STAGE PLANS:
                     predicate: p_brand is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 3147 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: p_brand (type: string), 
(UDFToDouble(p_type) + 2.0) (type: double)
+                      expressions: p_brand (type: string), 
(UDFToDouble(p_type) + 2.0D) (type: double)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 26 Data size: 3147 Basic stats: 
COMPLETE Column stats: NONE
                       Group By Operator
@@ -3092,7 +3092,7 @@ STAGE PLANS:
                     predicate: p_brand is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 3147 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: (UDFToDouble(p_type) + 2.0) (type: double), 
p_brand (type: string)
+                      expressions: (UDFToDouble(p_type) + 2.0D) (type: 
double), p_brand (type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 26 Data size: 3147 Basic stats: 
COMPLETE Column stats: NONE
                       Group By Operator
@@ -3132,7 +3132,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col4, _col5, _col8
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col4 = 0)) THEN (false) WHEN 
(_col4 is null) THEN (false) WHEN (_col8 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col5 < _col4)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col4 = 0L)) THEN (false) WHEN 
(_col4 is null) THEN (false) WHEN (_col8 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col5 < _col4)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -3359,7 +3359,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col4, _col5, _col8
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col4 = 0)) THEN (false) WHEN 
(_col4 is null) THEN (false) WHEN (_col8 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col5 < _col4)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col4 = 0L)) THEN (false) WHEN 
(_col4 is null) THEN (false) WHEN (_col8 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col5 < _col4)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -3611,7 +3611,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 550 Data size: 15193 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: ((_col2 = 0) or (_col5 is null and _col1 is not 
null and (_col3 >= _col2))) (type: boolean)
+                  predicate: ((_col2 = 0L) or (_col5 is null and _col1 is not 
null and (_col3 >= _col2))) (type: boolean)
                   Statistics: Num rows: 366 Data size: 10110 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -3898,7 +3898,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col7
                 Statistics: Num rows: 605 Data size: 6427 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 303 Data size: 3218 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -4134,7 +4134,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col12 is null and _col5 is not null and 
(_col10 >= _col9)) or (_col9 = 0)) (type: boolean)
+                  predicate: ((_col12 is null and _col5 is not null and 
(_col10 >= _col9)) or (_col9 = 0L)) (type: boolean)
                   Statistics: Num rows: 18 Data size: 2537 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: 
int), _col6 (type: string), _col7 (type: double), _col8 (type: string)
@@ -4344,7 +4344,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col12 is null and _col5 is not null and 
(_col10 >= _col9)) or (_col9 = 0)) (type: boolean)
+                  predicate: ((_col12 is null and _col5 is not null and 
(_col10 >= _col9)) or (_col9 = 0L)) (type: boolean)
                   Statistics: Num rows: 18 Data size: 2537 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: 
int), _col6 (type: string), _col7 (type: double), _col8 (type: string)
@@ -4579,7 +4579,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 550 Data size: 15193 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: ((_col2 = 0) or (_col5 is null and _col0 is not 
null and (_col3 >= _col2))) (type: boolean)
+                  predicate: ((_col2 = 0L) or (_col5 is null and _col0 is not 
null and (_col3 >= _col2))) (type: boolean)
                   Statistics: Num rows: 366 Data size: 10110 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
@@ -5271,7 +5271,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col3, _col4, _col7
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN ((_col1 
+ 100) is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) 
END) (type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN ((_col1 
+ 100) is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) 
END) (type: boolean)
                   Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     Statistics: Num rows: 15 Data size: 1903 Basic stats: 
COMPLETE Column stats: NONE
@@ -5492,7 +5492,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 4 Data size: 419 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col1 = 0) or (_col4 is null and _col0 is not 
null and (_col2 >= _col1))) (type: boolean)
+                  predicate: ((_col1 = 0L) or (_col4 is null and _col0 is not 
null and (_col2 >= _col1))) (type: boolean)
                   Statistics: Num rows: 2 Data size: 209 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -5717,7 +5717,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col3, _col4, _col7
                 Statistics: Num rows: 4 Data size: 378 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col0 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col0 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 189 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -5948,7 +5948,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col7
                 Statistics: Num rows: 3 Data size: 9 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -6172,7 +6172,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col6
                 Statistics: Num rows: 4 Data size: 19 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col6 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col6 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 9 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)
@@ -6400,7 +6400,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col6
                 Statistics: Num rows: 6 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col6 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col6 is not null) THEN (true) WHEN (_col1 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 3 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -6588,7 +6588,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col3, _col4, _col7
                 Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col0 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col0 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -6747,7 +6747,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 3 Data size: 67 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col2 = 0) or (_col5 is null and _col1 is not 
null and (_col3 >= _col2))) (type: boolean)
+                  predicate: ((_col2 = 0L) or (_col5 is null and _col1 is not 
null and (_col3 >= _col2))) (type: boolean)
                   Statistics: Num rows: 1 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -6902,7 +6902,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 3 Data size: 67 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col1 = 0) or (_col4 is null and _col0 is not 
null and (_col2 >= _col1))) (type: boolean)
+                  predicate: ((_col1 = 0L) or (_col4 is null and _col0 is not 
null and (_col2 >= _col1))) (type: boolean)
                   Statistics: Num rows: 1 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -7112,7 +7112,7 @@ STAGE PLANS:
                 residual filter predicates: {(_col1 > _col6)}
                 Statistics: Num rows: 8367 Data size: 186148 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col3 = 0)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col0 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN 
(_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col0 
is null) THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 4184 Data size: 93085 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/subquery_null_agg.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_null_agg.q.out 
b/ql/src/test/results/clientpositive/spark/subquery_null_agg.q.out
index 4cfce10..96e8ee2 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_null_agg.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_null_agg.q.out
@@ -134,7 +134,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col2
                 Statistics: Num rows: 1 Data size: 10 Basic stats: PARTIAL 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col1 = 0) or _col2 is null) (type: boolean)
+                  predicate: ((_col1 = 0L) or _col2 is null) (type: boolean)
                   Statistics: Num rows: 1 Data size: 10 Basic stats: PARTIAL 
Column stats: NONE
                   Select Operator
                     expressions: null (type: void)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out 
b/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out
index 77359a0..7488f2e 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_scalar.q.out
@@ -2795,7 +2795,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (_col1 = 2) (type: boolean)
+                  predicate: (_col1 = 2L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: bigint)
@@ -2863,7 +2863,7 @@ STAGE PLANS:
                   outputColumnNames: _col1
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (_col1 = 2) (type: boolean)
+                    predicate: (_col1 = 2L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
@@ -3118,7 +3118,7 @@ STAGE PLANS:
                       sort order: 
                       Statistics: Num rows: 1 Data size: 32560 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col0 (type: int), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), _col4 (type: string), 
_col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: 
string)
-        Map 5 
+        Map 5
             Map Operator Tree:
                 TableScan
                   alias: part_null
@@ -3136,7 +3136,7 @@ STAGE PLANS:
                         sort order: 
                         Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col0 (type: string)
-        Map 7 
+        Map 7
             Map Operator Tree:
                 TableScan
                   alias: part
@@ -3154,7 +3154,7 @@ STAGE PLANS:
                         sort order: 
                         Statistics: Num rows: 1 Data size: 16 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col0 (type: bigint), _col1 (type: 
bigint)
-        Map 9 
+        Map 9
             Map Operator Tree:
                 TableScan
                   alias: part
@@ -3173,7 +3173,7 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
                         Statistics: Num rows: 26 Data size: 3147 Basic stats: 
COMPLETE Column stats: NONE
-        Reducer 10 
+        Reducer 10
             Reduce Operator Tree:
               Group By Operator
                 keys: KEY._col0 (type: string)
@@ -3190,7 +3190,7 @@ STAGE PLANS:
                     Map-reduce partition columns: _col0 (type: string)
                     Statistics: Num rows: 13 Data size: 1573 Basic stats: 
COMPLETE Column stats: NONE
                     value expressions: _col1 (type: boolean)
-        Reducer 2 
+        Reducer 2
             Reduce Operator Tree:
               Join Operator
                 condition map:
@@ -3208,26 +3208,26 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
                     Statistics: Num rows: 1 Data size: 32745 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      sort order: 
+                      sort order:
                       Statistics: Num rows: 1 Data size: 32745 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col0 (type: int), _col1 (type: 
string), _col2 (type: string), _col3 (type: string), _col4 (type: string), 
_col5 (type: int), _col6 (type: string), _col7 (type: double), _col8 (type: 
string)
-        Reducer 3 
+        Reducer 3
             Reduce Operator Tree:
               Join Operator
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 
-                  1 
+                  0
+                  1
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11
                 Statistics: Num rows: 1 Data size: 32762 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col3 (type: string)
-                  sort order: +
-                  Map-reduce partition columns: _col3 (type: string)
+                  Reduce Output Operator
+                    key expressions: _col3 (type: string)
+                    sort order: +
+                    Map-reduce partition columns: _col3 (type: string)
                   Statistics: Num rows: 1 Data size: 32762 Basic stats: 
COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: int), _col1 (type: string), 
_col2 (type: string), _col4 (type: string), _col5 (type: int), _col6 (type: 
string), _col7 (type: double), _col8 (type: string), _col10 (type: bigint), 
_col11 (type: bigint)
-        Reducer 4 
+                    value expressions: _col0 (type: int), _col1 (type: 
string), _col2 (type: string), _col4 (type: string), _col5 (type: int), _col6 
(type: string), _col7 (type: double), _col8 (type: string), _col10 (type: 
bigint), _col11 (type: bigint)
+        Reducer 4
             Reduce Operator Tree:
               Join Operator
                 condition map:
@@ -3251,7 +3251,7 @@ STAGE PLANS:
                           input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-        Reducer 6 
+        Reducer 6
             Reduce Operator Tree:
               Group By Operator
                 aggregations: min(VALUE._col0)
@@ -3262,7 +3262,7 @@ STAGE PLANS:
                   sort order: 
                   Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col0 (type: string)
-        Reducer 8 
+        Reducer 8
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0), count(VALUE._col1)
@@ -4192,17 +4192,17 @@ STAGE PLANS:
                   Select Operator
                     expressions: _col0 (type: string), _col2 (type: string)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 14 Data size: 1730 Basic stats: 
COMPLETE Column stats: NONE
-                    Group By Operator
-                      keys: _col0 (type: string), _col1 (type: string)
-                      mode: hash
-                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 14 Data size: 1730 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
string)
-                        sort order: ++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string)
+                      Group By Operator
+                        keys: _col0 (type: string), _col1 (type: string)
+                        mode: hash
+                        outputColumnNames: _col0, _col1
                         Statistics: Num rows: 14 Data size: 1730 Basic stats: 
COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          key expressions: _col0 (type: string), _col1 (type: 
string)
+                          sort order: ++
+                          Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string)
+                          Statistics: Num rows: 14 Data size: 1730 Basic 
stats: COMPLETE Column stats: NONE
         Reducer 6 
             Reduce Operator Tree:
               Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/subquery_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_select.q.out 
b/ql/src/test/results/clientpositive/spark/subquery_select.q.out
index e36c74a..6d839fa 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_select.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_select.q.out
@@ -79,7 +79,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), CASE WHEN ((_col1 = 0)) THEN 
(false) WHEN (_col4 is not null) THEN (true) WHEN (_col0 is null) THEN (null) 
WHEN ((_col2 < _col1)) THEN (null) ELSE (false) END (type: boolean)
+                  expressions: _col0 (type: int), CASE WHEN ((_col1 = 0L)) 
THEN (false) WHEN (_col4 is not null) THEN (true) WHEN (_col0 is null) THEN 
(null) WHEN ((_col2 < _col1)) THEN (null) ELSE (false) END (type: boolean)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 28 Data size: 3947 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -252,7 +252,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col3, _col4, _col7
                 Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col1 (type: int), CASE WHEN ((_col3 = 0)) THEN 
(false) WHEN (_col3 is null) THEN (false) WHEN (_col7 is not null) THEN (true) 
WHEN (_col1 is null) THEN (null) WHEN ((_col4 < _col3)) THEN (null) ELSE 
(false) END (type: boolean)
+                  expressions: _col1 (type: int), CASE WHEN ((_col3 = 0L)) 
THEN (false) WHEN (_col3 is null) THEN (false) WHEN (_col7 is not null) THEN 
(true) WHEN (_col1 is null) THEN (null) WHEN ((_col4 < _col3)) THEN (null) ELSE 
(false) END (type: boolean)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 30 Data size: 3807 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -433,7 +433,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), CASE WHEN ((_col1 = 0)) THEN 
(true) WHEN (_col4 is not null) THEN (false) WHEN (_col0 is null) THEN (null) 
WHEN ((_col2 < _col1)) THEN (null) ELSE (true) END (type: boolean)
+                  expressions: _col0 (type: int), CASE WHEN ((_col1 = 0L)) 
THEN (true) WHEN (_col4 is not null) THEN (false) WHEN (_col0 is null) THEN 
(null) WHEN ((_col2 < _col1)) THEN (null) ELSE (true) END (type: boolean)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 28 Data size: 3947 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -674,7 +674,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col5, _col6, _col9
                 Statistics: Num rows: 14 Data size: 1730 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col1 (type: int), CASE WHEN ((_col5 = 0)) THEN 
(true) WHEN (_col5 is null) THEN (true) WHEN (_col9 is not null) THEN (false) 
WHEN (_col1 is null) THEN (null) WHEN ((_col6 < _col5)) THEN (null) ELSE (true) 
END (type: boolean)
+                  expressions: _col1 (type: int), CASE WHEN ((_col5 = 0L)) 
THEN (true) WHEN (_col5 is null) THEN (true) WHEN (_col9 is not null) THEN 
(false) WHEN (_col1 is null) THEN (null) WHEN ((_col6 < _col5)) THEN (null) 
ELSE (true) END (type: boolean)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 14 Data size: 1730 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -2130,7 +2130,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), CASE WHEN ((_col1 = 0)) THEN 
(false) WHEN (_col4 is not null) THEN (true) WHEN (_col0 is null) THEN (null) 
WHEN ((_col2 < _col1)) THEN (null) ELSE (false) END (type: boolean)
+                  expressions: _col0 (type: int), CASE WHEN ((_col1 = 0L)) 
THEN (false) WHEN (_col4 is not null) THEN (true) WHEN (_col0 is null) THEN 
(null) WHEN ((_col2 < _col1)) THEN (null) ELSE (false) END (type: boolean)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 28 Data size: 3947 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -3111,7 +3111,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col2, _col4, _col5, _col8, _col9, 
_col10, _col12
                 Statistics: Num rows: 33 Data size: 10556 Basic stats: 
COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col2 (type: int), (CASE WHEN ((_col4 = 0)) 
THEN (false) WHEN (_col4 is null) THEN (false) WHEN (_col8 is not null) THEN 
(true) WHEN (_col2 is null) THEN (null) WHEN ((_col5 < _col4)) THEN (null) ELSE 
(false) END and CASE WHEN ((_col9 = 0)) THEN (false) WHEN (_col12 is not null) 
THEN (true) WHEN (_col0 is null) THEN (null) WHEN ((_col10 < _col9)) THEN 
(null) ELSE (false) END) (type: boolean)
+                  expressions: _col2 (type: int), (CASE WHEN ((_col4 = 0L)) 
THEN (false) WHEN (_col4 is null) THEN (false) WHEN (_col8 is not null) THEN 
(true) WHEN (_col2 is null) THEN (null) WHEN ((_col5 < _col4)) THEN (null) ELSE 
(false) END and CASE WHEN ((_col9 = 0L)) THEN (false) WHEN (_col12 is not null) 
THEN (true) WHEN (_col0 is null) THEN (null) WHEN ((_col10 < _col9)) THEN 
(null) ELSE (false) END) (type: boolean)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 33 Data size: 10556 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -3493,7 +3493,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 28 Data size: 3947 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), CASE WHEN ((_col1 = 0)) THEN 
(false) WHEN (_col4 is not null) THEN (true) WHEN (_col0 is null) THEN (null) 
WHEN ((_col2 < _col1)) THEN (null) ELSE (false) END (type: boolean)
+                  expressions: _col0 (type: int), CASE WHEN ((_col1 = 0L)) 
THEN (false) WHEN (_col4 is not null) THEN (true) WHEN (_col0 is null) THEN 
(null) WHEN ((_col2 < _col1)) THEN (null) ELSE (false) END (type: boolean)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 28 Data size: 3947 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -3767,7 +3767,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col2, _col3
                 Statistics: Num rows: 26 Data size: 2470 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: CASE WHEN ((_col1 > 409437)) THEN (_col2) ELSE 
(_col3) END (type: double)
+                  expressions: CASE WHEN ((_col1 > 409437L)) THEN (_col2) ELSE 
(_col3) END (type: double)
                   outputColumnNames: _col0
                   Statistics: Num rows: 26 Data size: 2470 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
@@ -3953,7 +3953,7 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
-                  expressions: (_col0 - 1) (type: bigint)
+                  expressions: (_col0 - 1L) (type: bigint)
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Reduce Output Operator
@@ -4727,7 +4727,7 @@ STAGE PLANS:
                   outputColumnNames: _col1, _col2
                   Statistics: Num rows: 13 Data size: 1573 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (_col2 > 0) (type: boolean)
+                    predicate: (_col2 > 0L) (type: boolean)
                     Statistics: Num rows: 4 Data size: 484 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col1 (type: int)
@@ -5105,7 +5105,7 @@ STAGE PLANS:
                   outputColumnNames: _col1, _col2
                   Statistics: Num rows: 13 Data size: 1573 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (_col2 > 0) (type: boolean)
+                    predicate: (_col2 > 0L) (type: boolean)
                     Statistics: Num rows: 4 Data size: 484 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col1 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/subquery_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_views.q.out 
b/ql/src/test/results/clientpositive/spark/subquery_views.q.out
index 14be018..7d611e1 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_views.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_views.q.out
@@ -236,7 +236,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col4, _col5, _col8
                 Statistics: Num rows: 605 Data size: 6426 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: CASE WHEN ((_col4 = 0)) THEN (true) WHEN (_col4 
is null) THEN (true) WHEN (_col8 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col5 < _col4)) THEN (false) ELSE (true) END (type: boolean)
+                  predicate: CASE WHEN ((_col4 = 0L)) THEN (true) WHEN (_col4 
is null) THEN (true) WHEN (_col8 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col5 < _col4)) THEN (false) ELSE (true) END (type: boolean)
                   Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -324,7 +324,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col4, _col5, _col8
                 Statistics: Num rows: 605 Data size: 6426 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: CASE WHEN ((_col4 = 0)) THEN (true) WHEN (_col4 
is null) THEN (true) WHEN (_col8 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col5 < _col4)) THEN (false) ELSE (true) END (type: boolean)
+                  predicate: CASE WHEN ((_col4 = 0L)) THEN (true) WHEN (_col4 
is null) THEN (true) WHEN (_col8 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col5 < _col4)) THEN (false) ELSE (true) END (type: boolean)
                   Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/temp_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/temp_table.q.out 
b/ql/src/test/results/clientpositive/spark/temp_table.q.out
index 6672b14..71fa11d 100644
--- a/ql/src/test/results/clientpositive/spark/temp_table.q.out
+++ b/ql/src/test/results/clientpositive/spark/temp_table.q.out
@@ -19,7 +19,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 2.0) = 0.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 2.0D) = 0.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -86,7 +86,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 2.0) = 1.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 2.0D) = 1.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/udf_example_add.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/udf_example_add.q.out 
b/ql/src/test/results/clientpositive/spark/udf_example_add.q.out
index 587c68b..9e2a474 100644
--- a/ql/src/test/results/clientpositive/spark/udf_example_add.q.out
+++ b/ql/src/test/results/clientpositive/spark/udf_example_add.q.out
@@ -35,7 +35,7 @@ STAGE PLANS:
         TableScan
           alias: src
           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
             Limit
               Number of rows: 1

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union.q.out 
b/ql/src/test/results/clientpositive/spark/union.q.out
index fb1ad65..8feea55 100644
--- a/ql/src/test/results/clientpositive/spark/union.q.out
+++ b/ql/src/test/results/clientpositive/spark/union.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)
@@ -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/union20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union20.q.out 
b/ql/src/test/results/clientpositive/spark/union20.q.out
index bb77c42..d6934a9 100644
--- a/ql/src/test/results/clientpositive/spark/union20.q.out
+++ b/ql/src/test/results/clientpositive/spark/union20.q.out
@@ -55,7 +55,7 @@ STAGE PLANS:
                   alias: s2
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -89,7 +89,7 @@ STAGE PLANS:
                   alias: s4
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union22.q.out 
b/ql/src/test/results/clientpositive/spark/union22.q.out
index 9a8e553..5425fa2 100644
--- a/ql/src/test/results/clientpositive/spark/union22.q.out
+++ b/ql/src/test/results/clientpositive/spark/union22.q.out
@@ -89,7 +89,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((UDFToDouble(k0) > 50.0) and (UDFToDouble(k1) 
> 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(k0) > 50.0D) and (UDFToDouble(k1) 
> 20.0D)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 1862 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: k1 (type: string), k3 (type: string), k4 
(type: string)
@@ -172,7 +172,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(k0) <= 50.0) (type: boolean)
+                    predicate: (UDFToDouble(k0) <= 50.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 5622 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: k1 (type: string), k2 (type: string), k3 
(type: string), k4 (type: string)
@@ -268,7 +268,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(k1) > 20.0) (type: boolean)
+                    predicate: (UDFToDouble(k1) > 20.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 3693 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: k1 (type: string), k2 (type: string), ds 
(type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union24.q.out 
b/ql/src/test/results/clientpositive/spark/union24.q.out
index a901f49..145869f 100644
--- a/ql/src/test/results/clientpositive/spark/union24.q.out
+++ b/ql/src/test/results/clientpositive/spark/union24.q.out
@@ -87,7 +87,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), count (type: bigint)
@@ -174,7 +174,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), count (type: bigint)
@@ -261,7 +261,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), count (type: bigint)
@@ -348,7 +348,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -545,7 +545,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), count (type: bigint)
@@ -632,7 +632,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), count (type: bigint)
@@ -719,7 +719,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -792,7 +792,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), count (type: bigint)
@@ -981,7 +981,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), count (type: bigint)
@@ -1068,7 +1068,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), count (type: bigint)
@@ -1155,7 +1155,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -1228,7 +1228,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+                    predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
                     Statistics: Num rows: 103 Data size: 494 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/union27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union27.q.out 
b/ql/src/test/results/clientpositive/spark/union27.q.out
index 8d5d69a..320ac12 100644
--- a/ql/src/test/results/clientpositive/spark/union27.q.out
+++ b/ql/src/test/results/clientpositive/spark/union27.q.out
@@ -55,7 +55,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 97.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 97.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -72,7 +72,7 @@ STAGE PLANS:
                   alias: dim_pho
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 97.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 97.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)
@@ -90,7 +90,7 @@ STAGE PLANS:
                   alias: jackson_sev_add
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 97.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 97.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/union33.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union33.q.out 
b/ql/src/test/results/clientpositive/spark/union33.q.out
index 8e3e2a2..a518c6a 100644
--- a/ql/src/test/results/clientpositive/spark/union33.q.out
+++ b/ql/src/test/results/clientpositive/spark/union33.q.out
@@ -43,7 +43,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 0.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 0.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -218,7 +218,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 0.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 0.0D) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
index 9bdcaf6..0e86bb1 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
@@ -70,7 +70,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 1 (type: bigint)
+                    expressions: key (type: string), 1L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
@@ -108,7 +108,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 2 (type: bigint)
+                    expressions: key (type: string), 2L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_12.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
index cf89dab..57a9af7 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
@@ -86,7 +86,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 1 (type: bigint)
+                    expressions: key (type: string), 1L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_14.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
index cf89dab..57a9af7 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
@@ -86,7 +86,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 1 (type: bigint)
+                    expressions: key (type: string), 1L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
index 896e2d8..5d28f00 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
@@ -223,7 +223,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (UDFToDouble(key) = 7.0) (type: boolean)
+                    predicate: (UDFToDouble(key) = 7.0D) (type: boolean)
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -354,7 +354,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) + UDFToDouble(key)) >= 7.0) 
(type: boolean)
+                    predicate: ((UDFToDouble(key) + UDFToDouble(key)) >= 7.0D) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 300 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/spark/union_remove_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_2.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_2.q.out
index 5fa05a9..5bd51c5 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_2.q.out
@@ -82,7 +82,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 1 (type: bigint)
+                    expressions: key (type: string), 1L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
@@ -99,7 +99,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 2 (type: bigint)
+                    expressions: key (type: string), 2L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
index 3d311ea..e76e9db 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
@@ -87,7 +87,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 1 (type: bigint)
+                    expressions: key (type: string), 1L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
@@ -104,7 +104,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 2 (type: bigint)
+                    expressions: key (type: string), 2L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
index 3034bd1..0a67096 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
@@ -272,7 +272,7 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
-                  expressions: (_col0 - 200) (type: bigint)
+                  expressions: (_col0 - 200L) (type: bigint)
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Group By Operator
@@ -397,7 +397,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), (_col1 * 2) (type: bigint)
+                  expressions: _col0 (type: string), (_col1 * 2L) (type: 
bigint)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 250 Data size: 2656 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/union_remove_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
index 9d651ed..56720f3 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
@@ -82,7 +82,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 1 (type: bigint)
+                    expressions: key (type: string), 1L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
@@ -99,7 +99,7 @@ STAGE PLANS:
                   alias: inputtbl1
                   Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: key (type: string), 2 (type: bigint)
+                    expressions: key (type: string), 2L (type: bigint)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/spark/union_top_level.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_top_level.q.out 
b/ql/src/test/results/clientpositive/spark/union_top_level.q.out
index ce5e83f..9a0e430 100644
--- a/ql/src/test/results/clientpositive/spark/union_top_level.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_top_level.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) % 3.0) = 0.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 0.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -51,7 +51,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 1.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 1.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 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) % 3.0) = 2.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 2.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -363,7 +363,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 0.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 0.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -383,7 +383,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 1.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 1.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -403,7 +403,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 2.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 2.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -581,7 +581,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 0.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 0.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -601,7 +601,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 1.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 1.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -621,7 +621,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 2.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 2.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -786,7 +786,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 0.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 0.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -806,7 +806,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 1.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 1.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -826,7 +826,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) % 3.0) = 2.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) % 3.0D) = 2.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)

Reply via email to