You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2016/01/27 09:30:57 UTC

[13/17] hive git commit: HIVE-12478: Improve Hive/Calcite Transitive Predicate inference (Jesus Camacho Rodriguez, reviewed by Laljo John Pullokkaran)

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 1cb7c28..7976863 100644
--- a/ql/src/test/results/clientpositive/perf/query34.q.out
+++ b/ql/src/test/results/clientpositive/perf/query34.q.out
@@ -99,7 +99,7 @@ Stage-0
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 800 Data size: 85600 Basic stats: COMPLETE Column stats: NONE
                                           |        Filter Operator [FIL_55]
-                                          |           predicate:((((CASE WHEN ((hd_vehicle_count > 0)) THEN ((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count))) ELSE (null) END > 1.2) and ((hd_buy_potential = '1001-5000') or (hd_buy_potential = '5001-10000'))) and (hd_vehicle_count > 0)) and hd_demo_sk is not null) (type: boolean)
+                                          |           predicate:(((((hd_buy_potential = '1001-5000') or (hd_buy_potential = '5001-10000')) and (hd_vehicle_count > 0)) and (CASE WHEN ((hd_vehicle_count > 0)) THEN ((UDFToDouble(hd_dep_count) / UDFToDouble(hd_vehicle_count))) ELSE (null) END > 1.2)) and hd_demo_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 800 Data size: 85600 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_9]
                                           |              alias:household_demographics
@@ -169,7 +169,7 @@ Stage-0
                                                                outputColumnNames:["_col0"]
                                                                Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                                Filter Operator [FIL_53]
-                                                                  predicate:(((d_year) IN (1998, 1999, 2000) and (d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28)) and d_date_sk is not null) (type: boolean)
+                                                                  predicate:(((d_dom BETWEEN 1 AND 3 or d_dom BETWEEN 25 AND 28) and (d_year) IN (1998, 1999, 2000)) and d_date_sk is not null) (type: boolean)
                                                                   Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                                   TableScan [TS_3]
                                                                      alias:date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 9f3e650..14e3dfc 100644
--- a/ql/src/test/results/clientpositive/perf/query39.q.out
+++ b/ql/src/test/results/clientpositive/perf/query39.q.out
@@ -30,17 +30,17 @@ Stage-0
             |  Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
             |<-Reducer 6 [SIMPLE_EDGE]
                Reduce Output Operator [RS_60]
-                  key expressions:_col0 (type: int), _col1 (type: int), 3 (type: int), _col3 (type: double), _col4 (type: double), _col7 (type: int), _col8 (type: double), _col9 (type: double)
+                  key expressions:_col0 (type: int), _col1 (type: int), 3 (type: int), _col3 (type: double), _col4 (type: double), 4 (type: int), _col8 (type: double), _col9 (type: double)
                   sort order:++++++++
                   Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
                   value expressions:_col5 (type: int), _col6 (type: int)
                   Select Operator [SEL_59]
-                     outputColumnNames:["_col0","_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
+                     outputColumnNames:["_col0","_col1","_col3","_col4","_col5","_col6","_col8","_col9"]
                      Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
-                     Merge Join Operator [MERGEJOIN_104]
+                     Merge Join Operator [MERGEJOIN_105]
                      |  condition map:[{"":"Inner Join 0 to 1"}]
-                     |  keys:{"0":"_col1 (type: int), _col0 (type: int)","1":"_col2 (type: int), _col1 (type: int)"}
-                     |  outputColumnNames:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col8","_col9"]
+                     |  keys:{"0":"_col2 (type: int), _col1 (type: int)","1":"_col2 (type: int), _col1 (type: int)"}
+                     |  outputColumnNames:["_col1","_col2","_col4","_col5","_col7","_col8","_col10","_col11"]
                      |  Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 15 [SIMPLE_EDGE]
                      |  Reduce Output Operator [RS_57]
@@ -48,37 +48,37 @@ Stage-0
                      |     Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                      |     sort order:++
                      |     Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
-                     |     value expressions:_col3 (type: int), _col4 (type: double), _col5 (type: double)
+                     |     value expressions:_col4 (type: double), _col5 (type: double)
                      |     Select Operator [SEL_55]
-                     |        outputColumnNames:["_col1","_col2","_col3","_col4","_col5"]
+                     |        outputColumnNames:["_col1","_col2","_col4","_col5"]
                      |        Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
                      |        Filter Operator [FIL_54]
-                     |           predicate:(CASE (_col5) WHEN (0) THEN (0) ELSE ((_col4 / _col5)) END > 1.0) (type: boolean)
+                     |           predicate:(CASE (_col4) WHEN (0) THEN (0) ELSE ((_col5 / _col4)) END > 1.0) (type: boolean)
                      |           Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
-                     |           Select Operator [SEL_53]
-                     |              outputColumnNames:["_col1","_col2","_col3","_col4","_col5"]
+                     |           Select Operator [SEL_97]
+                     |              outputColumnNames:["_col1","_col2","_col4","_col5"]
                      |              Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
-                     |              Group By Operator [GBY_52]
-                     |              |  aggregations:["stddev_samp(VALUE._col0)","avg(VALUE._col1)"]
-                     |              |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: string), KEY._col3 (type: int)
+                     |              Group By Operator [GBY_53]
+                     |              |  aggregations:["avg(VALUE._col0)","stddev_samp(VALUE._col1)"]
+                     |              |  keys:KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 (type: int), 4 (type: int)
                      |              |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      |              |  Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                      |              |<-Reducer 14 [SIMPLE_EDGE]
-                     |                 Reduce Output Operator [RS_51]
-                     |                    key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: string), _col3 (type: int)
-                     |                    Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: string), _col3 (type: int)
+                     |                 Reduce Output Operator [RS_52]
+                     |                    key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: int), 4 (type: int)
+                     |                    Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: int), 4 (type: int)
                      |                    sort order:++++
                      |                    Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                     |                    value expressions:_col4 (type: struct<count:bigint,sum:double,variance:double>), _col5 (type: struct<count:bigint,sum:double,input:int>)
-                     |                    Group By Operator [GBY_50]
-                     |                       aggregations:["stddev_samp(_col3)","avg(_col3)"]
-                     |                       keys:_col4 (type: int), _col5 (type: int), _col6 (type: string), _col9 (type: int)
+                     |                    value expressions:_col4 (type: struct<count:bigint,sum:double,input:int>), _col5 (type: struct<count:bigint,sum:double,variance:double>)
+                     |                    Group By Operator [GBY_51]
+                     |                       aggregations:["avg(_col4)","stddev_samp(_col4)"]
+                     |                       keys:_col0 (type: string), _col1 (type: int), _col2 (type: int), 4 (type: int)
                      |                       outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                      |                       Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
                      |                       Select Operator [SEL_49]
-                     |                          outputColumnNames:["_col4","_col5","_col6","_col9","_col3"]
+                     |                          outputColumnNames:["_col0","_col1","_col2","_col4"]
                      |                          Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                     |                          Merge Join Operator [MERGEJOIN_103]
+                     |                          Merge Join Operator [MERGEJOIN_104]
                      |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                      |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |                          |  outputColumnNames:["_col3","_col4","_col5","_col6"]
@@ -93,7 +93,7 @@ Stage-0
                      |                          |        outputColumnNames:["_col0"]
                      |                          |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                      |                          |        Filter Operator [FIL_96]
-                     |                          |           predicate:(((d_moy = 4) and d_date_sk is not null) and (d_year = 1999)) (type: boolean)
+                     |                          |           predicate:(((d_year = 1999) and d_date_sk is not null) and (d_moy = 4)) (type: boolean)
                      |                          |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                      |                          |           TableScan [TS_37]
                      |                          |              alias:date_dim
@@ -105,7 +105,7 @@ Stage-0
                      |                                sort order:+
                      |                                Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                      |                                value expressions:_col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: string)
-                     |                                Merge Join Operator [MERGEJOIN_102]
+                     |                                Merge Join Operator [MERGEJOIN_103]
                      |                                |  condition map:[{"":"Inner Join 0 to 1"}]
                      |                                |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                      |                                |  outputColumnNames:["_col0","_col3","_col4","_col5","_col6"]
@@ -133,7 +133,7 @@ Stage-0
                      |                                      sort order:+
                      |                                      Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                      |                                      value expressions:_col0 (type: int), _col3 (type: int), _col4 (type: int)
-                     |                                      Merge Join Operator [MERGEJOIN_101]
+                     |                                      Merge Join Operator [MERGEJOIN_102]
                      |                                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |                                      |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                      |                                      |  outputColumnNames:["_col0","_col2","_col3","_col4"]
@@ -171,18 +171,18 @@ Stage-0
                      |                                                     Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
                         Reduce Output Operator [RS_56]
-                           key expressions:_col1 (type: int), _col0 (type: int)
-                           Map-reduce partition columns:_col1 (type: int), _col0 (type: int)
+                           key expressions:_col2 (type: int), _col1 (type: int)
+                           Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
                            sort order:++
                            Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
-                           value expressions:_col2 (type: double), _col3 (type: double)
+                           value expressions:_col4 (type: double), _col5 (type: double)
                            Select Operator [SEL_27]
-                              outputColumnNames:["_col0","_col1","_col2","_col3"]
+                              outputColumnNames:["_col1","_col2","_col4","_col5"]
                               Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
                               Filter Operator [FIL_26]
                                  predicate:(CASE (_col4) WHEN (0) THEN (0) ELSE ((_col5 / _col4)) END > 1.0) (type: boolean)
                                  Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
-                                 Select Operator [SEL_97]
+                                 Select Operator [SEL_98]
                                     outputColumnNames:["_col1","_col2","_col4","_col5"]
                                     Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                                     Group By Operator [GBY_25]
@@ -205,7 +205,7 @@ Stage-0
                                              Select Operator [SEL_21]
                                                 outputColumnNames:["_col0","_col1","_col2","_col4"]
                                                 Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                                                Merge Join Operator [MERGEJOIN_100]
+                                                Merge Join Operator [MERGEJOIN_101]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col3","_col4","_col5","_col6"]
@@ -220,7 +220,7 @@ Stage-0
                                                 |        outputColumnNames:["_col0"]
                                                 |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                 |        Filter Operator [FIL_92]
-                                                |           predicate:(((d_moy = 3) and d_date_sk is not null) and (d_year = 1999)) (type: boolean)
+                                                |           predicate:(((d_year = 1999) and d_date_sk is not null) and (d_moy = 3)) (type: boolean)
                                                 |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                 |           TableScan [TS_9]
                                                 |              alias:date_dim
@@ -232,7 +232,7 @@ Stage-0
                                                       sort order:+
                                                       Statistics:Num rows: 559020 Data size: 802908187 Basic stats: COMPLETE Column stats: NONE
                                                       value expressions:_col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: string)
-                                                      Merge Join Operator [MERGEJOIN_99]
+                                                      Merge Join Operator [MERGEJOIN_100]
                                                       |  condition map:[{"":"Inner Join 0 to 1"}]
                                                       |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                                       |  outputColumnNames:["_col0","_col3","_col4","_col5","_col6"]
@@ -260,7 +260,7 @@ Stage-0
                                                             sort order:+
                                                             Statistics:Num rows: 508200 Data size: 729916518 Basic stats: COMPLETE Column stats: NONE
                                                             value expressions:_col0 (type: int), _col3 (type: int), _col4 (type: int)
-                                                            Merge Join Operator [MERGEJOIN_98]
+                                                            Merge Join Operator [MERGEJOIN_99]
                                                             |  condition map:[{"":"Inner Join 0 to 1"}]
                                                             |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                                             |  outputColumnNames:["_col0","_col2","_col3","_col4"]

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 b2d6262..d404c81 100644
--- a/ql/src/test/results/clientpositive/perf/query40.q.out
+++ b/ql/src/test/results/clientpositive/perf/query40.q.out
@@ -17,133 +17,133 @@ Stage-0
       limit:100
       Stage-1
          Reducer 7
-         File Output Operator [FS_35]
+         File Output Operator [FS_36]
             compressed:false
             Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
             table:{"input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat","serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"}
-            Limit [LIM_34]
+            Limit [LIM_35]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_33]
+               Select Operator [SEL_34]
                |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 6 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_32]
+                  Reduce Output Operator [RS_33]
                      key expressions:_col0 (type: string), _col1 (type: string)
                      sort order:++
                      Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: decimal(23,2)), _col3 (type: decimal(23,2))
-                     Group By Operator [GBY_30]
+                     Group By Operator [GBY_31]
                      |  aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
                      |  keys:KEY._col0 (type: string), KEY._col1 (type: string)
                      |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                      |  Statistics:Num rows: 139755 Data size: 200727046 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 5 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_29]
+                        Reduce Output Operator [RS_30]
                            key expressions:_col0 (type: string), _col1 (type: string)
                            Map-reduce partition columns:_col0 (type: string), _col1 (type: string)
                            sort order:++
                            Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                            value expressions:_col2 (type: decimal(23,2)), _col3 (type: decimal(23,2))
-                           Group By Operator [GBY_28]
+                           Group By Operator [GBY_29]
                               aggregations:["sum(_col2)","sum(_col3)"]
                               keys:_col0 (type: string), _col1 (type: string)
                               outputColumnNames:["_col0","_col1","_col2","_col3"]
                               Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_26]
+                              Select Operator [SEL_27]
                                  outputColumnNames:["_col0","_col1","_col2","_col3"]
                                  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_57]
+                                 Merge Join Operator [MERGEJOIN_58]
                                  |  condition map:[{"":"Inner Join 0 to 1"}]
                                  |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                  |  outputColumnNames:["_col4","_col7","_col9","_col11","_col14"]
                                  |  Statistics:Num rows: 279510 Data size: 401454092 Basic stats: COMPLETE Column stats: NONE
                                  |<-Map 11 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_24]
+                                 |  Reduce Output Operator [RS_25]
                                  |     key expressions:_col0 (type: int)
                                  |     Map-reduce partition columns:_col0 (type: int)
                                  |     sort order:+
                                  |     Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                  |     value expressions:_col1 (type: string)
-                                 |     Select Operator [SEL_13]
+                                 |     Select Operator [SEL_14]
                                  |        outputColumnNames:["_col0","_col1"]
                                  |        Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_53]
+                                 |        Filter Operator [FIL_54]
                                  |           predicate:(d_date BETWEEN '1998-03-09' AND '1998-05-08' and d_date_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
-                                 |           TableScan [TS_11]
+                                 |           TableScan [TS_12]
                                  |              alias:date_dim
                                  |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
                                  |<-Reducer 4 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_23]
+                                    Reduce Output Operator [RS_24]
                                        key expressions:_col0 (type: int)
                                        Map-reduce partition columns:_col0 (type: int)
                                        sort order:+
                                        Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                        value expressions:_col4 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col9 (type: string), _col11 (type: string)
-                                       Merge Join Operator [MERGEJOIN_56]
+                                       Merge Join Operator [MERGEJOIN_57]
                                        |  condition map:[{"":"Inner Join 0 to 1"}]
                                        |  keys:{"0":"_col2 (type: int)","1":"_col0 (type: int)"}
                                        |  outputColumnNames:["_col0","_col4","_col7","_col9","_col11"]
                                        |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
                                        |<-Map 10 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_21]
+                                       |  Reduce Output Operator [RS_22]
                                        |     key expressions:_col0 (type: int)
                                        |     Map-reduce partition columns:_col0 (type: int)
                                        |     sort order:+
                                        |     Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
                                        |     value expressions:_col1 (type: string)
-                                       |     Select Operator [SEL_10]
+                                       |     Select Operator [SEL_11]
                                        |        outputColumnNames:["_col0","_col1"]
                                        |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_52]
+                                       |        Filter Operator [FIL_53]
                                        |           predicate:(i_current_price BETWEEN 0.99 AND 1.49 and i_item_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                       |           TableScan [TS_8]
+                                       |           TableScan [TS_9]
                                        |              alias:item
                                        |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
                                        |<-Reducer 3 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_20]
+                                          Reduce Output Operator [RS_21]
                                              key expressions:_col2 (type: int)
                                              Map-reduce partition columns:_col2 (type: int)
                                              sort order:+
                                              Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                              value expressions:_col0 (type: int), _col4 (type: decimal(7,2)), _col7 (type: decimal(7,2)), _col9 (type: string)
-                                             Merge Join Operator [MERGEJOIN_55]
+                                             Merge Join Operator [MERGEJOIN_56]
                                              |  condition map:[{"":"Inner Join 0 to 1"}]
                                              |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                                              |  outputColumnNames:["_col0","_col2","_col4","_col7","_col9"]
                                              |  Statistics:Num rows: 29 Data size: 30582 Basic stats: COMPLETE Column stats: NONE
                                              |<-Map 9 [SIMPLE_EDGE]
-                                             |  Reduce Output Operator [RS_18]
+                                             |  Reduce Output Operator [RS_19]
                                              |     key expressions:_col0 (type: int)
                                              |     Map-reduce partition columns:_col0 (type: int)
                                              |     sort order:+
                                              |     Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                              |     value expressions:_col1 (type: string)
-                                             |     Select Operator [SEL_7]
+                                             |     Select Operator [SEL_8]
                                              |        outputColumnNames:["_col0","_col1"]
                                              |        Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                             |        Filter Operator [FIL_51]
+                                             |        Filter Operator [FIL_52]
                                              |           predicate:w_warehouse_sk is not null (type: boolean)
                                              |           Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
-                                             |           TableScan [TS_5]
+                                             |           TableScan [TS_6]
                                              |              alias:warehouse
                                              |              Statistics:Num rows: 27 Data size: 27802 Basic stats: COMPLETE Column stats: NONE
                                              |<-Reducer 2 [SIMPLE_EDGE]
-                                                Reduce Output Operator [RS_17]
+                                                Reduce Output Operator [RS_18]
                                                    key expressions:_col1 (type: int)
                                                    Map-reduce partition columns:_col1 (type: int)
                                                    sort order:+
                                                    Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    value expressions:_col0 (type: int), _col2 (type: int), _col4 (type: decimal(7,2)), _col7 (type: decimal(7,2))
-                                                   Merge Join Operator [MERGEJOIN_54]
+                                                   Merge Join Operator [MERGEJOIN_55]
                                                    |  condition map:[{"":"Left Outer Join0 to 1"}]
                                                    |  keys:{"0":"_col3 (type: int), _col2 (type: int)","1":"_col1 (type: int), _col0 (type: int)"}
                                                    |  outputColumnNames:["_col0","_col1","_col2","_col4","_col7"]
                                                    |  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |<-Map 1 [SIMPLE_EDGE]
-                                                   |  Reduce Output Operator [RS_14]
+                                                   |  Reduce Output Operator [RS_15]
                                                    |     key expressions:_col3 (type: int), _col2 (type: int)
                                                    |     Map-reduce partition columns:_col3 (type: int), _col2 (type: int)
                                                    |     sort order:++
@@ -152,23 +152,26 @@ Stage-0
                                                    |     Select Operator [SEL_2]
                                                    |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                   |        Filter Operator [FIL_49]
+                                                   |        Filter Operator [FIL_50]
                                                    |           predicate:((cs_warehouse_sk is not null and cs_item_sk is not null) and cs_sold_date_sk is not null) (type: boolean)
                                                    |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |           TableScan [TS_0]
                                                    |              alias:catalog_sales
                                                    |              Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |<-Map 8 [SIMPLE_EDGE]
-                                                      Reduce Output Operator [RS_15]
+                                                      Reduce Output Operator [RS_16]
                                                          key expressions:_col1 (type: int), _col0 (type: int)
                                                          Map-reduce partition columns:_col1 (type: int), _col0 (type: int)
                                                          sort order:++
                                                          Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                          value expressions:_col2 (type: decimal(7,2))
-                                                         Select Operator [SEL_4]
+                                                         Select Operator [SEL_5]
                                                             outputColumnNames:["_col0","_col1","_col2"]
                                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                            TableScan [TS_3]
-                                                               alias:catalog_returns
+                                                            Filter Operator [FIL_51]
+                                                               predicate:cr_item_sk is not null (type: boolean)
                                                                Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+                                                               TableScan [TS_3]
+                                                                  alias:catalog_returns
+                                                                  Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
 

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 9ede45d..fbbc6dc 100644
--- a/ql/src/test/results/clientpositive/perf/query42.q.out
+++ b/ql/src/test/results/clientpositive/perf/query42.q.out
@@ -96,7 +96,7 @@ Stage-0
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                           |        Filter Operator [FIL_30]
-                                          |           predicate:(((d_year = 1998) and (d_moy = 12)) and d_date_sk is not null) (type: boolean)
+                                          |           predicate:(((d_moy = 12) and (d_year = 1998)) and d_date_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_0]
                                           |              alias:dt

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 f55f20c..39b8d1c 100644
--- a/ql/src/test/results/clientpositive/perf/query45.q.out
+++ b/ql/src/test/results/clientpositive/perf/query45.q.out
@@ -130,7 +130,7 @@ Stage-0
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                           |        Filter Operator [FIL_65]
-                                          |           predicate:(((d_qoy = 2) and (d_year = 2000)) and d_date_sk is not null) (type: boolean)
+                                          |           predicate:((d_date_sk is not null and (d_qoy = 2)) and (d_year = 2000)) (type: boolean)
                                           |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_9]
                                           |              alias:date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 0ded912..16f1606 100644
--- a/ql/src/test/results/clientpositive/perf/query46.q.out
+++ b/ql/src/test/results/clientpositive/perf/query46.q.out
@@ -233,7 +233,7 @@ Stage-0
                                                                                  outputColumnNames:["_col0"]
                                                                                  Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                                                  Filter Operator [FIL_79]
-                                                                                    predicate:(((d_year) IN (1998, 1999, 2000) and (d_dow) IN (6, 0)) and d_date_sk is not null) (type: boolean)
+                                                                                    predicate:(((d_dow) IN (6, 0) and (d_year) IN (1998, 1999, 2000)) and d_date_sk is not null) (type: boolean)
                                                                                     Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                                                     TableScan [TS_3]
                                                                                        alias:date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 40b76f0..b923cfa 100644
--- a/ql/src/test/results/clientpositive/perf/query48.q.out
+++ b/ql/src/test/results/clientpositive/perf/query48.q.out
@@ -109,7 +109,7 @@ Stage-0
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 4950 Data size: 1792764 Basic stats: COMPLETE Column stats: NONE
                                        |        Filter Operator [FIL_51]
-                                       |           predicate:(((cd_education_status = '4 yr Degree') and (cd_marital_status = 'M')) and cd_demo_sk is not null) (type: boolean)
+                                       |           predicate:(((cd_marital_status = 'M') and (cd_education_status = '4 yr Degree')) and cd_demo_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 4950 Data size: 1792764 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_6]
                                        |              alias:customer_demographics
@@ -137,7 +137,7 @@ Stage-0
                                              |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col6"]
                                              |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                              |        Filter Operator [FIL_49]
-                                             |           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_store_sk is not null) and (ss_sales_price BETWEEN 100.0 AND 150.0 or ss_sales_price BETWEEN 50.0 AND 100.0 or ss_sales_price BETWEEN 150.0 AND 200.0)) and ss_cdemo_sk is not null) and ss_addr_sk is not null) and ss_sold_date_sk is not null) (type: boolean)
+                                             |           predicate:((((((ss_sales_price BETWEEN 100.0 AND 150.0 or ss_sales_price BETWEEN 50.0 AND 100.0 or ss_sales_price BETWEEN 150.0 AND 200.0) 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) (type: boolean)
                                              |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                              |           TableScan [TS_0]
                                              |              alias:store_sales

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 8b41d05..f652b48 100644
--- a/ql/src/test/results/clientpositive/perf/query50.q.out
+++ b/ql/src/test/results/clientpositive/perf/query50.q.out
@@ -180,7 +180,7 @@ Stage-0
                                  |        outputColumnNames:["_col0"]
                                  |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                  |        Filter Operator [FIL_55]
-                                 |           predicate:(((d_year = 2000) and d_date_sk is not null) and (d_moy = 9)) (type: boolean)
+                                 |           predicate:(((d_year = 2000) and (d_moy = 9)) and d_date_sk is not null) (type: boolean)
                                  |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                  |           TableScan [TS_12]
                                  |              alias:d1
@@ -263,7 +263,7 @@ Stage-0
                                                    |        outputColumnNames:["_col0","_col1","_col2","_col3","_col4"]
                                                    |        Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |        Filter Operator [FIL_51]
-                                                   |           predicate:((((ss_ticket_number is not null and ss_customer_sk is not null) and ss_item_sk is not null) and ss_store_sk is not null) and ss_sold_date_sk is not null) (type: boolean)
+                                                   |           predicate:((((ss_item_sk is not null and ss_customer_sk is not null) and ss_ticket_number is not null) and ss_store_sk is not null) and ss_sold_date_sk is not null) (type: boolean)
                                                    |           Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                    |           TableScan [TS_0]
                                                    |              alias:store_sales
@@ -279,7 +279,7 @@ Stage-0
                                                             outputColumnNames:["_col0","_col1","_col2","_col3"]
                                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                             Filter Operator [FIL_52]
-                                                               predicate:(((sr_ticket_number is not null and sr_customer_sk is not null) and sr_item_sk is not null) and sr_returned_date_sk is not null) (type: boolean)
+                                                               predicate:(((sr_item_sk is not null and sr_customer_sk is not null) and sr_ticket_number is not null) and sr_returned_date_sk is not null) (type: boolean)
                                                                Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                                                                TableScan [TS_3]
                                                                   alias:store_returns

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 7e7224b..87b272a 100644
--- a/ql/src/test/results/clientpositive/perf/query52.q.out
+++ b/ql/src/test/results/clientpositive/perf/query52.q.out
@@ -97,7 +97,7 @@ Stage-0
                                           |        outputColumnNames:["_col0"]
                                           |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                           |        Filter Operator [FIL_30]
-                                          |           predicate:(((d_year = 1998) and (d_moy = 12)) and d_date_sk is not null) (type: boolean)
+                                          |           predicate:(((d_moy = 12) and (d_year = 1998)) and d_date_sk is not null) (type: boolean)
                                           |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                           |           TableScan [TS_0]
                                           |              alias:dt

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 56c70b7..efa358d 100644
--- a/ql/src/test/results/clientpositive/perf/query54.q.out
+++ b/ql/src/test/results/clientpositive/perf/query54.q.out
@@ -150,7 +150,7 @@ Stage-0
                                                          |        outputColumnNames:["_col0","_col1","_col2"]
                                                          |        Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                          |        Filter Operator [FIL_117]
-                                                         |           predicate:((ca_address_sk is not null and ca_state is not null) and ca_county is not null) (type: boolean)
+                                                         |           predicate:((ca_address_sk is not null and ca_county is not null) and ca_state is not null) (type: boolean)
                                                          |           Statistics:Num rows: 40000000 Data size: 40595195284 Basic stats: COMPLETE Column stats: NONE
                                                          |           TableScan [TS_34]
                                                          |              alias:customer_address
@@ -246,7 +246,7 @@ Stage-0
                                                                                     |        outputColumnNames:["_col0"]
                                                                                     |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                                                     |        Filter Operator [FIL_114]
-                                                                                    |           predicate:(((d_year = 2000) and (d_moy = 3)) and d_date_sk is not null) (type: boolean)
+                                                                                    |           predicate:(((d_moy = 3) and (d_year = 2000)) and d_date_sk is not null) (type: boolean)
                                                                                     |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                                                                     |           TableScan [TS_11]
                                                                                     |              alias:date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 d36f378..bcec2cc 100644
--- a/ql/src/test/results/clientpositive/perf/query55.q.out
+++ b/ql/src/test/results/clientpositive/perf/query55.q.out
@@ -94,7 +94,7 @@ Stage-0
                                        |        outputColumnNames:["_col0"]
                                        |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                        |        Filter Operator [FIL_30]
-                                       |           predicate:(((d_moy = 12) and d_date_sk is not null) and (d_year = 2001)) (type: boolean)
+                                       |           predicate:(((d_moy = 12) and (d_year = 2001)) and d_date_sk is not null) (type: boolean)
                                        |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
                                        |           TableScan [TS_0]
                                        |              alias:date_dim

http://git-wip-us.apache.org/repos/asf/hive/blob/48b201ee/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 c2f7189..4112910 100644
--- a/ql/src/test/results/clientpositive/perf/query58.q.out
+++ b/ql/src/test/results/clientpositive/perf/query58.q.out
@@ -287,7 +287,7 @@ Stage-0
                            |                                outputColumnNames:["_col1"]
                            |                                Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                            |                                Filter Operator [FIL_188]
-                           |                                   predicate:((d_date = '1998-08-04') and d_week_seq is not null) (type: boolean)
+                           |                                   predicate:(d_week_seq is not null and (d_date = '1998-08-04')) (type: boolean)
                            |                                   Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                            |                                   TableScan [TS_83]
                            |                                      alias:date_dim
@@ -300,7 +300,7 @@ Stage-0
                                  Statistics:Num rows: 84551 Data size: 121438791 Basic stats: COMPLETE Column stats: NONE
                                  value expressions:_col1 (type: decimal(17,2)), _col3 (type: decimal(17,2))
                                  Filter Operator [FIL_69]
-                                    predicate:(_col3 BETWEEN (0.9 * UDFToDouble(_col1)) AND (1.1 * UDFToDouble(_col1)) and _col1 BETWEEN (0.9 * UDFToDouble(_col3)) AND (1.1 * UDFToDouble(_col3))) (type: boolean)
+                                    predicate:(_col1 BETWEEN (0.9 * UDFToDouble(_col3)) AND (1.1 * UDFToDouble(_col3)) and _col3 BETWEEN (0.9 * UDFToDouble(_col1)) AND (1.1 * UDFToDouble(_col1))) (type: boolean)
                                     Statistics:Num rows: 84551 Data size: 121438791 Basic stats: COMPLETE Column stats: NONE
                                     Merge Join Operator [MERGEJOIN_201]
                                     |  condition map:[{"":"Inner Join 0 to 1"}]
@@ -448,7 +448,7 @@ Stage-0
                                     |                                outputColumnNames:["_col1"]
                                     |                                Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                     |                                Filter Operator [FIL_183]
-                                    |                                   predicate:((d_date = '1998-08-04') and d_week_seq is not null) (type: boolean)
+                                    |                                   predicate:(d_week_seq is not null and (d_date = '1998-08-04')) (type: boolean)
                                     |                                   Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                     |                                   TableScan [TS_45]
                                     |                                      alias:date_dim
@@ -522,7 +522,7 @@ Stage-0
                                                       |              outputColumnNames:["_col1"]
                                                       |              Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                       |              Filter Operator [FIL_178]
-                                                      |                 predicate:((d_date = '1998-08-04') and d_week_seq is not null) (type: boolean)
+                                                      |                 predicate:(d_week_seq is not null and (d_date = '1998-08-04')) (type: boolean)
                                                       |                 Statistics:Num rows: 36524 Data size: 40870356 Basic stats: COMPLETE Column stats: NONE
                                                       |                 TableScan [TS_12]
                                                       |                    alias:date_dim