http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out 
b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
index 45b2b4f..98743eb 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
@@ -477,7 +477,7 @@ Stage-0
                     Select Operator [SEL_23] (rows=1 width=20)
                       Output:["_col1","_col4"]
                       Merge Join Operator [MERGEJOIN_41] (rows=1 width=20)
-                        
Conds:RS_19._col0=RS_20._col0(Inner),RS_20._col0=RS_21._col0(Inner),Output:["_col1","_col3","_col4","_col6"],residual
 filter predicates:{((_col1 >= 1) or (_col4 >= 1))} {((UDFToLong(_col1) + 
_col4) >= 0)} {((_col3 + _col6) >= 0)}
+                        
Conds:RS_19._col0=RS_20._col0(Inner),RS_20._col0=RS_21._col0(Inner),Output:["_col1","_col3","_col4","_col6"],residual
 filter predicates:{((_col1 >= 1) or (_col4 >= 1L))} {((UDFToLong(_col1) + 
_col4) >= 0)} {((_col3 + _col6) >= 0)}
                       <-Map 1 [SIMPLE_EDGE] llap
                         SHUFFLE [RS_19]
                           PartitionCols:_col0
@@ -624,7 +624,7 @@ Stage-0
                   Select Operator [SEL_23] (rows=1 width=20)
                     Output:["_col1","_col4"]
                     Merge Join Operator [MERGEJOIN_40] (rows=1 width=20)
-                      
Conds:RS_19._col0=RS_20._col0(Inner),RS_20._col0=RS_21._col0(Inner),Output:["_col1","_col3","_col4","_col6"],residual
 filter predicates:{((_col1 >= 1) or (_col4 >= 1))} {((UDFToLong(_col1) + 
_col4) >= 0)} {((_col3 + _col6) >= 0)}
+                      
Conds:RS_19._col0=RS_20._col0(Inner),RS_20._col0=RS_21._col0(Inner),Output:["_col1","_col3","_col4","_col6"],residual
 filter predicates:{((_col1 >= 1) or (_col4 >= 1L))} {((UDFToLong(_col1) + 
_col4) >= 0)} {((_col3 + _col6) >= 0)}
                     <-Map 1 [SIMPLE_EDGE] llap
                       SHUFFLE [RS_19]
                         PartitionCols:_col0
@@ -929,7 +929,7 @@ Stage-0
             Select Operator [SEL_2] (rows=6 width=85)
               Output:["_col0"]
               Filter Operator [FIL_13] (rows=6 width=85)
-                predicate:(UDFToDouble(key) >= 1.0)
+                predicate:(UDFToDouble(key) >= 1.0D)
                 TableScan [TS_0] (rows=20 width=80)
                   
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
         <-Map 3 [SIMPLE_EDGE] llap
@@ -938,7 +938,7 @@ Stage-0
             Select Operator [SEL_5] (rows=6 width=85)
               Output:["_col0"]
               Filter Operator [FIL_14] (rows=6 width=85)
-                predicate:(UDFToDouble(key) >= 1.0)
+                predicate:(UDFToDouble(key) >= 1.0D)
                 TableScan [TS_3] (rows=20 width=80)
                   
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
 
@@ -1565,7 +1565,7 @@ Stage-0
                           Select Operator [SEL_19] (rows=6 width=85)
                             Output:["_col0"]
                             Filter Operator [FIL_44] (rows=6 width=85)
-                              predicate:(UDFToDouble(key) > 0.0)
+                              predicate:(UDFToDouble(key) > 0.0D)
                               TableScan [TS_17] (rows=20 width=80)
                                 
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
                     <-Reducer 2 [SIMPLE_EDGE] llap
@@ -1574,7 +1574,7 @@ Stage-0
                         Select Operator [SEL_8] (rows=1 width=93)
                           Output:["_col0","_col1"]
                           Filter Operator [FIL_7] (rows=1 width=101)
-                            predicate:(((UDFToDouble(_col2) + 
UDFToDouble(_col3)) >= 0.0) and ((UDFToDouble(_col2) >= 1.0) or (_col3 >= 1)))
+                            predicate:(((UDFToDouble(_col2) + 
UDFToDouble(_col3)) >= 0.0D) and ((UDFToDouble(_col2) >= 1.0D) or (_col3 >= 
1L)))
                             Select Operator [SEL_6] (rows=1 width=101)
                               Output:["_col2","_col3"]
                               Group By Operator [GBY_5] (rows=1 width=101)
@@ -1585,7 +1585,7 @@ Stage-0
                                   Group By Operator [GBY_3] (rows=1 width=101)
                                     
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                     Filter Operator [FIL_42] (rows=1 width=93)
-                                      predicate:((((c_int + 1) + 1) >= 0) and 
(((c_int + 1) > 0) or (UDFToDouble(key) >= 0.0)) and ((UDFToFloat(c_int) + 
c_float) >= 0) and ((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0)) and 
((c_int >= 1) or (c_float >= 1)) and (UDFToDouble(key) > 0.0) and (c_float > 0))
+                                      predicate:((((c_int + 1) + 1) >= 0) and 
(((c_int + 1) > 0) or (UDFToDouble(key) >= 0.0D)) and ((UDFToFloat(c_int) + 
c_float) >= 0) and ((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0)) and 
((c_int >= 1) or (c_float >= 1)) and (UDFToDouble(key) > 0.0D) and (c_float > 
0))
                                       TableScan [TS_0] (rows=20 width=88)
                                         
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                     <-Reducer 7 [SIMPLE_EDGE] llap
@@ -1603,7 +1603,7 @@ Stage-0
                                 Group By Operator [GBY_12] (rows=1 width=93)
                                   Output:["_col0","_col1","_col2"],keys:key, 
c_int, c_float
                                   Filter Operator [FIL_43] (rows=1 width=93)
-                                    predicate:(((UDFToFloat(c_int) + c_float) 
>= 0) and ((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0)) and ((c_int >= 
1) or (c_float >= 1)) and (UDFToDouble(key) > 0.0) and (c_float > 0))
+                                    predicate:(((UDFToFloat(c_int) + c_float) 
>= 0) and ((c_int + 1) >= 0) and ((c_int > 0) or (c_float >= 0)) and ((c_int >= 
1) or (c_float >= 1)) and (UDFToDouble(key) > 0.0D) and (c_float > 0))
                                     TableScan [TS_9] (rows=20 width=88)
                                       
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
@@ -2218,7 +2218,7 @@ Stage-0
             Select Operator [SEL_23] (rows=500 width=178)
               Output:["_col0","_col1"]
               Filter Operator [FIL_22] (rows=500 width=195)
-                predicate:((_col2 = 0) or (_col5 is null and _col0 is not null 
and (_col3 >= _col2)))
+                predicate:((_col2 = 0L) or (_col5 is null and _col0 is not 
null and (_col3 >= _col2)))
                 Merge Join Operator [MERGEJOIN_31] (rows=500 width=195)
                   Conds:RS_19._col0=RS_20._col0(Left 
Outer),Output:["_col0","_col1","_col2","_col3","_col5"]
                 <-Reducer 2 [SIMPLE_EDGE] llap
@@ -2291,7 +2291,7 @@ Stage-0
         Select Operator [SEL_25] (rows=13 width=223)
           Output:["_col0","_col1","_col2"]
           Filter Operator [FIL_24] (rows=13 width=231)
-            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)
+            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)
             Merge Join Operator [MERGEJOIN_32] (rows=26 width=230)
               Conds:RS_21._col0, _col1=RS_22._col0, _col1(Left 
Outer),Output:["_col0","_col1","_col2","_col4","_col5","_col8"]
             <-Reducer 2 [SIMPLE_EDGE] llap
@@ -2378,7 +2378,7 @@ Stage-0
             Select Operator [SEL_28] (rows=26 width=125)
               Output:["_col0","_col1"]
               Filter Operator [FIL_27] (rows=26 width=141)
-                predicate:((_col2 = 0) or (_col5 is null and _col1 is not null 
and (_col3 >= _col2)))
+                predicate:((_col2 = 0L) or (_col5 is null and _col1 is not 
null and (_col3 >= _col2)))
                 Merge Join Operator [MERGEJOIN_37] (rows=26 width=141)
                   Conds:RS_24.UDFToDouble(_col1)=RS_25._col0(Left 
Outer),Output:["_col0","_col1","_col2","_col3","_col5"]
                 <-Reducer 6 [SIMPLE_EDGE] llap
@@ -2457,7 +2457,7 @@ Stage-0
             Select Operator [SEL_34] (rows=3 width=106)
               Output:["_col0","_col1"]
               Filter Operator [FIL_33] (rows=3 width=119)
-                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)
+                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)
                 Merge Join Operator [MERGEJOIN_44] (rows=5 width=114)
                   Conds:RS_30._col0, _col1=RS_31._col0, _col1(Left 
Outer),Output:["_col0","_col1","_col3","_col4","_col7"]
                 <-Reducer 3 [SIMPLE_EDGE] llap
@@ -2492,7 +2492,7 @@ Stage-0
                               Select Operator [SEL_12] (rows=1 width=114)
                                 Output:["_col0","_col1"]
                                 Filter Operator [FIL_40] (rows=1 width=114)
-                                  predicate:(((_col2 - _col1) > 600.0) and 
_col1 is not null)
+                                  predicate:(((_col2 - _col1) > 600.0D) and 
_col1 is not null)
                                   Group By Operator [GBY_10] (rows=5 width=114)
                                     
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)"],keys:KEY._col0
                                   <-Map 1 [SIMPLE_EDGE] llap
@@ -2511,7 +2511,7 @@ Stage-0
                         Select Operator [SEL_24] (rows=1 width=110)
                           Output:["_col0","_col1"]
                           Filter Operator [FIL_41] (rows=1 width=114)
-                            predicate:(((_col2 - _col1) > 600.0) and _col1 is 
not null)
+                            predicate:(((_col2 - _col1) > 600.0D) and _col1 is 
not null)
                             Group By Operator [GBY_22] (rows=5 width=114)
                               
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)"],keys:KEY._col0
                             <-Map 1 [SIMPLE_EDGE] llap
@@ -5518,7 +5518,7 @@ Stage-0
                 Select Operator [SEL_9] (rows=550 width=87)
                   Output:["_col0","_col1","_col2"]
                   Map Join Operator [MAPJOIN_21] (rows=550 width=87)
-                    Conds:RS_6.UDFToDouble(_col0)=SEL_5.(UDFToDouble(_col0) + 
1.0)(Inner),Output:["_col0","_col1","_col2"]
+                    Conds:RS_6.UDFToDouble(_col0)=SEL_5.(UDFToDouble(_col0) + 
1.0D)(Inner),Output:["_col0","_col1","_col2"]
                   <-Map 1 [BROADCAST_EDGE] llap
                     BROADCAST [RS_6]
                       PartitionCols:UDFToDouble(_col0)
@@ -5757,10 +5757,10 @@ Stage-0
                 Select Operator [SEL_7] (rows=1 width=404)
                   Output:["_col0","_col1","_col2"]
                   Map Join Operator [MAPJOIN_17] (rows=1 width=404)
-                    Conds:SEL_1.UDFToDouble(_col0)=RS_5.(UDFToDouble(_col0) + 
1.0)(Left Outer),Output:["_col0","_col1","_col2"]
+                    Conds:SEL_1.UDFToDouble(_col0)=RS_5.(UDFToDouble(_col0) + 
1.0D)(Left Outer),Output:["_col0","_col1","_col2"]
                   <-Map 4 [BROADCAST_EDGE] llap
                     BROADCAST [RS_5]
-                      PartitionCols:(UDFToDouble(_col0) + 1.0)
+                      PartitionCols:(UDFToDouble(_col0) + 1.0D)
                       Select Operator [SEL_3] (rows=1 width=184)
                         Output:["_col0"]
                         TableScan [TS_2] (rows=1 width=184)
@@ -5799,7 +5799,7 @@ Stage-0
                 Select Operator [SEL_7] (rows=1 width=404)
                   Output:["_col0","_col1","_col2"]
                   Map Join Operator [MAPJOIN_17] (rows=1 width=404)
-                    Conds:RS_4.UDFToDouble(_col0)=SEL_3.(UDFToDouble(_col0) + 
1.0)(Right Outer),Output:["_col0","_col1","_col2"]
+                    Conds:RS_4.UDFToDouble(_col0)=SEL_3.(UDFToDouble(_col0) + 
1.0D)(Right Outer),Output:["_col0","_col1","_col2"]
                   <-Map 1 [BROADCAST_EDGE] llap
                     BROADCAST [RS_4]
                       PartitionCols:UDFToDouble(_col0)
@@ -5841,7 +5841,7 @@ Stage-0
                 Select Operator [SEL_7] (rows=1 width=404)
                   Output:["_col0","_col1","_col2"]
                   Merge Join Operator [MERGEJOIN_15] (rows=1 width=404)
-                    Conds:RS_4.UDFToDouble(_col0)=RS_5.(UDFToDouble(_col0) + 
1.0)(Outer),Output:["_col0","_col1","_col2"]
+                    Conds:RS_4.UDFToDouble(_col0)=RS_5.(UDFToDouble(_col0) + 
1.0D)(Outer),Output:["_col0","_col1","_col2"]
                   <-Map 1 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_4]
                       PartitionCols:UDFToDouble(_col0)
@@ -5851,7 +5851,7 @@ Stage-0
                           
default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
                   <-Map 5 [SIMPLE_EDGE] llap
                     SHUFFLE [RS_5]
-                      PartitionCols:(UDFToDouble(_col0) + 1.0)
+                      PartitionCols:(UDFToDouble(_col0) + 1.0D)
                       Select Operator [SEL_3] (rows=1 width=184)
                         Output:["_col0"]
                         TableScan [TS_2] (rows=1 width=184)
@@ -5886,7 +5886,7 @@ Stage-0
                 Select Operator [SEL_7] (rows=1 width=202)
                   Output:["_col0","_col1"]
                   Map Join Operator [MAPJOIN_17] (rows=1 width=202)
-                    Conds:SEL_1.(UDFToDouble(_col0) + 
1.0)=RS_5.UDFToDouble(_col0)(Left Outer),Output:["_col0","_col2"]
+                    Conds:SEL_1.(UDFToDouble(_col0) + 
1.0D)=RS_5.UDFToDouble(_col0)(Left Outer),Output:["_col0","_col2"]
                   <-Map 4 [BROADCAST_EDGE] llap
                     BROADCAST [RS_5]
                       PartitionCols:UDFToDouble(_col0)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/groupby_rollup_empty.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/groupby_rollup_empty.q.out 
b/ql/src/test/results/clientpositive/llap/groupby_rollup_empty.q.out
index 24be36e..364c15a 100644
--- a/ql/src/test/results/clientpositive/llap/groupby_rollup_empty.q.out
+++ b/ql/src/test/results/clientpositive/llap/groupby_rollup_empty.q.out
@@ -175,7 +175,7 @@ STAGE PLANS:
                       Statistics: Num rows: 1 Data size: 12 Basic stats: 
COMPLETE Column stats: NONE
                       Group By Operator
                         aggregations: sum(_col2)
-                        keys: _col0 (type: int), _col1 (type: int), 0 (type: 
bigint)
+                        keys: _col0 (type: int), _col1 (type: int), 0L (type: 
bigint)
                         mode: hash
                         outputColumnNames: _col0, _col1, _col2, _col3
                         Statistics: Num rows: 3 Data size: 36 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/having.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/having.q.out 
b/ql/src/test/results/clientpositive/llap/having.q.out
index 75de96a..7efb721 100644
--- a/ql/src/test/results/clientpositive/llap/having.q.out
+++ b/ql/src/test/results/clientpositive/llap/having.q.out
@@ -51,7 +51,7 @@ STAGE PLANS:
                   outputColumnNames: _col1
                   Statistics: Num rows: 250 Data size: 2000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (_col1 > 3) (type: boolean)
+                    predicate: (_col1 > 3L) (type: boolean)
                     Statistics: Num rows: 83 Data size: 664 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: _col1 (type: bigint)
@@ -111,7 +111,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (UDFToDouble(key) <> 302.0) (type: boolean)
+                    predicate: (UDFToDouble(key) <> 302.0D) (type: boolean)
                     Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
                       aggregations: max(value)
@@ -764,7 +764,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (UDFToDouble(key) > 300.0) (type: boolean)
+                    predicate: (UDFToDouble(key) > 300.0D) (type: boolean)
                     Statistics: Num rows: 166 Data size: 29548 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
                       aggregations: max(value)
@@ -1264,7 +1264,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 23750 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col1 >= 4) (type: boolean)
+                  predicate: (_col1 >= 4L) (type: boolean)
                   Statistics: Num rows: 83 Data size: 7885 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/intersect_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_all.q.out 
b/ql/src/test/results/clientpositive/llap/intersect_all.q.out
index 20a234e..9c67a99 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_all.q.out
@@ -232,7 +232,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 250 Data size: 48500 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col3 = 2) (type: boolean)
+                  predicate: (_col3 = 2L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 194 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col2 (type: bigint), _col0 (type: string), 
_col1 (type: string)
@@ -954,7 +954,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 500 Data size: 97000 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col3 = 4) (type: boolean)
+                  predicate: (_col3 = 4L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 194 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col2 (type: bigint), _col0 (type: string), 
_col1 (type: string)
@@ -1629,7 +1629,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 2) (type: boolean)
+                  predicate: (_col2 = 2L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col1 (type: bigint), _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out 
b/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
index a5384eb..444c222 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
@@ -230,7 +230,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 250 Data size: 46500 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 2) (type: boolean)
+                  predicate: (_col2 = 2L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 186 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
@@ -754,7 +754,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 500 Data size: 93000 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 4) (type: boolean)
+                  predicate: (_col2 = 4L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 186 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
@@ -1231,7 +1231,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col1 = 2) (type: boolean)
+                  predicate: (_col1 = 2L) (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/intersect_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_merge.q.out 
b/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
index 6f0e7f1..f69d074 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_merge.q.out
@@ -243,7 +243,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 48 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 5) (type: boolean)
+                  predicate: (_col2 = 5L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)
@@ -471,7 +471,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 48 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 4) (type: boolean)
+                  predicate: (_col2 = 4L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)
@@ -744,7 +744,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 48 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 5) (type: boolean)
+                  predicate: (_col2 = 5L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)
@@ -1017,7 +1017,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 48 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 5) (type: boolean)
+                  predicate: (_col2 = 5L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)
@@ -1290,7 +1290,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 3 Data size: 48 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 5) (type: boolean)
+                  predicate: (_col2 = 5L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)
@@ -1473,7 +1473,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 2 Data size: 32 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 3) (type: boolean)
+                  predicate: (_col2 = 3L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)
@@ -1656,7 +1656,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2 Data size: 48 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col3 = 3) (type: boolean)
+                  predicate: (_col3 = 3L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col2 (type: bigint), _col0 (type: int), 
_col1 (type: int)
@@ -1830,7 +1830,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col3 = 2) (type: boolean)
+                  predicate: (_col3 = 2L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col2 (type: bigint), _col0 (type: int), 
_col1 (type: int)
@@ -1881,7 +1881,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col2 = 2) (type: boolean)
+                  predicate: (_col2 = 2L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out 
b/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
index 3ef7801..c580274 100644
--- a/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
+++ b/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
@@ -144,7 +144,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) - 1.0) = 1.0) (type: boolean)
+                    predicate: ((UDFToDouble(key) - 1.0D) = 1.0D) (type: 
boolean)
                     Statistics: Num rows: 250 Data size: 21750 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
                       keys: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out 
b/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
index 72d3d39..fe6b4f9 100644
--- a/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/limit_pushdown.q.out
@@ -196,7 +196,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
@@ -292,7 +292,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/limit_pushdown3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out 
b/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
index 051b2db..97686cb 100644
--- a/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
+++ b/ql/src/test/results/clientpositive/llap/limit_pushdown3.q.out
@@ -197,7 +197,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
@@ -307,7 +307,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/lineage2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lineage2.q.out 
b/ql/src/test/results/clientpositive/llap/lineage2.q.out
index 4f59a4d..4fb586d 100644
--- a/ql/src/test/results/clientpositive/llap/lineage2.q.out
+++ b/ql/src/test/results/clientpositive/llap/lineage2.q.out
@@ -18,7 +18,7 @@ PREHOOK: query: select * from src1 where key > 10 and value > 
'val' order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"e07e602503383cf2b8477d43c5043f35","queryText":"select
 * from src1 where key > 10 and value > 'val' order by key limit 
5","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2,3],"targets":[0,1],"expression":"((UDFToDouble(src1.key)
 > 10.0) and (src1.value > 
'val'))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"e07e602503383cf2b8477d43c5043f35","queryText":"select
 * from src1 where key > 10 and value > 'val' order by key limit 
5","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2,3],"targets":[0,1],"expression":"((UDFToDouble(src1.key)
 > 10.0D) and (src1.value > 
'val'))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"src1.key"},{"id":1,"vertexType":"COLUMN","vertexId":"src1.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]}
 146    val_146
 150    val_150
 213    val_213
@@ -634,7 +634,7 @@ having count(a.c2) > 0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_l2
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"4e60ca1e72d985639b2027021a199297","queryText":"select
 sum(a.c1) over (partition by a.c1 order by a.id)\nfrom dest_l2 a\nwhere a.c2 
!= 10\ngroup by a.c1, a.c2, a.id\nhaving count(a.c2) > 
0","edges":[{"sources":[1,2,3],"targets":[0],"expression":"(tok_function sum (. 
(tok_table_or_col $hdt$_0) c1) (tok_windowspec (tok_partitioningspec 
(tok_distributeby (. (tok_table_or_col $hdt$_0) c1)) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_first (. (tok_table_or_col $hdt$_0) id))))) 
(tok_windowvalues (preceding 2147483647) 
current)))","edgeType":"PROJECTION"},{"sources":[2],"targets":[0],"expression":"(a.c2
 <> 
10)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0],"expression":"(count(default.dest_l2.c2)
 > 
0)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"sum_window_0"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_l2.c1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_l2.c2"},{"
 id":3,"vertexType":"COLUMN","vertexId":"default.dest_l2.id"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"4e60ca1e72d985639b2027021a199297","queryText":"select
 sum(a.c1) over (partition by a.c1 order by a.id)\nfrom dest_l2 a\nwhere a.c2 
!= 10\ngroup by a.c1, a.c2, a.id\nhaving count(a.c2) > 
0","edges":[{"sources":[1,2,3],"targets":[0],"expression":"(tok_function sum (. 
(tok_table_or_col $hdt$_0) c1) (tok_windowspec (tok_partitioningspec 
(tok_distributeby (. (tok_table_or_col $hdt$_0) c1)) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_first (. (tok_table_or_col $hdt$_0) id))))) 
(tok_windowvalues (preceding 2147483647) 
current)))","edgeType":"PROJECTION"},{"sources":[2],"targets":[0],"expression":"(a.c2
 <> 
10)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0],"expression":"(count(default.dest_l2.c2)
 > 
0L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"sum_window_0"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_l2.c1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_l2.c2"},{
 "id":3,"vertexType":"COLUMN","vertexId":"default.dest_l2.id"}]}
 1
 PREHOOK: query: select sum(a.c1), count(b.c1), b.c2, b.c3
 from dest_l2 a join dest_l3 b on (a.id = b.id)
@@ -646,7 +646,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_l2
 PREHOOK: Input: default@dest_l3
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"0dc990e844acc6c8309f674a4ca281d2","queryText":"select
 sum(a.c1), count(b.c1), b.c2, b.c3\nfrom dest_l2 a join dest_l3 b on (a.id = 
b.id)\nwhere a.c2 != 10 and b.c3 > 0\ngroup by a.c1, a.c2, a.id, b.c1, b.c2, 
b.c3\nhaving count(a.c2) > 0\norder by b.c3 limit 
5","edges":[{"sources":[4],"targets":[0],"expression":"sum(default.dest_l2.c1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[1],"expression":"count(default.dest_l3.c1)","edgeType":"PROJECTION"},{"sources":[6],"targets":[2],"edgeType":"PROJECTION"},{"sources":[7],"targets":[3],"edgeType":"PROJECTION"},{"sources":[8,9],"targets":[0,1,2,3],"expression":"((a.c2
 <> 10) and a.id is not 
null)","edgeType":"PREDICATE"},{"sources":[9,10],"targets":[0,1,2,3],"expression":"(a.id
 = 
b.id)","edgeType":"PREDICATE"},{"sources":[7,10],"targets":[0,1,2,3],"expression":"((b.c3
 > 0) and b.id is not 
null)","edgeType":"PREDICATE"},{"sources":[8],"targets":[0,1,2,3],"expression":"(count(
 default.dest_l2.c2) > 
0)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"_c0"},{"id":1,"vertexType":"COLUMN","vertexId":"_c1"},{"id":2,"vertexType":"COLUMN","vertexId":"b.c2"},{"id":3,"vertexType":"COLUMN","vertexId":"b.c3"},{"id":4,"vertexType":"COLUMN","vertexId":"default.dest_l2.c1"},{"id":5,"vertexType":"COLUMN","vertexId":"default.dest_l3.c1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dest_l3.c2"},{"id":7,"vertexType":"COLUMN","vertexId":"default.dest_l3.c3"},{"id":8,"vertexType":"COLUMN","vertexId":"default.dest_l2.c2"},{"id":9,"vertexType":"COLUMN","vertexId":"default.dest_l2.id"},{"id":10,"vertexType":"COLUMN","vertexId":"default.dest_l3.id"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"0dc990e844acc6c8309f674a4ca281d2","queryText":"select
 sum(a.c1), count(b.c1), b.c2, b.c3\nfrom dest_l2 a join dest_l3 b on (a.id = 
b.id)\nwhere a.c2 != 10 and b.c3 > 0\ngroup by a.c1, a.c2, a.id, b.c1, b.c2, 
b.c3\nhaving count(a.c2) > 0\norder by b.c3 limit 
5","edges":[{"sources":[4],"targets":[0],"expression":"sum(default.dest_l2.c1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[1],"expression":"count(default.dest_l3.c1)","edgeType":"PROJECTION"},{"sources":[6],"targets":[2],"edgeType":"PROJECTION"},{"sources":[7],"targets":[3],"edgeType":"PROJECTION"},{"sources":[8,9],"targets":[0,1,2,3],"expression":"((a.c2
 <> 10) and a.id is not 
null)","edgeType":"PREDICATE"},{"sources":[9,10],"targets":[0,1,2,3],"expression":"(a.id
 = 
b.id)","edgeType":"PREDICATE"},{"sources":[7,10],"targets":[0,1,2,3],"expression":"((b.c3
 > 0) and b.id is not 
null)","edgeType":"PREDICATE"},{"sources":[8],"targets":[0,1,2,3],"expression":"(count(
 default.dest_l2.c2) > 
0L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"_c0"},{"id":1,"vertexType":"COLUMN","vertexId":"_c1"},{"id":2,"vertexType":"COLUMN","vertexId":"b.c2"},{"id":3,"vertexType":"COLUMN","vertexId":"b.c3"},{"id":4,"vertexType":"COLUMN","vertexId":"default.dest_l2.c1"},{"id":5,"vertexType":"COLUMN","vertexId":"default.dest_l3.c1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dest_l3.c2"},{"id":7,"vertexType":"COLUMN","vertexId":"default.dest_l3.c3"},{"id":8,"vertexType":"COLUMN","vertexId":"default.dest_l2.c2"},{"id":9,"vertexType":"COLUMN","vertexId":"default.dest_l2.id"},{"id":10,"vertexType":"COLUMN","vertexId":"default.dest_l3.id"}]}
 1      1       s2      15
 PREHOOK: query: drop table if exists t
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/lineage3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lineage3.q.out 
b/ql/src/test/results/clientpositive/llap/lineage3.q.out
index ca4405c..d1e321e 100644
--- a/ql/src/test/results/clientpositive/llap/lineage3.q.out
+++ b/ql/src/test/results/clientpositive/llap/lineage3.q.out
@@ -25,7 +25,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@d1
 PREHOOK: Output: default@d2
-{"version":"1.0","engine":"tez","database":"default","hash":"2a73773c7e9a8a03f68ce31ed3972ed0","queryText":"from
 (select a.ctinyint x, b.cstring1 y\nfrom alltypesorc a join alltypesorc b on 
a.cint = b.cbigint) t\ninsert into table d1 select x where y is null\ninsert 
into table d2 select y where x > 
0","edges":[{"sources":[2],"targets":[0],"expression":"UDFToInteger(x)","edgeType":"PROJECTION"},{"sources":[3],"targets":[0,1],"expression":"a.cint
 is not 
null","edgeType":"PREDICATE"},{"sources":[3,4],"targets":[0,1],"expression":"(UDFToLong(a.cint)
 = 
b.cbigint)","edgeType":"PREDICATE"},{"sources":[4],"targets":[0,1],"expression":"b.cbigint
 is not 
null","edgeType":"PREDICATE"},{"sources":[5],"targets":[0],"expression":"t.y is 
null","edgeType":"PREDICATE"},{"sources":[5],"targets":[1],"expression":"CAST( 
y AS 
varchar(128))","edgeType":"PROJECTION"},{"sources":[2],"targets":[1],"expression":"(t.x
 > 
0)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0],"expression":"compute_stats(UDFToI
 nteger(x), 
'hll')","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.d1.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.d2.b"},{"id":2,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"2a73773c7e9a8a03f68ce31ed3972ed0","queryText":"from
 (select a.ctinyint x, b.cstring1 y\nfrom alltypesorc a join alltypesorc b on 
a.cint = b.cbigint) t\ninsert into table d1 select x where y is null\ninsert 
into table d2 select y where x > 
0","edges":[{"sources":[2],"targets":[0],"expression":"UDFToInteger(x)","edgeType":"PROJECTION"},{"sources":[3],"targets":[0,1],"expression":"a.cint
 is not 
null","edgeType":"PREDICATE"},{"sources":[3,4],"targets":[0,1],"expression":"(UDFToLong(a.cint)
 = 
b.cbigint)","edgeType":"PREDICATE"},{"sources":[4],"targets":[0,1],"expression":"b.cbigint
 is not 
null","edgeType":"PREDICATE"},{"sources":[5],"targets":[0],"expression":"t.y is 
null","edgeType":"PREDICATE"},{"sources":[5],"targets":[1],"expression":"CAST( 
y AS 
varchar(128))","edgeType":"PROJECTION"},{"sources":[2],"targets":[1],"expression":"(t.x
 > 
0Y)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0],"expression":"compute_stats(UDFTo
 Integer(x), 
'hll')","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.d1.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.d2.b"},{"id":2,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"}]}
 PREHOOK: query: drop table if exists t
 PREHOOK: type: DROPTABLE
 PREHOOK: query: create table t as
@@ -61,7 +61,7 @@ having min(cbigint) > 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: default@dest_l1@ds=tomorrow
-{"version":"1.0","engine":"tez","database":"default","hash":"d9978d282bef250892cc64adb1c06356","queryText":"insert
 into table dest_l1 partition (ds='tomorrow')\nselect min(cint), 
cast(min(cstring1) as varchar(128)) as cs\nfrom alltypesorc\nwhere cint is not 
null and cboolean1 = true\ngroup by csmallint\nhaving min(cbigint) > 
10","edges":[{"sources":[3],"targets":[0],"expression":"min(default.alltypesorc.cint)","edgeType":"PROJECTION"},{"sources":[4],"targets":[1],"expression":"CAST(
 min(default.alltypesorc.cstring1) AS 
varchar(128))","edgeType":"PROJECTION"},{"sources":[5,3],"targets":[0,1,2],"expression":"(alltypesorc.cboolean1
 and alltypesorc.cint is not 
null)","edgeType":"PREDICATE"},{"sources":[6],"targets":[0,1,2],"expression":"(min(default.alltypesorc.cbigint)
 > 
10)","edgeType":"PREDICATE"},{"sources":[3],"targets":[0],"expression":"compute_stats(min(default.alltypesorc.cint),
 
'hll')","edgeType":"PROJECTION"},{"sources":[4],"targets":[1],"expression":"compute_stats(CAST(
 min(d
 efault.alltypesorc.cstring1) AS varchar(128)), 
'hll')","edgeType":"PROJECTION"},{"sources":[],"targets":[2],"expression":"'tomorrow'","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_l1.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_l1.b"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_l1.ds"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"d9978d282bef250892cc64adb1c06356","queryText":"insert
 into table dest_l1 partition (ds='tomorrow')\nselect min(cint), 
cast(min(cstring1) as varchar(128)) as cs\nfrom alltypesorc\nwhere cint is not 
null and cboolean1 = true\ngroup by csmallint\nhaving min(cbigint) > 
10","edges":[{"sources":[3],"targets":[0],"expression":"min(default.alltypesorc.cint)","edgeType":"PROJECTION"},{"sources":[4],"targets":[1],"expression":"CAST(
 min(default.alltypesorc.cstring1) AS 
varchar(128))","edgeType":"PROJECTION"},{"sources":[5,3],"targets":[0,1,2],"expression":"(alltypesorc.cboolean1
 and alltypesorc.cint is not 
null)","edgeType":"PREDICATE"},{"sources":[6],"targets":[0,1,2],"expression":"(min(default.alltypesorc.cbigint)
 > 
10L)","edgeType":"PREDICATE"},{"sources":[3],"targets":[0],"expression":"compute_stats(min(default.alltypesorc.cint),
 
'hll')","edgeType":"PROJECTION"},{"sources":[4],"targets":[1],"expression":"compute_stats(CAST(
 min(
 default.alltypesorc.cstring1) AS varchar(128)), 
'hll')","edgeType":"PROJECTION"},{"sources":[],"targets":[2],"expression":"'tomorrow'","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_l1.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_l1.b"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_l1.ds"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"}]}
 PREHOOK: query: select cint, rank() over(order by cint) from alltypesorc
 where cint > 10 and cint < 10000 limit 10
 PREHOOK: type: QUERY
@@ -116,7 +116,7 @@ order by a.cbigint, a.ctinyint, b.cint, b.ctinyint limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"fd17992d1c081f6aa3cd7d5c99799748","queryText":"select
 a.cbigint, a.ctinyint, b.cint, b.ctinyint\nfrom\n  (select ctinyint, cbigint 
from alltypesorc\n   union all\n   select ctinyint, cbigint from alltypesorc) 
a\n  inner join\n  alltypesorc b\n  on (a.ctinyint = b.ctinyint)\nwhere 
b.ctinyint < 100 and a.cbigint is not null and b.cint is not null\norder by 
a.cbigint, a.ctinyint, b.cint, b.ctinyint limit 
5","edges":[{"sources":[4],"targets":[0],"expression":"cbigint","edgeType":"PROJECTION"},{"sources":[5],"targets":[1],"expression":"ctinyint","edgeType":"PROJECTION"},{"sources":[6],"targets":[2],"edgeType":"PROJECTION"},{"sources":[5],"targets":[3],"edgeType":"PROJECTION"},{"sources":[5,4],"targets":[0,1,2,3],"expression":"((alltypesorc.ctinyint
 < 100) and alltypesorc.cbigint is not 
null)","edgeType":"PREDICATE"},{"sources":[5],"targets":[0,1,2,3],"expression":"(ctinyint
 = b.ctinyint)","edgeType":"PREDICATE"},{"sources":[5,6
 ],"targets":[0,1,2,3],"expression":"((b.ctinyint < 100) and b.cint is not 
null)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"a.cbigint"},{"id":1,"vertexType":"COLUMN","vertexId":"a.ctinyint"},{"id":2,"vertexType":"COLUMN","vertexId":"b.cint"},{"id":3,"vertexType":"COLUMN","vertexId":"b.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"fd17992d1c081f6aa3cd7d5c99799748","queryText":"select
 a.cbigint, a.ctinyint, b.cint, b.ctinyint\nfrom\n  (select ctinyint, cbigint 
from alltypesorc\n   union all\n   select ctinyint, cbigint from alltypesorc) 
a\n  inner join\n  alltypesorc b\n  on (a.ctinyint = b.ctinyint)\nwhere 
b.ctinyint < 100 and a.cbigint is not null and b.cint is not null\norder by 
a.cbigint, a.ctinyint, b.cint, b.ctinyint limit 
5","edges":[{"sources":[4],"targets":[0],"expression":"cbigint","edgeType":"PROJECTION"},{"sources":[5],"targets":[1],"expression":"ctinyint","edgeType":"PROJECTION"},{"sources":[6],"targets":[2],"edgeType":"PROJECTION"},{"sources":[5],"targets":[3],"edgeType":"PROJECTION"},{"sources":[5,4],"targets":[0,1,2,3],"expression":"((alltypesorc.ctinyint
 < 100Y) and alltypesorc.cbigint is not 
null)","edgeType":"PREDICATE"},{"sources":[5],"targets":[0,1,2,3],"expression":"(ctinyint
 = b.ctinyint)","edgeType":"PREDICATE"},{"sources":[5,
 6],"targets":[0,1,2,3],"expression":"((b.ctinyint < 100Y) and b.cint is not 
null)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"a.cbigint"},{"id":1,"vertexType":"COLUMN","vertexId":"a.ctinyint"},{"id":2,"vertexType":"COLUMN","vertexId":"b.cint"},{"id":3,"vertexType":"COLUMN","vertexId":"b.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"}]}
 -2147311592    -51     -1071480828     -51
 -2147311592    -51     -1071480828     -51
 -2147311592    -51     -1067683781     -51
@@ -135,7 +135,7 @@ and x.ctinyint + length(c.cstring2) < 1000
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"15e00f9e88c1ad6b2f53a33a0c147f0e","queryText":"select
 x.ctinyint, x.cint, c.cbigint-100, c.cstring1\nfrom alltypesorc c\njoin (\n   
select a.ctinyint ctinyint, b.cint cint\n   from (select * from alltypesorc a 
where cboolean1=false) a\n   join alltypesorc b on (a.cint = b.cbigint - 
224870380)\n ) x on (x.cint = c.cint)\nwhere x.ctinyint > 10\nand x.cint < 
4.5\nand x.ctinyint + length(c.cstring2) < 
1000","edges":[{"sources":[4],"targets":[0],"edgeType":"PROJECTION"},{"sources":[5],"targets":[1],"edgeType":"PROJECTION"},{"sources":[6],"targets":[2],"expression":"(c.cbigint
 - 
100)","edgeType":"PROJECTION"},{"sources":[7],"targets":[3],"edgeType":"PROJECTION"},{"sources":[5],"targets":[0,1,2,3],"expression":"(CAST(
 c.cint AS decimal(11,1)) < 
4.5)","edgeType":"PREDICATE"},{"sources":[5],"targets":[0,1,2,3],"expression":"(c.cint
 = 
b.cint)","edgeType":"PREDICATE"},{"sources":[5,6],"targets":[0,1,2,3],"expression":"((CAST(
 b.cint 
 AS decimal(11,1)) < 4.5) and b.cbigint is not 
null)","edgeType":"PREDICATE"},{"sources":[6,5],"targets":[0,1,2,3],"expression":"((b.cbigint
 - 224870380) = 
UDFToLong(a.cint))","edgeType":"PREDICATE"},{"sources":[8,4,5],"targets":[0,1,2,3],"expression":"((a.cboolean1
 = false) and (a.ctinyint > 10) and a.cint is not 
null)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"x.ctinyint"},{"id":1,"vertexType":"COLUMN","vertexId":"x.cint"},{"id":2,"vertexType":"COLUMN","vertexId":"_c2"},{"id":3,"vertexType":"COLUMN","vertexId":"c.cstring1"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"15e00f9e88c1ad6b2f53a33a0c147f0e","queryText":"select
 x.ctinyint, x.cint, c.cbigint-100, c.cstring1\nfrom alltypesorc c\njoin (\n   
select a.ctinyint ctinyint, b.cint cint\n   from (select * from alltypesorc a 
where cboolean1=false) a\n   join alltypesorc b on (a.cint = b.cbigint - 
224870380)\n ) x on (x.cint = c.cint)\nwhere x.ctinyint > 10\nand x.cint < 
4.5\nand x.ctinyint + length(c.cstring2) < 
1000","edges":[{"sources":[4],"targets":[0],"edgeType":"PROJECTION"},{"sources":[5],"targets":[1],"edgeType":"PROJECTION"},{"sources":[6],"targets":[2],"expression":"(c.cbigint
 - 
100L)","edgeType":"PROJECTION"},{"sources":[7],"targets":[3],"edgeType":"PROJECTION"},{"sources":[5],"targets":[0,1,2,3],"expression":"(CAST(
 c.cint AS decimal(11,1)) < 
4.5)","edgeType":"PREDICATE"},{"sources":[5],"targets":[0,1,2,3],"expression":"(c.cint
 = 
b.cint)","edgeType":"PREDICATE"},{"sources":[5,6],"targets":[0,1,2,3],"expression":"((CAST(
 b.cint
  AS decimal(11,1)) < 4.5) and b.cbigint is not 
null)","edgeType":"PREDICATE"},{"sources":[6,5],"targets":[0,1,2,3],"expression":"((b.cbigint
 - 224870380) = 
UDFToLong(a.cint))","edgeType":"PREDICATE"},{"sources":[8,4,5],"targets":[0,1,2,3],"expression":"((a.cboolean1
 = false) and (a.ctinyint > 10Y) and a.cint is not 
null)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"x.ctinyint"},{"id":1,"vertexType":"COLUMN","vertexId":"x.cint"},{"id":2,"vertexType":"COLUMN","vertexId":"_c2"},{"id":3,"vertexType":"COLUMN","vertexId":"c.cstring1"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"}]}
 11     -654374827      857266369       OEfPnHnIYueoup
 PREHOOK: query: select c1, x2, x3
 from (
@@ -158,7 +158,7 @@ order by x2, c1 desc
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"0b26439f53dcab4e9429ed292244c371","queryText":"select
 c1, x2, x3\nfrom (\n  select c1, min(c2) x2, sum(c3) x3\n  from (\n    select 
c1, c2, c3\n    from (\n      select cint c1, ctinyint c2, min(cbigint) c3\n    
  from alltypesorc\n      where cint is not null\n      group by cint, 
ctinyint\n      order by cint, ctinyint\n      limit 5\n    ) x\n  ) x2\n  
group by c1\n) y\nwhere x2 > 0\norder by x2, c1 
desc","edges":[{"sources":[3],"targets":[0],"edgeType":"PROJECTION"},{"sources":[4],"targets":[1],"expression":"min(default.alltypesorc.ctinyint)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"expression":"sum(min(default.alltypesorc.cbigint))","edgeType":"PROJECTION"},{"sources":[3],"targets":[0,1,2],"expression":"alltypesorc.cint
 is not 
null","edgeType":"PREDICATE"},{"sources":[4],"targets":[0,1,2],"expression":"(min(default.alltypesorc.ctinyint)
 > 0)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COL
 
UMN","vertexId":"c1"},{"id":1,"vertexType":"COLUMN","vertexId":"x2"},{"id":2,"vertexType":"COLUMN","vertexId":"x3"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"0b26439f53dcab4e9429ed292244c371","queryText":"select
 c1, x2, x3\nfrom (\n  select c1, min(c2) x2, sum(c3) x3\n  from (\n    select 
c1, c2, c3\n    from (\n      select cint c1, ctinyint c2, min(cbigint) c3\n    
  from alltypesorc\n      where cint is not null\n      group by cint, 
ctinyint\n      order by cint, ctinyint\n      limit 5\n    ) x\n  ) x2\n  
group by c1\n) y\nwhere x2 > 0\norder by x2, c1 
desc","edges":[{"sources":[3],"targets":[0],"edgeType":"PROJECTION"},{"sources":[4],"targets":[1],"expression":"min(default.alltypesorc.ctinyint)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"expression":"sum(min(default.alltypesorc.cbigint))","edgeType":"PROJECTION"},{"sources":[3],"targets":[0,1,2],"expression":"alltypesorc.cint
 is not 
null","edgeType":"PREDICATE"},{"sources":[4],"targets":[0,1,2],"expression":"(min(default.alltypesorc.ctinyint)
 > 0Y)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"CO
 
LUMN","vertexId":"c1"},{"id":1,"vertexType":"COLUMN","vertexId":"x2"},{"id":2,"vertexType":"COLUMN","vertexId":"x3"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"}]}
 -1072910839    11      2048385991
 -1073279343    11      -1595604468
 PREHOOK: query: select key, value from src1
@@ -166,7 +166,7 @@ where key in (select key+18 from src1) order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"06c63ecdebcc1ca975a34b0fe1b4bf38","queryText":"select
 key, value from src1\nwhere key in (select key+18 from src1) order by 
key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"src1.key
 is not 
null","edgeType":"PREDICATE"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(src1.key)
 = (UDFToDouble(src1.key) + 
18.0))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"06c63ecdebcc1ca975a34b0fe1b4bf38","queryText":"select
 key, value from src1\nwhere key in (select key+18 from src1) order by 
key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"src1.key
 is not 
null","edgeType":"PREDICATE"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(src1.key)
 = (UDFToDouble(src1.key) + 
18.0D))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}]}
 146    val_146
 273    val_273
 PREHOOK: query: select * from src1 a
@@ -178,7 +178,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"94e9cc0a67801fe1503a3cb0c5029d59","queryText":"select
 * from src1 a\nwhere exists\n  (select cint from alltypesorc b\n   where a.key 
= b.ctinyint + 300)\nand key > 
300","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(a.key)
 > 
300.0)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0,1],"expression":"(a.key
 = 
a.key)","edgeType":"PREDICATE"},{"sources":[4,2],"targets":[0,1],"expression":"(UDFToDouble((UDFToInteger(b.ctinyint)
 + 300)) = 
UDFToDouble(a.key))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"a.key"},{"id":1,"vertexType":"COLUMN","vertexId":"a.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"94e9cc0a67801fe1503a3cb0c5029d59","queryText":"select
 * from src1 a\nwhere exists\n  (select cint from alltypesorc b\n   where a.key 
= b.ctinyint + 300)\nand key > 
300","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(a.key)
 > 
300.0D)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0,1],"expression":"(a.key
 = 
a.key)","edgeType":"PREDICATE"},{"sources":[4,2],"targets":[0,1],"expression":"(UDFToDouble((UDFToInteger(b.ctinyint)
 + 300)) = 
UDFToDouble(a.key))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"a.key"},{"id":1,"vertexType":"COLUMN","vertexId":"a.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"}]}
 311    val_311
 Warning: Shuffle Join MERGEJOIN[29][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: select key, value from src1
@@ -186,7 +186,7 @@ where key not in (select key+18 from src1) order by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"cbc4367150807328dda0f1cf4c74b811","queryText":"select
 key, value from src1\nwhere key not in (select key+18 from src1) order by 
key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(src1.key)
 = (UDFToDouble(src1.key) + 
18.0))","edgeType":"PREDICATE"},{"sources":[4,2],"targets":[0,1],"expression":"((count(*)
 = 0) or (true is null and src1.key is not null and 
(count((UDFToDouble(src1.key) + 18.0)) >= 
count(*))))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"},{"id":4,"vertexType":"TABLE","vertexId":"default.src1"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"cbc4367150807328dda0f1cf4c74b811","queryText":"select
 key, value from src1\nwhere key not in (select key+18 from src1) order by 
key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(src1.key)
 = (UDFToDouble(src1.key) + 
18.0D))","edgeType":"PREDICATE"},{"sources":[4,2],"targets":[0,1],"expression":"((count(*)
 = 0L) or (true is null and src1.key is not null and 
(count((UDFToDouble(src1.key) + 18.0D)) >= 
count(*))))","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"},{"id":4,"vertexType":"TABLE","vertexId":"default.src1"}]}
 PREHOOK: query: select * from src1 a
 where not exists
   (select cint from alltypesorc b
@@ -196,7 +196,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"723e79692e1de404c4ffb702097586da","queryText":"select
 * from src1 a\nwhere not exists\n  (select cint from alltypesorc b\n   where 
a.key = b.ctinyint + 300)\nand key > 
300","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(a.key)
 > 
300.0)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0,1],"expression":"(a.key
 = 
a.key)","edgeType":"PREDICATE"},{"sources":[4,2],"targets":[0,1],"expression":"(UDFToDouble((UDFToInteger(b.ctinyint)
 + 300)) = 
UDFToDouble(a.key))","edgeType":"PREDICATE"},{"sources":[],"targets":[0,1],"expression":"true
 is 
null","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"a.key"},{"id":1,"vertexType":"COLUMN","vertexId":"a.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"}
 ,{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"723e79692e1de404c4ffb702097586da","queryText":"select
 * from src1 a\nwhere not exists\n  (select cint from alltypesorc b\n   where 
a.key = b.ctinyint + 300)\nand key > 
300","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"edgeType":"PROJECTION"},{"sources":[2],"targets":[0,1],"expression":"(UDFToDouble(a.key)
 > 
300.0D)","edgeType":"PREDICATE"},{"sources":[2],"targets":[0,1],"expression":"(a.key
 = 
a.key)","edgeType":"PREDICATE"},{"sources":[4,2],"targets":[0,1],"expression":"(UDFToDouble((UDFToInteger(b.ctinyint)
 + 300)) = 
UDFToDouble(a.key))","edgeType":"PREDICATE"},{"sources":[],"targets":[0,1],"expression":"true
 is 
null","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"a.key"},{"id":1,"vertexType":"COLUMN","vertexId":"a.value"},{"id":2,"vertexType":"COLUMN","vertexId":"default.src1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.src1.value"
 },{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"}]}
 369    
 401    val_401
 406    val_406
@@ -251,7 +251,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Input: default@dest_v1
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"2baf9018d042c81043d25d70b4411308","queryText":"select
 t.ctinyint from (select * from dest_v1 where ctinyint is not null) t\nwhere 
ctinyint > 10 order by ctinyint limit 
2","edges":[{"sources":[1],"targets":[0],"edgeType":"PROJECTION"},{"sources":[1],"targets":[0],"expression":"(alltypesorc.ctinyint
 > 
10)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"t.ctinyint"},{"id":1,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"2baf9018d042c81043d25d70b4411308","queryText":"select
 t.ctinyint from (select * from dest_v1 where ctinyint is not null) t\nwhere 
ctinyint > 10 order by ctinyint limit 
2","edges":[{"sources":[1],"targets":[0],"edgeType":"PROJECTION"},{"sources":[1],"targets":[0],"expression":"(alltypesorc.ctinyint
 > 
10Y)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"t.ctinyint"},{"id":1,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"}]}
 11
 11
 PREHOOK: query: drop view if exists dest_v2
@@ -297,7 +297,7 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest_v3
-{"version":"1.0","engine":"tez","database":"default","hash":"9848a9a38a4f6f031dc669e7e495f9ee","queryText":"create
 view dest_v3 (a1, a2, a3, a4, a5, a6, a7) as\n  select x.csmallint, x.cbigint 
bint1, x.ctinyint, c.cbigint bint2, x.cint, x.cfloat, c.cstring1\n  from 
alltypesorc c\n  join (\n     select a.csmallint csmallint, a.ctinyint 
ctinyint, a.cstring2 cstring2,\n           a.cint cint, a.cstring1 ctring1, 
b.cfloat cfloat, b.cbigint cbigint\n     from ( select * from alltypesorc a 
where cboolean1=true ) a\n     join alltypesorc b on (a.csmallint = b.cint)\n   
) x on (x.ctinyint = c.cbigint)\n  where x.csmallint=11\n  and x.cint > 899\n  
and x.cfloat > 4.5\n  and c.cstring1 < '7'\n  and x.cint + x.cfloat + 
length(c.cstring1) < 
1000","edges":[{"sources":[],"targets":[0],"expression":"11","edgeType":"PROJECTION"},{"sources":[7],"targets":[1,2],"edgeType":"PROJECTION"},{"sources":[8],"targets":[3],"edgeType":"PROJECTION"},{"sources":[9],"targets":[4],"edgeType":"PROJECTION"},{"source
 
s":[10],"targets":[5],"edgeType":"PROJECTION"},{"sources":[11],"targets":[6],"edgeType":"PROJECTION"},{"sources":[11,7],"targets":[0,1,3,2,4,5,6],"expression":"((c.cstring1
 < '7') and c.cbigint is not 
null)","edgeType":"PREDICATE"},{"sources":[7,8],"targets":[0,1,3,2,4,5,6],"expression":"(c.cbigint
 = 
UDFToLong(a.ctinyint))","edgeType":"PREDICATE"},{"sources":[10,9],"targets":[0,1,3,2,4,5,6],"expression":"((b.cfloat
 > 4.5) and (11 = 
b.cint))","edgeType":"PREDICATE"},{"sources":[12,13,9,8],"targets":[0,1,3,2,4,5,6],"expression":"(a.cboolean1
 and (a.csmallint = 11) and (a.cint > 899) and a.ctinyint is not 
null)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.csmallint"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.bint1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.bint2"},{"id":3,"vertexType":"COLUMN","vertexId":"default.dest_v3.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.dest_v3.cint"},{"id":5
 
,"vertexType":"COLUMN","vertexId":"default.dest_v3.cfloat"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dest_v3.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":10,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"},{"id":11,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":12,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":13,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"9848a9a38a4f6f031dc669e7e495f9ee","queryText":"create
 view dest_v3 (a1, a2, a3, a4, a5, a6, a7) as\n  select x.csmallint, x.cbigint 
bint1, x.ctinyint, c.cbigint bint2, x.cint, x.cfloat, c.cstring1\n  from 
alltypesorc c\n  join (\n     select a.csmallint csmallint, a.ctinyint 
ctinyint, a.cstring2 cstring2,\n           a.cint cint, a.cstring1 ctring1, 
b.cfloat cfloat, b.cbigint cbigint\n     from ( select * from alltypesorc a 
where cboolean1=true ) a\n     join alltypesorc b on (a.csmallint = b.cint)\n   
) x on (x.ctinyint = c.cbigint)\n  where x.csmallint=11\n  and x.cint > 899\n  
and x.cfloat > 4.5\n  and c.cstring1 < '7'\n  and x.cint + x.cfloat + 
length(c.cstring1) < 
1000","edges":[{"sources":[],"targets":[0],"expression":"11S","edgeType":"PROJECTION"},{"sources":[7],"targets":[1,2],"edgeType":"PROJECTION"},{"sources":[8],"targets":[3],"edgeType":"PROJECTION"},{"sources":[9],"targets":[4],"edgeType":"PROJECTION"},{"sourc
 
es":[10],"targets":[5],"edgeType":"PROJECTION"},{"sources":[11],"targets":[6],"edgeType":"PROJECTION"},{"sources":[11,7],"targets":[0,1,3,2,4,5,6],"expression":"((c.cstring1
 < '7') and c.cbigint is not 
null)","edgeType":"PREDICATE"},{"sources":[7,8],"targets":[0,1,3,2,4,5,6],"expression":"(c.cbigint
 = 
UDFToLong(a.ctinyint))","edgeType":"PREDICATE"},{"sources":[10,9],"targets":[0,1,3,2,4,5,6],"expression":"((b.cfloat
 > 4.5) and (11 = 
b.cint))","edgeType":"PREDICATE"},{"sources":[12,13,9,8],"targets":[0,1,3,2,4,5,6],"expression":"(a.cboolean1
 and (a.csmallint = 11S) and (a.cint > 899) and a.ctinyint is not 
null)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.csmallint"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.bint1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.bint2"},{"id":3,"vertexType":"COLUMN","vertexId":"default.dest_v3.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.dest_v3.cint"},{"id"
 
:5,"vertexType":"COLUMN","vertexId":"default.dest_v3.cfloat"},{"id":6,"vertexType":"COLUMN","vertexId":"default.dest_v3.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cbigint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":10,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"},{"id":11,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":12,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":13,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"}]}
 PREHOOK: query: alter view dest_v3 as
   select * from (
     select sum(a.ctinyint) over (partition by a.csmallint order by 
a.csmallint) a,
@@ -311,13 +311,13 @@ PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest_v3
-{"version":"1.0","engine":"tez","database":"default","hash":"aaef165dff0212060ba950bfed68061d","queryText":"alter
 view dest_v3 as\n  select * from (\n    select sum(a.ctinyint) over (partition 
by a.csmallint order by a.csmallint) a,\n      count(b.cstring1) x, 
b.cboolean1\n    from alltypesorc a join alltypesorc b on (a.cint = b.cint)\n   
 where a.cboolean2 = true and b.cfloat > 0\n    group by a.ctinyint, 
a.csmallint, b.cboolean1\n    having count(a.cint) > 10\n    order by a, x, 
b.cboolean1 limit 10) 
t","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function 
sum (. (tok_table_or_col a) ctinyint) (tok_windowspec (tok_partitioningspec 
(tok_distributeby (. (tok_table_or_col a) csmallint)) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_first (. (tok_table_or_col a) 
csmallint)))))))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"},{"s
 ources":[7],"targets":[0,1,2],"expression":"(a.cint = 
b.cint)","edgeType":"PREDICATE"},{"sources":[8,9],"targets":[0,1,2],"expression":"((a.cboolean2
 = true) and (b.cfloat > 
0.0))","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint)
 > 
10)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","vertex
 Id":"default.alltypesorc.cfloat"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"aaef165dff0212060ba950bfed68061d","queryText":"alter
 view dest_v3 as\n  select * from (\n    select sum(a.ctinyint) over (partition 
by a.csmallint order by a.csmallint) a,\n      count(b.cstring1) x, 
b.cboolean1\n    from alltypesorc a join alltypesorc b on (a.cint = b.cint)\n   
 where a.cboolean2 = true and b.cfloat > 0\n    group by a.ctinyint, 
a.csmallint, b.cboolean1\n    having count(a.cint) > 10\n    order by a, x, 
b.cboolean1 limit 10) 
t","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function 
sum (. (tok_table_or_col a) ctinyint) (tok_windowspec (tok_partitioningspec 
(tok_distributeby (. (tok_table_or_col a) csmallint)) (tok_orderby 
(tok_tabsortcolnameasc (tok_nulls_first (. (tok_table_or_col a) 
csmallint)))))))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"},{"s
 ources":[7],"targets":[0,1,2],"expression":"(a.cint = 
b.cint)","edgeType":"PREDICATE"},{"sources":[8,9],"targets":[0,1,2],"expression":"((a.cboolean2
 = true) and (b.cfloat > 
0.0))","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint)
 > 
10L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","verte
 xId":"default.alltypesorc.cfloat"}]}
 PREHOOK: query: select * from dest_v3 limit 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Input: default@dest_v3
 #### A masked pattern was here ####
-{"version":"1.0","engine":"tez","database":"default","hash":"fd4e0dd59f42b53fc07125817451df49","queryText":"select
 * from dest_v3 limit 
2","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function 
sum (. (tok_table_or_col $hdt$_0) ctinyint) (tok_windowspec 
(tok_partitioningspec (tok_distributeby (. (tok_table_or_col $hdt$_0) 
csmallint)) (tok_orderby (tok_tabsortcolnameasc (tok_nulls_first (. 
(tok_table_or_col $hdt$_0) csmallint))))) (tok_windowvalues (preceding 
2147483647) 
current)))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"},{"sources":[8,7],"targets":[0,1,2],"expression":"(a.cboolean2
 and a.cint is not 
null)","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(a.cint
 = 
b.cint)","edgeType":"PREDICATE"},{"sources":[9,7],"targets":[0,1,2],"expression":"((b.cfloat
 > 0) and b.cint is not null)","edgeType":"PRED
 
ICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint)
 > 
10)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"}]}
+{"version":"1.0","engine":"tez","database":"default","hash":"fd4e0dd59f42b53fc07125817451df49","queryText":"select
 * from dest_v3 limit 
2","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function 
sum (. (tok_table_or_col $hdt$_0) ctinyint) (tok_windowspec 
(tok_partitioningspec (tok_distributeby (. (tok_table_or_col $hdt$_0) 
csmallint)) (tok_orderby (tok_tabsortcolnameasc (tok_nulls_first (. 
(tok_table_or_col $hdt$_0) csmallint))))) (tok_windowvalues (preceding 
2147483647) 
current)))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"},{"sources":[8,7],"targets":[0,1,2],"expression":"(a.cboolean2
 and a.cint is not 
null)","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(a.cint
 = 
b.cint)","edgeType":"PREDICATE"},{"sources":[9,7],"targets":[0,1,2],"expression":"((b.cfloat
 > 0) and b.cint is not null)","edgeType":"PRED
 
ICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint)
 > 
10L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"}]}
 38     216     false
 38     229     true
 PREHOOK: query: drop table if exists src_dp

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out 
b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out
index 768b804..3236d00 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb.q.out
@@ -690,7 +690,7 @@ STAGE PLANS:
                   alias: default.ssb_mv
                   Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((d_year = 1993) and (lo_quantity < 25.0) and 
lo_discount BETWEEN 1.0 AND 3.0) (type: boolean)
+                    predicate: ((d_year = 1993) and (lo_quantity < 25.0D) and 
lo_discount BETWEEN 1.0D AND 3.0D) (type: boolean)
                     Statistics: Num rows: 1 Data size: 28 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: discounted_price (type: double)
@@ -769,7 +769,7 @@ STAGE PLANS:
                   alias: default.ssb_mv
                   Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((d_yearmonthnum = 199401) and lo_discount 
BETWEEN 4.0 AND 6.0 and lo_quantity BETWEEN 26.0 AND 35.0) (type: boolean)
+                    predicate: ((d_yearmonthnum = 199401) and lo_discount 
BETWEEN 4.0D AND 6.0D and lo_quantity BETWEEN 26.0D AND 35.0D) (type: boolean)
                     Statistics: Num rows: 1 Data size: 28 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: discounted_price (type: double)
@@ -850,7 +850,7 @@ STAGE PLANS:
                   alias: default.ssb_mv
                   Statistics: Num rows: 1 Data size: 32 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((d_weeknuminyear = 6) and (d_year = 1994) and 
lo_discount BETWEEN 5.0 AND 7.0 and lo_quantity BETWEEN 26.0 AND 35.0) (type: 
boolean)
+                    predicate: ((d_weeknuminyear = 6) and (d_year = 1994) and 
lo_discount BETWEEN 5.0D AND 7.0D and lo_quantity BETWEEN 26.0D AND 35.0D) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 32 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: discounted_price (type: double)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out 
b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out
index 6c7e445..36ecc13 100644
--- 
a/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/materialized_view_rewrite_ssb_2.q.out
@@ -692,7 +692,7 @@ STAGE PLANS:
                   alias: default.ssb_mv
                   Statistics: Num rows: 1 Data size: 560 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(lo_quantity) < 25.0) and 
(UDFToInteger(d_year) = 1993) and UDFToDouble(lo_discount) BETWEEN 1.0 AND 3.0) 
(type: boolean)
+                    predicate: ((UDFToDouble(lo_quantity) < 25.0D) and 
(UDFToInteger(d_year) = 1993) and UDFToDouble(lo_discount) BETWEEN 1.0D AND 
3.0D) (type: boolean)
                     Statistics: Num rows: 1 Data size: 560 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: discounted_price (type: double)
@@ -771,7 +771,7 @@ STAGE PLANS:
                   alias: default.ssb_mv
                   Statistics: Num rows: 1 Data size: 560 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToInteger(d_yearmonthnum) = 199401) and 
UDFToDouble(lo_discount) BETWEEN 4.0 AND 6.0 and UDFToDouble(lo_quantity) 
BETWEEN 26.0 AND 35.0) (type: boolean)
+                    predicate: ((UDFToInteger(d_yearmonthnum) = 199401) and 
UDFToDouble(lo_discount) BETWEEN 4.0D AND 6.0D and UDFToDouble(lo_quantity) 
BETWEEN 26.0D AND 35.0D) (type: boolean)
                     Statistics: Num rows: 1 Data size: 560 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: discounted_price (type: double)
@@ -852,7 +852,7 @@ STAGE PLANS:
                   alias: default.ssb_mv
                   Statistics: Num rows: 1 Data size: 744 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToInteger(d_weeknuminyear) = 6) and 
(UDFToInteger(d_year) = 1994) and UDFToDouble(lo_discount) BETWEEN 5.0 AND 7.0 
and UDFToDouble(lo_quantity) BETWEEN 26.0 AND 35.0) (type: boolean)
+                    predicate: ((UDFToInteger(d_weeknuminyear) = 6) and 
(UDFToInteger(d_year) = 1994) and UDFToDouble(lo_discount) BETWEEN 5.0D AND 
7.0D and UDFToDouble(lo_quantity) BETWEEN 26.0D AND 35.0D) (type: boolean)
                     Statistics: Num rows: 1 Data size: 744 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: discounted_price (type: double)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/llap/mrr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mrr.q.out 
b/ql/src/test/results/clientpositive/llap/mrr.q.out
index bfa26e4..4fff286 100644
--- a/ql/src/test/results/clientpositive/llap/mrr.q.out
+++ b/ql/src/test/results/clientpositive/llap/mrr.q.out
@@ -1394,7 +1394,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 23750 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Filter Operator
-                  predicate: (_col1 > 1) (type: boolean)
+                  predicate: (_col1 > 1L) (type: boolean)
                   Statistics: Num rows: 83 Data size: 7885 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)

Reply via email to