http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out 
b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
index 1ed388f..4f4dddd 100644
--- a/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
+++ b/ql/src/test/results/clientpositive/spark/dynamic_rdd_cache.q.out
@@ -746,7 +746,7 @@ STAGE PLANS:
                   alias: inventory
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: (inv_item_sk is not null and inv_warehouse_sk 
is not null and inv_date_sk is not null) (type: boolean)
+                    predicate: (inv_date_sk is not null and inv_item_sk is not 
null and inv_warehouse_sk is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: inv_date_sk (type: int), inv_item_sk (type: 
int), inv_quantity_on_hand (type: int), inv_warehouse_sk (type: int)
@@ -764,7 +764,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: ((d_year = 1999) and (d_moy = 3) and d_date_sk 
is not null) (type: boolean)
+                    predicate: ((d_moy = 3) and (d_year = 1999) and d_date_sk 
is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -781,7 +781,7 @@ STAGE PLANS:
                   alias: inventory
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: (inv_item_sk is not null and inv_warehouse_sk 
is not null and inv_date_sk is not null) (type: boolean)
+                    predicate: (inv_date_sk is not null and inv_item_sk is not 
null and inv_warehouse_sk is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: inv_date_sk (type: int), inv_item_sk (type: 
int), inv_quantity_on_hand (type: int), inv_warehouse_sk (type: int)
@@ -834,7 +834,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: ((d_year = 1999) and (d_moy = 4) and d_date_sk 
is not null) (type: boolean)
+                    predicate: ((d_moy = 4) and (d_year = 1999) and d_date_sk 
is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
index b612747..f9eaa3c 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
@@ -56,7 +56,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value) IN ('val_400', 'val_500') and (key) 
IN (400, 450)) or ((value) IN ('val_100', 'val_200', 'val_300') and (key) IN 
(100, 150, 200))) (type: boolean)
+                    predicate: (((value) IN ('val_100', 'val_200', 'val_300') 
and (key) IN (100, 150, 200)) or ((value) IN ('val_400', 'val_500') and (key) 
IN (400, 450))) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)
@@ -69,7 +69,7 @@ STAGE PLANS:
               Forward
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: ((VALUE._col0) IN ('val_100', 'val_200', 
'val_300') and (KEY._col0) IN (100, 150, 200)) (type: boolean)
+                  predicate: ((KEY._col0) IN (100, 150, 200) and (VALUE._col0) 
IN ('val_100', 'val_200', 'val_300')) (type: boolean)
                   Statistics: Num rows: 63 Data size: 669 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: count()
@@ -90,7 +90,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.e1
                 Filter Operator
-                  predicate: ((VALUE._col0) IN ('val_400', 'val_500') and 
(KEY._col0) IN (400, 450)) (type: boolean)
+                  predicate: ((KEY._col0) IN (400, 450) and (VALUE._col0) IN 
('val_400', 'val_500')) (type: boolean)
                   Statistics: Num rows: 63 Data size: 669 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: count()
@@ -228,7 +228,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((key + key) = 400) or (((key - 100) = 500) 
and value is not null)) or (((key + key) = 200) or ((key - 100) = 100) or ((key 
= 300) and value is not null))) (type: boolean)
+                    predicate: ((((key + key) = 200) or ((key - 100) = 100) or 
((key = 300) and value is not null)) or (((key + key) = 400) or (((key - 100) = 
500) and value is not null))) (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: value (type: string)
@@ -262,7 +262,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.e1
                 Filter Operator
-                  predicate: (((VALUE._col0 + VALUE._col0) = 400) or 
(((VALUE._col0 - 100) = 500) and KEY._col0 is not null)) (type: boolean)
+                  predicate: ((((VALUE._col0 - 100) = 500) and KEY._col0 is 
not null) or ((VALUE._col0 + VALUE._col0) = 400)) (type: boolean)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: count()
@@ -400,7 +400,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((value) IN ('val_400', 'val_500') and (key) 
IN (400, 450)) or ((value) IN ('val_100', 'val_200', 'val_300') and (key) IN 
(100, 150, 200))) (type: boolean)
+                    predicate: (((value) IN ('val_100', 'val_200', 'val_300') 
and (key) IN (100, 150, 200)) or ((value) IN ('val_400', 'val_500') and (key) 
IN (400, 450))) (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)
@@ -413,7 +413,7 @@ STAGE PLANS:
               Forward
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: ((VALUE._col0) IN ('val_100', 'val_200', 
'val_300') and (KEY._col0) IN (100, 150, 200)) (type: boolean)
+                  predicate: ((KEY._col0) IN (100, 150, 200) and (VALUE._col0) 
IN ('val_100', 'val_200', 'val_300')) (type: boolean)
                   Statistics: Num rows: 63 Data size: 669 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: count()
@@ -434,7 +434,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.e1
                 Filter Operator
-                  predicate: ((VALUE._col0) IN ('val_400', 'val_500') and 
(KEY._col0) IN (400, 450)) (type: boolean)
+                  predicate: ((KEY._col0) IN (400, 450) and (VALUE._col0) IN 
('val_400', 'val_500')) (type: boolean)
                   Statistics: Num rows: 63 Data size: 669 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: count()
@@ -572,7 +572,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((((key + key) = 400) or (((key - 100) = 500) 
and value is not null)) or (((key + key) = 200) or ((key - 100) = 100) or ((key 
= 300) and value is not null))) (type: boolean)
+                    predicate: ((((key + key) = 200) or ((key - 100) = 100) or 
((key = 300) and value is not null)) or (((key + key) = 400) or (((key - 100) = 
500) and value is not null))) (type: boolean)
                     Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: value (type: string)
@@ -606,7 +606,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.e1
                 Filter Operator
-                  predicate: (((VALUE._col0 + VALUE._col0) = 400) or 
(((VALUE._col0 - 100) = 500) and KEY._col0 is not null)) (type: boolean)
+                  predicate: ((((VALUE._col0 - 100) = 500) and KEY._col0 is 
not null) or ((VALUE._col0 + VALUE._col0) = 400)) (type: boolean)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: count()

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/groupby_position.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_position.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_position.q.out
index ae27cc1..91c2581 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_position.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_position.q.out
@@ -570,7 +570,7 @@ STAGE PLANS:
                   alias: src2
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out 
b/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out
index 551519f..ac83820 100644
--- 
a/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/identity_project_remove_skip.q.out
@@ -32,7 +32,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value = 'val_105') and (key = '105')) (type: 
boolean)
+                    predicate: ((key = '105') and (value = 'val_105')) (type: 
boolean)
                     Statistics: Num rows: 125 Data size: 1328 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       Statistics: Num rows: 125 Data size: 1328 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out 
b/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out
index 19454a8..e0a701b 100644
--- a/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out
+++ b/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out
@@ -19,7 +19,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 80.0) and 
(UDFToDouble(key) < 100.0) and value is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and 
(UDFToDouble(key) > 80.0) and value is not null) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -37,7 +37,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 70.0) and 
(UDFToDouble(key) < 90.0) and value is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 90.0) and 
(UDFToDouble(key) > 70.0) and value is not null) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -138,7 +138,7 @@ STAGE PLANS:
                   filterExpr: ((UDFToDouble(key) > 80.0) and (UDFToDouble(key) 
< 100.0) and value is not null) (type: boolean)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 80.0) and 
(UDFToDouble(key) < 100.0) and value is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and 
(UDFToDouble(key) > 80.0) and value is not null) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -157,7 +157,7 @@ STAGE PLANS:
                   filterExpr: ((UDFToDouble(key) > 70.0) and (UDFToDouble(key) 
< 90.0) and value is not null) (type: boolean)
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 70.0) and 
(UDFToDouble(key) < 90.0) and value is not null) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 90.0) and 
(UDFToDouble(key) > 70.0) and value is not null) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/input12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input12.q.out 
b/ql/src/test/results/clientpositive/spark/input12.q.out
index 2efd81b..efbaaf9 100644
--- a/ql/src/test/results/clientpositive/spark/input12.q.out
+++ b/ql/src/test/results/clientpositive/spark/input12.q.out
@@ -69,7 +69,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.dest1
                   Filter Operator
-                    predicate: ((key >= 100) and (key < 200)) (type: boolean)
+                    predicate: ((key < 200) and (key >= 100)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: UDFToInteger(key) (type: int), value (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/input13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input13.q.out 
b/ql/src/test/results/clientpositive/spark/input13.q.out
index 09c7959..a72898f 100644
--- a/ql/src/test/results/clientpositive/spark/input13.q.out
+++ b/ql/src/test/results/clientpositive/spark/input13.q.out
@@ -72,7 +72,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.dest1
                   Filter Operator
-                    predicate: ((key >= 100) and (key < 200)) (type: boolean)
+                    predicate: ((key < 200) and (key >= 100)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: UDFToInteger(key) (type: int), value (type: 
string)
@@ -87,7 +87,7 @@ STAGE PLANS:
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                             name: default.dest2
                   Filter Operator
-                    predicate: ((key >= 200) and (key < 300)) (type: boolean)
+                    predicate: ((key < 300) and (key >= 200)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: UDFToInteger(key) (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/input_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input_part2.q.out 
b/ql/src/test/results/clientpositive/spark/input_part2.q.out
index e1582e2..a728e97 100644
--- a/ql/src/test/results/clientpositive/spark/input_part2.q.out
+++ b/ql/src/test/results/clientpositive/spark/input_part2.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((key < 100) and (ds = '2008-04-08')) (type: 
boolean)
+                    predicate: ((ds = '2008-04-08') and (key < 100)) (type: 
boolean)
                     Statistics: Num rows: 333 Data size: 3537 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: UDFToInteger(key) (type: int), value (type: 
string), '12' (type: string), '2008-04-08' (type: string)
@@ -84,7 +84,7 @@ STAGE PLANS:
                         MultiFileSpray: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((key < 100) and (ds = '2008-04-09')) (type: 
boolean)
+                    predicate: ((ds = '2008-04-09') and (key < 100)) (type: 
boolean)
                     Statistics: Num rows: 333 Data size: 3537 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: UDFToInteger(key) (type: int), value (type: 
string), '12' (type: string), '2008-04-09' (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join19.q.out 
b/ql/src/test/results/clientpositive/spark/join19.q.out
index eb55147..fc1fd2f 100644
--- a/ql/src/test/results/clientpositive/spark/join19.q.out
+++ b/ql/src/test/results/clientpositive/spark/join19.q.out
@@ -139,7 +139,7 @@ STAGE PLANS:
                   alias: t5
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: ((predicate = 
'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and subject is not null 
and object is not null) (type: boolean)
+                    predicate: ((predicate = 
'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and object is not null and 
subject is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: subject (type: string), object (type: 
string)
@@ -157,7 +157,7 @@ STAGE PLANS:
                   alias: t1
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: ((predicate = 
'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 
'http://ontos/OntosMiner/Common.English/ontology#Citation') and subject is not 
null) (type: boolean)
+                    predicate: ((object = 
'http://ontos/OntosMiner/Common.English/ontology#Citation') and (predicate = 
'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and subject is 
not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: subject (type: string)
@@ -210,7 +210,7 @@ STAGE PLANS:
                   alias: t4
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   Filter Operator
-                    predicate: ((predicate = 
'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 
'http://ontos/OntosMiner/Common.English/ontology#Author') and subject is not 
null) (type: boolean)
+                    predicate: ((object = 
'http://ontos/OntosMiner/Common.English/ontology#Author') and (predicate = 
'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and subject is 
not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                     Select Operator
                       expressions: subject (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join20.q.out 
b/ql/src/test/results/clientpositive/spark/join20.q.out
index 114127c..daf6328 100644
--- a/ql/src/test/results/clientpositive/spark/join20.q.out
+++ b/ql/src/test/results/clientpositive/spark/join20.q.out
@@ -685,7 +685,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < 15) and (key < 10)) (type: boolean)
+                    predicate: ((key < 10) and (key < 15)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out 
b/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
index 803b4b1..2a6b9b6 100644
--- a/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
+++ b/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
@@ -573,7 +573,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: 191 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join4.q.out 
b/ql/src/test/results/clientpositive/spark/join4.q.out
index ae91a49..7e1d473 100644
--- a/ql/src/test/results/clientpositive/spark/join4.q.out
+++ b/ql/src/test/results/clientpositive/spark/join4.q.out
@@ -54,7 +54,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 10.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 10.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -72,7 +72,7 @@ STAGE PLANS:
                   alias: src2
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join5.q.out 
b/ql/src/test/results/clientpositive/spark/join5.q.out
index d79af77..c354a0e 100644
--- a/ql/src/test/results/clientpositive/spark/join5.q.out
+++ b/ql/src/test/results/clientpositive/spark/join5.q.out
@@ -72,7 +72,7 @@ STAGE PLANS:
                   alias: src2
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 25.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 25.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join6.q.out 
b/ql/src/test/results/clientpositive/spark/join6.q.out
index 8ae5e3a..c488247 100644
--- a/ql/src/test/results/clientpositive/spark/join6.q.out
+++ b/ql/src/test/results/clientpositive/spark/join6.q.out
@@ -54,7 +54,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 10.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 10.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -72,7 +72,7 @@ STAGE PLANS:
                   alias: src2
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 25.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 25.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join7.q.out 
b/ql/src/test/results/clientpositive/spark/join7.q.out
index 45c4231..d9b7c05 100644
--- a/ql/src/test/results/clientpositive/spark/join7.q.out
+++ b/ql/src/test/results/clientpositive/spark/join7.q.out
@@ -64,7 +64,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 10.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 10.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -82,7 +82,7 @@ STAGE PLANS:
                   alias: src2
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 25.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 25.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -100,7 +100,7 @@ STAGE PLANS:
                   alias: src3
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 20.0) and 
(UDFToDouble(key) < 25.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 25.0) and 
(UDFToDouble(key) > 20.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join8.q.out 
b/ql/src/test/results/clientpositive/spark/join8.q.out
index 4ddad76..ae308b0 100644
--- a/ql/src/test/results/clientpositive/spark/join8.q.out
+++ b/ql/src/test/results/clientpositive/spark/join8.q.out
@@ -54,7 +54,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 10.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 10.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -72,7 +72,7 @@ STAGE PLANS:
                   alias: src2
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join_hive_626.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join_hive_626.q.out 
b/ql/src/test/results/clientpositive/spark/join_hive_626.q.out
index a067d74..603df07 100644
--- a/ql/src/test/results/clientpositive/spark/join_hive_626.q.out
+++ b/ql/src/test/results/clientpositive/spark/join_hive_626.q.out
@@ -82,7 +82,7 @@ STAGE PLANS:
                   alias: hive_bar
                   Statistics: Num rows: 1 Data size: 23 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (foo_id is not null and bar_id is not null) 
(type: boolean)
+                    predicate: (bar_id is not null and foo_id is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 23 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: bar_id (type: int), foo_id (type: int), 
bar_name (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join_reorder2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join_reorder2.q.out 
b/ql/src/test/results/clientpositive/spark/join_reorder2.q.out
index a8c34c4..74e3d01 100644
--- a/ql/src/test/results/clientpositive/spark/join_reorder2.q.out
+++ b/ql/src/test/results/clientpositive/spark/join_reorder2.q.out
@@ -225,7 +225,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and val is not null and (key + 
1) is not null) (type: boolean)
+                    predicate: ((key + 1) is not null and key is not null and 
val is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)
@@ -239,7 +239,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (key + 1) is not null) 
(type: boolean)
+                    predicate: ((key + 1) is not null and key is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/join_reorder3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join_reorder3.q.out 
b/ql/src/test/results/clientpositive/spark/join_reorder3.q.out
index efd8a8c..f4ed040 100644
--- a/ql/src/test/results/clientpositive/spark/join_reorder3.q.out
+++ b/ql/src/test/results/clientpositive/spark/join_reorder3.q.out
@@ -225,7 +225,7 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and val is not null and (key + 
1) is not null) (type: boolean)
+                    predicate: ((key + 1) is not null and key is not null and 
val is not null) (type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)
@@ -239,7 +239,7 @@ STAGE PLANS:
                   alias: b
                   Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
-                    predicate: (key is not null and (key + 1) is not null) 
(type: boolean)
+                    predicate: ((key + 1) is not null and key is not null) 
(type: boolean)
                     Statistics: Num rows: 1 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
index 7f403d5..e153b4d 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
@@ -92,7 +92,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) > 20.0) and 
(UDFToDouble(key) < 40.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 40.0) and 
(UDFToDouble(key) > 20.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string), 
'33' (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
index 65755e7..0762fba 100644
--- a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
@@ -109,7 +109,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -466,7 +466,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -725,7 +725,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 111 Data size: 1179 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -1082,7 +1082,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((UDFToDouble(key) > 15.0) and 
(UDFToDouble(key) < 20.0)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 20.0) and 
(UDFToDouble(key) > 15.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out 
b/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out
index c04a2e2..f00b6eb 100644
--- a/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out
+++ b/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out
@@ -64,7 +64,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 25 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < 300) and (key < 10)) (type: boolean)
+                    predicate: ((key < 10) and (key < 300)) (type: boolean)
                     Statistics: Num rows: 2 Data size: 15 Basic stats: 
COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       filter predicates:
@@ -225,7 +225,7 @@ STAGE PLANS:
                   alias: src1
                   Statistics: Num rows: 25 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < 300) and (key < 10)) (type: boolean)
+                    predicate: ((key < 10) and (key < 300)) (type: boolean)
                     Statistics: Num rows: 2 Data size: 15 Basic stats: 
COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
                       filter predicates:

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out 
b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
index 00b285c..618c7e0 100644
--- a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
@@ -169,7 +169,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)
@@ -581,7 +581,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/spark/multi_insert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/multi_insert.q.out 
b/ql/src/test/results/clientpositive/spark/multi_insert.q.out
index 33af962..4ed1e50 100644
--- a/ql/src/test/results/clientpositive/spark/multi_insert.q.out
+++ b/ql/src/test/results/clientpositive/spark/multi_insert.q.out
@@ -57,7 +57,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -194,7 +194,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -331,7 +331,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -468,7 +468,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -620,7 +620,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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -766,7 +766,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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -912,7 +912,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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -1058,7 +1058,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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -1189,7 +1189,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1220,7 +1220,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1372,7 +1372,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1403,7 +1403,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1555,7 +1555,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1586,7 +1586,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1738,7 +1738,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1769,7 +1769,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out 
b/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out
index d8c4b7f..c86731c 100644
--- a/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out
+++ b/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out
@@ -46,7 +46,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key > 500) or (key > 450)) (type: boolean)
+                    predicate: ((key > 450) or (key > 500)) (type: boolean)
                     Statistics: Num rows: 332 Data size: 3527 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out
 
b/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out
index 7f1d67b..85d57b1 100644
--- 
a/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -199,7 +199,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -340,7 +340,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -481,7 +481,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -637,7 +637,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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -787,7 +787,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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -937,7 +937,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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -1087,7 +1087,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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -1222,7 +1222,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1253,7 +1253,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1409,7 +1409,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1440,7 +1440,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1596,7 +1596,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1627,7 +1627,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1783,7 +1783,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -1814,7 +1814,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: 1179 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
@@ -2386,7 +2386,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -2495,7 +2495,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -2604,7 +2604,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -2713,7 +2713,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -2818,7 +2818,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -2860,7 +2860,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -3038,7 +3038,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -3080,7 +3080,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -3258,7 +3258,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -3300,7 +3300,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)
@@ -3478,7 +3478,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: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -3520,7 +3520,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 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: 254 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: KEY._col0 (type: string), KEY._col1 (type: string)

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

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/pcr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/pcr.q.out 
b/ql/src/test/results/clientpositive/spark/pcr.q.out
index 3ed71af..f373233 100644
--- a/ql/src/test/results/clientpositive/spark/pcr.q.out
+++ b/ql/src/test/results/clientpositive/spark/pcr.q.out
@@ -3227,7 +3227,7 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: ((ds > '2000-04-08') or ((ds <= '2000-04-09') 
and (key = 2))) (type: boolean)
+                    predicate: (((ds <= '2000-04-09') and (key = 2)) or (ds > 
'2000-04-08')) (type: boolean)
                     Statistics: Num rows: 30 Data size: 240 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: int), value (type: string), ds 
(type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out 
b/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
index 27c0873..1dc1a25 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < '400') and (key > '20') and ((value < 
'val_50') or (key > '2')) and (key <> '4')) (type: boolean)
+                    predicate: (((value < 'val_50') or (key > '2')) and (key < 
'400') and (key <> '4') and (key > '20')) (type: boolean)
                     Statistics: Num rows: 36 Data size: 382 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -75,7 +75,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col1 > '50') or (_col0 < '50')) (type: boolean)
+                  predicate: ((_col0 < '50') or (_col1 > '50')) (type: boolean)
                   Statistics: Num rows: 40 Data size: 428 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
@@ -304,7 +304,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < '400') and (key > '20') and ((value < 
'val_50') or (key > '2')) and (key <> '4')) (type: boolean)
+                    predicate: (((value < 'val_50') or (key > '2')) and (key < 
'400') and (key <> '4') and (key > '20')) (type: boolean)
                     Statistics: Num rows: 36 Data size: 382 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -343,7 +343,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col1 > '50') or (_col0 < '50')) (type: boolean)
+                  predicate: ((_col0 < '50') or (_col1 > '50')) (type: boolean)
                   Statistics: Num rows: 40 Data size: 428 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/ppd_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_join.q.out 
b/ql/src/test/results/clientpositive/spark/ppd_join.q.out
index 1b2487e..dd2c394 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_join.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_join.q.out
@@ -33,7 +33,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < '400') and (key > '20') and ((value < 
'val_50') or (key > '2')) and (key <> '4')) (type: boolean)
+                    predicate: (((value < 'val_50') or (key > '2')) and (key < 
'400') and (key <> '4') and (key > '20')) (type: boolean)
                     Statistics: Num rows: 36 Data size: 382 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -73,7 +73,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col1 > '50') or (_col0 < '50')) (type: boolean)
+                  predicate: ((_col0 < '50') or (_col1 > '50')) (type: boolean)
                   Statistics: Num rows: 40 Data size: 428 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col2 (type: string)
@@ -566,7 +566,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < '400') and (key > '20') and ((value < 
'val_50') or (key > '2')) and (key <> '4')) (type: boolean)
+                    predicate: (((value < 'val_50') or (key > '2')) and (key < 
'400') and (key <> '4') and (key > '20')) (type: boolean)
                     Statistics: Num rows: 36 Data size: 382 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
@@ -606,7 +606,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col1 > '50') or (_col0 < '50')) (type: boolean)
+                  predicate: ((_col0 < '50') or (_col1 > '50')) (type: boolean)
                   Statistics: Num rows: 40 Data size: 428 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col2 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_join2.q.out 
b/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
index 024e962..e0e6b31 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
@@ -40,7 +40,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key <> '305') and (key <> '302') and (key < 
'400') and (key <> '14') and (key <> '311')) (type: boolean)
+                    predicate: ((key < '400') and (key <> '14') and (key <> 
'302') and (key <> '305') and (key <> '311')) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -58,7 +58,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key <> '302') and (key < '400') and (key <> 
'305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and (key <> 
'14') and value is not null) (type: boolean)
+                    predicate: (((value <> 'val_50') or (key > '1')) and (key 
< '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> 
'311') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -1720,7 +1720,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key <> '305') and (key <> '302') and (key < 
'400') and (key <> '14') and (key <> '311')) (type: boolean)
+                    predicate: ((key < '400') and (key <> '14') and (key <> 
'302') and (key <> '305') and (key <> '311')) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
@@ -1738,7 +1738,7 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key <> '302') and (key < '400') and (key <> 
'305') and (key <> '311') and ((value <> 'val_50') or (key > '1')) and (key <> 
'14') and value is not null) (type: boolean)
+                    predicate: (((value <> 'val_50') or (key > '1')) and (key 
< '400') and (key <> '14') and (key <> '302') and (key <> '305') and (key <> 
'311') and value is not null) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)

Reply via email to