http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out 
b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
index 66bf74f..c210c4c 100644
--- a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
@@ -48,7 +48,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 12 Data size: 1023 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
-                      keys: _col0 (type: int), _col1 (type: varchar(10)), 
_col2 (type: int), 0 (type: bigint)
+                      keys: _col0 (type: int), _col1 (type: varchar(10)), 
_col2 (type: int), 0L (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 18 Data size: 1628 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -68,7 +68,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 18 Data size: 1628 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
-                  expressions: CASE WHEN (((_col3 = 3) and _col0 is not null)) 
THEN (1) ELSE (null) END (type: int), CASE WHEN (((_col3 = 5) and _col1 is not 
null)) THEN (1) ELSE (null) END (type: int), CASE WHEN (((_col3 = 6) and _col2 
is not null)) THEN (1) ELSE (null) END (type: int)
+                  expressions: CASE WHEN (((_col3 = 3L) and _col0 is not 
null)) THEN (1) ELSE (null) END (type: int), CASE WHEN (((_col3 = 5L) and _col1 
is not null)) THEN (1) ELSE (null) END (type: int), CASE WHEN (((_col3 = 6L) 
and _col2 is not null)) THEN (1) ELSE (null) END (type: int)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 18 Data size: 1628 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
@@ -189,7 +189,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 12 Data size: 1023 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
-                      keys: _col0 (type: varchar(10)), _col1 (type: int), 
_col2 (type: int), 0 (type: bigint)
+                      keys: _col0 (type: varchar(10)), _col1 (type: int), 
_col2 (type: int), 0L (type: bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 30 Data size: 2654 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -209,7 +209,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 30 Data size: 2654 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
-                  expressions: CASE WHEN (((_col3 = 3) and _col0 is not null)) 
THEN (1) ELSE (null) END (type: int), CASE WHEN (((_col3 = 5) and _col1 is not 
null)) THEN (1) ELSE (null) END (type: int), CASE WHEN (((_col3 = 6) and _col2 
is not null)) THEN (1) ELSE (null) END (type: int), CASE WHEN ((_col3 = 4)) 
THEN (1) ELSE (null) END (type: int), CASE WHEN ((_col3 = 0)) THEN (1) ELSE 
(null) END (type: int)
+                  expressions: CASE WHEN (((_col3 = 3L) and _col0 is not 
null)) THEN (1) ELSE (null) END (type: int), CASE WHEN (((_col3 = 5L) and _col1 
is not null)) THEN (1) ELSE (null) END (type: int), CASE WHEN (((_col3 = 6L) 
and _col2 is not null)) THEN (1) ELSE (null) END (type: int), CASE WHEN ((_col3 
= 4L)) THEN (1) ELSE (null) END (type: int), CASE WHEN ((_col3 = 0L)) THEN (1) 
ELSE (null) END (type: int)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Statistics: Num rows: 30 Data size: 2654 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out 
b/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
index ec3c286..cce6bc3 100644
--- a/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
+++ b/ql/src/test/results/clientpositive/llap/offset_limit_ppd_optimizer.q.out
@@ -198,7 +198,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
@@ -295,7 +295,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge5.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
index 6eba365..c1815e8 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
@@ -44,10 +44,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: 352 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 352 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)
@@ -174,10 +174,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: 352 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 352 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/llap/orc_merge6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge6.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
index 1583007..a340b97 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
@@ -44,10 +44,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: 352 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 352 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)
@@ -227,10 +227,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: 352 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 352 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/llap/orc_merge_incompat1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
index 0e9b34f..1480933 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
@@ -46,7 +46,7 @@ STAGE PLANS:
                   alias: orc_merge5
                   Statistics: Num rows: 1 Data size: 352 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (userid <= 13) (type: boolean)
+                    predicate: (userid <= 13L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 352 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/llap/orc_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out 
b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
index 9f20f77..2a1fd80 100644
--- a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
@@ -323,7 +323,7 @@ STAGE PLANS:
                   alias: orc_pred
                   Statistics: Num rows: 1049 Data size: 4188 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((UDFToInteger(t) > -2) and (t < 0)) (type: 
boolean)
+                    predicate: ((UDFToInteger(t) > -2) and (t < 0Y)) (type: 
boolean)
                     Statistics: Num rows: 116 Data size: 464 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: hash(t) (type: int)
@@ -388,10 +388,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: orc_pred
-                  filterExpr: ((t < 0) and (UDFToInteger(t) > -2)) (type: 
boolean)
+                  filterExpr: ((t < 0Y) and (UDFToInteger(t) > -2)) (type: 
boolean)
                   Statistics: Num rows: 1049 Data size: 4188 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((UDFToInteger(t) > -2) and (t < 0)) (type: 
boolean)
+                    predicate: ((UDFToInteger(t) > -2) and (t < 0Y)) (type: 
boolean)
                     Statistics: Num rows: 116 Data size: 464 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: hash(t) (type: int)
@@ -485,7 +485,7 @@ STAGE PLANS:
           Filter Operator
             predicate: ((s like 'bob%') and (t = -1) and s is not null) (type: 
boolean)
             Select Operator
-              expressions: -1 (type: tinyint), s (type: string)
+              expressions: -1Y (type: tinyint), s (type: string)
               outputColumnNames: _col0, _col1
               ListSink
 
@@ -513,7 +513,7 @@ STAGE PLANS:
           Filter Operator
             predicate: ((s like 'bob%') and (t = -1) and s is not null) (type: 
boolean)
             Select Operator
-              expressions: -1 (type: tinyint), s (type: string)
+              expressions: -1Y (type: tinyint), s (type: string)
               outputColumnNames: _col0, _col1
               ListSink
 
@@ -788,7 +788,7 @@ STAGE PLANS:
                   alias: orc_pred
                   Statistics: Num rows: 1049 Data size: 118521 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((d < 12.0) and (d >= 10.0) and (not (s like 
'%car%')) and (s like '%son') and (t > 0) and UDFToInteger(si) BETWEEN 300 AND 
400) (type: boolean)
+                    predicate: ((d < 12.0D) and (d >= 10.0D) and (not (s like 
'%car%')) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 
400) (type: boolean)
                     Statistics: Num rows: 1 Data size: 113 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -864,10 +864,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: orc_pred
-                  filterExpr: ((d >= 10.0) and (d < 12.0) and (s like '%son') 
and (t > 0) and UDFToInteger(si) BETWEEN 300 AND 400 and (not (s like 
'%car%'))) (type: boolean)
+                  filterExpr: ((d >= 10.0D) and (d < 12.0D) and (s like 
'%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 400 and (not (s like 
'%car%'))) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 118521 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((d < 12.0) and (d >= 10.0) and (not (s like 
'%car%')) and (s like '%son') and (t > 0) and UDFToInteger(si) BETWEEN 300 AND 
400) (type: boolean)
+                    predicate: ((d < 12.0D) and (d >= 10.0D) and (not (s like 
'%car%')) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 
400) (type: boolean)
                     Statistics: Num rows: 1 Data size: 113 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -1012,7 +1012,7 @@ STAGE PLANS:
                   alias: orc_pred
                   Statistics: Num rows: 1049 Data size: 118521 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((d < 12.0) and (d >= 10) and (not (s like 
'%car%')) and (s like '%son') and (t <> 101) and (t > 0) and (t > 10) and si 
BETWEEN 300 AND 400) (type: boolean)
+                    predicate: ((d < 12.0D) and (d >= 10) and (not (s like 
'%car%')) and (s like '%son') and (t <> 101Y) and (t > 0Y) and (t > 10Y) and si 
BETWEEN 300 AND 400) (type: boolean)
                     Statistics: Num rows: 1 Data size: 113 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -1109,10 +1109,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: orc_pred
-                  filterExpr: ((t > 10) and (t <> 101) and (d >= 10) and (d < 
12.0) and (s like '%son') and (not (s like '%car%')) and (t > 0) and si BETWEEN 
300 AND 400) (type: boolean)
+                  filterExpr: ((t > 10Y) and (t <> 101Y) and (d >= 10) and (d 
< 12.0D) and (s like '%son') and (not (s like '%car%')) and (t > 0Y) and si 
BETWEEN 300 AND 400) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 118521 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((d < 12.0) and (d >= 10) and (not (s like 
'%car%')) and (s like '%son') and (t <> 101) and (t > 0) and (t > 10) and si 
BETWEEN 300 AND 400) (type: boolean)
+                    predicate: ((d < 12.0D) and (d >= 10) and (not (s like 
'%car%')) and (s like '%son') and (t <> 101Y) and (t > 0Y) and (t > 10Y) and si 
BETWEEN 300 AND 400) (type: boolean)
                     Statistics: Num rows: 1 Data size: 113 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out 
b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
index 6885346..3f91c5c 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
@@ -328,7 +328,7 @@ STAGE PLANS:
         TableScan
           alias: tbl_pred
           Filter Operator
-            predicate: ((UDFToInteger(t) > -2) and (t < 0)) (type: boolean)
+            predicate: ((UDFToInteger(t) > -2) and (t < 0Y)) (type: boolean)
             Select Operator
               expressions: t (type: tinyint), si (type: smallint), i (type: 
int), b (type: bigint), f (type: float), d (type: double), bo (type: boolean), 
s (type: string), ts (type: timestamp), dec (type: decimal(4,2)), bin (type: 
binary)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10
@@ -358,9 +358,9 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: tbl_pred
-          filterExpr: ((t < 0) and (UDFToInteger(t) > -2)) (type: boolean)
+          filterExpr: ((t < 0Y) and (UDFToInteger(t) > -2)) (type: boolean)
           Filter Operator
-            predicate: ((UDFToInteger(t) > -2) and (t < 0)) (type: boolean)
+            predicate: ((UDFToInteger(t) > -2) and (t < 0Y)) (type: boolean)
             Select Operator
               expressions: t (type: tinyint), si (type: smallint), i (type: 
int), b (type: bigint), f (type: float), d (type: double), bo (type: boolean), 
s (type: string), ts (type: timestamp), dec (type: decimal(4,2)), bin (type: 
binary)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10
@@ -423,7 +423,7 @@ STAGE PLANS:
           Filter Operator
             predicate: ((s like 'bob%') and (t = -1) and s is not null) (type: 
boolean)
             Select Operator
-              expressions: -1 (type: tinyint), s (type: string)
+              expressions: -1Y (type: tinyint), s (type: string)
               outputColumnNames: _col0, _col1
               ListSink
 
@@ -451,7 +451,7 @@ STAGE PLANS:
           Filter Operator
             predicate: ((s like 'bob%') and (t = -1) and s is not null) (type: 
boolean)
             Select Operator
-              expressions: -1 (type: tinyint), s (type: string)
+              expressions: -1Y (type: tinyint), s (type: string)
               outputColumnNames: _col0, _col1
               ListSink
 
@@ -726,7 +726,7 @@ STAGE PLANS:
                   alias: tbl_pred
                   Statistics: Num rows: 1049 Data size: 118521 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((d < 12.0) and (d >= 10.0) and (not (s like 
'%car%')) and (s like '%son') and (t > 0) and UDFToInteger(si) BETWEEN 300 AND 
400) (type: boolean)
+                    predicate: ((d < 12.0D) and (d >= 10.0D) and (not (s like 
'%car%')) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 
400) (type: boolean)
                     Statistics: Num rows: 1 Data size: 113 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -802,10 +802,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: tbl_pred
-                  filterExpr: ((d >= 10.0) and (d < 12.0) and (s like '%son') 
and (t > 0) and UDFToInteger(si) BETWEEN 300 AND 400 and (not (s like 
'%car%'))) (type: boolean)
+                  filterExpr: ((d >= 10.0D) and (d < 12.0D) and (s like 
'%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 400 and (not (s like 
'%car%'))) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 118521 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((d < 12.0) and (d >= 10.0) and (not (s like 
'%car%')) and (s like '%son') and (t > 0) and UDFToInteger(si) BETWEEN 300 AND 
400) (type: boolean)
+                    predicate: ((d < 12.0D) and (d >= 10.0D) and (not (s like 
'%car%')) and (s like '%son') and (t > 0Y) and UDFToInteger(si) BETWEEN 300 AND 
400) (type: boolean)
                     Statistics: Num rows: 1 Data size: 113 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -995,7 +995,7 @@ STAGE PLANS:
                   alias: tbl_pred
                   Statistics: Num rows: 1049 Data size: 118521 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((d < 12.0) and (d >= 10) and (not (s like 
'%car%')) and (s like '%son') and (t <> 101) and (t > 0) and (t > 10) and si 
BETWEEN 300 AND 400) (type: boolean)
+                    predicate: ((d < 12.0D) and (d >= 10) and (not (s like 
'%car%')) and (s like '%son') and (t <> 101Y) and (t > 0Y) and (t > 10Y) and si 
BETWEEN 300 AND 400) (type: boolean)
                     Statistics: Num rows: 1 Data size: 113 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -1092,10 +1092,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: tbl_pred
-                  filterExpr: ((t > 10) and (t <> 101) and (d >= 10) and (d < 
12.0) and (s like '%son') and (not (s like '%car%')) and (t > 0) and si BETWEEN 
300 AND 400) (type: boolean)
+                  filterExpr: ((t > 10Y) and (t <> 101Y) and (d >= 10) and (d 
< 12.0D) and (s like '%son') and (not (s like '%car%')) and (t > 0Y) and si 
BETWEEN 300 AND 400) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 118521 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((d < 12.0) and (d >= 10) and (not (s like 
'%car%')) and (s like '%son') and (t <> 101) and (t > 0) and (t > 10) and si 
BETWEEN 300 AND 400) (type: boolean)
+                    predicate: ((d < 12.0D) and (d >= 10) and (not (s like 
'%car%')) and (s like '%son') and (t <> 101Y) and (t > 0Y) and (t > 10Y) and si 
BETWEEN 300 AND 400) (type: boolean)
                     Statistics: Num rows: 1 Data size: 113 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -1204,10 +1204,10 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: tbl_pred
-                  filterExpr: ((f < 123.2) and (f > 1.92) and (f >= 9.99) and 
f BETWEEN 1.92 AND 123.2 and (i < 67627) and (i > 60627) and (i >= 60626) and i 
BETWEEN 60626 AND 67627 and (b < 4294967861) and (b > 4294967261) and (b >= 
4294967260) and b BETWEEN 4294967261 AND 4294967861) (type: boolean)
+                  filterExpr: ((f < 123.2) and (f > 1.92) and (f >= 9.99) and 
f BETWEEN 1.92 AND 123.2 and (i < 67627) and (i > 60627) and (i >= 60626) and i 
BETWEEN 60626 AND 67627 and (b < 4294967861L) and (b > 4294967261L) and (b >= 
4294967260L) and b BETWEEN 4294967261L AND 4294967861L) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 16784 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((b < 4294967861) and (b > 4294967261) and (b 
>= 4294967260) and (f < 123.2) and (f > 1.92) and (f >= 9.99) and (i < 67627) 
and (i > 60627) and (i >= 60626) and b BETWEEN 4294967261 AND 4294967861 and f 
BETWEEN 1.92 AND 123.2 and i BETWEEN 60626 AND 67627) (type: boolean)
+                    predicate: ((b < 4294967861L) and (b > 4294967261L) and (b 
>= 4294967260L) and (f < 123.2) and (f > 1.92) and (f >= 9.99) and (i < 67627) 
and (i > 60627) and (i >= 60626) and b BETWEEN 4294967261L AND 4294967861L and 
f BETWEEN 1.92 AND 123.2 and i BETWEEN 60626 AND 67627) (type: boolean)
                     Statistics: Num rows: 38 Data size: 608 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: f (type: float), i (type: int), b (type: 
bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out 
b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
index b4ac5a6..fb421e2 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
@@ -143,13 +143,13 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: key (type: string), (UDFToDouble(value) + 
1.0) (type: double)
+                    expressions: key (type: string), (UDFToDouble(value) + 
1.0D) (type: double)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), (_col1 + 1.0) 
(type: double)
+                      key expressions: _col0 (type: string), (_col1 + 1.0D) 
(type: double)
                       sort order: ++
-                      Map-reduce partition columns: _col0 (type: string), 
(_col1 + 1.0) (type: double)
+                      Map-reduce partition columns: _col0 (type: string), 
(_col1 + 1.0D) (type: double)
                       Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
                       value expressions: _col1 (type: double)
             Execution mode: llap
@@ -158,7 +158,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), (VALUE._col0 + 
1.0) (type: double)
+                expressions: KEY.reducesinkkey0 (type: string), (VALUE._col0 + 
1.0D) (type: double)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Group By Operator
@@ -2697,13 +2697,13 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: key (type: string), (UDFToDouble(value) + 
1.0) (type: double)
+                    expressions: key (type: string), (UDFToDouble(value) + 
1.0D) (type: double)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
-                      key expressions: _col0 (type: string), (_col1 + 1.0) 
(type: double)
+                      key expressions: _col0 (type: string), (_col1 + 1.0D) 
(type: double)
                       sort order: ++
-                      Map-reduce partition columns: _col0 (type: string), 
(_col1 + 1.0) (type: double)
+                      Map-reduce partition columns: _col0 (type: string), 
(_col1 + 1.0D) (type: double)
                       Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
                       value expressions: _col1 (type: double)
             Execution mode: llap
@@ -2712,7 +2712,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: string), (VALUE._col0 + 
1.0) (type: double)
+                expressions: KEY.reducesinkkey0 (type: string), (VALUE._col0 + 
1.0D) (type: double)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 500 Data size: 47500 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out 
b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
index 2ff590e..88ea24c 100644
--- a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
+++ b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
@@ -184,7 +184,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (_col1 > 1) (type: boolean)
+                  predicate: (_col1 > 1L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: cardinality_violation(_col0) (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/subquery_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_in.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_in.q.out
index b5f9641..277036a 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_in.q.out
@@ -4866,7 +4866,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col12, _col13, _col16
                 Statistics: Num rows: 8 Data size: 5052 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col12 = 0)) THEN (false) WHEN 
(_col12 is null) THEN (false) WHEN (_col16 is not null) THEN (true) WHEN (_col5 
is null) THEN (null) WHEN ((_col13 < _col12)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col12 = 0L)) THEN (false) WHEN 
(_col12 is null) THEN (false) WHEN (_col16 is not null) THEN (true) WHEN (_col5 
is null) THEN (null) WHEN ((_col13 < _col12)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 4 Data size: 2536 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -5123,7 +5123,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col12, _col13, _col16
                 Statistics: Num rows: 8 Data size: 5052 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col12 = 0)) THEN (false) WHEN 
(_col12 is null) THEN (false) WHEN (_col16 is not null) THEN (true) WHEN (_col5 
is null) THEN (null) WHEN ((_col13 < _col12)) THEN (true) ELSE (false) END) 
(type: boolean)
+                  predicate: (not CASE WHEN ((_col12 = 0L)) THEN (false) WHEN 
(_col12 is null) THEN (false) WHEN (_col16 is not null) THEN (true) WHEN (_col5 
is null) THEN (null) WHEN ((_col13 < _col12)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 4 Data size: 2536 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out
index 1c6c120..390caf0 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_in_having.q.out
@@ -1846,7 +1846,7 @@ STAGE PLANS:
                         1 Reducer 8
                       Statistics: Num rows: 1 Data size: 668 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 
(_col2 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 
(_col2 is null) THEN (null) WHEN ((_col5 < _col4)) THEN (true) ELSE (false) 
END) (type: boolean)
                         Statistics: Num rows: 1 Data size: 668 Basic stats: 
COMPLETE Column stats: NONE
                         Select Operator
                           expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/subquery_multi.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_multi.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_multi.q.out
index de543c9..438e444 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_multi.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_multi.q.out
@@ -380,7 +380,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col13
                 Statistics: Num rows: 1 Data size: 1576 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col10 = 0) or (_col13 is null and _col3 is not 
null and (_col11 >= _col10))) (type: boolean)
+                  predicate: ((_col10 = 0L) or (_col13 is null and _col3 is 
not null and (_col11 >= _col10))) (type: boolean)
                   Statistics: Num rows: 1 Data size: 1576 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)
@@ -588,7 +588,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col13
                 Statistics: Num rows: 1 Data size: 1576 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col10 = 0) or (_col13 is null and _col3 is not 
null and (_col11 >= _col10))) (type: boolean)
+                  predicate: ((_col10 = 0L) or (_col13 is null and _col3 is 
not null and (_col11 >= _col10))) (type: boolean)
                   Statistics: Num rows: 1 Data size: 1576 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)
@@ -825,7 +825,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col13
                 Statistics: Num rows: 1 Data size: 1576 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col10 = 0) or (_col13 is null and _col3 is not 
null and (_col11 >= _col10))) (type: boolean)
+                  predicate: ((_col10 = 0L) or (_col13 is null and _col3 is 
not null and (_col11 >= _col10))) (type: boolean)
                   Statistics: Num rows: 1 Data size: 1576 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)
@@ -1019,7 +1019,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 1 Data size: 1345 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col12 is null and _col1 is not null and 
(_col10 >= _col9)) or (_col9 = 0)) (type: boolean)
+                  predicate: ((_col12 is null and _col1 is not null and 
(_col10 >= _col9)) or (_col9 = 0L)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 1345 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)
@@ -1809,7 +1809,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col14
                 Statistics: Num rows: 16 Data size: 3891 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 (_col3 
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 (_col3 
is null) THEN (null) WHEN ((_col11 < _col10)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 8 Data size: 1945 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)
@@ -2266,7 +2266,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col14
                 Statistics: Num rows: 16 Data size: 5484 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 (_col3 
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 (_col3 
is null) THEN (null) WHEN ((_col11 < _col10)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 8 Data size: 2742 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)
@@ -2533,7 +2533,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col14
                 Statistics: Num rows: 16 Data size: 3891 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 (_col3 
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 (_col3 
is null) THEN (null) WHEN ((_col11 < _col10)) THEN (true) ELSE (false) END) 
(type: boolean)
                   Statistics: Num rows: 8 Data size: 1945 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)
@@ -3006,7 +3006,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col2, _col4, _col5, _col7
                 Statistics: Num rows: 2 Data size: 64 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: ((_col4 = 0) or (_col7 is null and _col2 is not 
null and (_col5 >= _col4))) (type: boolean)
+                  predicate: ((_col4 = 0L) or (_col7 is null and _col2 is not 
null and (_col5 >= _col4))) (type: boolean)
                   Statistics: Num rows: 2 Data size: 64 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), 1 (type: int)
@@ -3864,7 +3864,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 26 Data size: 16518 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: ((_col0 = 3) or CASE WHEN ((_col9 = 0)) THEN 
(true) WHEN (_col12 is not null) THEN (false) WHEN (_col5 is null) THEN (null) 
WHEN ((_col10 < _col9)) THEN (null) ELSE (true) END) (type: boolean)
+                  predicate: ((_col0 = 3) or CASE WHEN ((_col9 = 0L)) THEN 
(true) WHEN (_col12 is not null) THEN (false) WHEN (_col5 is null) THEN (null) 
WHEN ((_col10 < _col9)) THEN (null) ELSE (true) END) (type: boolean)
                   Statistics: Num rows: 14 Data size: 8898 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -4076,7 +4076,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col2, _col4, _col5
                 Statistics: Num rows: 500 Data size: 52040 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: ((_col4 is not null and (_col2 <> 0)) or _col1 is 
not null or _col5 is not null) (type: boolean)
+                  predicate: ((_col4 is not null and (_col2 <> 0L)) or _col1 
is not null or _col5 is not null) (type: boolean)
                   Statistics: Num rows: 500 Data size: 52040 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     Statistics: Num rows: 500 Data size: 52040 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
index 247d8f3..851a783 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
@@ -103,7 +103,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 500 Data size: 97540 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 500 Data size: 97540 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
@@ -388,7 +388,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col8
                 Statistics: Num rows: 26 Data size: 5994 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 13 Data size: 3007 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col1 (type: string), _col0 (type: string), 
_col2 (type: int)
@@ -666,7 +666,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 26 Data size: 3674 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 26 Data size: 3674 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: int)
@@ -969,7 +969,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col10
                 Statistics: Num rows: 8 Data size: 1924 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 4 Data size: 964 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col1 (type: string), _col0 (type: string), 
_col2 (type: int)
@@ -1517,7 +1517,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 166 Data size: 17366 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 166 Data size: 17366 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -1690,7 +1690,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col14
                 Statistics: Num rows: 26 Data size: 16394 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 13 Data size: 8207 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -1870,7 +1870,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 26 Data size: 16542 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 26 Data size: 16542 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -2077,7 +2077,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 26 Data size: 16538 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 26 Data size: 16538 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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: 26 Data size: 356 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 13 Data size: 180 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     Statistics: Num rows: 13 Data size: 180 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -2506,7 +2506,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 26 Data size: 16538 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 26 Data size: 16538 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -2699,7 +2699,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col14
                 Statistics: Num rows: 26 Data size: 16250 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 13 Data size: 8127 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -2930,7 +2930,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col11, _col12, _col16
                 Statistics: Num rows: 26 Data size: 16374 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 13 Data size: 8187 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -3043,7 +3043,7 @@ STAGE PLANS:
                     predicate: p_brand is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 5096 Basic stats: 
COMPLETE Column stats: COMPLETE
                     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: 5096 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Group By Operator
@@ -3059,7 +3059,7 @@ STAGE PLANS:
                           Statistics: Num rows: 13 Data size: 1404 Basic 
stats: COMPLETE Column stats: COMPLETE
                           value expressions: _col1 (type: bigint), _col2 
(type: bigint)
                     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: 2600 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Group By Operator
@@ -3103,7 +3103,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col4, _col5, _col8
                 Statistics: Num rows: 26 Data size: 6262 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 13 Data size: 3133 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -3272,7 +3272,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col4, _col5, _col8
                 Statistics: Num rows: 26 Data size: 6046 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 13 Data size: 3025 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -3522,7 +3522,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 500 Data size: 98620 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 500 Data size: 98620 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -3811,7 +3811,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col7
                 Statistics: Num rows: 500 Data size: 97100 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 250 Data size: 48560 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -4070,7 +4070,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 26 Data size: 16542 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 26 Data size: 16542 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -4278,7 +4278,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 26 Data size: 16542 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 26 Data size: 16542 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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)
@@ -4557,7 +4557,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 500 Data size: 97164 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 500 Data size: 97164 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
@@ -5235,7 +5235,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col3, _col4, _col7
                 Statistics: Num rows: 26 Data size: 492 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 13 Data size: 248 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
                     Statistics: Num rows: 13 Data size: 248 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -5458,7 +5458,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 4 Data size: 88 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 4 Data size: 88 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -5627,7 +5627,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col3, _col4, _col7
                 Statistics: Num rows: 4 Data size: 56 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 28 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -5908,7 +5908,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col7
                 Statistics: Num rows: 3 Data size: 80 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 56 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -6130,7 +6130,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col6
                 Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 1 Data size: 28 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)
@@ -6354,7 +6354,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col4, _col6
                 Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 1 Data size: 28 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -6541,7 +6541,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col3, _col4, _col7
                 Statistics: Num rows: 3 Data size: 52 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 48 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -6700,7 +6700,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col5
                 Statistics: Num rows: 3 Data size: 84 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 3 Data size: 84 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -6848,7 +6848,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 3 Data size: 68 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 3 Data size: 68 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int)
@@ -7033,7 +7033,7 @@ STAGE PLANS:
                 residual filter predicates: {(_col1 > _col6)}
                 Statistics: Num rows: 500 Data size: 104497 Basic stats: 
COMPLETE Column stats: COMPLETE
                 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: 250 Data size: 52304 Basic stats: 
COMPLETE Column stats: COMPLETE
                   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/llap/subquery_null_agg.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_null_agg.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_null_agg.q.out
index cff9568..85a64f1 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_null_agg.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_null_agg.q.out
@@ -125,7 +125,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/llap/subquery_scalar.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out
index 6a2c635..0f7681f 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_scalar.q.out
@@ -2838,7 +2838,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col1 = 2) (type: boolean)
+                  predicate: (_col1 = 2L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: bigint)
@@ -3002,7 +3002,7 @@ STAGE PLANS:
                   outputColumnNames: _col1
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
-                    predicate: (_col1 = 2) (type: boolean)
+                    predicate: (_col1 = 2L) (type: boolean)
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
                     Select Operator
                       Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -3374,7 +3374,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col10, _col11, _col13
                 Statistics: Num rows: 14 Data size: 1787 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col10 = 0) or (_col13 is null and _col3 is not 
null and (_col11 >= _col10))) (type: boolean)
+                  predicate: ((_col10 = 0L) or (_col13 is null and _col3 is 
not null and (_col11 >= _col10))) (type: boolean)
                   Statistics: Num rows: 9 Data size: 1148 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)
@@ -3590,7 +3590,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col12
                 Statistics: Num rows: 14 Data size: 1787 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (not CASE WHEN ((_col9 = 0)) THEN (false) WHEN 
(_col12 is not null) THEN (true) WHEN (_col3 is null) THEN (null) WHEN ((_col10 
< _col9)) THEN (true) ELSE (false) END) (type: boolean)
+                  predicate: (not CASE WHEN ((_col9 = 0L)) THEN (false) WHEN 
(_col12 is not null) THEN (true) WHEN (_col3 is null) THEN (null) WHEN ((_col10 
< _col9)) THEN (true) ELSE (false) END) (type: boolean)
                   Statistics: Num rows: 7 Data size: 893 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)
@@ -6349,7 +6349,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (0.0 = _col1) (type: boolean)
+                  predicate: (0.0D = _col1) (type: boolean)
                   Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/subquery_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_select.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_select.q.out
index a399d3e..abbfffd 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_select.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_select.q.out
@@ -92,7 +92,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 26 Data size: 528 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 26 Data size: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
@@ -282,7 +282,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col3, _col4, _col7
                 Statistics: Num rows: 26 Data size: 404 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 26 Data size: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
@@ -478,7 +478,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 26 Data size: 528 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 26 Data size: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
@@ -714,7 +714,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col5, _col6, _col9
                 Statistics: Num rows: 8 Data size: 132 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 8 Data size: 64 Basic stats: COMPLETE 
Column stats: COMPLETE
                   File Output Operator
@@ -2237,7 +2237,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 26 Data size: 528 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 26 Data size: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
@@ -3246,7 +3246,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col2, _col4, _col5, _col8, _col9, 
_col10, _col12
                 Statistics: Num rows: 26 Data size: 3974 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 26 Data size: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
@@ -3587,7 +3587,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col4
                 Statistics: Num rows: 26 Data size: 528 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 26 Data size: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
@@ -3902,7 +3902,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col2, _col3
                 Statistics: Num rows: 26 Data size: 520 Basic stats: COMPLETE 
Column stats: COMPLETE
                 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: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
@@ -4098,7 +4098,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
@@ -4880,7 +4880,7 @@ STAGE PLANS:
                   outputColumnNames: _col1, _col2
                   Statistics: Num rows: 13 Data size: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (_col2 > 0) (type: boolean)
+                    predicate: (_col2 > 0L) (type: boolean)
                     Statistics: Num rows: 4 Data size: 64 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: _col1 (type: int)
@@ -5277,7 +5277,7 @@ STAGE PLANS:
                   outputColumnNames: _col1, _col2
                   Statistics: Num rows: 13 Data size: 208 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (_col2 > 0) (type: boolean)
+                    predicate: (_col2 > 0L) (type: boolean)
                     Statistics: Num rows: 4 Data size: 64 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: _col1 (type: int)

Reply via email to