http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query27.q.out 
b/ql/src/test/results/clientpositive/perf/query27.q.out
index cbd7d29..c6a1905 100644
--- a/ql/src/test/results/clientpositive/perf/query27.q.out
+++ b/ql/src/test/results/clientpositive/perf/query27.q.out
@@ -125,7 +125,7 @@ Stage-0
                                         Select Operator [SEL_2] 
(rows=575995635 width=88)
                                           
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                           Filter Operator [FIL_51] 
(rows=575995635 width=88)
-                                            predicate:(ss_cdemo_sk is not null 
and ss_sold_date_sk is not null and ss_store_sk is not null and ss_item_sk is 
not null)
+                                            predicate:(ss_cdemo_sk is not null 
and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is 
not null)
                                             TableScan [TS_0] (rows=575995635 
width=88)
                                               
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_cdemo_sk","ss_store_sk","ss_quantity","ss_list_price","ss_sales_price","ss_coupon_amt"]
                                     <-Map 8 [SIMPLE_EDGE]
@@ -134,7 +134,7 @@ Stage-0
                                         Select Operator [SEL_5] (rows=232725 
width=385)
                                           Output:["_col0"]
                                           Filter Operator [FIL_52] 
(rows=232725 width=385)
-                                            predicate:((cd_gender = 'M') and 
(cd_marital_status = 'U') and (cd_education_status = '2 yr Degree') and 
cd_demo_sk is not null)
+                                            predicate:((cd_education_status = 
'2 yr Degree') and (cd_gender = 'M') and (cd_marital_status = 'U') and 
cd_demo_sk is not null)
                                             TableScan [TS_3] (rows=1861800 
width=385)
                                               
default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query28.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query28.q.out 
b/ql/src/test/results/clientpositive/perf/query28.q.out
index 48e3dc5..33dc1ae 100644
--- a/ql/src/test/results/clientpositive/perf/query28.q.out
+++ b/ql/src/test/results/clientpositive/perf/query28.q.out
@@ -150,7 +150,7 @@ Stage-0
                             Select Operator [SEL_23] (rows=21333171 width=88)
                               Output:["ss_list_price"]
                               Filter Operator [FIL_55] (rows=21333171 width=88)
-                                predicate:(ss_quantity BETWEEN 16 AND 20 and 
(ss_list_price BETWEEN 142 AND 152 or ss_coupon_amt BETWEEN 3054 AND 4054 or 
ss_wholesale_cost BETWEEN 80 AND 100))
+                                predicate:((ss_list_price BETWEEN 142 AND 152 
or ss_coupon_amt BETWEEN 3054 AND 4054 or ss_wholesale_cost BETWEEN 80 AND 100) 
and ss_quantity BETWEEN 16 AND 20)
                                 TableScan [TS_0] (rows=575995635 width=88)
                                   
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_quantity","ss_wholesale_cost","ss_list_price","ss_coupon_amt"]
             <-Reducer 12 [CUSTOM_SIMPLE_EDGE]
@@ -171,7 +171,7 @@ Stage-0
                             Select Operator [SEL_30] (rows=21333171 width=88)
                               Output:["ss_list_price"]
                               Filter Operator [FIL_56] (rows=21333171 width=88)
-                                predicate:(ss_quantity BETWEEN 11 AND 15 and 
(ss_list_price BETWEEN 66 AND 76 or ss_coupon_amt BETWEEN 920 AND 1920 or 
ss_wholesale_cost BETWEEN 4 AND 24))
+                                predicate:((ss_list_price BETWEEN 66 AND 76 or 
ss_coupon_amt BETWEEN 920 AND 1920 or ss_wholesale_cost BETWEEN 4 AND 24) and 
ss_quantity BETWEEN 11 AND 15)
                                  Please refer to the previous TableScan [TS_0]
             <-Reducer 14 [CUSTOM_SIMPLE_EDGE]
               PARTITION_ONLY_SHUFFLE [RS_47]
@@ -191,7 +191,7 @@ Stage-0
                             Select Operator [SEL_37] (rows=21333171 width=88)
                               Output:["ss_list_price"]
                               Filter Operator [FIL_57] (rows=21333171 width=88)
-                                predicate:(ss_quantity BETWEEN 6 AND 10 and 
(ss_list_price BETWEEN 91 AND 101 or ss_coupon_amt BETWEEN 1430 AND 2430 or 
ss_wholesale_cost BETWEEN 32 AND 52))
+                                predicate:((ss_list_price BETWEEN 91 AND 101 
or ss_coupon_amt BETWEEN 1430 AND 2430 or ss_wholesale_cost BETWEEN 32 AND 52) 
and ss_quantity BETWEEN 6 AND 10)
                                  Please refer to the previous TableScan [TS_0]
             <-Reducer 3 [CUSTOM_SIMPLE_EDGE]
               PARTITION_ONLY_SHUFFLE [RS_42]
@@ -211,7 +211,7 @@ Stage-0
                             Select Operator [SEL_2] (rows=21333171 width=88)
                               Output:["ss_list_price"]
                               Filter Operator [FIL_52] (rows=21333171 width=88)
-                                predicate:(ss_quantity BETWEEN 0 AND 5 and 
(ss_list_price BETWEEN 11 AND 21 or ss_coupon_amt BETWEEN 460 AND 1460 or 
ss_wholesale_cost BETWEEN 14 AND 34))
+                                predicate:((ss_list_price BETWEEN 11 AND 21 or 
ss_coupon_amt BETWEEN 460 AND 1460 or ss_wholesale_cost BETWEEN 14 AND 34) and 
ss_quantity BETWEEN 0 AND 5)
                                  Please refer to the previous TableScan [TS_0]
             <-Reducer 6 [CUSTOM_SIMPLE_EDGE]
               PARTITION_ONLY_SHUFFLE [RS_43]
@@ -231,7 +231,7 @@ Stage-0
                             Select Operator [SEL_9] (rows=21333171 width=88)
                               Output:["ss_list_price"]
                               Filter Operator [FIL_53] (rows=21333171 width=88)
-                                predicate:(ss_quantity BETWEEN 26 AND 30 and 
(ss_list_price BETWEEN 28 AND 38 or ss_coupon_amt BETWEEN 2513 AND 3513 or 
ss_wholesale_cost BETWEEN 42 AND 62))
+                                predicate:((ss_list_price BETWEEN 28 AND 38 or 
ss_coupon_amt BETWEEN 2513 AND 3513 or ss_wholesale_cost BETWEEN 42 AND 62) and 
ss_quantity BETWEEN 26 AND 30)
                                  Please refer to the previous TableScan [TS_0]
             <-Reducer 8 [CUSTOM_SIMPLE_EDGE]
               PARTITION_ONLY_SHUFFLE [RS_44]
@@ -251,6 +251,6 @@ Stage-0
                             Select Operator [SEL_16] (rows=21333171 width=88)
                               Output:["ss_list_price"]
                               Filter Operator [FIL_54] (rows=21333171 width=88)
-                                predicate:(ss_quantity BETWEEN 21 AND 25 and 
(ss_list_price BETWEEN 135 AND 145 or ss_coupon_amt BETWEEN 14180 AND 15180 or 
ss_wholesale_cost BETWEEN 38 AND 58))
+                                predicate:((ss_list_price BETWEEN 135 AND 145 
or ss_coupon_amt BETWEEN 14180 AND 15180 or ss_wholesale_cost BETWEEN 38 AND 
58) and ss_quantity BETWEEN 21 AND 25)
                                  Please refer to the previous TableScan [TS_0]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query29.q.out 
b/ql/src/test/results/clientpositive/perf/query29.q.out
index d64f034..81abe01 100644
--- a/ql/src/test/results/clientpositive/perf/query29.q.out
+++ b/ql/src/test/results/clientpositive/perf/query29.q.out
@@ -170,7 +170,7 @@ Stage-0
                                           Select Operator [SEL_17] (rows=4058 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_90] 
(rows=4058 width=1119)
-                                              predicate:(d_moy BETWEEN 4 AND 7 
and (d_year = 1999) and d_date_sk is not null)
+                                              predicate:((d_year = 1999) and 
d_date_sk is not null and d_moy BETWEEN 4 AND 7)
                                               TableScan [TS_9] (rows=73049 
width=1119)
                                                 
default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
                                       <-Map 14 [SIMPLE_EDGE]
@@ -179,7 +179,7 @@ Stage-0
                                           Select Operator [SEL_14] 
(rows=57591150 width=77)
                                             
Output:["_col0","_col1","_col2","_col3","_col4"]
                                             Filter Operator [FIL_89] 
(rows=57591150 width=77)
-                                              predicate:(sr_customer_sk is not 
null and sr_item_sk is not null and sr_ticket_number is not null and 
sr_returned_date_sk is not null)
+                                              predicate:(sr_customer_sk is not 
null and sr_item_sk is not null and sr_returned_date_sk is not null and 
sr_ticket_number is not null)
                                               TableScan [TS_12] (rows=57591150 
width=77)
                                                 
default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"]
                                   <-Reducer 8 [SIMPLE_EDGE]
@@ -201,7 +201,7 @@ Stage-0
                                           Select Operator [SEL_8] 
(rows=575995635 width=88)
                                             
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                             Filter Operator [FIL_87] 
(rows=575995635 width=88)
-                                              predicate:(ss_customer_sk is not 
null and ss_item_sk is not null and ss_ticket_number is not null and 
ss_sold_date_sk is not null and ss_store_sk is not null)
+                                              predicate:(ss_customer_sk is not 
null and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk 
is not null and ss_ticket_number is not null)
                                               TableScan [TS_6] (rows=575995635 
width=88)
                                                 
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"]
                     <-Reducer 2 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query3.q.out 
b/ql/src/test/results/clientpositive/perf/query3.q.out
index 33bcb31..462f05d 100644
--- a/ql/src/test/results/clientpositive/perf/query3.q.out
+++ b/ql/src/test/results/clientpositive/perf/query3.q.out
@@ -87,7 +87,7 @@ Stage-0
                             Select Operator [SEL_2] (rows=575995635 width=88)
                               Output:["_col0","_col1","_col2"]
                               Filter Operator [FIL_30] (rows=575995635 
width=88)
-                                predicate:(ss_sold_date_sk is not null and 
ss_item_sk is not null)
+                                predicate:(ss_item_sk is not null and 
ss_sold_date_sk is not null)
                                 TableScan [TS_0] (rows=575995635 width=88)
                                   
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
                         <-Map 6 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query31.q.out 
b/ql/src/test/results/clientpositive/perf/query31.q.out
index 644d3e1..4ccc6a4 100644
--- a/ql/src/test/results/clientpositive/perf/query31.q.out
+++ b/ql/src/test/results/clientpositive/perf/query31.q.out
@@ -177,7 +177,7 @@ Stage-0
                               Select Operator [SEL_2] (rows=575995635 width=88)
                                 Output:["_col0","_col1","_col2"]
                                 Filter Operator [FIL_236] (rows=575995635 
width=88)
-                                  predicate:(ss_sold_date_sk is not null and 
ss_addr_sk is not null)
+                                  predicate:(ss_addr_sk is not null and 
ss_sold_date_sk is not null)
                                   TableScan [TS_0] (rows=575995635 width=88)
                                     
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
             <-Reducer 16 [SIMPLE_EDGE]
@@ -220,7 +220,7 @@ Stage-0
                                   Select Operator [SEL_62] (rows=144002668 
width=135)
                                     Output:["_col0","_col1","_col2"]
                                     Filter Operator [FIL_245] (rows=144002668 
width=135)
-                                      predicate:(ws_sold_date_sk is not null 
and ws_bill_addr_sk is not null)
+                                      predicate:(ws_bill_addr_sk is not null 
and ws_sold_date_sk is not null)
                                       TableScan [TS_60] (rows=144002668 
width=135)
                                         
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
                 <-Reducer 19 [ONE_TO_ONE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query33.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query33.q.out 
b/ql/src/test/results/clientpositive/perf/query33.q.out
index 9d47c8a..0810c28 100644
--- a/ql/src/test/results/clientpositive/perf/query33.q.out
+++ b/ql/src/test/results/clientpositive/perf/query33.q.out
@@ -226,7 +226,7 @@ Stage-0
                                           Select Operator [SEL_15] (rows=18262 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_161] 
(rows=18262 width=1119)
-                                              predicate:((d_year = 1999) and 
(d_moy = 3) and d_date_sk is not null)
+                                              predicate:((d_moy = 3) and 
(d_year = 1999) and d_date_sk is not null)
                                               TableScan [TS_13] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
                                       <-Map 27 [SIMPLE_EDGE]
@@ -235,7 +235,7 @@ Stage-0
                                           Select Operator [SEL_49] 
(rows=287989836 width=135)
                                             
Output:["_col0","_col1","_col2","_col3"]
                                             Filter Operator [FIL_165] 
(rows=287989836 width=135)
-                                              predicate:(cs_sold_date_sk is 
not null and cs_bill_addr_sk is not null and cs_item_sk is not null)
+                                              predicate:(cs_bill_addr_sk is 
not null and cs_item_sk is not null and cs_sold_date_sk is not null)
                                               TableScan [TS_47] 
(rows=287989836 width=135)
                                                 
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"]
                             <-Reducer 8 [SIMPLE_EDGE]
@@ -249,7 +249,7 @@ Stage-0
                                     Select Operator [SEL_2] (rows=462000 
width=1436)
                                       Output:["_col0","_col1"]
                                       Filter Operator [FIL_158] (rows=462000 
width=1436)
-                                        predicate:(i_manufact_id is not null 
and i_item_sk is not null)
+                                        predicate:(i_item_sk is not null and 
i_manufact_id is not null)
                                         TableScan [TS_0] (rows=462000 
width=1436)
                                           
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_manufact_id"]
                                 <-Reducer 16 [ONE_TO_ONE_EDGE]
@@ -326,7 +326,7 @@ Stage-0
                                           Select Operator [SEL_87] 
(rows=144002668 width=135)
                                             
Output:["_col0","_col1","_col2","_col3"]
                                             Filter Operator [FIL_170] 
(rows=144002668 width=135)
-                                              predicate:(ws_sold_date_sk is 
not null and ws_bill_addr_sk is not null and ws_item_sk is not null)
+                                              predicate:(ws_bill_addr_sk is 
not null and ws_item_sk is not null and ws_sold_date_sk is not null)
                                               TableScan [TS_85] 
(rows=144002668 width=135)
                                                 
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"]
                 <-Reducer 4 [CONTAINS]
@@ -387,7 +387,7 @@ Stage-0
                                           Select Operator [SEL_12] 
(rows=575995635 width=88)
                                             
Output:["_col0","_col1","_col2","_col3"]
                                             Filter Operator [FIL_160] 
(rows=575995635 width=88)
-                                              predicate:(ss_sold_date_sk is 
not null and ss_addr_sk is not null and ss_item_sk is not null)
+                                              predicate:(ss_addr_sk is not 
null and ss_item_sk is not null and ss_sold_date_sk is not null)
                                               TableScan [TS_10] 
(rows=575995635 width=88)
                                                 
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query34.q.out 
b/ql/src/test/results/clientpositive/perf/query34.q.out
index a535ce5..c85b4d0 100644
--- a/ql/src/test/results/clientpositive/perf/query34.q.out
+++ b/ql/src/test/results/clientpositive/perf/query34.q.out
@@ -141,7 +141,7 @@ Stage-0
                                         Select Operator [SEL_5] 
(rows=575995635 width=88)
                                           
Output:["_col0","_col1","_col2","_col3","_col4"]
                                           Filter Operator [FIL_53] 
(rows=575995635 width=88)
-                                            predicate:(ss_sold_date_sk is not 
null and ss_store_sk is not null and ss_hdemo_sk is not null and ss_customer_sk 
is not null)
+                                            predicate:(ss_customer_sk is not 
null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and 
ss_store_sk is not null)
                                             TableScan [TS_3] (rows=575995635 
width=88)
                                               
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_store_sk","ss_ticket_number"]
                                     <-Map 9 [SIMPLE_EDGE]
@@ -150,7 +150,7 @@ Stage-0
                                         Select Operator [SEL_8] (rows=8116 
width=1119)
                                           Output:["_col0"]
                                           Filter Operator [FIL_54] (rows=8116 
width=1119)
-                                            predicate:((d_year) IN (2000, 
2001, 2002) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and 
d_date_sk is not null)
+                                            predicate:((d_dom BETWEEN 1 AND 3 
or d_dom BETWEEN 25 AND 28) and (d_year) IN (2000, 2001, 2002) and d_date_sk is 
not null)
                                             TableScan [TS_6] (rows=73049 
width=1119)
                                               
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_dom"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query35.q.out 
b/ql/src/test/results/clientpositive/perf/query35.q.out
index 5d45b17..a72f578 100644
--- a/ql/src/test/results/clientpositive/perf/query35.q.out
+++ b/ql/src/test/results/clientpositive/perf/query35.q.out
@@ -173,7 +173,7 @@ Stage-0
                                           Select Operator [SEL_14] (rows=12174 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_102] 
(rows=12174 width=1119)
-                                              predicate:((d_year = 1999) and 
(d_qoy < 4) and d_date_sk is not null)
+                                              predicate:((d_qoy < 4) and 
(d_year = 1999) and d_date_sk is not null)
                                               TableScan [TS_12] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
                                       <-Map 19 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query36.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query36.q.out 
b/ql/src/test/results/clientpositive/perf/query36.q.out
index e0dc8d9..dee62b5 100644
--- a/ql/src/test/results/clientpositive/perf/query36.q.out
+++ b/ql/src/test/results/clientpositive/perf/query36.q.out
@@ -134,7 +134,7 @@ Stage-0
                                             Select Operator [SEL_2] 
(rows=575995635 width=88)
                                               
Output:["_col0","_col1","_col2","_col3","_col4"]
                                               Filter Operator [FIL_46] 
(rows=575995635 width=88)
-                                                predicate:(ss_sold_date_sk is 
not null and ss_item_sk is not null and ss_store_sk is not null)
+                                                predicate:(ss_item_sk is not 
null and ss_sold_date_sk is not null and ss_store_sk is not null)
                                                 TableScan [TS_0] 
(rows=575995635 width=88)
                                                   
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"]
                                         <-Map 8 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query37.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query37.q.out 
b/ql/src/test/results/clientpositive/perf/query37.q.out
index 1c4f715..d5af964 100644
--- a/ql/src/test/results/clientpositive/perf/query37.q.out
+++ b/ql/src/test/results/clientpositive/perf/query37.q.out
@@ -88,7 +88,7 @@ Stage-0
                             Select Operator [SEL_8] (rows=4176000 width=15)
                               Output:["_col0","_col1"]
                               Filter Operator [FIL_41] (rows=4176000 width=15)
-                                predicate:(inv_quantity_on_hand BETWEEN 100 
AND 500 and inv_item_sk is not null and inv_date_sk is not null)
+                                predicate:(inv_date_sk is not null and 
inv_item_sk is not null and inv_quantity_on_hand BETWEEN 100 AND 500)
                                 TableScan [TS_6] (rows=37584000 width=15)
                                   
default@inventory,inventory,Tbl:COMPLETE,Col:NONE,Output:["inv_date_sk","inv_item_sk","inv_quantity_on_hand"]
                         <-Map 8 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query38.q.out 
b/ql/src/test/results/clientpositive/perf/query38.q.out
index 81fc9f3..199bed7 100644
--- a/ql/src/test/results/clientpositive/perf/query38.q.out
+++ b/ql/src/test/results/clientpositive/perf/query38.q.out
@@ -117,7 +117,7 @@ Stage-0
                                                 Select Operator [SEL_5] 
(rows=8116 width=1119)
                                                   Output:["_col0","_col1"]
                                                   Filter Operator [FIL_106] 
(rows=8116 width=1119)
-                                                    predicate:(d_month_seq 
BETWEEN 1212 AND 1223 and d_date_sk is not null)
+                                                    predicate:(d_date_sk is 
not null and d_month_seq BETWEEN 1212 AND 1223)
                                                     TableScan [TS_3] 
(rows=73049 width=1119)
                                                       
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date","d_month_seq"]
                                             <-Map 16 [SIMPLE_EDGE]
@@ -126,7 +126,7 @@ Stage-0
                                                 Select Operator [SEL_27] 
(rows=287989836 width=135)
                                                   Output:["_col0","_col1"]
                                                   Filter Operator [FIL_108] 
(rows=287989836 width=135)
-                                                    predicate:(cs_sold_date_sk 
is not null and cs_bill_customer_sk is not null)
+                                                    
predicate:(cs_bill_customer_sk is not null and cs_sold_date_sk is not null)
                                                     TableScan [TS_25] 
(rows=287989836 width=135)
                                                       
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk"]
                         <-Reducer 14 [CONTAINS]
@@ -166,7 +166,7 @@ Stage-0
                                                 Select Operator [SEL_53] 
(rows=144002668 width=135)
                                                   Output:["_col0","_col1"]
                                                   Filter Operator [FIL_111] 
(rows=144002668 width=135)
-                                                    predicate:(ws_sold_date_sk 
is not null and ws_bill_customer_sk is not null)
+                                                    
predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null)
                                                     TableScan [TS_51] 
(rows=144002668 width=135)
                                                       
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_customer_sk"]
                         <-Reducer 4 [CONTAINS]
@@ -206,7 +206,7 @@ Stage-0
                                                 Select Operator [SEL_2] 
(rows=575995635 width=88)
                                                   Output:["_col0","_col1"]
                                                   Filter Operator [FIL_105] 
(rows=575995635 width=88)
-                                                    predicate:(ss_sold_date_sk 
is not null and ss_customer_sk is not null)
+                                                    predicate:(ss_customer_sk 
is not null and ss_sold_date_sk is not null)
                                                     TableScan [TS_0] 
(rows=575995635 width=88)
                                                       
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_customer_sk"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query39.q.out 
b/ql/src/test/results/clientpositive/perf/query39.q.out
index 7607ba0..8e91494 100644
--- a/ql/src/test/results/clientpositive/perf/query39.q.out
+++ b/ql/src/test/results/clientpositive/perf/query39.q.out
@@ -130,7 +130,7 @@ Stage-0
                                           Select Operator [SEL_2] 
(rows=37584000 width=15)
                                             
Output:["_col0","_col1","_col2","_col3"]
                                             Filter Operator [FIL_90] 
(rows=37584000 width=15)
-                                              predicate:(inv_item_sk is not 
null and inv_warehouse_sk is not null and inv_date_sk is not null)
+                                              predicate:(inv_date_sk is not 
null and inv_item_sk is not null and inv_warehouse_sk is not null)
                                               TableScan [TS_0] (rows=37584000 
width=15)
                                                 
default@inventory,inventory,Tbl:COMPLETE,Col:NONE,Output:["inv_date_sk","inv_item_sk","inv_warehouse_sk","inv_quantity_on_hand"]
                                       <-Map 12 [SIMPLE_EDGE]
@@ -139,7 +139,7 @@ Stage-0
                                           Select Operator [SEL_33] (rows=18262 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_95] 
(rows=18262 width=1119)
-                                              predicate:((d_year = 1999) and 
(d_moy = 5) and d_date_sk is not null)
+                                              predicate:((d_moy = 5) and 
(d_year = 1999) and d_date_sk is not null)
                                               TableScan [TS_3] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
               <-Reducer 5 [SIMPLE_EDGE]
@@ -188,7 +188,7 @@ Stage-0
                                           Select Operator [SEL_5] (rows=18262 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_91] 
(rows=18262 width=1119)
-                                              predicate:((d_year = 1999) and 
(d_moy = 4) and d_date_sk is not null)
+                                              predicate:((d_moy = 4) and 
(d_year = 1999) and d_date_sk is not null)
                                                Please refer to the previous 
TableScan [TS_3]
 
 PREHOOK: query: with inv as

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query4.q.out 
b/ql/src/test/results/clientpositive/perf/query4.q.out
index 1494710..81867b9 100644
--- a/ql/src/test/results/clientpositive/perf/query4.q.out
+++ b/ql/src/test/results/clientpositive/perf/query4.q.out
@@ -278,7 +278,7 @@ Stage-0
                                     Select Operator [SEL_116] (rows=80000000 
width=860)
                                       
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                       Filter Operator [FIL_280] (rows=80000000 
width=860)
-                                        predicate:(c_customer_sk is not null 
and c_customer_id is not null)
+                                        predicate:(c_customer_id is not null 
and c_customer_sk is not null)
                                         TableScan [TS_114] (rows=80000000 
width=860)
                                           
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_customer_id","c_first_name","c_last_name","c_preferred_cust_flag","c_birth_country","c_login","c_email_address"]
                                 <-Reducer 11 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query40.q.out 
b/ql/src/test/results/clientpositive/perf/query40.q.out
index 919c5c2..604f741 100644
--- a/ql/src/test/results/clientpositive/perf/query40.q.out
+++ b/ql/src/test/results/clientpositive/perf/query40.q.out
@@ -133,7 +133,7 @@ Stage-0
                                       Select Operator [SEL_2] (rows=287989836 
width=135)
                                         
Output:["_col0","_col1","_col2","_col3","_col4"]
                                         Filter Operator [FIL_50] 
(rows=287989836 width=135)
-                                          predicate:(cs_warehouse_sk is not 
null and cs_item_sk is not null and cs_sold_date_sk is not null)
+                                          predicate:(cs_item_sk is not null 
and cs_sold_date_sk is not null and cs_warehouse_sk is not null)
                                           TableScan [TS_0] (rows=287989836 
width=135)
                                             
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_warehouse_sk","cs_item_sk","cs_order_number","cs_sales_price"]
                                   <-Map 8 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query42.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query42.q.out 
b/ql/src/test/results/clientpositive/perf/query42.q.out
index 1ccb4fd..f31a62d 100644
--- a/ql/src/test/results/clientpositive/perf/query42.q.out
+++ b/ql/src/test/results/clientpositive/perf/query42.q.out
@@ -93,7 +93,7 @@ Stage-0
                                 Select Operator [SEL_2] (rows=575995635 
width=88)
                                   Output:["_col0","_col1","_col2"]
                                   Filter Operator [FIL_30] (rows=575995635 
width=88)
-                                    predicate:(ss_sold_date_sk is not null and 
ss_item_sk is not null)
+                                    predicate:(ss_item_sk is not null and 
ss_sold_date_sk is not null)
                                     TableScan [TS_0] (rows=575995635 width=88)
                                       
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
                             <-Map 6 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query45.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query45.q.out 
b/ql/src/test/results/clientpositive/perf/query45.q.out
index 112b47b..3efed2e 100644
--- a/ql/src/test/results/clientpositive/perf/query45.q.out
+++ b/ql/src/test/results/clientpositive/perf/query45.q.out
@@ -112,7 +112,7 @@ Stage-0
                                           Select Operator [SEL_18] 
(rows=144002668 width=135)
                                             
Output:["_col0","_col1","_col2","_col3"]
                                             Filter Operator [FIL_79] 
(rows=144002668 width=135)
-                                              predicate:(ws_bill_customer_sk 
is not null and ws_sold_date_sk is not null and ws_item_sk is not null)
+                                              predicate:(ws_bill_customer_sk 
is not null and ws_item_sk is not null and ws_sold_date_sk is not null)
                                               TableScan [TS_16] 
(rows=144002668 width=135)
                                                 
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk","ws_sales_price"]
                                       <-Map 15 [SIMPLE_EDGE]
@@ -165,7 +165,7 @@ Stage-0
                                       Select Operator [SEL_2] (rows=80000000 
width=860)
                                         Output:["_col0","_col1"]
                                         Filter Operator [FIL_75] 
(rows=80000000 width=860)
-                                          predicate:(c_customer_sk is not null 
and c_current_addr_sk is not null)
+                                          predicate:(c_current_addr_sk is not 
null and c_customer_sk is not null)
                                           TableScan [TS_0] (rows=80000000 
width=860)
                                             
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
                                   <-Map 7 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query46.q.out 
b/ql/src/test/results/clientpositive/perf/query46.q.out
index 380944a..1a193ed 100644
--- a/ql/src/test/results/clientpositive/perf/query46.q.out
+++ b/ql/src/test/results/clientpositive/perf/query46.q.out
@@ -116,7 +116,7 @@ Stage-0
                           Select Operator [SEL_2] (rows=80000000 width=860)
                             Output:["_col0","_col1","_col2","_col3"]
                             Filter Operator [FIL_74] (rows=80000000 width=860)
-                              predicate:(c_customer_sk is not null and 
c_current_addr_sk is not null)
+                              predicate:(c_current_addr_sk is not null and 
c_customer_sk is not null)
                               TableScan [TS_0] (rows=80000000 width=860)
                                 
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk","c_first_name","c_last_name"]
                   <-Reducer 7 [SIMPLE_EDGE]
@@ -185,7 +185,7 @@ Stage-0
                                               Select Operator [SEL_8] 
(rows=575995635 width=88)
                                                 
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                                 Filter Operator [FIL_76] 
(rows=575995635 width=88)
-                                                  predicate:(ss_sold_date_sk 
is not null and ss_store_sk is not null and ss_hdemo_sk is not null and 
ss_addr_sk is not null and ss_customer_sk is not null)
+                                                  predicate:(ss_addr_sk is not 
null and ss_customer_sk is not null and ss_hdemo_sk is not null and 
ss_sold_date_sk is not null and ss_store_sk is not null)
                                                   TableScan [TS_6] 
(rows=575995635 width=88)
                                                     
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_ticket_number","ss_coupon_amt","ss_net_profit"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query47.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query47.q.out 
b/ql/src/test/results/clientpositive/perf/query47.q.out
index 1d4f36b..1288408 100644
--- a/ql/src/test/results/clientpositive/perf/query47.q.out
+++ b/ql/src/test/results/clientpositive/perf/query47.q.out
@@ -167,7 +167,7 @@ Stage-0
                                           Select Operator [SEL_81] (rows=1704 
width=1910)
                                             Output:["_col0","_col1","_col2"]
                                             Filter Operator [FIL_179] 
(rows=1704 width=1910)
-                                              predicate:(s_store_sk is not 
null and s_store_name is not null and s_company_name is not null)
+                                              predicate:(s_company_name is not 
null and s_store_name is not null and s_store_sk is not null)
                                               TableScan [TS_79] (rows=1704 
width=1910)
                                                 
default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_store_name","s_company_name"]
                                       <-Reducer 10 [SIMPLE_EDGE]
@@ -181,7 +181,7 @@ Stage-0
                                               Select Operator [SEL_78] 
(rows=462000 width=1436)
                                                 
Output:["_col0","_col1","_col2"]
                                                 Filter Operator [FIL_178] 
(rows=462000 width=1436)
-                                                  predicate:(i_item_sk is not 
null and i_category is not null and i_brand is not null)
+                                                  predicate:(i_brand is not 
null and i_category is not null and i_item_sk is not null)
                                                   TableScan [TS_76] 
(rows=462000 width=1436)
                                                     
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand","i_category"]
                                           <-Reducer 9 [SIMPLE_EDGE]
@@ -217,7 +217,7 @@ Stage-0
                         Select Operator [SEL_66] (rows=63887519 width=88)
                           
Output:["rank_window_1","_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                           Filter Operator [FIL_170] (rows=63887519 width=88)
-                            predicate:((_col0 > 0) and rank_window_1 is not 
null and (_col5 = 2000))
+                            predicate:((_col0 > 0) and (_col5 = 2000) and 
rank_window_1 is not null)
                             PTF Operator [PTF_65] (rows=383325119 width=88)
                               Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col5 ASC NULLS 
FIRST, _col6 ASC NULLS FIRST","partition by:":"_col1, _col2, _col3, _col4"}]
                               Select Operator [SEL_64] (rows=383325119 
width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query48.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query48.q.out 
b/ql/src/test/results/clientpositive/perf/query48.q.out
index ffe80b4..8db0c1e 100644
--- a/ql/src/test/results/clientpositive/perf/query48.q.out
+++ b/ql/src/test/results/clientpositive/perf/query48.q.out
@@ -161,7 +161,7 @@ Stage-0
                       Select Operator [SEL_14] (rows=10000000 width=1014)
                         Output:["_col0","_col1"]
                         Filter Operator [FIL_52] (rows=10000000 width=1014)
-                          predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 
'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and 
ca_address_sk is not null)
+                          predicate:((ca_country = 'United States') and 
(ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and 
ca_address_sk is not null)
                           TableScan [TS_12] (rows=40000000 width=1014)
                             
default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_state","ca_country"]
                   <-Reducer 4 [SIMPLE_EDGE]
@@ -175,7 +175,7 @@ Stage-0
                           Select Operator [SEL_11] (rows=465450 width=385)
                             Output:["_col0"]
                             Filter Operator [FIL_51] (rows=465450 width=385)
-                              predicate:((cd_marital_status = 'M') and 
(cd_education_status = '4 yr Degree') and cd_demo_sk is not null)
+                              predicate:((cd_education_status = '4 yr Degree') 
and (cd_marital_status = 'M') and cd_demo_sk is not null)
                               TableScan [TS_9] (rows=1861800 width=385)
                                 
default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"]
                       <-Reducer 3 [SIMPLE_EDGE]
@@ -212,7 +212,7 @@ Stage-0
                                   Select Operator [SEL_5] (rows=63999513 
width=88)
                                     
Output:["_col0","_col1","_col2","_col3","_col4","_col6"]
                                     Filter Operator [FIL_49] (rows=63999513 
width=88)
-                                      predicate:((ss_sales_price BETWEEN 100 
AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 
200) and (ss_net_profit BETWEEN 0 AND 2000 or ss_net_profit BETWEEN 150 AND 
3000 or ss_net_profit BETWEEN 50 AND 25000) and ss_store_sk is not null and 
ss_cdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not 
null)
+                                      predicate:((ss_net_profit BETWEEN 0 AND 
2000 or ss_net_profit BETWEEN 150 AND 3000 or ss_net_profit BETWEEN 50 AND 
25000) and (ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 
100 or ss_sales_price BETWEEN 150 AND 200) and ss_addr_sk is not null and 
ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not 
null)
                                       TableScan [TS_3] (rows=575995635 
width=88)
                                         
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_net_profit"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query49.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query49.q.out 
b/ql/src/test/results/clientpositive/perf/query49.q.out
index c62549a..be4027d 100644
--- a/ql/src/test/results/clientpositive/perf/query49.q.out
+++ b/ql/src/test/results/clientpositive/perf/query49.q.out
@@ -331,7 +331,7 @@ Stage-0
                                                       Select Operator [SEL_79] 
(rows=19197050 width=77)
                                                         
Output:["_col0","_col1","_col2","_col3"]
                                                         Filter Operator 
[FIL_140] (rows=19197050 width=77)
-                                                          
predicate:((sr_return_amt > 10000) and sr_ticket_number is not null and 
sr_item_sk is not null)
+                                                          
predicate:((sr_return_amt > 10000) and sr_item_sk is not null and 
sr_ticket_number is not null)
                                                           TableScan [TS_77] 
(rows=57591150 width=77)
                                                             
default@store_returns,sr,Tbl:COMPLETE,Col:NONE,Output:["sr_item_sk","sr_ticket_number","sr_return_quantity","sr_return_amt"]
                                                   <-Reducer 18 [SIMPLE_EDGE]
@@ -345,7 +345,7 @@ Stage-0
                                                           Select Operator 
[SEL_5] (rows=18262 width=1119)
                                                             Output:["_col0"]
                                                             Filter Operator 
[FIL_131] (rows=18262 width=1119)
-                                                              
predicate:((d_year = 2000) and (d_moy = 12) and d_date_sk is not null)
+                                                              
predicate:((d_moy = 12) and (d_year = 2000) and d_date_sk is not null)
                                                               TableScan [TS_3] 
(rows=73049 width=1119)
                                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
                                                       <-Map 26 [SIMPLE_EDGE]
@@ -354,7 +354,7 @@ Stage-0
                                                           Select Operator 
[SEL_73] (rows=21333171 width=88)
                                                             
Output:["_col0","_col1","_col2","_col3","_col4"]
                                                             Filter Operator 
[FIL_138] (rows=21333171 width=88)
-                                                              
predicate:((ss_net_profit > 1) and (ss_net_paid > 0) and (ss_quantity > 0) and 
ss_ticket_number is not null and ss_item_sk is not null and ss_sold_date_sk is 
not null)
+                                                              
predicate:((ss_net_paid > 0) and (ss_net_profit > 1) and (ss_quantity > 0) and 
ss_item_sk is not null and ss_sold_date_sk is not null and ss_ticket_number is 
not null)
                                                               TableScan 
[TS_71] (rows=575995635 width=88)
                                                                 
default@store_sales,sts,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ticket_number","ss_quantity","ss_net_paid","ss_net_profit"]
                   <-Reducer 8 [CONTAINS]
@@ -409,7 +409,7 @@ Stage-0
                                                                 Select 
Operator [SEL_40] (rows=9599627 width=106)
                                                                   
Output:["_col0","_col1","_col2","_col3"]
                                                                   Filter 
Operator [FIL_136] (rows=9599627 width=106)
-                                                                    
predicate:((cr_return_amount > 10000) and cr_order_number is not null and 
cr_item_sk is not null)
+                                                                    
predicate:((cr_return_amount > 10000) and cr_item_sk is not null and 
cr_order_number is not null)
                                                                     TableScan 
[TS_38] (rows=28798881 width=106)
                                                                       
default@catalog_returns,cr,Tbl:COMPLETE,Col:NONE,Output:["cr_item_sk","cr_order_number","cr_return_quantity","cr_return_amount"]
                                                             <-Reducer 13 
[SIMPLE_EDGE]
@@ -427,7 +427,7 @@ Stage-0
                                                                     Select 
Operator [SEL_34] (rows=10666290 width=135)
                                                                       
Output:["_col0","_col1","_col2","_col3","_col4"]
                                                                       Filter 
Operator [FIL_134] (rows=10666290 width=135)
-                                                                        
predicate:((cs_net_profit > 1) and (cs_net_paid > 0) and (cs_quantity > 0) and 
cs_order_number is not null and cs_item_sk is not null and cs_sold_date_sk is 
not null)
+                                                                        
predicate:((cs_net_paid > 0) and (cs_net_profit > 1) and (cs_quantity > 0) and 
cs_item_sk is not null and cs_order_number is not null and cs_sold_date_sk is 
not null)
                                                                         
TableScan [TS_32] (rows=287989836 width=135)
                                                                           
default@catalog_sales,cs,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_order_number","cs_quantity","cs_net_paid","cs_net_profit"]
                             <-Reducer 6 [CONTAINS]
@@ -472,7 +472,7 @@ Stage-0
                                                                 Select 
Operator [SEL_8] (rows=4799489 width=92)
                                                                   
Output:["_col0","_col1","_col2","_col3"]
                                                                   Filter 
Operator [FIL_132] (rows=4799489 width=92)
-                                                                    
predicate:((wr_return_amt > 10000) and wr_order_number is not null and 
wr_item_sk is not null)
+                                                                    
predicate:((wr_return_amt > 10000) and wr_item_sk is not null and 
wr_order_number is not null)
                                                                     TableScan 
[TS_6] (rows=14398467 width=92)
                                                                       
default@web_returns,wr,Tbl:COMPLETE,Col:NONE,Output:["wr_item_sk","wr_order_number","wr_return_quantity","wr_return_amt"]
                                                             <-Reducer 2 
[SIMPLE_EDGE]
@@ -490,7 +490,7 @@ Stage-0
                                                                     Select 
Operator [SEL_2] (rows=5333432 width=135)
                                                                       
Output:["_col0","_col1","_col2","_col3","_col4"]
                                                                       Filter 
Operator [FIL_130] (rows=5333432 width=135)
-                                                                        
predicate:((ws_net_profit > 1) and (ws_net_paid > 0) and (ws_quantity > 0) and 
ws_order_number is not null and ws_item_sk is not null and ws_sold_date_sk is 
not null)
+                                                                        
predicate:((ws_net_paid > 0) and (ws_net_profit > 1) and (ws_quantity > 0) and 
ws_item_sk is not null and ws_order_number is not null and ws_sold_date_sk is 
not null)
                                                                         
TableScan [TS_0] (rows=144002668 width=135)
                                                                           
default@web_sales,ws,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_order_number","ws_quantity","ws_net_paid","ws_net_profit"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query5.q.out 
b/ql/src/test/results/clientpositive/perf/query5.q.out
index 9762e15..ff197d2 100644
--- a/ql/src/test/results/clientpositive/perf/query5.q.out
+++ b/ql/src/test/results/clientpositive/perf/query5.q.out
@@ -336,7 +336,7 @@ Stage-0
                                           Select Operator [SEL_27] 
(rows=287989836 width=135)
                                             
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                             Filter Operator [FIL_122] 
(rows=287989836 width=135)
-                                              predicate:(cs_sold_date_sk is 
not null and cs_catalog_page_sk is not null)
+                                              predicate:(cs_catalog_page_sk is 
not null and cs_sold_date_sk is not null)
                                               TableScan [TS_25] 
(rows=287989836 width=135)
                                                 
Output:["cs_sold_date_sk","cs_catalog_page_sk","cs_ext_sales_price","cs_net_profit"]
                                       <-Map 20 [CONTAINS]
@@ -345,7 +345,7 @@ Stage-0
                                           Select Operator [SEL_30] 
(rows=28798881 width=106)
                                             
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                             Filter Operator [FIL_123] 
(rows=28798881 width=106)
-                                              predicate:(cr_returned_date_sk 
is not null and cr_catalog_page_sk is not null)
+                                              predicate:(cr_catalog_page_sk is 
not null and cr_returned_date_sk is not null)
                                               TableScan [TS_28] (rows=28798881 
width=106)
                                                 
Output:["cr_returned_date_sk","cr_catalog_page_sk","cr_return_amount","cr_net_loss"]
                   <-Reducer 16 [CONTAINS]
@@ -405,7 +405,7 @@ Stage-0
                                                 Select Operator [SEL_56] 
(rows=144002668 width=135)
                                                   
Output:["_col0","_col1","_col2"]
                                                   Filter Operator [FIL_127] 
(rows=144002668 width=135)
-                                                    predicate:(ws_web_site_sk 
is not null and ws_item_sk is not null and ws_order_number is not null)
+                                                    predicate:(ws_item_sk is 
not null and ws_order_number is not null and ws_web_site_sk is not null)
                                                     TableScan [TS_54] 
(rows=144002668 width=135)
                                                       
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_item_sk","ws_web_site_sk","ws_order_number"]
                                             <-Map 26 [SIMPLE_EDGE]
@@ -414,7 +414,7 @@ Stage-0
                                                 Select Operator [SEL_59] 
(rows=14398467 width=92)
                                                   
Output:["_col0","_col1","_col2","_col3","_col4"]
                                                   Filter Operator [FIL_128] 
(rows=14398467 width=92)
-                                                    
predicate:(wr_returned_date_sk is not null and wr_item_sk is not null and 
wr_order_number is not null)
+                                                    predicate:(wr_item_sk is 
not null and wr_order_number is not null and wr_returned_date_sk is not null)
                                                     TableScan [TS_57] 
(rows=14398467 width=92)
                                                       
default@web_returns,web_returns,Tbl:COMPLETE,Col:NONE,Output:["wr_returned_date_sk","wr_item_sk","wr_order_number","wr_return_amt","wr_net_loss"]
                   <-Reducer 5 [CONTAINS]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query50.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query50.q.out 
b/ql/src/test/results/clientpositive/perf/query50.q.out
index d815b02..02d9447 100644
--- a/ql/src/test/results/clientpositive/perf/query50.q.out
+++ b/ql/src/test/results/clientpositive/perf/query50.q.out
@@ -181,7 +181,7 @@ Stage-0
                                   Select Operator [SEL_8] (rows=575995635 
width=88)
                                     
Output:["_col0","_col1","_col2","_col3","_col4"]
                                     Filter Operator [FIL_53] (rows=575995635 
width=88)
-                                      predicate:(ss_ticket_number is not null 
and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is 
not null and ss_sold_date_sk is not null)
+                                      predicate:(ss_customer_sk is not null 
and ss_item_sk is not null and ss_sold_date_sk is not null and ss_store_sk is 
not null and ss_ticket_number is not null)
                                       TableScan [TS_6] (rows=575995635 
width=88)
                                         
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number"]
                               <-Reducer 2 [SIMPLE_EDGE]
@@ -195,7 +195,7 @@ Stage-0
                                       Select Operator [SEL_2] (rows=57591150 
width=77)
                                         
Output:["_col0","_col1","_col2","_col3"]
                                         Filter Operator [FIL_51] 
(rows=57591150 width=77)
-                                          predicate:(sr_ticket_number is not 
null and sr_item_sk is not null and sr_customer_sk is not null and 
sr_returned_date_sk is not null)
+                                          predicate:(sr_customer_sk is not 
null and sr_item_sk is not null and sr_returned_date_sk is not null and 
sr_ticket_number is not null)
                                           TableScan [TS_0] (rows=57591150 
width=77)
                                             
default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number"]
                                   <-Map 8 [SIMPLE_EDGE]
@@ -204,7 +204,7 @@ Stage-0
                                       Select Operator [SEL_5] (rows=18262 
width=1119)
                                         Output:["_col0"]
                                         Filter Operator [FIL_52] (rows=18262 
width=1119)
-                                          predicate:((d_year = 2000) and 
(d_moy = 9) and d_date_sk is not null)
+                                          predicate:((d_moy = 9) and (d_year = 
2000) and d_date_sk is not null)
                                           TableScan [TS_3] (rows=73049 
width=1119)
                                             
default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query51.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query51.q.out 
b/ql/src/test/results/clientpositive/perf/query51.q.out
index 5f549c5..2517306 100644
--- a/ql/src/test/results/clientpositive/perf/query51.q.out
+++ b/ql/src/test/results/clientpositive/perf/query51.q.out
@@ -144,7 +144,7 @@ Stage-0
                                           Select Operator [SEL_5] (rows=8116 
width=1119)
                                             Output:["_col0","_col1"]
                                             Filter Operator [FIL_60] 
(rows=8116 width=1119)
-                                              predicate:(d_month_seq BETWEEN 
1212 AND 1223 and d_date_sk is not null)
+                                              predicate:(d_date_sk is not null 
and d_month_seq BETWEEN 1212 AND 1223)
                                               TableScan [TS_3] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date","d_month_seq"]
                                       <-Map 1 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query52.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query52.q.out 
b/ql/src/test/results/clientpositive/perf/query52.q.out
index 9631f59..b14ab53 100644
--- a/ql/src/test/results/clientpositive/perf/query52.q.out
+++ b/ql/src/test/results/clientpositive/perf/query52.q.out
@@ -91,7 +91,7 @@ Stage-0
                               Select Operator [SEL_2] (rows=575995635 width=88)
                                 Output:["_col0","_col1","_col2"]
                                 Filter Operator [FIL_31] (rows=575995635 
width=88)
-                                  predicate:(ss_sold_date_sk is not null and 
ss_item_sk is not null)
+                                  predicate:(ss_item_sk is not null and 
ss_sold_date_sk is not null)
                                   TableScan [TS_0] (rows=575995635 width=88)
                                     
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
                           <-Map 6 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query53.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query53.q.out 
b/ql/src/test/results/clientpositive/perf/query53.q.out
index bc9e6c4..a10ee45 100644
--- a/ql/src/test/results/clientpositive/perf/query53.q.out
+++ b/ql/src/test/results/clientpositive/perf/query53.q.out
@@ -135,7 +135,7 @@ Stage-0
                                           Select Operator [SEL_5] (rows=115500 
width=1436)
                                             Output:["_col0","_col4"]
                                             Filter Operator [FIL_48] 
(rows=115500 width=1436)
-                                              predicate:(((i_class) IN 
('personal', 'portable', 'reference', 'self-help') or (i_class) IN 
('accessories', 'classical', 'fragrances', 'pants')) and ((i_brand) IN 
('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 
'scholaramalgamalg #9') or (i_brand) IN ('amalgimporto #1', 'edu packscholar 
#1', 'exportiimporto #1', 'importoamalg #1')) and ((i_category) IN ('Books', 
'Children', 'Electronics') or (i_category) IN ('Women', 'Music', 'Men')) and 
(((i_category) IN ('Books', 'Children', 'Electronics') and (i_class) IN 
('personal', 'portable', 'reference', 'self-help') and (i_brand) IN 
('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 
'scholaramalgamalg #9')) or ((i_category) IN ('Women', 'Music', 'Men') and 
(i_class) IN ('accessories', 'classical', 'fragrances', 'pants') and (i_brand) 
IN ('amalgimporto #1', 'edu packscholar #1', 'exportiimporto #1', 'importoamalg 
#1'))) and i_item_sk is not null)
+                                              predicate:((((i_category) IN 
('Books', 'Children', 'Electronics') and (i_class) IN ('personal', 'portable', 
'reference', 'self-help') and (i_brand) IN ('scholaramalgamalg #14', 
'scholaramalgamalg #7', 'exportiunivamalg #9', 'scholaramalgamalg #9')) or 
((i_category) IN ('Women', 'Music', 'Men') and (i_class) IN ('accessories', 
'classical', 'fragrances', 'pants') and (i_brand) IN ('amalgimporto #1', 'edu 
packscholar #1', 'exportiimporto #1', 'importoamalg #1'))) and ((i_brand) IN 
('scholaramalgamalg #14', 'scholaramalgamalg #7', 'exportiunivamalg #9', 
'scholaramalgamalg #9') or (i_brand) IN ('amalgimporto #1', 'edu packscholar 
#1', 'exportiimporto #1', 'importoamalg #1')) and ((i_category) IN ('Books', 
'Children', 'Electronics') or (i_category) IN ('Women', 'Music', 'Men')) and 
((i_class) IN ('personal', 'portable', 'reference', 'self-help') or (i_class) 
IN ('accessories', 'classical', 'fragrances', 'pants')) and i_item_sk is not 
null)
                                               TableScan [TS_3] (rows=462000 
width=1436)
                                                 
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand","i_class","i_category","i_manufact_id"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query54.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query54.q.out 
b/ql/src/test/results/clientpositive/perf/query54.q.out
index be2a13e..e6b9b28 100644
--- a/ql/src/test/results/clientpositive/perf/query54.q.out
+++ b/ql/src/test/results/clientpositive/perf/query54.q.out
@@ -193,7 +193,7 @@ Stage-0
                                                   Select Operator [SEL_2] 
(rows=18262 width=1119)
                                                     Output:["_col0"]
                                                     Filter Operator [FIL_174] 
(rows=18262 width=1119)
-                                                      predicate:((d_year = 
1999) and (d_moy = 3))
+                                                      predicate:((d_moy = 3) 
and (d_year = 1999))
                                                       TableScan [TS_73] 
(rows=73049 width=1119)
                                                         
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_month_seq","d_year","d_moy"]
                                         <-Reducer 32 [CUSTOM_SIMPLE_EDGE]
@@ -310,7 +310,7 @@ Stage-0
                                                                       Select 
Operator [SEL_51] (rows=80000000 width=860)
                                                                         
Output:["_col0","_col1"]
                                                                         Filter 
Operator [FIL_173] (rows=80000000 width=860)
-                                                                          
predicate:(c_customer_sk is not null and c_current_addr_sk is not null)
+                                                                          
predicate:(c_current_addr_sk is not null and c_customer_sk is not null)
                                                                           
TableScan [TS_49] (rows=80000000 width=860)
                                                                             
default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
                                                                   <-Reducer 18 
[SIMPLE_EDGE]
@@ -348,7 +348,7 @@ Stage-0
                                                                                
 Select Operator [SEL_37] (rows=287989836 width=135)
                                                                                
   Output:["_col0","_col1","_col2"]
                                                                                
   Filter Operator [FIL_169] (rows=287989836 width=135)
-                                                                               
     predicate:(cs_item_sk is not null and cs_sold_date_sk is not null and 
cs_bill_customer_sk is not null)
+                                                                               
     predicate:(cs_bill_customer_sk is not null and cs_item_sk is not null and 
cs_sold_date_sk is not null)
                                                                                
     TableScan [TS_35] (rows=287989836 width=135)
                                                                                
       Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk"]
                                                                             
<-Map 21 [CONTAINS]
@@ -357,7 +357,7 @@ Stage-0
                                                                                
 Select Operator [SEL_40] (rows=144002668 width=135)
                                                                                
   Output:["_col0","_col1","_col2"]
                                                                                
   Filter Operator [FIL_170] (rows=144002668 width=135)
-                                                                               
     predicate:(ws_item_sk is not null and ws_sold_date_sk is not null and 
ws_bill_customer_sk is not null)
+                                                                               
     predicate:(ws_bill_customer_sk is not null and ws_item_sk is not null and 
ws_sold_date_sk is not null)
                                                                                
     TableScan [TS_38] (rows=144002668 width=135)
                                                                                
       Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk"]
                                                   <-Reducer 2 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query55.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query55.q.out 
b/ql/src/test/results/clientpositive/perf/query55.q.out
index 7125422..27ea1c3 100644
--- a/ql/src/test/results/clientpositive/perf/query55.q.out
+++ b/ql/src/test/results/clientpositive/perf/query55.q.out
@@ -73,7 +73,7 @@ Stage-0
                             Select Operator [SEL_2] (rows=575995635 width=88)
                               Output:["_col0","_col1","_col2"]
                               Filter Operator [FIL_30] (rows=575995635 
width=88)
-                                predicate:(ss_sold_date_sk is not null and 
ss_item_sk is not null)
+                                predicate:(ss_item_sk is not null and 
ss_sold_date_sk is not null)
                                 TableScan [TS_0] (rows=575995635 width=88)
                                   
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
                         <-Map 6 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query56.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query56.q.out 
b/ql/src/test/results/clientpositive/perf/query56.q.out
index 395a53b..4041740 100644
--- a/ql/src/test/results/clientpositive/perf/query56.q.out
+++ b/ql/src/test/results/clientpositive/perf/query56.q.out
@@ -212,7 +212,7 @@ Stage-0
                                           Select Operator [SEL_15] (rows=18262 
width=1119)
                                             Output:["_col0"]
                                             Filter Operator [FIL_161] 
(rows=18262 width=1119)
-                                              predicate:((d_year = 2000) and 
(d_moy = 1) and d_date_sk is not null)
+                                              predicate:((d_moy = 1) and 
(d_year = 2000) and d_date_sk is not null)
                                               TableScan [TS_13] (rows=73049 
width=1119)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
                                       <-Map 27 [SIMPLE_EDGE]
@@ -221,7 +221,7 @@ Stage-0
                                           Select Operator [SEL_49] 
(rows=287989836 width=135)
                                             
Output:["_col0","_col1","_col2","_col3"]
                                             Filter Operator [FIL_165] 
(rows=287989836 width=135)
-                                              predicate:(cs_sold_date_sk is 
not null and cs_bill_addr_sk is not null and cs_item_sk is not null)
+                                              predicate:(cs_bill_addr_sk is 
not null and cs_item_sk is not null and cs_sold_date_sk is not null)
                                               TableScan [TS_47] 
(rows=287989836 width=135)
                                                 
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"]
                             <-Reducer 8 [SIMPLE_EDGE]
@@ -312,7 +312,7 @@ Stage-0
                                           Select Operator [SEL_87] 
(rows=144002668 width=135)
                                             
Output:["_col0","_col1","_col2","_col3"]
                                             Filter Operator [FIL_170] 
(rows=144002668 width=135)
-                                              predicate:(ws_sold_date_sk is 
not null and ws_bill_addr_sk is not null and ws_item_sk is not null)
+                                              predicate:(ws_bill_addr_sk is 
not null and ws_item_sk is not null and ws_sold_date_sk is not null)
                                               TableScan [TS_85] 
(rows=144002668 width=135)
                                                 
default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"]
                 <-Reducer 4 [CONTAINS]
@@ -373,7 +373,7 @@ Stage-0
                                           Select Operator [SEL_12] 
(rows=575995635 width=88)
                                             
Output:["_col0","_col1","_col2","_col3"]
                                             Filter Operator [FIL_160] 
(rows=575995635 width=88)
-                                              predicate:(ss_sold_date_sk is 
not null and ss_addr_sk is not null and ss_item_sk is not null)
+                                              predicate:(ss_addr_sk is not 
null and ss_item_sk is not null and ss_sold_date_sk is not null)
                                               TableScan [TS_10] 
(rows=575995635 width=88)
                                                 
default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query57.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query57.q.out 
b/ql/src/test/results/clientpositive/perf/query57.q.out
index e9630de..1a1bbf1 100644
--- a/ql/src/test/results/clientpositive/perf/query57.q.out
+++ b/ql/src/test/results/clientpositive/perf/query57.q.out
@@ -161,7 +161,7 @@ Stage-0
                                           Select Operator [SEL_81] 
(rows=462000 width=1436)
                                             Output:["_col0","_col1","_col2"]
                                             Filter Operator [FIL_179] 
(rows=462000 width=1436)
-                                              predicate:(i_item_sk is not null 
and i_category is not null and i_brand is not null)
+                                              predicate:(i_brand is not null 
and i_category is not null and i_item_sk is not null)
                                               TableScan [TS_79] (rows=462000 
width=1436)
                                                 
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand","i_category"]
                                       <-Reducer 10 [SIMPLE_EDGE]
@@ -189,7 +189,7 @@ Stage-0
                                                   Select Operator [SEL_72] 
(rows=287989836 width=135)
                                                     
Output:["_col0","_col1","_col2","_col3"]
                                                     Filter Operator [FIL_176] 
(rows=287989836 width=135)
-                                                      predicate:(cs_item_sk is 
not null and cs_sold_date_sk is not null and cs_call_center_sk is not null)
+                                                      
predicate:(cs_call_center_sk is not null and cs_item_sk is not null and 
cs_sold_date_sk is not null)
                                                       TableScan [TS_70] 
(rows=287989836 width=135)
                                                         
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_call_center_sk","cs_item_sk","cs_sales_price"]
                                               <-Map 20 [SIMPLE_EDGE]
@@ -211,7 +211,7 @@ Stage-0
                         Select Operator [SEL_66] (rows=31942874 width=135)
                           
Output:["rank_window_1","_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
                           Filter Operator [FIL_170] (rows=31942874 width=135)
-                            predicate:((_col0 > 0) and rank_window_1 is not 
null and (_col4 = 2000))
+                            predicate:((_col0 > 0) and (_col4 = 2000) and 
rank_window_1 is not null)
                             PTF Operator [PTF_65] (rows=191657247 width=135)
                               Function 
definitions:[{},{"name:":"windowingtablefunction","order by:":"_col4 ASC NULLS 
FIRST, _col5 ASC NULLS FIRST","partition by:":"_col1, _col2, _col3"}]
                               Select Operator [SEL_64] (rows=191657247 
width=135)

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query58.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query58.q.out 
b/ql/src/test/results/clientpositive/perf/query58.q.out
index ca1a5b3..d5ef23b 100644
--- a/ql/src/test/results/clientpositive/perf/query58.q.out
+++ b/ql/src/test/results/clientpositive/perf/query58.q.out
@@ -174,7 +174,7 @@ Stage-0
               Select Operator [SEL_160] (rows=1442 width=88)
                 
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                 Filter Operator [FIL_154] (rows=1442 width=88)
-                  predicate:(_col5 BETWEEN (0.9 * _col1) AND (1.1 * _col1) and 
_col5 BETWEEN (0.9 * _col3) AND (1.1 * _col3) and _col1 BETWEEN (0.9 * _col5) 
AND (1.1 * _col5) and _col3 BETWEEN (0.9 * _col5) AND (1.1 * _col5) and _col1 
BETWEEN (0.9 * _col3) AND (1.1 * _col3) and _col3 BETWEEN (0.9 * _col1) AND 
(1.1 * _col1))
+                  predicate:(_col1 BETWEEN (0.9 * _col3) AND (1.1 * _col3) and 
_col1 BETWEEN (0.9 * _col5) AND (1.1 * _col5) and _col3 BETWEEN (0.9 * _col1) 
AND (1.1 * _col1) and _col3 BETWEEN (0.9 * _col5) AND (1.1 * _col5) and _col5 
BETWEEN (0.9 * _col1) AND (1.1 * _col1) and _col5 BETWEEN (0.9 * _col3) AND 
(1.1 * _col3))
                   Merge Join Operator [MERGEJOIN_279] (rows=766650239 width=88)
                     
Conds:RS_150._col0=RS_151._col0(Inner),RS_150._col0=RS_152._col0(Inner),Output:["_col0","_col1","_col3","_col5"]
                   <-Reducer 10 [ONE_TO_ONE_EDGE]
@@ -221,7 +221,7 @@ Stage-0
                                               Select Operator [SEL_73] 
(rows=73049 width=1119)
                                                 Output:["_col0","_col1"]
                                                 Filter Operator [FIL_257] 
(rows=73049 width=1119)
-                                                  predicate:(d_week_seq is not 
null and d_date is not null)
+                                                  predicate:(d_date is not 
null and d_week_seq is not null)
                                                   TableScan [TS_21] 
(rows=73049 width=1119)
                                                     
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                                           <-Reducer 24 [SIMPLE_EDGE]
@@ -263,7 +263,7 @@ Stage-0
                                     Select Operator [SEL_5] (rows=462000 
width=1436)
                                       Output:["_col0","_col1"]
                                       Filter Operator [FIL_247] (rows=462000 
width=1436)
-                                        predicate:(i_item_sk is not null and 
i_item_id is not null)
+                                        predicate:(i_item_id is not null and 
i_item_sk is not null)
                                         TableScan [TS_3] (rows=462000 
width=1436)
                                           
default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
                                 <-Map 32 [SIMPLE_EDGE]
@@ -332,7 +332,7 @@ Stage-0
                                               Select Operator [SEL_123] 
(rows=73049 width=1119)
                                                 Output:["_col0","_col1"]
                                                 Filter Operator [FIL_263] 
(rows=73049 width=1119)
-                                                  predicate:(d_week_seq is not 
null and d_date is not null)
+                                                  predicate:(d_date is not 
null and d_week_seq is not null)
                                                    Please refer to the 
previous TableScan [TS_21]
                                           <-Reducer 28 [SIMPLE_EDGE]
                                             SHUFFLE [RS_127]
@@ -395,7 +395,7 @@ Stage-0
                                               Select Operator [SEL_23] 
(rows=73049 width=1119)
                                                 Output:["_col0","_col1"]
                                                 Filter Operator [FIL_251] 
(rows=73049 width=1119)
-                                                  predicate:(d_week_seq is not 
null and d_date is not null)
+                                                  predicate:(d_date is not 
null and d_week_seq is not null)
                                                    Please refer to the 
previous TableScan [TS_21]
                                           <-Reducer 20 [SIMPLE_EDGE]
                                             SHUFFLE [RS_27]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query59.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query59.q.out 
b/ql/src/test/results/clientpositive/perf/query59.q.out
index baa9962..37c2cc0 100644
--- a/ql/src/test/results/clientpositive/perf/query59.q.out
+++ b/ql/src/test/results/clientpositive/perf/query59.q.out
@@ -127,7 +127,7 @@ Stage-0
                           Select Operator [SEL_48] (rows=1704 width=1910)
                             Output:["_col0","_col1"]
                             Filter Operator [FIL_97] (rows=1704 width=1910)
-                              predicate:(s_store_sk is not null and s_store_id 
is not null)
+                              predicate:(s_store_id is not null and s_store_sk 
is not null)
                               TableScan [TS_46] (rows=1704 width=1910)
                                 
default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_store_id"]
                       <-Reducer 10 [SIMPLE_EDGE]
@@ -189,7 +189,7 @@ Stage-0
                           Select Operator [SEL_20] (rows=1704 width=1910)
                             Output:["_col0","_col1","_col2"]
                             Filter Operator [FIL_93] (rows=1704 width=1910)
-                              predicate:(s_store_sk is not null and s_store_id 
is not null)
+                              predicate:(s_store_id is not null and s_store_sk 
is not null)
                               TableScan [TS_18] (rows=1704 width=1910)
                                 
default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_store_id","s_store_name"]
                       <-Reducer 4 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/c5b3ccc4/ql/src/test/results/clientpositive/perf/query6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query6.q.out 
b/ql/src/test/results/clientpositive/perf/query6.q.out
index 1c685e2..f1e4758 100644
--- a/ql/src/test/results/clientpositive/perf/query6.q.out
+++ b/ql/src/test/results/clientpositive/perf/query6.q.out
@@ -134,7 +134,7 @@ Stage-0
                                                         Select Operator 
[SEL_32] (rows=18262 width=1119)
                                                           
Output:["d_month_seq"]
                                                           Filter Operator 
[FIL_106] (rows=18262 width=1119)
-                                                            predicate:((d_year 
= 2000) and (d_moy = 2))
+                                                            predicate:((d_moy 
= 2) and (d_year = 2000))
                                                             TableScan [TS_3] 
(rows=73049 width=1119)
                                                               
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_month_seq","d_year","d_moy"]
                                   <-Reducer 19 [CUSTOM_SIMPLE_EDGE]
@@ -191,7 +191,7 @@ Stage-0
                                   Select Operator [SEL_12] (rows=575995635 
width=88)
                                     Output:["_col0","_col1","_col2"]
                                     Filter Operator [FIL_102] (rows=575995635 
width=88)
-                                      predicate:(ss_customer_sk is not null 
and ss_sold_date_sk is not null and ss_item_sk is not null)
+                                      predicate:(ss_customer_sk is not null 
and ss_item_sk is not null and ss_sold_date_sk is not null)
                                       TableScan [TS_10] (rows=575995635 
width=88)
                                         
default@store_sales,s,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk"]
                               <-Reducer 2 [SIMPLE_EDGE]
@@ -221,6 +221,6 @@ Stage-0
                                             Select Operator [SEL_5] 
(rows=18262 width=1119)
                                               Output:["d_month_seq"]
                                               Filter Operator [FIL_101] 
(rows=18262 width=1119)
-                                                predicate:((d_year = 2000) and 
(d_moy = 2) and d_month_seq is not null)
+                                                predicate:((d_moy = 2) and 
(d_year = 2000) and d_month_seq is not null)
                                                  Please refer to the previous 
TableScan [TS_3]
 

Reply via email to