http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/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 03ebe37..8ee41d0 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
@@ -469,7 +469,7 @@ Stage-0
                                 Group By Operator [GBY_6] (rows=1 width=101)
                                   
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                   Filter Operator [FIL_39] (rows=2 width=93)
-                                    predicate:(((c_int + 1) >= 0) and ((c_int 
> 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) 
and ((UDFToFloat(c_int) + c_float) >= 0) and key is not null)
+                                    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 (c_float > 0) and key is not null)
                                     TableScan [TS_3] (rows=20 width=88)
                                       
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                       <-Reducer 8 [SIMPLE_EDGE] llap
@@ -485,7 +485,7 @@ Stage-0
                                 Group By Operator [GBY_14] (rows=1 width=93)
                                   Output:["_col0","_col1","_col2"],keys:key, 
c_int, c_float
                                   Filter Operator [FIL_40] (rows=2 width=93)
-                                    predicate:(((c_int + 1) >= 0) and ((c_int 
> 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) 
and ((UDFToFloat(c_int) + c_float) >= 0) and key is not null)
+                                    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 (c_float > 0) and key is not null)
                                     TableScan [TS_11] (rows=20 width=88)
                                       
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
@@ -540,7 +540,7 @@ Stage-0
                           Group By Operator [GBY_6] (rows=1 width=101)
                             
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                             Filter Operator [FIL_36] (rows=2 width=93)
-                              predicate:(((c_int + 1) >= 0) and ((c_int > 0) 
or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) and 
((UDFToFloat(c_int) + c_float) >= 0) and key is not null)
+                              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 (c_float > 0) and key is not null)
                               TableScan [TS_3] (rows=20 width=88)
                                 
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                 <-Reducer 7 [SIMPLE_EDGE] llap
@@ -556,7 +556,7 @@ Stage-0
                           Group By Operator [GBY_14] (rows=1 width=93)
                             Output:["_col0","_col1","_col2"],keys:key, c_int, 
c_float
                             Filter Operator [FIL_37] (rows=2 width=93)
-                              predicate:(((c_int + 1) >= 0) and ((c_int > 0) 
or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) and 
((UDFToFloat(c_int) + c_float) >= 0) and key is not null)
+                              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 (c_float > 0) and key is not null)
                               TableScan [TS_11] (rows=20 width=88)
                                 
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
@@ -616,7 +616,7 @@ Stage-0
                               Group By Operator [GBY_6] (rows=1 width=101)
                                 
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                 Filter Operator [FIL_38] (rows=2 width=93)
-                                  predicate:(((c_int + 1) >= 0) and ((c_int > 
0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) 
and ((UDFToFloat(c_int) + c_float) >= 0) and key is not null)
+                                  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 (c_float > 0) and key is not null)
                                   TableScan [TS_3] (rows=20 width=88)
                                     
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                     <-Reducer 8 [SIMPLE_EDGE] llap
@@ -632,7 +632,7 @@ Stage-0
                               Group By Operator [GBY_14] (rows=1 width=93)
                                 Output:["_col0","_col1","_col2"],keys:key, 
c_int, c_float
                                 Filter Operator [FIL_39] (rows=2 width=93)
-                                  predicate:(((c_int + 1) >= 0) and ((c_int > 
0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) 
and ((UDFToFloat(c_int) + c_float) >= 0) and key is not null)
+                                  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 (c_float > 0) and key is not null)
                                   TableScan [TS_11] (rows=20 width=88)
                                     
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
@@ -687,7 +687,7 @@ Stage-0
                           Group By Operator [GBY_6] (rows=1 width=101)
                             
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                             Filter Operator [FIL_36] (rows=2 width=93)
-                              predicate:(((c_int + 1) >= 0) and ((c_int > 0) 
or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) and 
((UDFToFloat(c_int) + c_float) >= 0) and key is not null)
+                              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 (c_float > 0) and key is not null)
                               TableScan [TS_3] (rows=20 width=88)
                                 
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                 <-Reducer 7 [SIMPLE_EDGE] llap
@@ -703,7 +703,7 @@ Stage-0
                           Group By Operator [GBY_14] (rows=1 width=93)
                             Output:["_col0","_col1","_col2"],keys:key, c_int, 
c_float
                             Filter Operator [FIL_37] (rows=2 width=93)
-                              predicate:(((c_int + 1) >= 0) and ((c_int > 0) 
or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) and 
((UDFToFloat(c_int) + c_float) >= 0) and key is not null)
+                              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 (c_float > 0) and key is not null)
                               TableScan [TS_11] (rows=20 width=88)
                                 
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
@@ -1543,7 +1543,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) >= 1.0) or (_col3 
>= 1)) and ((UDFToDouble(_col2) + UDFToDouble(_col3)) >= 0.0))
+                            predicate:(((UDFToDouble(_col2) + 
UDFToDouble(_col3)) >= 0.0) and ((UDFToDouble(_col2) >= 1.0) or (_col3 >= 1)))
                             Select Operator [SEL_6] (rows=1 width=101)
                               Output:["_col2","_col3"]
                               Group By Operator [GBY_5] (rows=1 width=101)
@@ -1554,7 +1554,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) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0) and (((c_int + 1) + 1) >= 0) 
and (((c_int + 1) > 0) or (UDFToDouble(key) >= 0.0)) and (UDFToDouble(key) > 
0.0))
+                                      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))
                                       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
@@ -1572,7 +1572,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:(((c_int + 1) >= 0) and ((c_int 
> 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) 
and ((UDFToFloat(c_int) + c_float) >= 0) and (UDFToDouble(key) > 0.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.0) 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"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out 
b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
index 4693c2b..e43f736 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
@@ -346,7 +346,7 @@ Stage-0
                                   Select Operator [SEL_20] (rows=7 width=531)
                                     
Output:["_col0","_col2","_col3","_col4","_col5"]
                                     Filter Operator [FIL_89] (rows=7 width=534)
-                                      predicate:((v1 = 'srv1') and k2 is not 
null and k3 is not null and v2 is not null and v3 is not null and k1 is not 
null)
+                                      predicate:((v1 = 'srv1') and k1 is not 
null and k2 is not null and k3 is not null and v2 is not null and v3 is not 
null)
                                       TableScan [TS_18] (rows=85 width=534)
                                         
default@sr,sr,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v1","k2","v2","k3","v3"]
                           <-Reducer 9 [SIMPLE_EDGE] llap
@@ -396,7 +396,7 @@ Stage-0
                                           Select Operator [SEL_8] (rows=7 
width=531)
                                             
Output:["_col0","_col1","_col2","_col3","_col4"]
                                             Filter Operator [FIL_85] (rows=7 
width=534)
-                                              predicate:((v3 = 'ssv3') and k2 
is not null and k3 is not null and k1 is not null and v1 is not null and v2 is 
not null)
+                                              predicate:((v3 = 'ssv3') and k1 
is not null and k2 is not null and k3 is not null and v1 is not null and v2 is 
not null)
                                               TableScan [TS_6] (rows=85 
width=534)
                                                 
default@ss,ss,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v1","k2","v2","k3","v3"]
                     <-Reducer 2 [SIMPLE_EDGE] llap
@@ -418,7 +418,7 @@ Stage-0
                             Select Operator [SEL_2] (rows=170 width=356)
                               Output:["_col0","_col1","_col2","_col3"]
                               Filter Operator [FIL_83] (rows=170 width=356)
-                                predicate:(v2 is not null and v3 is not null 
and k1 is not null)
+                                predicate:(k1 is not null and v2 is not null 
and v3 is not null)
                                 TableScan [TS_0] (rows=170 width=356)
                                   
default@cs,cs,Tbl:COMPLETE,Col:COMPLETE,Output:["k1","v2","k3","v3"]
 
@@ -1039,7 +1039,7 @@ Stage-0
                             Select Operator [SEL_2] (rows=170 width=34)
                               Output:["_col0","_col1","_col2","_col3"]
                               Filter Operator [FIL_83] (rows=170 width=34)
-                                predicate:(v2 is not null and v3 is not null 
and k1 is not null)
+                                predicate:(k1 is not null and v2 is not null 
and v3 is not null)
                                 TableScan [TS_0] (rows=170 width=34)
                                   
default@cs,cs,Tbl:COMPLETE,Col:NONE,Output:["k1","v2","k3","v3"]
                         <-Select Operator [SEL_5] (rows=250 width=10)
@@ -1063,7 +1063,7 @@ Stage-0
                                 Select Operator [SEL_20] (rows=42 width=34)
                                   
Output:["_col0","_col2","_col3","_col4","_col5"]
                                   Filter Operator [FIL_89] (rows=42 width=34)
-                                    predicate:((v1 = 'srv1') and k2 is not 
null and k3 is not null and v2 is not null and v3 is not null and k1 is not 
null)
+                                    predicate:((v1 = 'srv1') and k1 is not 
null and k2 is not null and k3 is not null and v2 is not null and v3 is not 
null)
                                     TableScan [TS_18] (rows=85 width=34)
                                       
default@sr,sr,Tbl:COMPLETE,Col:NONE,Output:["k1","v1","k2","v2","k3","v3"]
                             <-Select Operator [SEL_23] (rows=250 width=10)
@@ -1096,7 +1096,7 @@ Stage-0
                                     Select Operator [SEL_8] (rows=42 width=34)
                                       
Output:["_col0","_col1","_col2","_col3","_col4"]
                                       Filter Operator [FIL_85] (rows=42 
width=34)
-                                        predicate:((v3 = 'ssv3') and k2 is not 
null and k3 is not null and k1 is not null and v1 is not null and v2 is not 
null)
+                                        predicate:((v3 = 'ssv3') and k1 is not 
null and k2 is not null and k3 is not null and v1 is not null and v2 is not 
null)
                                         TableScan [TS_6] (rows=85 width=34)
                                           
default@ss,ss,Tbl:COMPLETE,Col:NONE,Output:["k1","v1","k2","v2","k3","v3"]
                                 <-Select Operator [SEL_11] (rows=250 width=10)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out 
b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
index a4c251e..c4fdc18 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
@@ -47,7 +47,7 @@ Stage-0
                 Select Operator [SEL_5] (rows=1019 width=251)
                   
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                   Filter Operator [FIL_16] (rows=1019 width=251)
-                    predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is 
not null)
+                    predicate:(cbigint is not null and cint BETWEEN 1000000 
AND 3000000)
                     TableScan [TS_3] (rows=12288 width=251)
                       
default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"]
 
@@ -128,7 +128,7 @@ Stage-0
                   Select Operator [SEL_5] (rows=1019 width=8)
                     Output:["_col0"]
                     Filter Operator [FIL_18] (rows=1019 width=8)
-                      predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null)
+                      predicate:(cbigint is not null and cint BETWEEN 1000000 
AND 3000000)
                       TableScan [TS_3] (rows=12288 width=8)
                         
default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["cint","cbigint"]
 
@@ -208,7 +208,7 @@ Stage-0
                       Select Operator [SEL_5] (rows=1019 width=8)
                         Output:["_col0"]
                         Filter Operator [FIL_20] (rows=1019 width=8)
-                          predicate:(cint BETWEEN 1000000 AND 3000000 and 
cbigint is not null)
+                          predicate:(cbigint is not null and cint BETWEEN 
1000000 AND 3000000)
                           TableScan [TS_3] (rows=12288 width=8)
                             
default@alltypesorc,b,Tbl:COMPLETE,Col:COMPLETE,Output:["cint","cbigint"]
 
@@ -277,7 +277,7 @@ Stage-0
                 Select Operator [SEL_5] (rows=1365 width=215)
                   
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"]
                   Filter Operator [FIL_16] (rows=1365 width=215)
-                    predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint is 
not null)
+                    predicate:(cbigint is not null and cint BETWEEN 1000000 
AND 3000000)
                     TableScan [TS_3] (rows=12288 width=215)
                       
default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["ctinyint","csmallint","cint","cbigint","cfloat","cdouble","cstring1","cstring2","ctimestamp1","ctimestamp2","cboolean1","cboolean2"]
             <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
@@ -358,7 +358,7 @@ Stage-0
                   Select Operator [SEL_5] (rows=1365 width=215)
                     Output:["_col0"]
                     Filter Operator [FIL_18] (rows=1365 width=215)
-                      predicate:(cint BETWEEN 1000000 AND 3000000 and cbigint 
is not null)
+                      predicate:(cbigint is not null and cint BETWEEN 1000000 
AND 3000000)
                       TableScan [TS_3] (rows=12288 width=215)
                         
default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"]
               <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
@@ -438,7 +438,7 @@ Stage-0
                       Select Operator [SEL_5] (rows=1365 width=215)
                         Output:["_col0"]
                         Filter Operator [FIL_20] (rows=1365 width=215)
-                          predicate:(cint BETWEEN 1000000 AND 3000000 and 
cbigint is not null)
+                          predicate:(cbigint is not null and cint BETWEEN 
1000000 AND 3000000)
                           TableScan [TS_3] (rows=12288 width=215)
                             
default@alltypesorc,b,Tbl:COMPLETE,Col:NONE,Output:["cint","cbigint"]
                   <-Map 1 [CUSTOM_SIMPLE_EDGE] llap

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out 
b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
index d393427..6ee21df 100644
--- a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
@@ -1150,7 +1150,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 25 Data size: 4375 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) 
(type: boolean)
+                    predicate: ((key < 'zzzzzzzz') and (value < 'zzzzzzzzzz')) 
(type: boolean)
                     Statistics: Num rows: 2 Data size: 350 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: key (type: string)
@@ -1210,7 +1210,7 @@ STAGE PLANS:
                   alias: y1
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((value < 'zzzzzzzz') and (key < 'zzzzzzzz')) 
(type: boolean)
+                    predicate: ((key < 'zzzzzzzz') and (value < 'zzzzzzzz')) 
(type: boolean)
                     Statistics: Num rows: 55 Data size: 9790 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: key (type: string)
@@ -1345,7 +1345,7 @@ STAGE PLANS:
                   alias: x
                   Statistics: Num rows: 25 Data size: 4375 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((value < 'zzzzzzzzzz') and (key < 'zzzzzzzz')) 
(type: boolean)
+                    predicate: ((key < 'zzzzzzzz') and (value < 'zzzzzzzzzz')) 
(type: boolean)
                     Statistics: Num rows: 2 Data size: 350 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: key (type: string)
@@ -1405,7 +1405,7 @@ STAGE PLANS:
                   alias: y1
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((value < 'zzzzzzzz') and (key < 'zzzzzzzz')) 
(type: boolean)
+                    predicate: ((key < 'zzzzzzzz') and (value < 'zzzzzzzz')) 
(type: boolean)
                     Statistics: Num rows: 55 Data size: 9790 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out 
b/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out
index 1f21f0f..e00f49b 100644
--- a/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out
+++ b/ql/src/test/results/clientpositive/llap/identity_project_remove_skip.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((value = 'val_105') and (key = '105')) (type: 
boolean)
+                    predicate: ((key = '105') and (value = 'val_105')) (type: 
boolean)
                     Statistics: Num rows: 1 Data size: 178 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/insert1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/insert1.q.out 
b/ql/src/test/results/clientpositive/llap/insert1.q.out
index af4b887..0e27f9d 100644
--- a/ql/src/test/results/clientpositive/llap/insert1.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert1.q.out
@@ -298,7 +298,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.insert1
                   Filter Operator
-                    predicate: ((key > 10) and (key < 20)) (type: boolean)
+                    predicate: ((key < 20) and (key > 10)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out 
b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
index d1c396a..2efe092 100644
--- a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
+++ b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
@@ -521,7 +521,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (value is not null and key is not null) (type: 
boolean)
+                    predicate: (key is not null and value is not null) (type: 
boolean)
                     Statistics: Num rows: 25 Data size: 4375 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out 
b/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out
index 7fa1883..134ade7 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_hint.q.out
@@ -146,7 +146,7 @@ STAGE PLANS:
                   filterExpr: (key is not null and (key BETWEEN 
DynamicValue(RS_7_srcpart_small_key1_min) AND 
DynamicValue(RS_7_srcpart_small_key1_max) and in_bloom_filter(key, 
DynamicValue(RS_7_srcpart_small_key1_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (key is not null and (key BETWEEN 
DynamicValue(RS_7_srcpart_small_key1_min) AND 
DynamicValue(RS_7_srcpart_small_key1_max) and in_bloom_filter(key, 
DynamicValue(RS_7_srcpart_small_key1_bloom_filter)))) (type: boolean)
+                    predicate: ((key BETWEEN 
DynamicValue(RS_7_srcpart_small_key1_min) AND 
DynamicValue(RS_7_srcpart_small_key1_max) and in_bloom_filter(key, 
DynamicValue(RS_7_srcpart_small_key1_bloom_filter))) and key is not null) 
(type: boolean)
                     Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out 
b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
index 7c504f1..c4361de 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
@@ -22,7 +22,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (value is not null and key is not null) (type: 
boolean)
+                    predicate: (key is not null and value is not null) (type: 
boolean)
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -562,7 +562,7 @@ STAGE PLANS:
                   alias: srcpart
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (value is not null and key is not null) (type: 
boolean)
+                    predicate: (key is not null and value is not null) (type: 
boolean)
                     Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string), 
ds (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/mergejoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mergejoin.q.out 
b/ql/src/test/results/clientpositive/llap/mergejoin.q.out
index 0cca224..a54f3d4 100644
--- a/ql/src/test/results/clientpositive/llap/mergejoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/mergejoin.q.out
@@ -25,7 +25,7 @@ STAGE PLANS:
                   filterExpr: (key is not null and (key BETWEEN 
DynamicValue(RS_7_b_key_min) AND DynamicValue(RS_7_b_key_max) and 
in_bloom_filter(key, DynamicValue(RS_7_b_key_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (key is not null and (key BETWEEN 
DynamicValue(RS_7_b_key_min) AND DynamicValue(RS_7_b_key_max) and 
in_bloom_filter(key, DynamicValue(RS_7_b_key_bloom_filter)))) (type: boolean)
+                    predicate: ((key BETWEEN DynamicValue(RS_7_b_key_min) AND 
DynamicValue(RS_7_b_key_max) and in_bloom_filter(key, 
DynamicValue(RS_7_b_key_bloom_filter))) and key is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -1717,7 +1717,7 @@ STAGE PLANS:
                   filterExpr: (key is not null and value is not null and 
(value BETWEEN DynamicValue(RS_10_c_value_min) AND 
DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, 
DynamicValue(RS_10_c_value_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 242 Data size: 43428 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and value is not null and 
(value BETWEEN DynamicValue(RS_10_c_value_min) AND 
DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, 
DynamicValue(RS_10_c_value_bloom_filter)))) (type: boolean)
+                    predicate: ((value BETWEEN DynamicValue(RS_10_c_value_min) 
AND DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, 
DynamicValue(RS_10_c_value_bloom_filter))) and key is not null and value is not 
null) (type: boolean)
                     Statistics: Num rows: 218 Data size: 39121 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)
@@ -2289,7 +2289,7 @@ STAGE PLANS:
                   filterExpr: (key is not null and value is not null and 
(value BETWEEN DynamicValue(RS_10_c_value_min) AND 
DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, 
DynamicValue(RS_10_c_value_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 242 Data size: 43428 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and value is not null and 
(value BETWEEN DynamicValue(RS_10_c_value_min) AND 
DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, 
DynamicValue(RS_10_c_value_bloom_filter)))) (type: boolean)
+                    predicate: ((value BETWEEN DynamicValue(RS_10_c_value_min) 
AND DynamicValue(RS_10_c_value_max) and in_bloom_filter(value, 
DynamicValue(RS_10_c_value_bloom_filter))) and key is not null and value is not 
null) (type: boolean)
                     Statistics: Num rows: 218 Data size: 39121 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out 
b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
index 58c29fe..559173c 100644
--- a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
@@ -827,7 +827,7 @@ STAGE PLANS:
                   alias: bigtbl
                   Statistics: Num rows: 5000 Data size: 2622552 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key1 is not null and value is not null and 
key2 is not null) (type: boolean)
+                    predicate: (key1 is not null and key2 is not null and 
value is not null) (type: boolean)
                     Statistics: Num rows: 4250 Data size: 2229169 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key1 (type: string), key2 (type: string), 
value (type: string)
@@ -1162,7 +1162,7 @@ STAGE PLANS:
                   alias: bigtbl
                   Statistics: Num rows: 5000 Data size: 2622552 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key1 is not null and value is not null and 
key2 is not null) (type: boolean)
+                    predicate: (key1 is not null and key2 is not null and 
value is not null) (type: boolean)
                     Statistics: Num rows: 4250 Data size: 2229169 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key1 (type: string), key2 (type: string), 
value (type: string)
@@ -1500,7 +1500,7 @@ STAGE PLANS:
                   alias: bigtbl
                   Statistics: Num rows: 5000 Data size: 2622552 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key1 is not null and value is not null and 
key2 is not null) (type: boolean)
+                    predicate: (key1 is not null and key2 is not null and 
value is not null) (type: boolean)
                     Statistics: Num rows: 4250 Data size: 2229169 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key1 (type: string), key2 (type: string), 
value (type: string)
@@ -1866,7 +1866,7 @@ STAGE PLANS:
                   alias: bigtbl
                   Statistics: Num rows: 5000 Data size: 2622552 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key1 is not null and value is not null and 
key2 is not null) (type: boolean)
+                    predicate: (key1 is not null and key2 is not null and 
value is not null) (type: boolean)
                     Statistics: Num rows: 4250 Data size: 2229169 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key1 (type: string), key2 (type: string), 
value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/multi_insert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multi_insert.q.out 
b/ql/src/test/results/clientpositive/llap/multi_insert.q.out
index 58fc759..56d26b3 100644
--- a/ql/src/test/results/clientpositive/llap/multi_insert.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_insert.q.out
@@ -58,7 +58,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                   Filter Operator
-                    predicate: ((key > 10) and (key < 20)) (type: boolean)
+                    predicate: ((key < 20) and (key > 10)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 9790 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -201,7 +201,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                   Filter Operator
-                    predicate: ((key > 10) and (key < 20)) (type: boolean)
+                    predicate: ((key < 20) and (key > 10)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 9790 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -344,7 +344,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                   Filter Operator
-                    predicate: ((key > 10) and (key < 20)) (type: boolean)
+                    predicate: ((key < 20) and (key > 10)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 9790 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -487,7 +487,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                   Filter Operator
-                    predicate: ((key > 10) and (key < 20)) (type: boolean)
+                    predicate: ((key < 20) and (key > 10)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 9790 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -649,7 +649,7 @@ STAGE PLANS:
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           name: default.src_multi1
                 Filter Operator
-                  predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: 
boolean)
+                  predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: 
boolean)
                   Statistics: Num rows: 24 Data size: 4272 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -803,7 +803,7 @@ STAGE PLANS:
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           name: default.src_multi1
                 Filter Operator
-                  predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: 
boolean)
+                  predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: 
boolean)
                   Statistics: Num rows: 24 Data size: 4272 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -957,7 +957,7 @@ STAGE PLANS:
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           name: default.src_multi1
                 Filter Operator
-                  predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: 
boolean)
+                  predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: 
boolean)
                   Statistics: Num rows: 24 Data size: 4272 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -1111,7 +1111,7 @@ STAGE PLANS:
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                           name: default.src_multi1
                 Filter Operator
-                  predicate: ((KEY._col0 > 10) and (KEY._col0 < 20)) (type: 
boolean)
+                  predicate: ((KEY._col0 < 20) and (KEY._col0 > 10)) (type: 
boolean)
                   Statistics: Num rows: 24 Data size: 4272 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -1250,7 +1250,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                     Filter Operator
-                      predicate: ((_col0 > 10) and (_col0 < 20)) (type: 
boolean)
+                      predicate: ((_col0 < 20) and (_col0 > 10)) (type: 
boolean)
                       Statistics: Num rows: 111 Data size: 19758 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -1283,7 +1283,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                     Filter Operator
-                      predicate: ((_col0 > 10) and (_col0 < 20)) (type: 
boolean)
+                      predicate: ((_col0 < 20) and (_col0 > 10)) (type: 
boolean)
                       Statistics: Num rows: 111 Data size: 19758 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -1447,7 +1447,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                     Filter Operator
-                      predicate: ((_col0 > 10) and (_col0 < 20)) (type: 
boolean)
+                      predicate: ((_col0 < 20) and (_col0 > 10)) (type: 
boolean)
                       Statistics: Num rows: 111 Data size: 19758 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -1480,7 +1480,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                     Filter Operator
-                      predicate: ((_col0 > 10) and (_col0 < 20)) (type: 
boolean)
+                      predicate: ((_col0 < 20) and (_col0 > 10)) (type: 
boolean)
                       Statistics: Num rows: 111 Data size: 19758 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -1644,7 +1644,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                     Filter Operator
-                      predicate: ((_col0 > 10) and (_col0 < 20)) (type: 
boolean)
+                      predicate: ((_col0 < 20) and (_col0 > 10)) (type: 
boolean)
                       Statistics: Num rows: 111 Data size: 19758 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -1677,7 +1677,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                     Filter Operator
-                      predicate: ((_col0 > 10) and (_col0 < 20)) (type: 
boolean)
+                      predicate: ((_col0 < 20) and (_col0 > 10)) (type: 
boolean)
                       Statistics: Num rows: 111 Data size: 19758 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -1841,7 +1841,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                     Filter Operator
-                      predicate: ((_col0 > 10) and (_col0 < 20)) (type: 
boolean)
+                      predicate: ((_col0 < 20) and (_col0 > 10)) (type: 
boolean)
                       Statistics: Num rows: 111 Data size: 19758 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -1874,7 +1874,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.src_multi1
                     Filter Operator
-                      predicate: ((_col0 > 10) and (_col0 < 20)) (type: 
boolean)
+                      predicate: ((_col0 < 20) and (_col0 > 10)) (type: 
boolean)
                       Statistics: Num rows: 111 Data size: 19758 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/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 eefc091..d93f604 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: 3992 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((t < 0) and (UDFToInteger(t) > -2)) (type: 
boolean)
+                    predicate: ((UDFToInteger(t) > -2) and (t < 0)) (type: 
boolean)
                     Statistics: Num rows: 116 Data size: 441 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hash(t) (type: int)
@@ -391,7 +391,7 @@ STAGE PLANS:
                   filterExpr: ((t < 0) and (UDFToInteger(t) > -2)) (type: 
boolean)
                   Statistics: Num rows: 1049 Data size: 3992 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((t < 0) and (UDFToInteger(t) > -2)) (type: 
boolean)
+                    predicate: ((UDFToInteger(t) > -2) and (t < 0)) (type: 
boolean)
                     Statistics: Num rows: 116 Data size: 441 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hash(t) (type: int)
@@ -483,7 +483,7 @@ STAGE PLANS:
         TableScan
           alias: orc_pred
           Filter Operator
-            predicate: ((t = -1) and s is not null and (s like 'bob%')) (type: 
boolean)
+            predicate: ((s like 'bob%') and (t = -1) and s is not null) (type: 
boolean)
             Select Operator
               expressions: -1 (type: tinyint), s (type: string)
               outputColumnNames: _col0, _col1
@@ -511,7 +511,7 @@ STAGE PLANS:
           alias: orc_pred
           filterExpr: ((t = -1) and s is not null and (s like 'bob%')) (type: 
boolean)
           Filter Operator
-            predicate: ((t = -1) and s is not null and (s like 'bob%')) (type: 
boolean)
+            predicate: ((s like 'bob%') and (t = -1) and s is not null) (type: 
boolean)
             Select Operator
               expressions: -1 (type: tinyint), s (type: string)
               outputColumnNames: _col0, _col1
@@ -591,7 +591,7 @@ STAGE PLANS:
                   alias: orc_pred
                   Statistics: Num rows: 1049 Data size: 187624 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (s is not null and (s like 'bob%') and (not (t) 
IN (-1, -2, -3)) and t BETWEEN 25 AND 30) (type: boolean)
+                    predicate: ((not (t) IN (-1, -2, -3)) and (s like 'bob%') 
and s is not null and t BETWEEN 25 AND 30) (type: boolean)
                     Statistics: Num rows: 54 Data size: 9658 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), s (type: string)
@@ -657,7 +657,7 @@ STAGE PLANS:
                   filterExpr: (s is not null and (s like 'bob%') and (not (t) 
IN (-1, -2, -3)) and t BETWEEN 25 AND 30) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 187624 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (s is not null and (s like 'bob%') and (not (t) 
IN (-1, -2, -3)) and t BETWEEN 25 AND 30) (type: boolean)
+                    predicate: ((not (t) IN (-1, -2, -3)) and (s like 'bob%') 
and s is not null and t BETWEEN 25 AND 30) (type: boolean)
                     Statistics: Num rows: 54 Data size: 9658 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), s (type: string)
@@ -788,7 +788,7 @@ STAGE PLANS:
                   alias: orc_pred
                   Statistics: Num rows: 1049 Data size: 199600 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 190 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -867,7 +867,7 @@ STAGE PLANS:
                   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)
                   Statistics: Num rows: 1049 Data size: 199600 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 190 Basic stats: 
COMPLETE Column stats: NONE
                     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: 199600 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 190 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -1112,7 +1112,7 @@ STAGE PLANS:
                   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)
                   Statistics: Num rows: 1049 Data size: 199600 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 190 Basic stats: 
COMPLETE Column stats: NONE
                     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/c5b3ccc4/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 35df63c..9ceb438 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: ((t < 0) and (UDFToInteger(t) > -2)) (type: boolean)
+            predicate: ((UDFToInteger(t) > -2) and (t < 0)) (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
@@ -360,7 +360,7 @@ STAGE PLANS:
           alias: tbl_pred
           filterExpr: ((t < 0) and (UDFToInteger(t) > -2)) (type: boolean)
           Filter Operator
-            predicate: ((t < 0) and (UDFToInteger(t) > -2)) (type: boolean)
+            predicate: ((UDFToInteger(t) > -2) and (t < 0)) (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
@@ -421,7 +421,7 @@ STAGE PLANS:
         TableScan
           alias: tbl_pred
           Filter Operator
-            predicate: ((t = -1) and s is not null and (s like 'bob%')) (type: 
boolean)
+            predicate: ((s like 'bob%') and (t = -1) and s is not null) (type: 
boolean)
             Select Operator
               expressions: -1 (type: tinyint), s (type: string)
               outputColumnNames: _col0, _col1
@@ -449,7 +449,7 @@ STAGE PLANS:
           alias: tbl_pred
           filterExpr: ((t = -1) and s is not null and (s like 'bob%')) (type: 
boolean)
           Filter Operator
-            predicate: ((t = -1) and s is not null and (s like 'bob%')) (type: 
boolean)
+            predicate: ((s like 'bob%') and (t = -1) and s is not null) (type: 
boolean)
             Select Operator
               expressions: -1 (type: tinyint), s (type: string)
               outputColumnNames: _col0, _col1
@@ -529,7 +529,7 @@ STAGE PLANS:
                   alias: tbl_pred
                   Statistics: Num rows: 1049 Data size: 187624 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (s is not null and (s like 'bob%') and (not (t) 
IN (-1, -2, -3)) and t BETWEEN 25 AND 30) (type: boolean)
+                    predicate: ((not (t) IN (-1, -2, -3)) and (s like 'bob%') 
and s is not null and t BETWEEN 25 AND 30) (type: boolean)
                     Statistics: Num rows: 54 Data size: 9658 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), s (type: string)
@@ -595,7 +595,7 @@ STAGE PLANS:
                   filterExpr: (s is not null and (s like 'bob%') and (not (t) 
IN (-1, -2, -3)) and t BETWEEN 25 AND 30) (type: boolean)
                   Statistics: Num rows: 1049 Data size: 187624 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (s is not null and (s like 'bob%') and (not (t) 
IN (-1, -2, -3)) and t BETWEEN 25 AND 30) (type: boolean)
+                    predicate: ((not (t) IN (-1, -2, -3)) and (s like 'bob%') 
and s is not null and t BETWEEN 25 AND 30) (type: boolean)
                     Statistics: Num rows: 54 Data size: 9658 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), s (type: string)
@@ -726,7 +726,7 @@ STAGE PLANS:
                   alias: tbl_pred
                   Statistics: Num rows: 1049 Data size: 199600 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 190 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -805,7 +805,7 @@ STAGE PLANS:
                   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)
                   Statistics: Num rows: 1049 Data size: 199600 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 190 Basic stats: 
COMPLETE Column stats: NONE
                     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: 199600 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 190 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -1095,7 +1095,7 @@ STAGE PLANS:
                   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)
                   Statistics: Num rows: 1049 Data size: 199600 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 190 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: t (type: tinyint), si (type: smallint), d 
(type: double), s (type: string)
@@ -1207,7 +1207,7 @@ STAGE PLANS:
                   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)
                   Statistics: Num rows: 1049 Data size: 15968 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((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)
+                    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)
                     Statistics: Num rows: 1 Data size: 15 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: f (type: float), i (type: int), b (type: 
bigint)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out 
b/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out
index 996d47f..52590cd 100644
--- a/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out
+++ b/ql/src/test/results/clientpositive/llap/semijoin_hint.q.out
@@ -186,7 +186,7 @@ STAGE PLANS:
                   filterExpr: (str is not null and (str BETWEEN 
DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (str is not null and (str BETWEEN 
DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter)))) (type: boolean)
+                    predicate: ((str BETWEEN DynamicValue(RS_7_v_key1_min) AND 
DynamicValue(RS_7_v_key1_max) and in_bloom_filter(str, 
DynamicValue(RS_7_v_key1_bloom_filter))) and str is not null) (type: boolean)
                     Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: str (type: string)
@@ -455,7 +455,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_9_srcpart_date_str_min) AND 
DynamicValue(RS_9_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_9_srcpart_date_str_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_9_srcpart_date_str_min) AND 
DynamicValue(RS_9_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_9_srcpart_date_str_bloom_filter)))) (type: boolean)
+                    predicate: ((key1 BETWEEN 
DynamicValue(RS_9_srcpart_date_str_min) AND 
DynamicValue(RS_9_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_9_srcpart_date_str_bloom_filter))) and key1 is not null) (type: 
boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
                       expressions: key1 (type: string)
@@ -611,7 +611,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_3_i_cstring_min) AND DynamicValue(RS_3_i_cstring_max) and 
in_bloom_filter(key1, DynamicValue(RS_3_i_cstring_bloom_filter)))) (type: 
boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_3_i_cstring_min) AND DynamicValue(RS_3_i_cstring_max) and 
in_bloom_filter(key1, DynamicValue(RS_3_i_cstring_bloom_filter)))) (type: 
boolean)
+                    predicate: ((key1 BETWEEN DynamicValue(RS_3_i_cstring_min) 
AND DynamicValue(RS_3_i_cstring_max) and in_bloom_filter(key1, 
DynamicValue(RS_3_i_cstring_bloom_filter))) and key1 is not null) (type: 
boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
                       expressions: key1 (type: string)
@@ -760,7 +760,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean)
+                    predicate: ((key1 BETWEEN DynamicValue(RS_3_k_str_min) AND 
DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_3_k_str_bloom_filter))) and key1 is not null) (type: boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
                       expressions: key1 (type: string)
@@ -1028,7 +1028,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter)))) (type: boolean)
+                    predicate: ((key1 BETWEEN DynamicValue(RS_6_k_str_min) AND 
DynamicValue(RS_6_k_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_6_k_str_bloom_filter))) and key1 is not null) (type: boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
                       expressions: key1 (type: string)
@@ -1048,7 +1048,7 @@ STAGE PLANS:
                   filterExpr: (str is not null and (str BETWEEN 
DynamicValue(RS_21_v_key1_min) AND DynamicValue(RS_21_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_21_v_key1_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (str is not null and (str BETWEEN 
DynamicValue(RS_21_v_key1_min) AND DynamicValue(RS_21_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_21_v_key1_bloom_filter)))) (type: boolean)
+                    predicate: ((str BETWEEN DynamicValue(RS_21_v_key1_min) 
AND DynamicValue(RS_21_v_key1_max) and in_bloom_filter(str, 
DynamicValue(RS_21_v_key1_bloom_filter))) and str is not null) (type: boolean)
                     Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: str (type: string)
@@ -1188,7 +1188,7 @@ STAGE PLANS:
                   filterExpr: (str is not null and (str BETWEEN 
DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (str is not null and (str BETWEEN 
DynamicValue(RS_7_v_key1_min) AND DynamicValue(RS_7_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_7_v_key1_bloom_filter)))) (type: boolean)
+                    predicate: ((str BETWEEN DynamicValue(RS_7_v_key1_min) AND 
DynamicValue(RS_7_v_key1_max) and in_bloom_filter(str, 
DynamicValue(RS_7_v_key1_bloom_filter))) and str is not null) (type: boolean)
                     Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: str (type: string)
@@ -1453,7 +1453,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_12_srcpart_date_str_min) AND 
DynamicValue(RS_12_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_12_srcpart_date_str_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_12_srcpart_date_str_min) AND 
DynamicValue(RS_12_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_12_srcpart_date_str_bloom_filter)))) (type: boolean)
+                    predicate: ((key1 BETWEEN 
DynamicValue(RS_12_srcpart_date_str_min) AND 
DynamicValue(RS_12_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_12_srcpart_date_str_bloom_filter))) and key1 is not null) 
(type: boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
                       expressions: key1 (type: string)
@@ -1607,7 +1607,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_9_i_cstring_min) AND DynamicValue(RS_9_i_cstring_max) and 
in_bloom_filter(key1, DynamicValue(RS_9_i_cstring_bloom_filter)))) (type: 
boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_9_i_cstring_min) AND DynamicValue(RS_9_i_cstring_max) and 
in_bloom_filter(key1, DynamicValue(RS_9_i_cstring_bloom_filter)))) (type: 
boolean)
+                    predicate: ((key1 BETWEEN DynamicValue(RS_9_i_cstring_min) 
AND DynamicValue(RS_9_i_cstring_max) and in_bloom_filter(key1, 
DynamicValue(RS_9_i_cstring_bloom_filter))) and key1 is not null) (type: 
boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
                       expressions: key1 (type: string)
@@ -1754,7 +1754,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_6_k_str_min) AND DynamicValue(RS_6_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_6_k_str_bloom_filter)))) (type: boolean)
+                    predicate: ((key1 BETWEEN DynamicValue(RS_6_k_str_min) AND 
DynamicValue(RS_6_k_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_6_k_str_bloom_filter))) and key1 is not null) (type: boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
                       expressions: key1 (type: string)
@@ -2010,7 +2010,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean)
+                    predicate: ((key1 BETWEEN DynamicValue(RS_3_k_str_min) AND 
DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_3_k_str_bloom_filter))) and key1 is not null) (type: boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Reduce Output Operator
                       key expressions: key1 (type: string)
@@ -2026,7 +2026,7 @@ STAGE PLANS:
                   filterExpr: (str is not null and (str BETWEEN 
DynamicValue(RS_17_v_key1_min) AND DynamicValue(RS_17_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_17_v_key1_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (str is not null and (str BETWEEN 
DynamicValue(RS_17_v_key1_min) AND DynamicValue(RS_17_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_17_v_key1_bloom_filter)))) (type: boolean)
+                    predicate: ((str BETWEEN DynamicValue(RS_17_v_key1_min) 
AND DynamicValue(RS_17_v_key1_max) and in_bloom_filter(str, 
DynamicValue(RS_17_v_key1_bloom_filter))) and str is not null) (type: boolean)
                     Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: str (type: string)
@@ -2162,7 +2162,7 @@ STAGE PLANS:
                   filterExpr: (str is not null and (str BETWEEN 
DynamicValue(RS_5_v_key1_min) AND DynamicValue(RS_5_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_5_v_key1_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (str is not null and (str BETWEEN 
DynamicValue(RS_5_v_key1_min) AND DynamicValue(RS_5_v_key1_max) and 
in_bloom_filter(str, DynamicValue(RS_5_v_key1_bloom_filter)))) (type: boolean)
+                    predicate: ((str BETWEEN DynamicValue(RS_5_v_key1_min) AND 
DynamicValue(RS_5_v_key1_max) and in_bloom_filter(str, 
DynamicValue(RS_5_v_key1_bloom_filter))) and str is not null) (type: boolean)
                     Statistics: Num rows: 2000 Data size: 174000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: str (type: string)
@@ -2400,7 +2400,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_4_srcpart_date_str_min) AND 
DynamicValue(RS_4_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_4_srcpart_date_str_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_4_srcpart_date_str_min) AND 
DynamicValue(RS_4_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_4_srcpart_date_str_bloom_filter)))) (type: boolean)
+                    predicate: ((key1 BETWEEN 
DynamicValue(RS_4_srcpart_date_str_min) AND 
DynamicValue(RS_4_srcpart_date_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_4_srcpart_date_str_bloom_filter))) and key1 is not null) (type: 
boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Reduce Output Operator
                       key expressions: key1 (type: string)
@@ -2536,7 +2536,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_8_i_cstring_min) AND DynamicValue(RS_8_i_cstring_max) and 
in_bloom_filter(key1, DynamicValue(RS_8_i_cstring_bloom_filter)))) (type: 
boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_8_i_cstring_min) AND DynamicValue(RS_8_i_cstring_max) and 
in_bloom_filter(key1, DynamicValue(RS_8_i_cstring_bloom_filter)))) (type: 
boolean)
+                    predicate: ((key1 BETWEEN DynamicValue(RS_8_i_cstring_min) 
AND DynamicValue(RS_8_i_cstring_max) and in_bloom_filter(key1, 
DynamicValue(RS_8_i_cstring_bloom_filter))) and key1 is not null) (type: 
boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Reduce Output Operator
                       key expressions: key1 (type: string)
@@ -2684,7 +2684,7 @@ STAGE PLANS:
                   filterExpr: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean)
                   Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                   Filter Operator
-                    predicate: (key1 is not null and (key1 BETWEEN 
DynamicValue(RS_3_k_str_min) AND DynamicValue(RS_3_k_str_max) and 
in_bloom_filter(key1, DynamicValue(RS_3_k_str_bloom_filter)))) (type: boolean)
+                    predicate: ((key1 BETWEEN DynamicValue(RS_3_k_str_min) AND 
DynamicValue(RS_3_k_str_max) and in_bloom_filter(key1, 
DynamicValue(RS_3_k_str_bloom_filter))) and key1 is not null) (type: boolean)
                     Statistics: Num rows: 1000 Data size: 87000 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Reduce Output Operator
                       key expressions: key1 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/skewjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/skewjoin.q.out 
b/ql/src/test/results/clientpositive/llap/skewjoin.q.out
index 5a87f93..e53da81 100644
--- a/ql/src/test/results/clientpositive/llap/skewjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/skewjoin.q.out
@@ -738,7 +738,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (key is not null and 
UDFToDouble(substring(value, 5)) is not null) (type: boolean)
+                    predicate: (UDFToDouble(substring(value, 5)) is not null 
and key is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -757,7 +757,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (key is not null and (substring(value, 5) + 1) 
is not null) (type: boolean)
+                    predicate: ((substring(value, 5) + 1) is not null and key 
is not null) (type: boolean)
                     Statistics: Num rows: 500 Data size: 89000 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -873,7 +873,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((key < 80) and (key < 100)) (type: boolean)
+                    predicate: ((key < 100) and (key < 80)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 4785 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out 
b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out
index 1023641..79c896f 100644
--- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out
+++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out
@@ -635,7 +635,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (key2 is not null and key is not null) (type: 
boolean)
+                    predicate: (key is not null and key2 is not null) (type: 
boolean)
                     Statistics: Num rows: 450 Data size: 82252 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), key2 (type: int), value 
(type: string)
@@ -715,7 +715,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (key2 is not null and key is not null) (type: 
boolean)
+                    predicate: (key is not null and key2 is not null) (type: 
boolean)
                     Statistics: Num rows: 450 Data size: 82252 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), key2 (type: int), value 
(type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/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 01fe124..5fc35d5 100644
--- a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
+++ b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
@@ -86,7 +86,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col4, _col5, _col6
                 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col5 > 8) and (_col0 = _col5)) (type: boolean)
+                  predicate: ((_col0 = _col5) and (_col5 > 8)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col4 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
@@ -98,7 +98,7 @@ STAGE PLANS:
                       Map-reduce partition columns: UDFToInteger(_col0) (type: 
int)
                       Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: ((_col5 <= 8) and (_col0 = _col5)) (type: boolean)
+                  predicate: ((_col0 = _col5) and (_col5 <= 8)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col4 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/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 03819ef..6179d08 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_in.q.out
@@ -931,7 +931,7 @@ STAGE PLANS:
                   alias: li
                   Statistics: Num rows: 100 Data size: 1600 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: ((l_linenumber = 1) and l_partkey is not null 
and l_orderkey is not null) (type: boolean)
+                    predicate: ((l_linenumber = 1) and l_orderkey is not null 
and l_partkey is not null) (type: boolean)
                     Statistics: Num rows: 14 Data size: 224 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: l_orderkey (type: int), l_partkey (type: 
int), l_suppkey (type: int)
@@ -2109,7 +2109,7 @@ STAGE PLANS:
                   alias: p
                   Statistics: Num rows: 26 Data size: 3354 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
-                    predicate: (p_size is not null and p_partkey is not null) 
(type: boolean)
+                    predicate: (p_partkey is not null and p_size is not null) 
(type: boolean)
                     Statistics: Num rows: 26 Data size: 3354 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
                       keys: p_partkey (type: int), p_name (type: string), 
p_size (type: int)

Reply via email to