You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by px...@apache.org on 2015/12/23 06:06:49 UTC

[6/9] hive git commit: HIVE-11927: Implement/Enable constant related optimization rules in Calcite: enable HiveReduceExpressionsRule to fold constants (Pengcheng Xiong, reviewed by Laljo John Pullokkaran)

http://git-wip-us.apache.org/repos/asf/hive/blob/b340ecb5/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 a18cdaf..f4ad98c 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), _col2 (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), _col7 (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","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
+                     outputColumnNames:["_col0","_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
                      Statistics:Num rows: 112735 Data size: 161919824 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":"_col2 (type: int), _col1 (type: int)","1":"_col2 (type: int), _col1 (type: int)"}
-                     |  outputColumnNames:["_col1","_col2","_col3","_col4","_col5","_col7","_col8","_col9","_col10","_col11"]
+                     |  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"]
                      |  Statistics:Num rows: 112735 Data size: 161919824 Basic stats: COMPLETE Column stats: NONE
                      |<-Reducer 15 [SIMPLE_EDGE]
                      |  Reduce Output Operator [RS_57]
@@ -78,7 +78,7 @@ Stage-0
                      |                       Select Operator [SEL_49]
                      |                          outputColumnNames:["_col4","_col5","_col6","_col9","_col3"]
                      |                          Statistics:Num rows: 614922 Data size: 883199024 Basic stats: COMPLETE Column stats: NONE
-                     |                          Merge Join Operator [MERGEJOIN_102]
+                     |                          Merge Join Operator [MERGEJOIN_103]
                      |                          |  condition map:[{"":"Inner Join 0 to 1"}]
                      |                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                      |                          |  outputColumnNames:["_col3","_col4","_col5","_col6"]
@@ -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_101]
+                     |                                Merge Join Operator [MERGEJOIN_102]
                      |                                |  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_100]
+                     |                                      Merge Join Operator [MERGEJOIN_101]
                      |                                      |  condition map:[{"":"Inner Join 0 to 1"}]
                      |                                      |  keys:{"0":"_col1 (type: int)","1":"_col0 (type: int)"}
                      |                                      |  outputColumnNames:["_col0","_col2","_col3","_col4"]
@@ -171,41 +171,41 @@ 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:_col2 (type: int), _col1 (type: int)
-                           Map-reduce partition columns:_col2 (type: int), _col1 (type: int)
+                           key expressions:_col1 (type: int), _col0 (type: int)
+                           Map-reduce partition columns:_col1 (type: int), _col0 (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:_col2 (type: double), _col3 (type: double)
                            Select Operator [SEL_27]
-                              outputColumnNames:["_col1","_col2","_col3","_col4","_col5"]
+                              outputColumnNames:["_col0","_col1","_col2","_col3"]
                               Statistics:Num rows: 102487 Data size: 147199837 Basic stats: COMPLETE Column stats: NONE
                               Filter Operator [FIL_26]
-                                 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_25]
-                                    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_24]
-                                    |  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_25]
+                                    |  aggregations:["avg(VALUE._col0)","stddev_samp(VALUE._col1)"]
+                                    |  keys:KEY._col0 (type: string), KEY._col1 (type: int), KEY._col2 (type: int), KEY._col3 (type: int)
                                     |  outputColumnNames:["_col0","_col1","_col2","_col3","_col4","_col5"]
                                     |  Statistics:Num rows: 307461 Data size: 441599512 Basic stats: COMPLETE Column stats: NONE
                                     |<-Reducer 4 [SIMPLE_EDGE]
-                                       Reduce Output Operator [RS_23]
-                                          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_24]
+                                          key expressions:_col0 (type: string), _col1 (type: int), _col2 (type: int), _col3 (type: int)
+                                          Map-reduce partition columns:_col0 (type: string), _col1 (type: int), _col2 (type: int), _col3 (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_22]
-                                             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_23]
+                                             aggregations:["avg(_col4)","stddev_samp(_col4)"]
+                                             keys:_col0 (type: string), _col1 (type: int), _col2 (type: int), 3 (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_21]
-                                                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_99]
+                                                Merge Join Operator [MERGEJOIN_100]
                                                 |  condition map:[{"":"Inner Join 0 to 1"}]
                                                 |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
                                                 |  outputColumnNames:["_col3","_col4","_col5","_col6"]
@@ -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_98]
+                                                      Merge Join Operator [MERGEJOIN_99]
                                                       |  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_97]
+                                                            Merge Join Operator [MERGEJOIN_98]
                                                             |  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/b340ecb5/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 3954829..94f7e32 100644
--- a/ql/src/test/results/clientpositive/perf/query42.q.out
+++ b/ql/src/test/results/clientpositive/perf/query42.q.out
@@ -15,103 +15,106 @@ Stage-0
       limit:100
       Stage-1
          Reducer 5
-         File Output Operator [FS_23]
+         File Output Operator [FS_24]
             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_22]
+            Limit [LIM_23]
                Number of rows:100
                Statistics:Num rows: 100 Data size: 143600 Basic stats: COMPLETE Column stats: NONE
-               Select Operator [SEL_21]
+               Select Operator [SEL_22]
                |  outputColumnNames:["_col0","_col1","_col2","_col3"]
                |  Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
-                  Reduce Output Operator [RS_20]
-                     key expressions:_col3 (type: decimal(17,2)), _col0 (type: int), _col1 (type: int), _col2 (type: string)
+                  Reduce Output Operator [RS_21]
+                     key expressions:_col3 (type: decimal(17,2)), 1998 (type: int), _col1 (type: int), _col2 (type: string)
                      sort order:-+++
                      Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
-                     Group By Operator [GBY_18]
-                     |  aggregations:["sum(VALUE._col0)"]
-                     |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: string)
-                     |  outputColumnNames:["_col0","_col1","_col2","_col3"]
-                     |  Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
-                     |<-Reducer 3 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_17]
-                           key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: string)
-                           Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: string)
-                           sort order:+++
-                           Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                           value expressions:_col3 (type: decimal(17,2))
-                           Group By Operator [GBY_16]
-                              aggregations:["sum(_col5)"]
-                              keys:_col1 (type: int), _col7 (type: int), _col8 (type: string)
-                              outputColumnNames:["_col0","_col1","_col2","_col3"]
+                     Select Operator [SEL_20]
+                        outputColumnNames:["_col1","_col2","_col3"]
+                        Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
+                        Group By Operator [GBY_19]
+                        |  aggregations:["sum(VALUE._col0)"]
+                        |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: string)
+                        |  outputColumnNames:["_col0","_col1","_col2","_col3"]
+                        |  Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
+                        |<-Reducer 3 [SIMPLE_EDGE]
+                           Reduce Output Operator [RS_18]
+                              key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: string)
+                              Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: string)
+                              sort order:+++
                               Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_15]
-                                 outputColumnNames:["_col1","_col7","_col8","_col5"]
+                              value expressions:_col3 (type: decimal(17,2))
+                              Group By Operator [GBY_17]
+                                 aggregations:["sum(_col3)"]
+                                 keys:1998 (type: int), _col1 (type: int), _col2 (type: string)
+                                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                                  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_33]
-                                 |  condition map:[{"":"Inner Join 0 to 1"}]
-                                 |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
-                                 |  outputColumnNames:["_col5","_col7","_col8"]
-                                 |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                                 |<-Map 7 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_13]
-                                 |     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: int), _col2 (type: string)
-                                 |     Select Operator [SEL_8]
-                                 |        outputColumnNames:["_col0","_col1","_col2"]
-                                 |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_31]
-                                 |           predicate:((i_manager_id = 1) and i_item_sk is not null) (type: boolean)
-                                 |           Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                 |           TableScan [TS_6]
-                                 |              alias:item
-                                 |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_12]
-                                       key expressions:_col4 (type: int)
-                                       Map-reduce partition columns:_col4 (type: int)
-                                       sort order:+
-                                       Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                       value expressions:_col5 (type: decimal(7,2))
-                                       Merge Join Operator [MERGEJOIN_32]
-                                       |  condition map:[{"":"Inner Join 0 to 1"}]
-                                       |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
-                                       |  outputColumnNames:["_col4","_col5"]
-                                       |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                       |<-Map 1 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_9]
-                                       |     key expressions:_col0 (type: int)
-                                       |     Map-reduce partition columns:_col0 (type: int)
-                                       |     sort order:+
-                                       |     Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |     Select Operator [SEL_2]
-                                       |        outputColumnNames:["_col0"]
-                                       |        Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |        Filter Operator [FIL_29]
-                                       |           predicate:(((d_year = 1998) and (d_moy = 12)) 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
-                                       |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                       |<-Map 6 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_10]
-                                             key expressions:_col0 (type: int)
-                                             Map-reduce partition columns:_col0 (type: int)
-                                             sort order:+
-                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                             value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                                             Select Operator [SEL_5]
-                                                outputColumnNames:["_col0","_col1","_col2"]
+                                 Select Operator [SEL_15]
+                                    outputColumnNames:["_col1","_col2","_col3"]
+                                    Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
+                                    Merge Join Operator [MERGEJOIN_34]
+                                    |  condition map:[{"":"Inner Join 0 to 1"}]
+                                    |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
+                                    |  outputColumnNames:["_col5","_col7","_col8"]
+                                    |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
+                                    |<-Map 7 [SIMPLE_EDGE]
+                                    |  Reduce Output Operator [RS_13]
+                                    |     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: int), _col2 (type: string)
+                                    |     Select Operator [SEL_8]
+                                    |        outputColumnNames:["_col0","_col1","_col2"]
+                                    |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
+                                    |        Filter Operator [FIL_32]
+                                    |           predicate:((i_manager_id = 1) and i_item_sk is not null) (type: boolean)
+                                    |           Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
+                                    |           TableScan [TS_6]
+                                    |              alias:item
+                                    |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
+                                    |<-Reducer 2 [SIMPLE_EDGE]
+                                       Reduce Output Operator [RS_12]
+                                          key expressions:_col4 (type: int)
+                                          Map-reduce partition columns:_col4 (type: int)
+                                          sort order:+
+                                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
+                                          value expressions:_col5 (type: decimal(7,2))
+                                          Merge Join Operator [MERGEJOIN_33]
+                                          |  condition map:[{"":"Inner Join 0 to 1"}]
+                                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
+                                          |  outputColumnNames:["_col4","_col5"]
+                                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
+                                          |<-Map 1 [SIMPLE_EDGE]
+                                          |  Reduce Output Operator [RS_9]
+                                          |     key expressions:_col0 (type: int)
+                                          |     Map-reduce partition columns:_col0 (type: int)
+                                          |     sort order:+
+                                          |     Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
+                                          |     Select Operator [SEL_2]
+                                          |        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)
+                                          |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
+                                          |           TableScan [TS_0]
+                                          |              alias:dt
+                                          |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
+                                          |<-Map 6 [SIMPLE_EDGE]
+                                             Reduce Output Operator [RS_10]
+                                                key expressions:_col0 (type: int)
+                                                Map-reduce partition columns:_col0 (type: int)
+                                                sort order:+
                                                 Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                Filter Operator [FIL_30]
-                                                   predicate:(ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean)
+                                                value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
+                                                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:store_sales
+                                                   Filter Operator [FIL_31]
+                                                      predicate:(ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean)
                                                       Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+                                                      TableScan [TS_3]
+                                                         alias:store_sales
+                                                         Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b340ecb5/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 63f0bf6..b4f46cc 100644
--- a/ql/src/test/results/clientpositive/perf/query52.q.out
+++ b/ql/src/test/results/clientpositive/perf/query52.q.out
@@ -27,92 +27,95 @@ Stage-0
                |  Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
                |<-Reducer 4 [SIMPLE_EDGE]
                   Reduce Output Operator [RS_21]
-                     key expressions:_col0 (type: int), _col3 (type: decimal(17,2)), _col1 (type: int)
+                     key expressions:1998 (type: int), _col3 (type: decimal(17,2)), _col1 (type: int)
                      sort order:+-+
                      Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
                      value expressions:_col2 (type: string)
-                     Group By Operator [GBY_18]
-                     |  aggregations:["sum(VALUE._col0)"]
-                     |  keys:KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: string)
-                     |  outputColumnNames:["_col0","_col1","_col2","_col3"]
-                     |  Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
-                     |<-Reducer 3 [SIMPLE_EDGE]
-                        Reduce Output Operator [RS_17]
-                           key expressions:_col0 (type: int), _col1 (type: int), _col2 (type: string)
-                           Map-reduce partition columns:_col0 (type: int), _col1 (type: int), _col2 (type: string)
-                           sort order:+++
-                           Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                           value expressions:_col3 (type: decimal(17,2))
-                           Group By Operator [GBY_16]
-                              aggregations:["sum(_col5)"]
-                              keys:_col1 (type: int), _col7 (type: int), _col8 (type: string)
-                              outputColumnNames:["_col0","_col1","_col2","_col3"]
+                     Select Operator [SEL_20]
+                        outputColumnNames:["_col1","_col2","_col3"]
+                        Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
+                        Group By Operator [GBY_19]
+                        |  aggregations:["sum(VALUE._col0)"]
+                        |  keys:KEY._col0 (type: int), KEY._col1 (type: string), KEY._col2 (type: int)
+                        |  outputColumnNames:["_col0","_col1","_col2","_col3"]
+                        |  Statistics:Num rows: 127050 Data size: 182479129 Basic stats: COMPLETE Column stats: NONE
+                        |<-Reducer 3 [SIMPLE_EDGE]
+                           Reduce Output Operator [RS_18]
+                              key expressions:_col0 (type: int), _col1 (type: string), _col2 (type: int)
+                              Map-reduce partition columns:_col0 (type: int), _col1 (type: string), _col2 (type: int)
+                              sort order:+++
                               Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                              Select Operator [SEL_15]
-                                 outputColumnNames:["_col1","_col7","_col8","_col5"]
+                              value expressions:_col3 (type: decimal(17,2))
+                              Group By Operator [GBY_17]
+                                 aggregations:["sum(_col3)"]
+                                 keys:1998 (type: int), _col1 (type: string), _col2 (type: int)
+                                 outputColumnNames:["_col0","_col1","_col2","_col3"]
                                  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                                 Merge Join Operator [MERGEJOIN_34]
-                                 |  condition map:[{"":"Inner Join 0 to 1"}]
-                                 |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
-                                 |  outputColumnNames:["_col5","_col7","_col8"]
-                                 |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
-                                 |<-Map 7 [SIMPLE_EDGE]
-                                 |  Reduce Output Operator [RS_13]
-                                 |     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: int), _col2 (type: string)
-                                 |     Select Operator [SEL_8]
-                                 |        outputColumnNames:["_col0","_col1","_col2"]
-                                 |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                 |        Filter Operator [FIL_32]
-                                 |           predicate:((i_manager_id = 1) and i_item_sk is not null) (type: boolean)
-                                 |           Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
-                                 |           TableScan [TS_6]
-                                 |              alias:item
-                                 |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
-                                 |<-Reducer 2 [SIMPLE_EDGE]
-                                    Reduce Output Operator [RS_12]
-                                       key expressions:_col4 (type: int)
-                                       Map-reduce partition columns:_col4 (type: int)
-                                       sort order:+
-                                       Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                       value expressions:_col5 (type: decimal(7,2))
-                                       Merge Join Operator [MERGEJOIN_33]
-                                       |  condition map:[{"":"Inner Join 0 to 1"}]
-                                       |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
-                                       |  outputColumnNames:["_col4","_col5"]
-                                       |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
-                                       |<-Map 1 [SIMPLE_EDGE]
-                                       |  Reduce Output Operator [RS_9]
-                                       |     key expressions:_col0 (type: int)
-                                       |     Map-reduce partition columns:_col0 (type: int)
-                                       |     sort order:+
-                                       |     Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |     Select Operator [SEL_2]
-                                       |        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)
-                                       |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
-                                       |           TableScan [TS_0]
-                                       |              alias:dt
-                                       |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
-                                       |<-Map 6 [SIMPLE_EDGE]
-                                          Reduce Output Operator [RS_10]
-                                             key expressions:_col0 (type: int)
-                                             Map-reduce partition columns:_col0 (type: int)
-                                             sort order:+
-                                             Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                             value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
-                                             Select Operator [SEL_5]
-                                                outputColumnNames:["_col0","_col1","_col2"]
+                                 Select Operator [SEL_15]
+                                    outputColumnNames:["_col1","_col2","_col3"]
+                                    Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
+                                    Merge Join Operator [MERGEJOIN_34]
+                                    |  condition map:[{"":"Inner Join 0 to 1"}]
+                                    |  keys:{"0":"_col4 (type: int)","1":"_col0 (type: int)"}
+                                    |  outputColumnNames:["_col5","_col7","_col8"]
+                                    |  Statistics:Num rows: 254100 Data size: 364958258 Basic stats: COMPLETE Column stats: NONE
+                                    |<-Map 7 [SIMPLE_EDGE]
+                                    |  Reduce Output Operator [RS_13]
+                                    |     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: int), _col2 (type: string)
+                                    |     Select Operator [SEL_8]
+                                    |        outputColumnNames:["_col0","_col1","_col2"]
+                                    |        Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
+                                    |        Filter Operator [FIL_32]
+                                    |           predicate:((i_manager_id = 1) and i_item_sk is not null) (type: boolean)
+                                    |           Statistics:Num rows: 231000 Data size: 331780228 Basic stats: COMPLETE Column stats: NONE
+                                    |           TableScan [TS_6]
+                                    |              alias:item
+                                    |              Statistics:Num rows: 462000 Data size: 663560457 Basic stats: COMPLETE Column stats: NONE
+                                    |<-Reducer 2 [SIMPLE_EDGE]
+                                       Reduce Output Operator [RS_12]
+                                          key expressions:_col4 (type: int)
+                                          Map-reduce partition columns:_col4 (type: int)
+                                          sort order:+
+                                          Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
+                                          value expressions:_col5 (type: decimal(7,2))
+                                          Merge Join Operator [MERGEJOIN_33]
+                                          |  condition map:[{"":"Inner Join 0 to 1"}]
+                                          |  keys:{"0":"_col0 (type: int)","1":"_col0 (type: int)"}
+                                          |  outputColumnNames:["_col4","_col5"]
+                                          |  Statistics:Num rows: 20088 Data size: 22478696 Basic stats: COMPLETE Column stats: NONE
+                                          |<-Map 1 [SIMPLE_EDGE]
+                                          |  Reduce Output Operator [RS_9]
+                                          |     key expressions:_col0 (type: int)
+                                          |     Map-reduce partition columns:_col0 (type: int)
+                                          |     sort order:+
+                                          |     Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
+                                          |     Select Operator [SEL_2]
+                                          |        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)
+                                          |           Statistics:Num rows: 18262 Data size: 20435178 Basic stats: COMPLETE Column stats: NONE
+                                          |           TableScan [TS_0]
+                                          |              alias:dt
+                                          |              Statistics:Num rows: 73049 Data size: 81741831 Basic stats: COMPLETE Column stats: NONE
+                                          |<-Map 6 [SIMPLE_EDGE]
+                                             Reduce Output Operator [RS_10]
+                                                key expressions:_col0 (type: int)
+                                                Map-reduce partition columns:_col0 (type: int)
+                                                sort order:+
                                                 Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                                                Filter Operator [FIL_31]
-                                                   predicate:(ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean)
+                                                value expressions:_col1 (type: int), _col2 (type: decimal(7,2))
+                                                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:store_sales
+                                                   Filter Operator [FIL_31]
+                                                      predicate:(ss_sold_date_sk is not null and ss_item_sk is not null) (type: boolean)
                                                       Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+                                                      TableScan [TS_3]
+                                                         alias:store_sales
+                                                         Statistics:Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE