hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject [07/14] hive git commit: HIVE-14564 : Column Pruning generates out of order columns in SelectOperator which cause ArrayIndexOutOfBoundsException. (Zhihai Xu via Ashutosh Chauhan)
Date Sat, 08 Apr 2017 03:58:08 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/ql/src/test/results/clientpositive/perf/query51.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query51.q.out b/ql/src/test/results/clientpositive/perf/query51.q.out
index 55e08d9..7da09ba 100644
--- a/ql/src/test/results/clientpositive/perf/query51.q.out
+++ b/ql/src/test/results/clientpositive/perf/query51.q.out
@@ -134,28 +134,26 @@ Stage-0
                                     PartitionCols:_col0
                                     Group By Operator [GBY_30] (rows=158402938 width=135)
                                       Output:["_col0","_col1","_col2"],aggregations:["sum(_col2)"],keys:_col1, _col4
-                                      Select Operator [SEL_29] (rows=158402938 width=135)
-                                        Output:["_col1","_col4","_col2"]
-                                        Merge Join Operator [MERGEJOIN_66] (rows=158402938 width=135)
-                                          Conds:RS_26._col0=RS_27._col0(Inner),Output:["_col1","_col2","_col4"]
-                                        <-Map 11 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_27]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_25] (rows=8116 width=1119)
-                                              Output:["_col0","_col1"]
-                                              Filter Operator [FIL_62] (rows=8116 width=1119)
-                                                predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null)
-                                                TableScan [TS_23] (rows=73049 width=1119)
-                                                  default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date","d_month_seq"]
-                                        <-Map 8 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_26]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_22] (rows=144002668 width=135)
-                                              Output:["_col0","_col1","_col2"]
-                                              Filter Operator [FIL_61] (rows=144002668 width=135)
-                                                predicate:(ws_item_sk is not null and ws_sold_date_sk is not null)
-                                                TableScan [TS_20] (rows=144002668 width=135)
-                                                  default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_sales_price"]
+                                      Merge Join Operator [MERGEJOIN_66] (rows=158402938 width=135)
+                                        Conds:RS_26._col0=RS_27._col0(Inner),Output:["_col1","_col2","_col4"]
+                                      <-Map 11 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_27]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_25] (rows=8116 width=1119)
+                                            Output:["_col0","_col1"]
+                                            Filter Operator [FIL_62] (rows=8116 width=1119)
+                                              predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null)
+                                              TableScan [TS_23] (rows=73049 width=1119)
+                                                default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date","d_month_seq"]
+                                      <-Map 8 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_26]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_22] (rows=144002668 width=135)
+                                            Output:["_col0","_col1","_col2"]
+                                            Filter Operator [FIL_61] (rows=144002668 width=135)
+                                              predicate:(ws_item_sk is not null and ws_sold_date_sk is not null)
+                                              TableScan [TS_20] (rows=144002668 width=135)
+                                                default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_sales_price"]
                         <-Reducer 3 [SIMPLE_EDGE]
                           SHUFFLE [RS_40]
                             PartitionCols:_col0, _col1
@@ -170,26 +168,24 @@ Stage-0
                                     PartitionCols:_col0
                                     Group By Operator [GBY_10] (rows=633595212 width=88)
                                       Output:["_col0","_col1","_col2"],aggregations:["sum(_col2)"],keys:_col1, _col4
-                                      Select Operator [SEL_9] (rows=633595212 width=88)
-                                        Output:["_col1","_col4","_col2"]
-                                        Merge Join Operator [MERGEJOIN_65] (rows=633595212 width=88)
-                                          Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col1","_col2","_col4"]
-                                        <-Map 1 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_6]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_2] (rows=575995635 width=88)
-                                              Output:["_col0","_col1","_col2"]
-                                              Filter Operator [FIL_59] (rows=575995635 width=88)
-                                                predicate:(ss_item_sk is not null and ss_sold_date_sk is not null)
-                                                TableScan [TS_0] (rows=575995635 width=88)
-                                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_sales_price"]
-                                        <-Map 7 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_7]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_5] (rows=8116 width=1119)
-                                              Output:["_col0","_col1"]
-                                              Filter Operator [FIL_60] (rows=8116 width=1119)
-                                                predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null)
-                                                TableScan [TS_3] (rows=73049 width=1119)
-                                                  default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date","d_month_seq"]
+                                      Merge Join Operator [MERGEJOIN_65] (rows=633595212 width=88)
+                                        Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col1","_col2","_col4"]
+                                      <-Map 1 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_6]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_2] (rows=575995635 width=88)
+                                            Output:["_col0","_col1","_col2"]
+                                            Filter Operator [FIL_59] (rows=575995635 width=88)
+                                              predicate:(ss_item_sk is not null and ss_sold_date_sk is not null)
+                                              TableScan [TS_0] (rows=575995635 width=88)
+                                                default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_sales_price"]
+                                      <-Map 7 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_7]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_5] (rows=8116 width=1119)
+                                            Output:["_col0","_col1"]
+                                            Filter Operator [FIL_60] (rows=8116 width=1119)
+                                              predicate:(d_month_seq BETWEEN 1193 AND 1204 and d_date_sk is not null)
+                                              TableScan [TS_3] (rows=73049 width=1119)
+                                                default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date","d_month_seq"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/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 c61ed30..74ecaf2 100644
--- a/ql/src/test/results/clientpositive/perf/query52.q.out
+++ b/ql/src/test/results/clientpositive/perf/query52.q.out
@@ -31,40 +31,38 @@ Stage-0
                     PartitionCols:_col0, _col1
                     Group By Operator [GBY_16] (rows=696954748 width=88)
                       Output:["_col0","_col1","_col2"],aggregations:["sum(_col2)"],keys:_col7, _col8
-                      Select Operator [SEL_15] (rows=696954748 width=88)
-                        Output:["_col7","_col8","_col2"]
-                        Merge Join Operator [MERGEJOIN_34] (rows=696954748 width=88)
-                          Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7","_col8"]
-                        <-Map 7 [SIMPLE_EDGE]
-                          SHUFFLE [RS_13]
-                            PartitionCols:_col0
-                            Select Operator [SEL_8] (rows=231000 width=1436)
-                              Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_32] (rows=231000 width=1436)
-                                predicate:((i_manager_id = 1) and i_item_sk is not null)
-                                TableScan [TS_6] (rows=462000 width=1436)
-                                  default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manager_id"]
-                        <-Reducer 2 [SIMPLE_EDGE]
-                          SHUFFLE [RS_12]
-                            PartitionCols:_col1
-                            Merge Join Operator [MERGEJOIN_33] (rows=633595212 width=88)
-                              Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
-                            <-Map 1 [SIMPLE_EDGE]
-                              SHUFFLE [RS_9]
-                                PartitionCols:_col0
-                                Select Operator [SEL_2] (rows=575995635 width=88)
-                                  Output:["_col0","_col1","_col2"]
-                                  Filter Operator [FIL_30] (rows=575995635 width=88)
-                                    predicate:(ss_sold_date_sk is not null and ss_item_sk is not null)
-                                    TableScan [TS_0] (rows=575995635 width=88)
-                                      default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
-                            <-Map 6 [SIMPLE_EDGE]
-                              SHUFFLE [RS_10]
-                                PartitionCols:_col0
-                                Select Operator [SEL_5] (rows=18262 width=1119)
-                                  Output:["_col0"]
-                                  Filter Operator [FIL_31] (rows=18262 width=1119)
-                                    predicate:((d_moy = 12) and (d_year = 1998) and d_date_sk is not null)
-                                    TableScan [TS_3] (rows=73049 width=1119)
-                                      default@date_dim,dt,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                      Merge Join Operator [MERGEJOIN_34] (rows=696954748 width=88)
+                        Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7","_col8"]
+                      <-Map 7 [SIMPLE_EDGE]
+                        SHUFFLE [RS_13]
+                          PartitionCols:_col0
+                          Select Operator [SEL_8] (rows=231000 width=1436)
+                            Output:["_col0","_col1","_col2"]
+                            Filter Operator [FIL_32] (rows=231000 width=1436)
+                              predicate:((i_manager_id = 1) and i_item_sk is not null)
+                              TableScan [TS_6] (rows=462000 width=1436)
+                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manager_id"]
+                      <-Reducer 2 [SIMPLE_EDGE]
+                        SHUFFLE [RS_12]
+                          PartitionCols:_col1
+                          Merge Join Operator [MERGEJOIN_33] (rows=633595212 width=88)
+                            Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
+                          <-Map 1 [SIMPLE_EDGE]
+                            SHUFFLE [RS_9]
+                              PartitionCols:_col0
+                              Select Operator [SEL_2] (rows=575995635 width=88)
+                                Output:["_col0","_col1","_col2"]
+                                Filter Operator [FIL_30] (rows=575995635 width=88)
+                                  predicate:(ss_sold_date_sk is not null and ss_item_sk is not null)
+                                  TableScan [TS_0] (rows=575995635 width=88)
+                                    default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
+                          <-Map 6 [SIMPLE_EDGE]
+                            SHUFFLE [RS_10]
+                              PartitionCols:_col0
+                              Select Operator [SEL_5] (rows=18262 width=1119)
+                                Output:["_col0"]
+                                Filter Operator [FIL_31] (rows=18262 width=1119)
+                                  predicate:((d_moy = 12) and (d_year = 1998) and d_date_sk is not null)
+                                  TableScan [TS_3] (rows=73049 width=1119)
+                                    default@date_dim,dt,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/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 0b59b1b..e1f5135 100644
--- a/ql/src/test/results/clientpositive/perf/query54.q.out
+++ b/ql/src/test/results/clientpositive/perf/query54.q.out
@@ -49,131 +49,127 @@ Stage-0
                             PartitionCols:_col0
                             Group By Operator [GBY_57] (rows=696954748 width=88)
                               Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col10
-                              Select Operator [SEL_56] (rows=696954748 width=88)
-                                Output:["_col10","_col2"]
-                                Merge Join Operator [MERGEJOIN_117] (rows=696954748 width=88)
-                                  Conds:RS_53._col1=RS_54._col5(Inner),Output:["_col2","_col10"]
-                                <-Reducer 10 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_54]
-                                    PartitionCols:_col5
-                                    Merge Join Operator [MERGEJOIN_116] (rows=316240138 width=135)
-                                      Conds:RS_46._col0=RS_47._col1(Inner),Output:["_col5"]
-                                    <-Reducer 17 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_47]
-                                        PartitionCols:_col1
-                                        Select Operator [SEL_42] (rows=287491029 width=135)
-                                          Output:["_col0","_col1"]
-                                          Group By Operator [GBY_41] (rows=287491029 width=135)
-                                            Output:["_col0","_col1"],keys:KEY._col0, KEY._col1
-                                          <-Reducer 16 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_40]
-                                              PartitionCols:_col0, _col1
-                                              Group By Operator [GBY_39] (rows=574982058 width=135)
-                                                Output:["_col0","_col1"],keys:_col10, _col9
-                                                Select Operator [SEL_38] (rows=574982058 width=135)
-                                                  Output:["_col10","_col9"]
-                                                  Merge Join Operator [MERGEJOIN_115] (rows=574982058 width=135)
-                                                    Conds:RS_35._col1=RS_36._col0(Inner),Output:["_col9","_col10"]
-                                                  <-Map 21 [SIMPLE_EDGE]
-                                                    SHUFFLE [RS_36]
+                              Merge Join Operator [MERGEJOIN_117] (rows=696954748 width=88)
+                                Conds:RS_53._col1=RS_54._col5(Inner),Output:["_col2","_col10"]
+                              <-Reducer 10 [SIMPLE_EDGE]
+                                SHUFFLE [RS_54]
+                                  PartitionCols:_col5
+                                  Merge Join Operator [MERGEJOIN_116] (rows=316240138 width=135)
+                                    Conds:RS_46._col0=RS_47._col1(Inner),Output:["_col5"]
+                                  <-Reducer 17 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_47]
+                                      PartitionCols:_col1
+                                      Select Operator [SEL_42] (rows=287491029 width=135)
+                                        Output:["_col0","_col1"]
+                                        Group By Operator [GBY_41] (rows=287491029 width=135)
+                                          Output:["_col0","_col1"],keys:KEY._col0, KEY._col1
+                                        <-Reducer 16 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_40]
+                                            PartitionCols:_col0, _col1
+                                            Group By Operator [GBY_39] (rows=574982058 width=135)
+                                              Output:["_col0","_col1"],keys:_col10, _col9
+                                              Merge Join Operator [MERGEJOIN_115] (rows=574982058 width=135)
+                                                Conds:RS_35._col1=RS_36._col0(Inner),Output:["_col9","_col10"]
+                                              <-Map 21 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_36]
+                                                  PartitionCols:_col0
+                                                  Select Operator [SEL_28] (rows=80000000 width=860)
+                                                    Output:["_col0","_col1"]
+                                                    Filter Operator [FIL_110] (rows=80000000 width=860)
+                                                      predicate:(c_customer_sk is not null and c_current_addr_sk is not null)
+                                                      TableScan [TS_26] (rows=80000000 width=860)
+                                                        default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
+                                              <-Reducer 15 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_35]
+                                                  PartitionCols:_col1
+                                                  Merge Join Operator [MERGEJOIN_114] (rows=522710951 width=135)
+                                                    Conds:RS_32._col2=RS_33._col0(Inner),Output:["_col1"]
+                                                  <-Map 20 [SIMPLE_EDGE]
+                                                    SHUFFLE [RS_33]
                                                       PartitionCols:_col0
-                                                      Select Operator [SEL_28] (rows=80000000 width=860)
-                                                        Output:["_col0","_col1"]
-                                                        Filter Operator [FIL_110] (rows=80000000 width=860)
-                                                          predicate:(c_customer_sk is not null and c_current_addr_sk is not null)
-                                                          TableScan [TS_26] (rows=80000000 width=860)
-                                                            default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
-                                                  <-Reducer 15 [SIMPLE_EDGE]
-                                                    SHUFFLE [RS_35]
-                                                      PartitionCols:_col1
-                                                      Merge Join Operator [MERGEJOIN_114] (rows=522710951 width=135)
-                                                        Conds:RS_32._col2=RS_33._col0(Inner),Output:["_col1"]
-                                                      <-Map 20 [SIMPLE_EDGE]
-                                                        SHUFFLE [RS_33]
+                                                      Select Operator [SEL_25] (rows=115500 width=1436)
+                                                        Output:["_col0"]
+                                                        Filter Operator [FIL_109] (rows=115500 width=1436)
+                                                          predicate:((i_category = 'Jewelry') and (i_class = 'football') and i_item_sk is not null)
+                                                          TableScan [TS_23] (rows=462000 width=1436)
+                                                            default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_class","i_category"]
+                                                  <-Reducer 14 [SIMPLE_EDGE]
+                                                    SHUFFLE [RS_32]
+                                                      PartitionCols:_col2
+                                                      Merge Join Operator [MERGEJOIN_113] (rows=475191764 width=135)
+                                                        Conds:Union 13._col0=RS_30._col0(Inner),Output:["_col1","_col2"]
+                                                      <-Map 19 [SIMPLE_EDGE]
+                                                        SHUFFLE [RS_30]
                                                           PartitionCols:_col0
-                                                          Select Operator [SEL_25] (rows=115500 width=1436)
+                                                          Select Operator [SEL_22] (rows=18262 width=1119)
                                                             Output:["_col0"]
-                                                            Filter Operator [FIL_109] (rows=115500 width=1436)
-                                                              predicate:((i_category = 'Jewelry') and (i_class = 'football') and i_item_sk is not null)
-                                                              TableScan [TS_23] (rows=462000 width=1436)
-                                                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_class","i_category"]
-                                                      <-Reducer 14 [SIMPLE_EDGE]
-                                                        SHUFFLE [RS_32]
-                                                          PartitionCols:_col2
-                                                          Merge Join Operator [MERGEJOIN_113] (rows=475191764 width=135)
-                                                            Conds:Union 13._col0=RS_30._col0(Inner),Output:["_col1","_col2"]
-                                                          <-Map 19 [SIMPLE_EDGE]
-                                                            SHUFFLE [RS_30]
-                                                              PartitionCols:_col0
-                                                              Select Operator [SEL_22] (rows=18262 width=1119)
-                                                                Output:["_col0"]
-                                                                Filter Operator [FIL_108] (rows=18262 width=1119)
-                                                                  predicate:((d_moy = 3) and (d_year = 2000) and d_date_sk is not null)
-                                                                  TableScan [TS_20] (rows=73049 width=1119)
-                                                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                                          <-Union 13 [SIMPLE_EDGE]
-                                                            <-Map 12 [CONTAINS]
-                                                              Reduce Output Operator [RS_29]
-                                                                PartitionCols:_col0
-                                                                Select Operator [SEL_14] (rows=287989836 width=135)
-                                                                  Output:["_col0","_col1","_col2"]
-                                                                  Filter Operator [FIL_106] (rows=287989836 width=135)
-                                                                    predicate:(cs_item_sk is not null and cs_sold_date_sk is not null and cs_bill_customer_sk is not null)
-                                                                    TableScan [TS_12] (rows=287989836 width=135)
-                                                                      Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk"]
-                                                            <-Map 18 [CONTAINS]
-                                                              Reduce Output Operator [RS_29]
-                                                                PartitionCols:_col0
-                                                                Select Operator [SEL_17] (rows=144002668 width=135)
-                                                                  Output:["_col0","_col1","_col2"]
-                                                                  Filter Operator [FIL_107] (rows=144002668 width=135)
-                                                                    predicate:(ws_item_sk is not null and ws_sold_date_sk is not null and ws_bill_customer_sk is not null)
-                                                                    TableScan [TS_15] (rows=144002668 width=135)
-                                                                      Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk"]
-                                    <-Reducer 9 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_46]
-                                        PartitionCols:_col0
-                                        Merge Join Operator [MERGEJOIN_112] (rows=44000000 width=1014)
-                                          Conds:RS_43._col1, _col2=RS_44._col0, _col1(Inner),Output:["_col0"]
-                                        <-Map 11 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_44]
-                                            PartitionCols:_col0, _col1
-                                            Select Operator [SEL_11] (rows=1704 width=1910)
-                                              Output:["_col0","_col1"]
-                                              Filter Operator [FIL_105] (rows=1704 width=1910)
-                                                predicate:(s_county is not null and s_state is not null)
-                                                TableScan [TS_9] (rows=1704 width=1910)
-                                                  default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_county","s_state"]
-                                        <-Map 8 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_43]
-                                            PartitionCols:_col1, _col2
-                                            Select Operator [SEL_8] (rows=40000000 width=1014)
-                                              Output:["_col0","_col1","_col2"]
-                                              Filter Operator [FIL_104] (rows=40000000 width=1014)
-                                                predicate:(ca_address_sk is not null and ca_county is not null and ca_state is not null)
-                                                TableScan [TS_6] (rows=40000000 width=1014)
-                                                  default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county","ca_state"]
-                                <-Reducer 2 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_53]
-                                    PartitionCols:_col1
-                                    Merge Join Operator [MERGEJOIN_111] (rows=633595212 width=88)
-                                      Conds:RS_50._col0=RS_51._col0(Inner),Output:["_col1","_col2"]
-                                    <-Map 1 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_50]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_2] (rows=575995635 width=88)
-                                          Output:["_col0","_col1","_col2"]
-                                          Filter Operator [FIL_102] (rows=575995635 width=88)
-                                            predicate:(ss_customer_sk is not null and ss_sold_date_sk is not null)
-                                            TableScan [TS_0] (rows=575995635 width=88)
-                                              default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_sales_price"]
-                                    <-Map 7 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_51]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_5] (rows=8116 width=1119)
-                                          Output:["_col0"]
-                                          Filter Operator [FIL_103] (rows=8116 width=1119)
-                                            predicate:(d_month_seq BETWEEN 1203 AND 1205 and d_date_sk is not null)
-                                            TableScan [TS_3] (rows=73049 width=1119)
-                                              default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_month_seq"]
+                                                            Filter Operator [FIL_108] (rows=18262 width=1119)
+                                                              predicate:((d_moy = 3) and (d_year = 2000) and d_date_sk is not null)
+                                                              TableScan [TS_20] (rows=73049 width=1119)
+                                                                default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                                                      <-Union 13 [SIMPLE_EDGE]
+                                                        <-Map 12 [CONTAINS]
+                                                          Reduce Output Operator [RS_29]
+                                                            PartitionCols:_col0
+                                                            Select Operator [SEL_14] (rows=287989836 width=135)
+                                                              Output:["_col0","_col1","_col2"]
+                                                              Filter Operator [FIL_106] (rows=287989836 width=135)
+                                                                predicate:(cs_item_sk is not null and cs_sold_date_sk is not null and cs_bill_customer_sk is not null)
+                                                                TableScan [TS_12] (rows=287989836 width=135)
+                                                                  Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk"]
+                                                        <-Map 18 [CONTAINS]
+                                                          Reduce Output Operator [RS_29]
+                                                            PartitionCols:_col0
+                                                            Select Operator [SEL_17] (rows=144002668 width=135)
+                                                              Output:["_col0","_col1","_col2"]
+                                                              Filter Operator [FIL_107] (rows=144002668 width=135)
+                                                                predicate:(ws_item_sk is not null and ws_sold_date_sk is not null and ws_bill_customer_sk is not null)
+                                                                TableScan [TS_15] (rows=144002668 width=135)
+                                                                  Output:["ws_sold_date_sk","ws_item_sk","ws_bill_customer_sk"]
+                                  <-Reducer 9 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_46]
+                                      PartitionCols:_col0
+                                      Merge Join Operator [MERGEJOIN_112] (rows=44000000 width=1014)
+                                        Conds:RS_43._col1, _col2=RS_44._col0, _col1(Inner),Output:["_col0"]
+                                      <-Map 11 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_44]
+                                          PartitionCols:_col0, _col1
+                                          Select Operator [SEL_11] (rows=1704 width=1910)
+                                            Output:["_col0","_col1"]
+                                            Filter Operator [FIL_105] (rows=1704 width=1910)
+                                              predicate:(s_county is not null and s_state is not null)
+                                              TableScan [TS_9] (rows=1704 width=1910)
+                                                default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_county","s_state"]
+                                      <-Map 8 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_43]
+                                          PartitionCols:_col1, _col2
+                                          Select Operator [SEL_8] (rows=40000000 width=1014)
+                                            Output:["_col0","_col1","_col2"]
+                                            Filter Operator [FIL_104] (rows=40000000 width=1014)
+                                              predicate:(ca_address_sk is not null and ca_county is not null and ca_state is not null)
+                                              TableScan [TS_6] (rows=40000000 width=1014)
+                                                default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county","ca_state"]
+                              <-Reducer 2 [SIMPLE_EDGE]
+                                SHUFFLE [RS_53]
+                                  PartitionCols:_col1
+                                  Merge Join Operator [MERGEJOIN_111] (rows=633595212 width=88)
+                                    Conds:RS_50._col0=RS_51._col0(Inner),Output:["_col1","_col2"]
+                                  <-Map 1 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_50]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_2] (rows=575995635 width=88)
+                                        Output:["_col0","_col1","_col2"]
+                                        Filter Operator [FIL_102] (rows=575995635 width=88)
+                                          predicate:(ss_customer_sk is not null and ss_sold_date_sk is not null)
+                                          TableScan [TS_0] (rows=575995635 width=88)
+                                            default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_customer_sk","ss_ext_sales_price"]
+                                  <-Map 7 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_51]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_5] (rows=8116 width=1119)
+                                        Output:["_col0"]
+                                        Filter Operator [FIL_103] (rows=8116 width=1119)
+                                          predicate:(d_month_seq BETWEEN 1203 AND 1205 and d_date_sk is not null)
+                                          TableScan [TS_3] (rows=73049 width=1119)
+                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_month_seq"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/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 fb3743d..7948b6d 100644
--- a/ql/src/test/results/clientpositive/perf/query55.q.out
+++ b/ql/src/test/results/clientpositive/perf/query55.q.out
@@ -29,40 +29,38 @@ Stage-0
                   PartitionCols:_col0, _col1
                   Group By Operator [GBY_16] (rows=696954748 width=88)
                     Output:["_col0","_col1","_col2"],aggregations:["sum(_col2)"],keys:_col7, _col8
-                    Select Operator [SEL_15] (rows=696954748 width=88)
-                      Output:["_col7","_col8","_col2"]
-                      Merge Join Operator [MERGEJOIN_34] (rows=696954748 width=88)
-                        Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7","_col8"]
-                      <-Map 7 [SIMPLE_EDGE]
-                        SHUFFLE [RS_13]
-                          PartitionCols:_col0
-                          Select Operator [SEL_8] (rows=231000 width=1436)
-                            Output:["_col0","_col1","_col2"]
-                            Filter Operator [FIL_32] (rows=231000 width=1436)
-                              predicate:((i_manager_id = 36) and i_item_sk is not null)
-                              TableScan [TS_6] (rows=462000 width=1436)
-                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manager_id"]
-                      <-Reducer 2 [SIMPLE_EDGE]
-                        SHUFFLE [RS_12]
-                          PartitionCols:_col1
-                          Merge Join Operator [MERGEJOIN_33] (rows=633595212 width=88)
-                            Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
-                          <-Map 1 [SIMPLE_EDGE]
-                            SHUFFLE [RS_9]
-                              PartitionCols:_col0
-                              Select Operator [SEL_2] (rows=575995635 width=88)
-                                Output:["_col0","_col1","_col2"]
-                                Filter Operator [FIL_30] (rows=575995635 width=88)
-                                  predicate:(ss_sold_date_sk is not null and ss_item_sk is not null)
-                                  TableScan [TS_0] (rows=575995635 width=88)
-                                    default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
-                          <-Map 6 [SIMPLE_EDGE]
-                            SHUFFLE [RS_10]
-                              PartitionCols:_col0
-                              Select Operator [SEL_5] (rows=18262 width=1119)
-                                Output:["_col0"]
-                                Filter Operator [FIL_31] (rows=18262 width=1119)
-                                  predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null)
-                                  TableScan [TS_3] (rows=73049 width=1119)
-                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                    Merge Join Operator [MERGEJOIN_34] (rows=696954748 width=88)
+                      Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7","_col8"]
+                    <-Map 7 [SIMPLE_EDGE]
+                      SHUFFLE [RS_13]
+                        PartitionCols:_col0
+                        Select Operator [SEL_8] (rows=231000 width=1436)
+                          Output:["_col0","_col1","_col2"]
+                          Filter Operator [FIL_32] (rows=231000 width=1436)
+                            predicate:((i_manager_id = 36) and i_item_sk is not null)
+                            TableScan [TS_6] (rows=462000 width=1436)
+                              default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manager_id"]
+                    <-Reducer 2 [SIMPLE_EDGE]
+                      SHUFFLE [RS_12]
+                        PartitionCols:_col1
+                        Merge Join Operator [MERGEJOIN_33] (rows=633595212 width=88)
+                          Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
+                        <-Map 1 [SIMPLE_EDGE]
+                          SHUFFLE [RS_9]
+                            PartitionCols:_col0
+                            Select Operator [SEL_2] (rows=575995635 width=88)
+                              Output:["_col0","_col1","_col2"]
+                              Filter Operator [FIL_30] (rows=575995635 width=88)
+                                predicate:(ss_sold_date_sk is not null and ss_item_sk is not null)
+                                TableScan [TS_0] (rows=575995635 width=88)
+                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
+                        <-Map 6 [SIMPLE_EDGE]
+                          SHUFFLE [RS_10]
+                            PartitionCols:_col0
+                            Select Operator [SEL_5] (rows=18262 width=1119)
+                              Output:["_col0"]
+                              Filter Operator [FIL_31] (rows=18262 width=1119)
+                                predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null)
+                                TableScan [TS_3] (rows=73049 width=1119)
+                                  default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/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 f7e6a08..df95c70 100644
--- a/ql/src/test/results/clientpositive/perf/query58.q.out
+++ b/ql/src/test/results/clientpositive/perf/query58.q.out
@@ -142,70 +142,68 @@ Stage-0
                           PartitionCols:_col0
                           Group By Operator [GBY_100] (rows=174243235 width=135)
                             Output:["_col0","_col1"],aggregations:["sum(_col5)"],keys:_col7
-                            Select Operator [SEL_99] (rows=174243235 width=135)
-                              Output:["_col7","_col5"]
-                              Merge Join Operator [MERGEJOIN_207] (rows=174243235 width=135)
-                                Conds:RS_96._col4=RS_97._col0(Inner),Output:["_col5","_col7"]
-                              <-Map 33 [SIMPLE_EDGE]
-                                SHUFFLE [RS_97]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_89] (rows=462000 width=1436)
-                                    Output:["_col0","_col1"]
-                                    Filter Operator [FIL_195] (rows=462000 width=1436)
-                                      predicate:(i_item_sk is not null and i_item_id is not null)
-                                      TableScan [TS_87] (rows=462000 width=1436)
-                                        default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
-                              <-Reducer 26 [SIMPLE_EDGE]
-                                SHUFFLE [RS_96]
-                                  PartitionCols:_col4
-                                  Merge Join Operator [MERGEJOIN_206] (rows=158402938 width=135)
-                                    Conds:RS_93._col0=RS_94._col0(Inner),Output:["_col4","_col5"]
-                                  <-Map 32 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_94]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_86] (rows=144002668 width=135)
-                                        Output:["_col0","_col1","_col2"]
-                                        Filter Operator [FIL_194] (rows=144002668 width=135)
-                                          predicate:(ws_item_sk is not null and ws_sold_date_sk is not null)
-                                          TableScan [TS_84] (rows=144002668 width=135)
-                                            default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"]
-                                  <-Reducer 25 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_93]
-                                      PartitionCols:_col0
-                                      Merge Join Operator [MERGEJOIN_205] (rows=88388 width=1119)
-                                        Conds:RS_90._col1=RS_91._col0(Inner),Output:["_col0"]
-                                      <-Map 24 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_90]
-                                          PartitionCols:_col1
-                                          Select Operator [SEL_73] (rows=73049 width=1119)
-                                            Output:["_col0","_col1"]
-                                            Filter Operator [FIL_191] (rows=73049 width=1119)
-                                              predicate:(d_date_sk is not null and d_date is not null)
-                                              TableScan [TS_71] (rows=73049 width=1119)
-                                                default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-                                      <-Reducer 30 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_91]
-                                          PartitionCols:_col0
-                                          Merge Join Operator [MERGEJOIN_204] (rows=80353 width=1119)
-                                            Conds:RS_80._col1=RS_81._col1(Inner),Output:["_col0"]
-                                          <-Map 29 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_80]
-                                              PartitionCols:_col1
-                                              Select Operator [SEL_76] (rows=73049 width=1119)
-                                                Output:["_col0","_col1"]
-                                                Filter Operator [FIL_192] (rows=73049 width=1119)
-                                                  predicate:(d_week_seq is not null and d_date is not null)
-                                                  TableScan [TS_74] (rows=73049 width=1119)
-                                                    default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
-                                          <-Map 31 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_81]
-                                              PartitionCols:_col1
-                                              Select Operator [SEL_79] (rows=36524 width=1119)
-                                                Output:["_col1"]
-                                                Filter Operator [FIL_193] (rows=36524 width=1119)
-                                                  predicate:((d_date = '1998-08-04') and d_week_seq is not null)
-                                                  TableScan [TS_77] (rows=73049 width=1119)
-                                                    default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                            Merge Join Operator [MERGEJOIN_207] (rows=174243235 width=135)
+                              Conds:RS_96._col4=RS_97._col0(Inner),Output:["_col5","_col7"]
+                            <-Map 33 [SIMPLE_EDGE]
+                              SHUFFLE [RS_97]
+                                PartitionCols:_col0
+                                Select Operator [SEL_89] (rows=462000 width=1436)
+                                  Output:["_col0","_col1"]
+                                  Filter Operator [FIL_195] (rows=462000 width=1436)
+                                    predicate:(i_item_sk is not null and i_item_id is not null)
+                                    TableScan [TS_87] (rows=462000 width=1436)
+                                      default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
+                            <-Reducer 26 [SIMPLE_EDGE]
+                              SHUFFLE [RS_96]
+                                PartitionCols:_col4
+                                Merge Join Operator [MERGEJOIN_206] (rows=158402938 width=135)
+                                  Conds:RS_93._col0=RS_94._col0(Inner),Output:["_col4","_col5"]
+                                <-Map 32 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_94]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_86] (rows=144002668 width=135)
+                                      Output:["_col0","_col1","_col2"]
+                                      Filter Operator [FIL_194] (rows=144002668 width=135)
+                                        predicate:(ws_item_sk is not null and ws_sold_date_sk is not null)
+                                        TableScan [TS_84] (rows=144002668 width=135)
+                                          default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"]
+                                <-Reducer 25 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_93]
+                                    PartitionCols:_col0
+                                    Merge Join Operator [MERGEJOIN_205] (rows=88388 width=1119)
+                                      Conds:RS_90._col1=RS_91._col0(Inner),Output:["_col0"]
+                                    <-Map 24 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_90]
+                                        PartitionCols:_col1
+                                        Select Operator [SEL_73] (rows=73049 width=1119)
+                                          Output:["_col0","_col1"]
+                                          Filter Operator [FIL_191] (rows=73049 width=1119)
+                                            predicate:(d_date_sk is not null and d_date is not null)
+                                            TableScan [TS_71] (rows=73049 width=1119)
+                                              default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
+                                    <-Reducer 30 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_91]
+                                        PartitionCols:_col0
+                                        Merge Join Operator [MERGEJOIN_204] (rows=80353 width=1119)
+                                          Conds:RS_80._col1=RS_81._col1(Inner),Output:["_col0"]
+                                        <-Map 29 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_80]
+                                            PartitionCols:_col1
+                                            Select Operator [SEL_76] (rows=73049 width=1119)
+                                              Output:["_col0","_col1"]
+                                              Filter Operator [FIL_192] (rows=73049 width=1119)
+                                                predicate:(d_week_seq is not null and d_date is not null)
+                                                TableScan [TS_74] (rows=73049 width=1119)
+                                                  default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                                        <-Map 31 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_81]
+                                            PartitionCols:_col1
+                                            Select Operator [SEL_79] (rows=36524 width=1119)
+                                              Output:["_col1"]
+                                              Filter Operator [FIL_193] (rows=36524 width=1119)
+                                                predicate:((d_date = '1998-08-04') and d_week_seq is not null)
+                                                TableScan [TS_77] (rows=73049 width=1119)
+                                                  default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                   <-Reducer 6 [SIMPLE_EDGE]
                     SHUFFLE [RS_104]
                       PartitionCols:_col0
@@ -223,70 +221,68 @@ Stage-0
                                 PartitionCols:_col0
                                 Group By Operator [GBY_62] (rows=348467716 width=135)
                                   Output:["_col0","_col1"],aggregations:["sum(_col5)"],keys:_col7
-                                  Select Operator [SEL_61] (rows=348467716 width=135)
-                                    Output:["_col7","_col5"]
-                                    Merge Join Operator [MERGEJOIN_203] (rows=348467716 width=135)
-                                      Conds:RS_58._col4=RS_59._col0(Inner),Output:["_col5","_col7"]
-                                    <-Map 23 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_59]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_51] (rows=462000 width=1436)
-                                          Output:["_col0","_col1"]
-                                          Filter Operator [FIL_190] (rows=462000 width=1436)
-                                            predicate:(i_item_sk is not null and i_item_id is not null)
-                                            TableScan [TS_49] (rows=462000 width=1436)
-                                              default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
-                                    <-Reducer 16 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_58]
-                                        PartitionCols:_col4
-                                        Merge Join Operator [MERGEJOIN_202] (rows=316788826 width=135)
-                                          Conds:RS_55._col0=RS_56._col0(Inner),Output:["_col4","_col5"]
-                                        <-Map 22 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_56]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_48] (rows=287989836 width=135)
-                                              Output:["_col0","_col1","_col2"]
-                                              Filter Operator [FIL_189] (rows=287989836 width=135)
-                                                predicate:(cs_item_sk is not null and cs_sold_date_sk is not null)
-                                                TableScan [TS_46] (rows=287989836 width=135)
-                                                  default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"]
-                                        <-Reducer 15 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_55]
-                                            PartitionCols:_col0
-                                            Merge Join Operator [MERGEJOIN_201] (rows=88388 width=1119)
-                                              Conds:RS_52._col1=RS_53._col0(Inner),Output:["_col0"]
-                                            <-Map 14 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_52]
-                                                PartitionCols:_col1
-                                                Select Operator [SEL_35] (rows=73049 width=1119)
-                                                  Output:["_col0","_col1"]
-                                                  Filter Operator [FIL_186] (rows=73049 width=1119)
-                                                    predicate:(d_date_sk is not null and d_date is not null)
-                                                    TableScan [TS_33] (rows=73049 width=1119)
-                                                      default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-                                            <-Reducer 20 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_53]
-                                                PartitionCols:_col0
-                                                Merge Join Operator [MERGEJOIN_200] (rows=80353 width=1119)
-                                                  Conds:RS_42._col1=RS_43._col1(Inner),Output:["_col0"]
-                                                <-Map 19 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_42]
-                                                    PartitionCols:_col1
-                                                    Select Operator [SEL_38] (rows=73049 width=1119)
-                                                      Output:["_col0","_col1"]
-                                                      Filter Operator [FIL_187] (rows=73049 width=1119)
-                                                        predicate:(d_week_seq is not null and d_date is not null)
-                                                        TableScan [TS_36] (rows=73049 width=1119)
-                                                          default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
-                                                <-Map 21 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_43]
-                                                    PartitionCols:_col1
-                                                    Select Operator [SEL_41] (rows=36524 width=1119)
-                                                      Output:["_col1"]
-                                                      Filter Operator [FIL_188] (rows=36524 width=1119)
-                                                        predicate:((d_date = '1998-08-04') and d_week_seq is not null)
-                                                        TableScan [TS_39] (rows=73049 width=1119)
-                                                          default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                                  Merge Join Operator [MERGEJOIN_203] (rows=348467716 width=135)
+                                    Conds:RS_58._col4=RS_59._col0(Inner),Output:["_col5","_col7"]
+                                  <-Map 23 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_59]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_51] (rows=462000 width=1436)
+                                        Output:["_col0","_col1"]
+                                        Filter Operator [FIL_190] (rows=462000 width=1436)
+                                          predicate:(i_item_sk is not null and i_item_id is not null)
+                                          TableScan [TS_49] (rows=462000 width=1436)
+                                            default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
+                                  <-Reducer 16 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_58]
+                                      PartitionCols:_col4
+                                      Merge Join Operator [MERGEJOIN_202] (rows=316788826 width=135)
+                                        Conds:RS_55._col0=RS_56._col0(Inner),Output:["_col4","_col5"]
+                                      <-Map 22 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_56]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_48] (rows=287989836 width=135)
+                                            Output:["_col0","_col1","_col2"]
+                                            Filter Operator [FIL_189] (rows=287989836 width=135)
+                                              predicate:(cs_item_sk is not null and cs_sold_date_sk is not null)
+                                              TableScan [TS_46] (rows=287989836 width=135)
+                                                default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"]
+                                      <-Reducer 15 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_55]
+                                          PartitionCols:_col0
+                                          Merge Join Operator [MERGEJOIN_201] (rows=88388 width=1119)
+                                            Conds:RS_52._col1=RS_53._col0(Inner),Output:["_col0"]
+                                          <-Map 14 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_52]
+                                              PartitionCols:_col1
+                                              Select Operator [SEL_35] (rows=73049 width=1119)
+                                                Output:["_col0","_col1"]
+                                                Filter Operator [FIL_186] (rows=73049 width=1119)
+                                                  predicate:(d_date_sk is not null and d_date is not null)
+                                                  TableScan [TS_33] (rows=73049 width=1119)
+                                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
+                                          <-Reducer 20 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_53]
+                                              PartitionCols:_col0
+                                              Merge Join Operator [MERGEJOIN_200] (rows=80353 width=1119)
+                                                Conds:RS_42._col1=RS_43._col1(Inner),Output:["_col0"]
+                                              <-Map 19 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_42]
+                                                  PartitionCols:_col1
+                                                  Select Operator [SEL_38] (rows=73049 width=1119)
+                                                    Output:["_col0","_col1"]
+                                                    Filter Operator [FIL_187] (rows=73049 width=1119)
+                                                      predicate:(d_week_seq is not null and d_date is not null)
+                                                      TableScan [TS_36] (rows=73049 width=1119)
+                                                        default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                                              <-Map 21 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_43]
+                                                  PartitionCols:_col1
+                                                  Select Operator [SEL_41] (rows=36524 width=1119)
+                                                    Output:["_col1"]
+                                                    Filter Operator [FIL_188] (rows=36524 width=1119)
+                                                      predicate:((d_date = '1998-08-04') and d_week_seq is not null)
+                                                      TableScan [TS_39] (rows=73049 width=1119)
+                                                        default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                         <-Reducer 5 [SIMPLE_EDGE]
                           SHUFFLE [RS_66]
                             PartitionCols:_col0
@@ -297,68 +293,66 @@ Stage-0
                                 PartitionCols:_col0
                                 Group By Operator [GBY_29] (rows=696954748 width=88)
                                   Output:["_col0","_col1"],aggregations:["sum(_col5)"],keys:_col7
-                                  Select Operator [SEL_28] (rows=696954748 width=88)
-                                    Output:["_col7","_col5"]
-                                    Merge Join Operator [MERGEJOIN_199] (rows=696954748 width=88)
-                                      Conds:RS_25._col4=RS_26._col0(Inner),Output:["_col5","_col7"]
-                                    <-Map 13 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_26]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_18] (rows=462000 width=1436)
-                                          Output:["_col0","_col1"]
-                                          Filter Operator [FIL_185] (rows=462000 width=1436)
-                                            predicate:(i_item_sk is not null and i_item_id is not null)
-                                            TableScan [TS_16] (rows=462000 width=1436)
-                                              default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
-                                    <-Reducer 3 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_25]
-                                        PartitionCols:_col4
-                                        Merge Join Operator [MERGEJOIN_198] (rows=633595212 width=88)
-                                          Conds:RS_22._col0=RS_23._col0(Inner),Output:["_col4","_col5"]
-                                        <-Map 12 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_23]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_15] (rows=575995635 width=88)
-                                              Output:["_col0","_col1","_col2"]
-                                              Filter Operator [FIL_184] (rows=575995635 width=88)
-                                                predicate:(ss_item_sk is not null and ss_sold_date_sk is not null)
-                                                TableScan [TS_13] (rows=575995635 width=88)
-                                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
-                                        <-Reducer 2 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_22]
-                                            PartitionCols:_col0
-                                            Merge Join Operator [MERGEJOIN_197] (rows=88388 width=1119)
-                                              Conds:RS_19._col1=RS_20._col0(Inner),Output:["_col0"]
-                                            <-Map 1 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_19]
-                                                PartitionCols:_col1
-                                                Select Operator [SEL_2] (rows=73049 width=1119)
-                                                  Output:["_col0","_col1"]
-                                                  Filter Operator [FIL_181] (rows=73049 width=1119)
-                                                    predicate:(d_date_sk is not null and d_date is not null)
-                                                    TableScan [TS_0] (rows=73049 width=1119)
-                                                      default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-                                            <-Reducer 10 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_20]
-                                                PartitionCols:_col0
-                                                Merge Join Operator [MERGEJOIN_196] (rows=80353 width=1119)
-                                                  Conds:RS_9._col1=RS_10._col1(Inner),Output:["_col0"]
-                                                <-Map 11 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_10]
-                                                    PartitionCols:_col1
-                                                    Select Operator [SEL_8] (rows=36524 width=1119)
-                                                      Output:["_col1"]
-                                                      Filter Operator [FIL_183] (rows=36524 width=1119)
-                                                        predicate:((d_date = '1998-08-04') and d_week_seq is not null)
-                                                        TableScan [TS_6] (rows=73049 width=1119)
-                                                          default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
-                                                <-Map 9 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_9]
-                                                    PartitionCols:_col1
-                                                    Select Operator [SEL_5] (rows=73049 width=1119)
-                                                      Output:["_col0","_col1"]
-                                                      Filter Operator [FIL_182] (rows=73049 width=1119)
-                                                        predicate:(d_week_seq is not null and d_date is not null)
-                                                        TableScan [TS_3] (rows=73049 width=1119)
-                                                          default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                                  Merge Join Operator [MERGEJOIN_199] (rows=696954748 width=88)
+                                    Conds:RS_25._col4=RS_26._col0(Inner),Output:["_col5","_col7"]
+                                  <-Map 13 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_26]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_18] (rows=462000 width=1436)
+                                        Output:["_col0","_col1"]
+                                        Filter Operator [FIL_185] (rows=462000 width=1436)
+                                          predicate:(i_item_sk is not null and i_item_id is not null)
+                                          TableScan [TS_16] (rows=462000 width=1436)
+                                            default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
+                                  <-Reducer 3 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_25]
+                                      PartitionCols:_col4
+                                      Merge Join Operator [MERGEJOIN_198] (rows=633595212 width=88)
+                                        Conds:RS_22._col0=RS_23._col0(Inner),Output:["_col4","_col5"]
+                                      <-Map 12 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_23]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_15] (rows=575995635 width=88)
+                                            Output:["_col0","_col1","_col2"]
+                                            Filter Operator [FIL_184] (rows=575995635 width=88)
+                                              predicate:(ss_item_sk is not null and ss_sold_date_sk is not null)
+                                              TableScan [TS_13] (rows=575995635 width=88)
+                                                default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
+                                      <-Reducer 2 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_22]
+                                          PartitionCols:_col0
+                                          Merge Join Operator [MERGEJOIN_197] (rows=88388 width=1119)
+                                            Conds:RS_19._col1=RS_20._col0(Inner),Output:["_col0"]
+                                          <-Map 1 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_19]
+                                              PartitionCols:_col1
+                                              Select Operator [SEL_2] (rows=73049 width=1119)
+                                                Output:["_col0","_col1"]
+                                                Filter Operator [FIL_181] (rows=73049 width=1119)
+                                                  predicate:(d_date_sk is not null and d_date is not null)
+                                                  TableScan [TS_0] (rows=73049 width=1119)
+                                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
+                                          <-Reducer 10 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_20]
+                                              PartitionCols:_col0
+                                              Merge Join Operator [MERGEJOIN_196] (rows=80353 width=1119)
+                                                Conds:RS_9._col1=RS_10._col1(Inner),Output:["_col0"]
+                                              <-Map 11 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_10]
+                                                  PartitionCols:_col1
+                                                  Select Operator [SEL_8] (rows=36524 width=1119)
+                                                    Output:["_col1"]
+                                                    Filter Operator [FIL_183] (rows=36524 width=1119)
+                                                      predicate:((d_date = '1998-08-04') and d_week_seq is not null)
+                                                      TableScan [TS_6] (rows=73049 width=1119)
+                                                        default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                                              <-Map 9 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_9]
+                                                  PartitionCols:_col1
+                                                  Select Operator [SEL_5] (rows=73049 width=1119)
+                                                    Output:["_col0","_col1"]
+                                                    Filter Operator [FIL_182] (rows=73049 width=1119)
+                                                      predicate:(d_week_seq is not null and d_date is not null)
+                                                      TableScan [TS_3] (rows=73049 width=1119)
+                                                        default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/ql/src/test/results/clientpositive/perf/query6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query6.q.out b/ql/src/test/results/clientpositive/perf/query6.q.out
index 06cd19f..11b618d 100644
--- a/ql/src/test/results/clientpositive/perf/query6.q.out
+++ b/ql/src/test/results/clientpositive/perf/query6.q.out
@@ -105,12 +105,10 @@ Stage-0
                                     PartitionCols:_col0
                                     Group By Operator [GBY_76] (rows=231000 width=1436)
                                       Output:["_col0","_col1"],aggregations:["avg(i_current_price)"],keys:i_category
-                                      Select Operator [SEL_75] (rows=231000 width=1436)
-                                        Output:["i_category","i_current_price"]
-                                        Filter Operator [FIL_125] (rows=231000 width=1436)
-                                          predicate:(i_category = i_category)
-                                          TableScan [TS_73] (rows=462000 width=1436)
-                                            default@item,j,Tbl:COMPLETE,Col:NONE,Output:["i_current_price","i_category"]
+                                      Filter Operator [FIL_125] (rows=231000 width=1436)
+                                        predicate:(i_category = i_category)
+                                        TableScan [TS_73] (rows=462000 width=1436)
+                                          default@item,j,Tbl:COMPLETE,Col:NONE,Output:["i_current_price","i_category"]
                           <-Reducer 5 [SIMPLE_EDGE]
                             SHUFFLE [RS_80]
                               PartitionCols:_col11


Mime
View raw message