You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2017/04/08 03:58:11 UTC

[10/14] hive git commit: HIVE-14564 : Column Pruning generates out of order columns in SelectOperator which cause ArrayIndexOutOfBoundsException. (Zhihai Xu via Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/ql/src/test/results/clientpositive/perf/query17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query17.q.out b/ql/src/test/results/clientpositive/perf/query17.q.out
index f03aeaa..651ba57 100644
--- a/ql/src/test/results/clientpositive/perf/query17.q.out
+++ b/ql/src/test/results/clientpositive/perf/query17.q.out
@@ -28,7 +28,7 @@ Stage-0
           <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_51]
               Select Operator [SEL_50] (rows=510205767 width=88)
-                Output:["_col0","_col1","_col10","_col11","_col12","_col13","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
+                Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13"]
                 Group By Operator [GBY_49] (rows=510205767 width=88)
                   Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["count(VALUE._col0)","avg(VALUE._col1)","stddev_samp(VALUE._col2)","count(VALUE._col3)","avg(VALUE._col4)","stddev_samp(VALUE._col5)","count(VALUE._col6)","avg(VALUE._col7)","stddev_samp(VALUE._col8)"],keys:KEY._col0, KEY._col1, KEY._col2
                 <-Reducer 4 [SIMPLE_EDGE]
@@ -36,112 +36,110 @@ Stage-0
                     PartitionCols:_col0, _col1, _col2
                     Group By Operator [GBY_47] (rows=1020411534 width=88)
                       Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["count(_col15)","avg(_col15)","stddev_samp(_col15)","count(_col20)","avg(_col20)","stddev_samp(_col20)","count(_col3)","avg(_col3)","stddev_samp(_col3)"],keys:_col24, _col25, _col7
-                      Select Operator [SEL_46] (rows=1020411534 width=88)
-                        Output:["_col24","_col25","_col7","_col15","_col20","_col3"]
-                        Merge Join Operator [MERGEJOIN_100] (rows=1020411534 width=88)
-                          Conds:RS_43._col11=RS_44._col0(Inner),Output:["_col3","_col7","_col15","_col20","_col24","_col25"]
-                        <-Map 17 [SIMPLE_EDGE]
-                          SHUFFLE [RS_44]
-                            PartitionCols:_col0
-                            Select Operator [SEL_36] (rows=462000 width=1436)
-                              Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_93] (rows=462000 width=1436)
-                                predicate:i_item_sk is not null
-                                TableScan [TS_34] (rows=462000 width=1436)
-                                  default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id","i_item_desc"]
-                        <-Reducer 3 [SIMPLE_EDGE]
-                          SHUFFLE [RS_43]
-                            PartitionCols:_col11
-                            Merge Join Operator [MERGEJOIN_99] (rows=927646829 width=88)
-                              Conds:RS_40._col1, _col2=RS_41._col12, _col11(Inner),Output:["_col3","_col7","_col11","_col15","_col20"]
-                            <-Reducer 12 [SIMPLE_EDGE]
-                              SHUFFLE [RS_41]
-                                PartitionCols:_col12, _col11
-                                Select Operator [SEL_33] (rows=843315281 width=88)
-                                  Output:["_col1","_col11","_col12","_col14","_col5","_col9"]
-                                  Merge Join Operator [MERGEJOIN_98] (rows=843315281 width=88)
-                                    Conds:RS_30._col3=RS_31._col0(Inner),Output:["_col1","_col5","_col7","_col8","_col10","_col16"]
-                                  <-Map 16 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_31]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_20] (rows=1704 width=1910)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_92] (rows=1704 width=1910)
-                                          predicate:s_store_sk is not null
-                                          TableScan [TS_18] (rows=1704 width=1910)
-                                            default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_state"]
-                                  <-Reducer 11 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_30]
-                                      PartitionCols:_col3
-                                      Merge Join Operator [MERGEJOIN_97] (rows=766650239 width=88)
-                                        Conds:RS_27._col6=RS_28._col0(Inner),Output:["_col1","_col3","_col5","_col7","_col8","_col10"]
-                                      <-Map 15 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_28]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_17] (rows=36525 width=1119)
-                                            Output:["_col0"]
-                                            Filter Operator [FIL_91] (rows=36525 width=1119)
-                                              predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null)
-                                              TableScan [TS_15] (rows=73049 width=1119)
-                                                default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
-                                      <-Reducer 10 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_27]
-                                          PartitionCols:_col6
-                                          Merge Join Operator [MERGEJOIN_96] (rows=696954748 width=88)
-                                            Conds:RS_24._col0=RS_25._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
-                                          <-Map 14 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_25]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_14] (rows=36524 width=1119)
-                                                Output:["_col0"]
-                                                Filter Operator [FIL_90] (rows=36524 width=1119)
-                                                  predicate:((d_quarter_name = '2000Q1') and d_date_sk is not null)
-                                                  TableScan [TS_12] (rows=73049 width=1119)
-                                                    default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
-                                          <-Reducer 9 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_24]
-                                              PartitionCols:_col0
-                                              Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
-                                                Conds:RS_21._col1, _col2, _col4=RS_22._col1, _col2, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
-                                              <-Map 13 [SIMPLE_EDGE]
-                                                SHUFFLE [RS_22]
-                                                  PartitionCols:_col1, _col2, _col3
-                                                  Select Operator [SEL_11] (rows=57591150 width=77)
-                                                    Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                    Filter Operator [FIL_89] (rows=57591150 width=77)
-                                                      predicate:(sr_item_sk is not null and sr_customer_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null)
-                                                      TableScan [TS_9] (rows=57591150 width=77)
-                                                        default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"]
-                                              <-Map 8 [SIMPLE_EDGE]
-                                                SHUFFLE [RS_21]
-                                                  PartitionCols:_col1, _col2, _col4
-                                                  Select Operator [SEL_8] (rows=575995635 width=88)
-                                                    Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                                    Filter Operator [FIL_88] (rows=575995635 width=88)
-                                                      predicate:(ss_item_sk is not null and ss_customer_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
-                                                      TableScan [TS_6] (rows=575995635 width=88)
-                                                        default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"]
-                            <-Reducer 2 [SIMPLE_EDGE]
-                              SHUFFLE [RS_40]
-                                PartitionCols:_col1, _col2
-                                Merge Join Operator [MERGEJOIN_94] (rows=316788826 width=135)
-                                  Conds:RS_37._col0=RS_38._col0(Inner),Output:["_col1","_col2","_col3"]
-                                <-Map 1 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_37]
+                      Merge Join Operator [MERGEJOIN_100] (rows=1020411534 width=88)
+                        Conds:RS_43._col11=RS_44._col0(Inner),Output:["_col3","_col7","_col15","_col20","_col24","_col25"]
+                      <-Map 17 [SIMPLE_EDGE]
+                        SHUFFLE [RS_44]
+                          PartitionCols:_col0
+                          Select Operator [SEL_36] (rows=462000 width=1436)
+                            Output:["_col0","_col1","_col2"]
+                            Filter Operator [FIL_93] (rows=462000 width=1436)
+                              predicate:i_item_sk is not null
+                              TableScan [TS_34] (rows=462000 width=1436)
+                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id","i_item_desc"]
+                      <-Reducer 3 [SIMPLE_EDGE]
+                        SHUFFLE [RS_43]
+                          PartitionCols:_col11
+                          Merge Join Operator [MERGEJOIN_99] (rows=927646829 width=88)
+                            Conds:RS_40._col1, _col2=RS_41._col12, _col11(Inner),Output:["_col3","_col7","_col11","_col15","_col20"]
+                          <-Reducer 12 [SIMPLE_EDGE]
+                            SHUFFLE [RS_41]
+                              PartitionCols:_col12, _col11
+                              Select Operator [SEL_33] (rows=843315281 width=88)
+                                Output:["_col1","_col5","_col9","_col11","_col12","_col14"]
+                                Merge Join Operator [MERGEJOIN_98] (rows=843315281 width=88)
+                                  Conds:RS_30._col3=RS_31._col0(Inner),Output:["_col1","_col5","_col7","_col8","_col10","_col16"]
+                                <-Map 16 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_31]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_2] (rows=287989836 width=135)
-                                      Output:["_col0","_col1","_col2","_col3"]
-                                      Filter Operator [FIL_86] (rows=287989836 width=135)
-                                        predicate:(cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null)
-                                        TableScan [TS_0] (rows=287989836 width=135)
-                                          default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity"]
-                                <-Map 7 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_38]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_5] (rows=36525 width=1119)
-                                      Output:["_col0"]
-                                      Filter Operator [FIL_87] (rows=36525 width=1119)
-                                        predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null)
-                                        TableScan [TS_3] (rows=73049 width=1119)
-                                          default@date_dim,d3,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
+                                    Select Operator [SEL_20] (rows=1704 width=1910)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_92] (rows=1704 width=1910)
+                                        predicate:s_store_sk is not null
+                                        TableScan [TS_18] (rows=1704 width=1910)
+                                          default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_state"]
+                                <-Reducer 11 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_30]
+                                    PartitionCols:_col3
+                                    Merge Join Operator [MERGEJOIN_97] (rows=766650239 width=88)
+                                      Conds:RS_27._col6=RS_28._col0(Inner),Output:["_col1","_col3","_col5","_col7","_col8","_col10"]
+                                    <-Map 15 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_28]
+                                        PartitionCols:_col0
+                                        Select Operator [SEL_17] (rows=36525 width=1119)
+                                          Output:["_col0"]
+                                          Filter Operator [FIL_91] (rows=36525 width=1119)
+                                            predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null)
+                                            TableScan [TS_15] (rows=73049 width=1119)
+                                              default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
+                                    <-Reducer 10 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_27]
+                                        PartitionCols:_col6
+                                        Merge Join Operator [MERGEJOIN_96] (rows=696954748 width=88)
+                                          Conds:RS_24._col0=RS_25._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                        <-Map 14 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_25]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_14] (rows=36524 width=1119)
+                                              Output:["_col0"]
+                                              Filter Operator [FIL_90] (rows=36524 width=1119)
+                                                predicate:((d_quarter_name = '2000Q1') and d_date_sk is not null)
+                                                TableScan [TS_12] (rows=73049 width=1119)
+                                                  default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
+                                        <-Reducer 9 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_24]
+                                            PartitionCols:_col0
+                                            Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
+                                              Conds:RS_21._col1, _col2, _col4=RS_22._col1, _col2, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                            <-Map 13 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_22]
+                                                PartitionCols:_col1, _col2, _col3
+                                                Select Operator [SEL_11] (rows=57591150 width=77)
+                                                  Output:["_col0","_col1","_col2","_col3","_col4"]
+                                                  Filter Operator [FIL_89] (rows=57591150 width=77)
+                                                    predicate:(sr_item_sk is not null and sr_customer_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null)
+                                                    TableScan [TS_9] (rows=57591150 width=77)
+                                                      default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"]
+                                            <-Map 8 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_21]
+                                                PartitionCols:_col1, _col2, _col4
+                                                Select Operator [SEL_8] (rows=575995635 width=88)
+                                                  Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
+                                                  Filter Operator [FIL_88] (rows=575995635 width=88)
+                                                    predicate:(ss_item_sk is not null and ss_customer_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
+                                                    TableScan [TS_6] (rows=575995635 width=88)
+                                                      default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"]
+                          <-Reducer 2 [SIMPLE_EDGE]
+                            SHUFFLE [RS_40]
+                              PartitionCols:_col1, _col2
+                              Merge Join Operator [MERGEJOIN_94] (rows=316788826 width=135)
+                                Conds:RS_37._col0=RS_38._col0(Inner),Output:["_col1","_col2","_col3"]
+                              <-Map 1 [SIMPLE_EDGE]
+                                SHUFFLE [RS_37]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_2] (rows=287989836 width=135)
+                                    Output:["_col0","_col1","_col2","_col3"]
+                                    Filter Operator [FIL_86] (rows=287989836 width=135)
+                                      predicate:(cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null)
+                                      TableScan [TS_0] (rows=287989836 width=135)
+                                        default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity"]
+                              <-Map 7 [SIMPLE_EDGE]
+                                SHUFFLE [RS_38]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_5] (rows=36525 width=1119)
+                                    Output:["_col0"]
+                                    Filter Operator [FIL_87] (rows=36525 width=1119)
+                                      predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null)
+                                      TableScan [TS_3] (rows=73049 width=1119)
+                                        default@date_dim,d3,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/ql/src/test/results/clientpositive/perf/query18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query18.q.out b/ql/src/test/results/clientpositive/perf/query18.q.out
index cf11954..da35ca0 100644
--- a/ql/src/test/results/clientpositive/perf/query18.q.out
+++ b/ql/src/test/results/clientpositive/perf/query18.q.out
@@ -43,7 +43,7 @@ Stage-0
                           SHUFFLE [RS_38]
                             PartitionCols:_col3
                             Select Operator [SEL_30] (rows=383314495 width=135)
-                              Output:["_col1","_col10","_col16","_col3","_col6","_col7","_col8","_col9"]
+                              Output:["_col1","_col3","_col6","_col7","_col8","_col9","_col10","_col16"]
                               Merge Join Operator [MERGEJOIN_82] (rows=383314495 width=135)
                                 Conds:RS_27._col3=RS_28._col0(Inner),Output:["_col1","_col4","_col5","_col6","_col7","_col8","_col14","_col16"]
                               <-Map 15 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/ql/src/test/results/clientpositive/perf/query19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query19.q.out b/ql/src/test/results/clientpositive/perf/query19.q.out
index 0ddcd83..77f7576 100644
--- a/ql/src/test/results/clientpositive/perf/query19.q.out
+++ b/ql/src/test/results/clientpositive/perf/query19.q.out
@@ -35,7 +35,7 @@ Stage-0
                     Group By Operator [GBY_37] (rows=843315281 width=88)
                       Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col7)"],keys:_col10, _col9, _col11, _col12
                       Select Operator [SEL_36] (rows=843315281 width=88)
-                        Output:["_col10","_col9","_col11","_col12","_col7"]
+                        Output:["_col7","_col9","_col10","_col11","_col12"]
                         Filter Operator [FIL_35] (rows=843315281 width=88)
                           predicate:(substr(_col17, 1, 5) <> substr(_col19, 1, 5))
                           Select Operator [SEL_34] (rows=843315281 width=88)
@@ -45,56 +45,54 @@ Stage-0
                             <-Reducer 10 [SIMPLE_EDGE]
                               SHUFFLE [RS_32]
                                 PartitionCols:_col2
-                                Select Operator [SEL_27] (rows=766650239 width=88)
-                                  Output:["_col10","_col11","_col12","_col15","_col2","_col4","_col9"]
-                                  Merge Join Operator [MERGEJOIN_72] (rows=766650239 width=88)
-                                    Conds:RS_24._col3=RS_25._col0(Inner),Output:["_col2","_col4","_col9","_col10","_col11","_col12","_col15"]
-                                  <-Map 13 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_25]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_17] (rows=1704 width=1910)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_68] (rows=1704 width=1910)
-                                          predicate:s_store_sk is not null
-                                          TableScan [TS_15] (rows=1704 width=1910)
-                                            default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_zip"]
-                                  <-Reducer 9 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_24]
-                                      PartitionCols:_col3
-                                      Merge Join Operator [MERGEJOIN_71] (rows=696954748 width=88)
-                                        Conds:RS_21._col1=RS_22._col0(Inner),Output:["_col2","_col3","_col4","_col9","_col10","_col11","_col12"]
-                                      <-Map 12 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_22]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_14] (rows=231000 width=1436)
-                                            Output:["_col0","_col1","_col2","_col3","_col4"]
-                                            Filter Operator [FIL_67] (rows=231000 width=1436)
-                                              predicate:((i_manager_id = 7) and i_item_sk is not null)
-                                              TableScan [TS_12] (rows=462000 width=1436)
-                                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manufact_id","i_manufact","i_manager_id"]
-                                      <-Reducer 8 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_21]
-                                          PartitionCols:_col1
-                                          Merge Join Operator [MERGEJOIN_70] (rows=633595212 width=88)
-                                            Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col1","_col2","_col3","_col4"]
-                                          <-Map 11 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_19]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_11] (rows=18262 width=1119)
-                                                Output:["_col0"]
-                                                Filter Operator [FIL_66] (rows=18262 width=1119)
-                                                  predicate:((d_moy = 11) and (d_year = 1999) and d_date_sk is not null)
-                                                  TableScan [TS_9] (rows=73049 width=1119)
-                                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                          <-Map 7 [SIMPLE_EDGE]
-                                            SHUFFLE [RS_18]
-                                              PartitionCols:_col0
-                                              Select Operator [SEL_8] (rows=575995635 width=88)
-                                                Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                Filter Operator [FIL_65] (rows=575995635 width=88)
-                                                  predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is not null)
-                                                  TableScan [TS_6] (rows=575995635 width=88)
-                                                    default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"]
+                                Merge Join Operator [MERGEJOIN_72] (rows=766650239 width=88)
+                                  Conds:RS_24._col3=RS_25._col0(Inner),Output:["_col2","_col4","_col9","_col10","_col11","_col12","_col15"]
+                                <-Map 13 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_25]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_17] (rows=1704 width=1910)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_68] (rows=1704 width=1910)
+                                        predicate:s_store_sk is not null
+                                        TableScan [TS_15] (rows=1704 width=1910)
+                                          default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_zip"]
+                                <-Reducer 9 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_24]
+                                    PartitionCols:_col3
+                                    Merge Join Operator [MERGEJOIN_71] (rows=696954748 width=88)
+                                      Conds:RS_21._col1=RS_22._col0(Inner),Output:["_col2","_col3","_col4","_col9","_col10","_col11","_col12"]
+                                    <-Map 12 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_22]
+                                        PartitionCols:_col0
+                                        Select Operator [SEL_14] (rows=231000 width=1436)
+                                          Output:["_col0","_col1","_col2","_col3","_col4"]
+                                          Filter Operator [FIL_67] (rows=231000 width=1436)
+                                            predicate:((i_manager_id = 7) and i_item_sk is not null)
+                                            TableScan [TS_12] (rows=462000 width=1436)
+                                              default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manufact_id","i_manufact","i_manager_id"]
+                                    <-Reducer 8 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_21]
+                                        PartitionCols:_col1
+                                        Merge Join Operator [MERGEJOIN_70] (rows=633595212 width=88)
+                                          Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col1","_col2","_col3","_col4"]
+                                        <-Map 11 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_19]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_11] (rows=18262 width=1119)
+                                              Output:["_col0"]
+                                              Filter Operator [FIL_66] (rows=18262 width=1119)
+                                                predicate:((d_moy = 11) and (d_year = 1999) and d_date_sk is not null)
+                                                TableScan [TS_9] (rows=73049 width=1119)
+                                                  default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                                        <-Map 7 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_18]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_8] (rows=575995635 width=88)
+                                              Output:["_col0","_col1","_col2","_col3","_col4"]
+                                              Filter Operator [FIL_65] (rows=575995635 width=88)
+                                                predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and ss_customer_sk is not null and ss_store_sk is not null)
+                                                TableScan [TS_6] (rows=575995635 width=88)
+                                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"]
                             <-Reducer 2 [SIMPLE_EDGE]
                               SHUFFLE [RS_31]
                                 PartitionCols:_col0

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/ql/src/test/results/clientpositive/perf/query20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query20.q.out b/ql/src/test/results/clientpositive/perf/query20.q.out
index c525703..cff652f 100644
--- a/ql/src/test/results/clientpositive/perf/query20.q.out
+++ b/ql/src/test/results/clientpositive/perf/query20.q.out
@@ -41,40 +41,38 @@ Stage-0
                             PartitionCols:_col0, _col1, _col2, _col3, _col4
                             Group By Operator [GBY_16] (rows=348467716 width=135)
                               Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)"],keys:_col10, _col9, _col6, _col7, _col8
-                              Select Operator [SEL_15] (rows=348467716 width=135)
-                                Output:["_col10","_col9","_col6","_col7","_col8","_col2"]
-                                Merge Join Operator [MERGEJOIN_38] (rows=348467716 width=135)
-                                  Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col6","_col7","_col8","_col9","_col10"]
-                                <-Map 8 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_13]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_8] (rows=231000 width=1436)
-                                      Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                      Filter Operator [FIL_36] (rows=231000 width=1436)
-                                        predicate:((i_category) IN ('Jewelry', 'Sports', 'Books') 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_item_id","i_item_desc","i_current_price","i_class","i_category"]
-                                <-Reducer 2 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_12]
-                                    PartitionCols:_col1
-                                    Merge Join Operator [MERGEJOIN_37] (rows=316788826 width=135)
-                                      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=287989836 width=135)
-                                          Output:["_col0","_col1","_col2"]
-                                          Filter Operator [FIL_34] (rows=287989836 width=135)
-                                            predicate:(cs_item_sk is not null and cs_sold_date_sk is not null)
-                                            TableScan [TS_0] (rows=287989836 width=135)
-                                              default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"]
-                                    <-Map 7 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_10]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_5] (rows=8116 width=1119)
-                                          Output:["_col0"]
-                                          Filter Operator [FIL_35] (rows=8116 width=1119)
-                                            predicate:(d_date BETWEEN '2001-01-12' AND '2001-02-11' 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"]
+                              Merge Join Operator [MERGEJOIN_38] (rows=348467716 width=135)
+                                Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col6","_col7","_col8","_col9","_col10"]
+                              <-Map 8 [SIMPLE_EDGE]
+                                SHUFFLE [RS_13]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_8] (rows=231000 width=1436)
+                                    Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
+                                    Filter Operator [FIL_36] (rows=231000 width=1436)
+                                      predicate:((i_category) IN ('Jewelry', 'Sports', 'Books') 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_item_id","i_item_desc","i_current_price","i_class","i_category"]
+                              <-Reducer 2 [SIMPLE_EDGE]
+                                SHUFFLE [RS_12]
+                                  PartitionCols:_col1
+                                  Merge Join Operator [MERGEJOIN_37] (rows=316788826 width=135)
+                                    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=287989836 width=135)
+                                        Output:["_col0","_col1","_col2"]
+                                        Filter Operator [FIL_34] (rows=287989836 width=135)
+                                          predicate:(cs_item_sk is not null and cs_sold_date_sk is not null)
+                                          TableScan [TS_0] (rows=287989836 width=135)
+                                            default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"]
+                                  <-Map 7 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_10]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_5] (rows=8116 width=1119)
+                                        Output:["_col0"]
+                                        Filter Operator [FIL_35] (rows=8116 width=1119)
+                                          predicate:(d_date BETWEEN '2001-01-12' AND '2001-02-11' 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"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/78d8b337/ql/src/test/results/clientpositive/perf/query22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query22.q.out b/ql/src/test/results/clientpositive/perf/query22.q.out
index 6ff8896..a597ef0 100644
--- a/ql/src/test/results/clientpositive/perf/query22.q.out
+++ b/ql/src/test/results/clientpositive/perf/query22.q.out
@@ -70,54 +70,52 @@ Stage-0
                     PartitionCols:_col0, _col1, _col2, _col3, _col4
                     Group By Operator [GBY_22] (rows=250121525 width=15)
                       Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["avg(_col3)"],keys:_col8, _col9, _col10, _col11, 0
-                      Select Operator [SEL_21] (rows=50024305 width=15)
-                        Output:["_col8","_col9","_col10","_col11","_col3"]
-                        Merge Join Operator [MERGEJOIN_46] (rows=50024305 width=15)
-                          Conds:RS_18._col1=RS_19._col0(Inner),Output:["_col3","_col8","_col9","_col10","_col11"]
-                        <-Map 9 [SIMPLE_EDGE]
-                          SHUFFLE [RS_19]
-                            PartitionCols:_col0
-                            Select Operator [SEL_11] (rows=462000 width=1436)
-                              Output:["_col0","_col1","_col2","_col3","_col4"]
-                              Filter Operator [FIL_43] (rows=462000 width=1436)
-                                predicate:i_item_sk is not null
-                                TableScan [TS_9] (rows=462000 width=1436)
-                                  default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand","i_class","i_category","i_product_name"]
-                        <-Reducer 3 [SIMPLE_EDGE]
-                          SHUFFLE [RS_18]
-                            PartitionCols:_col1
-                            Merge Join Operator [MERGEJOIN_45] (rows=45476640 width=15)
-                              Conds:RS_15._col2=RS_16._col0(Inner),Output:["_col1","_col3"]
-                            <-Map 8 [SIMPLE_EDGE]
-                              SHUFFLE [RS_16]
-                                PartitionCols:_col0
-                                Select Operator [SEL_8] (rows=27 width=1029)
-                                  Output:["_col0"]
-                                  Filter Operator [FIL_42] (rows=27 width=1029)
-                                    predicate:w_warehouse_sk is not null
-                                    TableScan [TS_6] (rows=27 width=1029)
-                                      default@warehouse,warehouse,Tbl:COMPLETE,Col:NONE,Output:["w_warehouse_sk"]
-                            <-Reducer 2 [SIMPLE_EDGE]
-                              SHUFFLE [RS_15]
-                                PartitionCols:_col2
-                                Merge Join Operator [MERGEJOIN_44] (rows=41342400 width=15)
-                                  Conds:RS_12._col0=RS_13._col0(Inner),Output:["_col1","_col2","_col3"]
-                                <-Map 1 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_12]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_2] (rows=37584000 width=15)
-                                      Output:["_col0","_col1","_col2","_col3"]
-                                      Filter Operator [FIL_40] (rows=37584000 width=15)
-                                        predicate:(inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null)
-                                        TableScan [TS_0] (rows=37584000 width=15)
-                                          default@inventory,inventory,Tbl:COMPLETE,Col:NONE,Output:["inv_date_sk","inv_item_sk","inv_warehouse_sk","inv_quantity_on_hand"]
-                                <-Map 7 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_13]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_5] (rows=8116 width=1119)
-                                      Output:["_col0"]
-                                      Filter Operator [FIL_41] (rows=8116 width=1119)
-                                        predicate:(d_month_seq BETWEEN 1212 AND 1223 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"]
+                      Merge Join Operator [MERGEJOIN_46] (rows=50024305 width=15)
+                        Conds:RS_18._col1=RS_19._col0(Inner),Output:["_col3","_col8","_col9","_col10","_col11"]
+                      <-Map 9 [SIMPLE_EDGE]
+                        SHUFFLE [RS_19]
+                          PartitionCols:_col0
+                          Select Operator [SEL_11] (rows=462000 width=1436)
+                            Output:["_col0","_col1","_col2","_col3","_col4"]
+                            Filter Operator [FIL_43] (rows=462000 width=1436)
+                              predicate:i_item_sk is not null
+                              TableScan [TS_9] (rows=462000 width=1436)
+                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand","i_class","i_category","i_product_name"]
+                      <-Reducer 3 [SIMPLE_EDGE]
+                        SHUFFLE [RS_18]
+                          PartitionCols:_col1
+                          Merge Join Operator [MERGEJOIN_45] (rows=45476640 width=15)
+                            Conds:RS_15._col2=RS_16._col0(Inner),Output:["_col1","_col3"]
+                          <-Map 8 [SIMPLE_EDGE]
+                            SHUFFLE [RS_16]
+                              PartitionCols:_col0
+                              Select Operator [SEL_8] (rows=27 width=1029)
+                                Output:["_col0"]
+                                Filter Operator [FIL_42] (rows=27 width=1029)
+                                  predicate:w_warehouse_sk is not null
+                                  TableScan [TS_6] (rows=27 width=1029)
+                                    default@warehouse,warehouse,Tbl:COMPLETE,Col:NONE,Output:["w_warehouse_sk"]
+                          <-Reducer 2 [SIMPLE_EDGE]
+                            SHUFFLE [RS_15]
+                              PartitionCols:_col2
+                              Merge Join Operator [MERGEJOIN_44] (rows=41342400 width=15)
+                                Conds:RS_12._col0=RS_13._col0(Inner),Output:["_col1","_col2","_col3"]
+                              <-Map 1 [SIMPLE_EDGE]
+                                SHUFFLE [RS_12]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_2] (rows=37584000 width=15)
+                                    Output:["_col0","_col1","_col2","_col3"]
+                                    Filter Operator [FIL_40] (rows=37584000 width=15)
+                                      predicate:(inv_date_sk is not null and inv_item_sk is not null and inv_warehouse_sk is not null)
+                                      TableScan [TS_0] (rows=37584000 width=15)
+                                        default@inventory,inventory,Tbl:COMPLETE,Col:NONE,Output:["inv_date_sk","inv_item_sk","inv_warehouse_sk","inv_quantity_on_hand"]
+                              <-Map 7 [SIMPLE_EDGE]
+                                SHUFFLE [RS_13]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_5] (rows=8116 width=1119)
+                                    Output:["_col0"]
+                                    Filter Operator [FIL_41] (rows=8116 width=1119)
+                                      predicate:(d_month_seq BETWEEN 1212 AND 1223 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/query25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query25.q.out b/ql/src/test/results/clientpositive/perf/query25.q.out
index 8e5119c..7e15c26 100644
--- a/ql/src/test/results/clientpositive/perf/query25.q.out
+++ b/ql/src/test/results/clientpositive/perf/query25.q.out
@@ -34,112 +34,110 @@ Stage-0
                   PartitionCols:_col0, _col1, _col2, _col3
                   Group By Operator [GBY_47] (rows=1020411534 width=88)
                     Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(_col18)","sum(_col23)","sum(_col3)"],keys:_col28, _col29, _col8, _col9
-                    Select Operator [SEL_46] (rows=1020411534 width=88)
-                      Output:["_col28","_col29","_col8","_col9","_col18","_col23","_col3"]
-                      Merge Join Operator [MERGEJOIN_100] (rows=1020411534 width=88)
-                        Conds:RS_43._col14=RS_44._col0(Inner),Output:["_col3","_col8","_col9","_col18","_col23","_col28","_col29"]
-                      <-Map 17 [SIMPLE_EDGE]
-                        SHUFFLE [RS_44]
-                          PartitionCols:_col0
-                          Select Operator [SEL_36] (rows=462000 width=1436)
-                            Output:["_col0","_col1","_col2"]
-                            Filter Operator [FIL_93] (rows=462000 width=1436)
-                              predicate:i_item_sk is not null
-                              TableScan [TS_34] (rows=462000 width=1436)
-                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id","i_item_desc"]
-                      <-Reducer 3 [SIMPLE_EDGE]
-                        SHUFFLE [RS_43]
-                          PartitionCols:_col14
-                          Merge Join Operator [MERGEJOIN_99] (rows=927646829 width=88)
-                            Conds:RS_40._col1, _col2=RS_41._col14, _col13(Inner),Output:["_col3","_col8","_col9","_col14","_col18","_col23"]
-                          <-Reducer 12 [SIMPLE_EDGE]
-                            SHUFFLE [RS_41]
-                              PartitionCols:_col14, _col13
-                              Select Operator [SEL_33] (rows=843315281 width=88)
-                                Output:["_col1","_col11","_col13","_col14","_col16","_col2","_col7"]
-                                Merge Join Operator [MERGEJOIN_98] (rows=843315281 width=88)
-                                  Conds:RS_30._col3=RS_31._col0(Inner),Output:["_col1","_col5","_col7","_col8","_col10","_col18","_col19"]
-                                <-Map 16 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_31]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_20] (rows=1704 width=1910)
-                                      Output:["_col0","_col1","_col2"]
-                                      Filter Operator [FIL_92] (rows=1704 width=1910)
-                                        predicate:s_store_sk is not null
-                                        TableScan [TS_18] (rows=1704 width=1910)
-                                          default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_store_id","s_store_name"]
-                                <-Reducer 11 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_30]
-                                    PartitionCols:_col3
-                                    Merge Join Operator [MERGEJOIN_97] (rows=766650239 width=88)
-                                      Conds:RS_27._col6=RS_28._col0(Inner),Output:["_col1","_col3","_col5","_col7","_col8","_col10"]
-                                    <-Map 15 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_28]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_17] (rows=4058 width=1119)
-                                          Output:["_col0"]
-                                          Filter Operator [FIL_91] (rows=4058 width=1119)
-                                            predicate:(d_moy BETWEEN 4 AND 10 and (d_year = 1998) and d_date_sk is not null)
-                                            TableScan [TS_15] (rows=73049 width=1119)
-                                              default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                    <-Reducer 10 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_27]
-                                        PartitionCols:_col6
-                                        Merge Join Operator [MERGEJOIN_96] (rows=696954748 width=88)
-                                          Conds:RS_24._col0=RS_25._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
-                                        <-Map 14 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_25]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_14] (rows=18262 width=1119)
-                                              Output:["_col0"]
-                                              Filter Operator [FIL_90] (rows=18262 width=1119)
-                                                predicate:((d_moy = 4) and (d_year = 1998) and d_date_sk is not null)
-                                                TableScan [TS_12] (rows=73049 width=1119)
-                                                  default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                        <-Reducer 9 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_24]
-                                            PartitionCols:_col0
-                                            Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
-                                              Conds:RS_21._col1, _col2, _col4=RS_22._col1, _col2, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
-                                            <-Map 13 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_22]
-                                                PartitionCols:_col1, _col2, _col3
-                                                Select Operator [SEL_11] (rows=57591150 width=77)
-                                                  Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                  Filter Operator [FIL_89] (rows=57591150 width=77)
-                                                    predicate:(sr_item_sk is not null and sr_customer_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null)
-                                                    TableScan [TS_9] (rows=57591150 width=77)
-                                                      default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_net_loss"]
-                                            <-Map 8 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_21]
-                                                PartitionCols:_col1, _col2, _col4
-                                                Select Operator [SEL_8] (rows=575995635 width=88)
-                                                  Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                                  Filter Operator [FIL_88] (rows=575995635 width=88)
-                                                    predicate:(ss_item_sk is not null and ss_customer_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
-                                                    TableScan [TS_6] (rows=575995635 width=88)
-                                                      default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_net_profit"]
-                          <-Reducer 2 [SIMPLE_EDGE]
-                            SHUFFLE [RS_40]
-                              PartitionCols:_col1, _col2
-                              Merge Join Operator [MERGEJOIN_94] (rows=316788826 width=135)
-                                Conds:RS_37._col0=RS_38._col0(Inner),Output:["_col1","_col2","_col3"]
-                              <-Map 1 [SIMPLE_EDGE]
-                                SHUFFLE [RS_37]
+                    Merge Join Operator [MERGEJOIN_100] (rows=1020411534 width=88)
+                      Conds:RS_43._col14=RS_44._col0(Inner),Output:["_col3","_col8","_col9","_col18","_col23","_col28","_col29"]
+                    <-Map 17 [SIMPLE_EDGE]
+                      SHUFFLE [RS_44]
+                        PartitionCols:_col0
+                        Select Operator [SEL_36] (rows=462000 width=1436)
+                          Output:["_col0","_col1","_col2"]
+                          Filter Operator [FIL_93] (rows=462000 width=1436)
+                            predicate:i_item_sk is not null
+                            TableScan [TS_34] (rows=462000 width=1436)
+                              default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id","i_item_desc"]
+                    <-Reducer 3 [SIMPLE_EDGE]
+                      SHUFFLE [RS_43]
+                        PartitionCols:_col14
+                        Merge Join Operator [MERGEJOIN_99] (rows=927646829 width=88)
+                          Conds:RS_40._col1, _col2=RS_41._col14, _col13(Inner),Output:["_col3","_col8","_col9","_col14","_col18","_col23"]
+                        <-Reducer 12 [SIMPLE_EDGE]
+                          SHUFFLE [RS_41]
+                            PartitionCols:_col14, _col13
+                            Select Operator [SEL_33] (rows=843315281 width=88)
+                              Output:["_col1","_col2","_col7","_col11","_col13","_col14","_col16"]
+                              Merge Join Operator [MERGEJOIN_98] (rows=843315281 width=88)
+                                Conds:RS_30._col3=RS_31._col0(Inner),Output:["_col1","_col5","_col7","_col8","_col10","_col18","_col19"]
+                              <-Map 16 [SIMPLE_EDGE]
+                                SHUFFLE [RS_31]
                                   PartitionCols:_col0
-                                  Select Operator [SEL_2] (rows=287989836 width=135)
-                                    Output:["_col0","_col1","_col2","_col3"]
-                                    Filter Operator [FIL_86] (rows=287989836 width=135)
-                                      predicate:(cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null)
-                                      TableScan [TS_0] (rows=287989836 width=135)
-                                        default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_net_profit"]
-                              <-Map 7 [SIMPLE_EDGE]
-                                SHUFFLE [RS_38]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_5] (rows=4058 width=1119)
-                                    Output:["_col0"]
-                                    Filter Operator [FIL_87] (rows=4058 width=1119)
-                                      predicate:(d_moy BETWEEN 4 AND 10 and (d_year = 1998) and d_date_sk is not null)
-                                      TableScan [TS_3] (rows=73049 width=1119)
-                                        default@date_dim,d3,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                                  Select Operator [SEL_20] (rows=1704 width=1910)
+                                    Output:["_col0","_col1","_col2"]
+                                    Filter Operator [FIL_92] (rows=1704 width=1910)
+                                      predicate:s_store_sk is not null
+                                      TableScan [TS_18] (rows=1704 width=1910)
+                                        default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_store_id","s_store_name"]
+                              <-Reducer 11 [SIMPLE_EDGE]
+                                SHUFFLE [RS_30]
+                                  PartitionCols:_col3
+                                  Merge Join Operator [MERGEJOIN_97] (rows=766650239 width=88)
+                                    Conds:RS_27._col6=RS_28._col0(Inner),Output:["_col1","_col3","_col5","_col7","_col8","_col10"]
+                                  <-Map 15 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_28]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_17] (rows=4058 width=1119)
+                                        Output:["_col0"]
+                                        Filter Operator [FIL_91] (rows=4058 width=1119)
+                                          predicate:(d_moy BETWEEN 4 AND 10 and (d_year = 1998) and d_date_sk is not null)
+                                          TableScan [TS_15] (rows=73049 width=1119)
+                                            default@date_dim,d2,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                                  <-Reducer 10 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_27]
+                                      PartitionCols:_col6
+                                      Merge Join Operator [MERGEJOIN_96] (rows=696954748 width=88)
+                                        Conds:RS_24._col0=RS_25._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                      <-Map 14 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_25]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_14] (rows=18262 width=1119)
+                                            Output:["_col0"]
+                                            Filter Operator [FIL_90] (rows=18262 width=1119)
+                                              predicate:((d_moy = 4) and (d_year = 1998) and d_date_sk is not null)
+                                              TableScan [TS_12] (rows=73049 width=1119)
+                                                default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
+                                      <-Reducer 9 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_24]
+                                          PartitionCols:_col0
+                                          Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
+                                            Conds:RS_21._col1, _col2, _col4=RS_22._col1, _col2, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                          <-Map 13 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_22]
+                                              PartitionCols:_col1, _col2, _col3
+                                              Select Operator [SEL_11] (rows=57591150 width=77)
+                                                Output:["_col0","_col1","_col2","_col3","_col4"]
+                                                Filter Operator [FIL_89] (rows=57591150 width=77)
+                                                  predicate:(sr_item_sk is not null and sr_customer_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null)
+                                                  TableScan [TS_9] (rows=57591150 width=77)
+                                                    default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_net_loss"]
+                                          <-Map 8 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_21]
+                                              PartitionCols:_col1, _col2, _col4
+                                              Select Operator [SEL_8] (rows=575995635 width=88)
+                                                Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
+                                                Filter Operator [FIL_88] (rows=575995635 width=88)
+                                                  predicate:(ss_item_sk is not null and ss_customer_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
+                                                  TableScan [TS_6] (rows=575995635 width=88)
+                                                    default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_net_profit"]
+                        <-Reducer 2 [SIMPLE_EDGE]
+                          SHUFFLE [RS_40]
+                            PartitionCols:_col1, _col2
+                            Merge Join Operator [MERGEJOIN_94] (rows=316788826 width=135)
+                              Conds:RS_37._col0=RS_38._col0(Inner),Output:["_col1","_col2","_col3"]
+                            <-Map 1 [SIMPLE_EDGE]
+                              SHUFFLE [RS_37]
+                                PartitionCols:_col0
+                                Select Operator [SEL_2] (rows=287989836 width=135)
+                                  Output:["_col0","_col1","_col2","_col3"]
+                                  Filter Operator [FIL_86] (rows=287989836 width=135)
+                                    predicate:(cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null)
+                                    TableScan [TS_0] (rows=287989836 width=135)
+                                      default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_net_profit"]
+                            <-Map 7 [SIMPLE_EDGE]
+                              SHUFFLE [RS_38]
+                                PartitionCols:_col0
+                                Select Operator [SEL_5] (rows=4058 width=1119)
+                                  Output:["_col0"]
+                                  Filter Operator [FIL_87] (rows=4058 width=1119)
+                                    predicate:(d_moy BETWEEN 4 AND 10 and (d_year = 1998) and d_date_sk is not null)
+                                    TableScan [TS_3] (rows=73049 width=1119)
+                                      default@date_dim,d3,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/query26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query26.q.out b/ql/src/test/results/clientpositive/perf/query26.q.out
index 6f7aaf7..1c94c40 100644
--- a/ql/src/test/results/clientpositive/perf/query26.q.out
+++ b/ql/src/test/results/clientpositive/perf/query26.q.out
@@ -31,68 +31,66 @@ Stage-0
                   PartitionCols:_col0
                   Group By Operator [GBY_28] (rows=421645953 width=135)
                     Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["avg(_col4)","avg(_col5)","avg(_col7)","avg(_col6)"],keys:_col18
-                    Select Operator [SEL_27] (rows=421645953 width=135)
-                      Output:["_col18","_col4","_col5","_col7","_col6"]
-                      Merge Join Operator [MERGEJOIN_58] (rows=421645953 width=135)
-                        Conds:RS_24._col2=RS_25._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col18"]
-                      <-Map 11 [SIMPLE_EDGE]
-                        SHUFFLE [RS_25]
-                          PartitionCols:_col0
-                          Select Operator [SEL_14] (rows=462000 width=1436)
-                            Output:["_col0","_col1"]
-                            Filter Operator [FIL_54] (rows=462000 width=1436)
-                              predicate:i_item_sk is not null
-                              TableScan [TS_12] (rows=462000 width=1436)
-                                default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
-                      <-Reducer 4 [SIMPLE_EDGE]
-                        SHUFFLE [RS_24]
-                          PartitionCols:_col2
-                          Merge Join Operator [MERGEJOIN_57] (rows=383314495 width=135)
-                            Conds:RS_21._col3=RS_22._col0(Inner),Output:["_col2","_col4","_col5","_col6","_col7"]
-                          <-Map 10 [SIMPLE_EDGE]
-                            SHUFFLE [RS_22]
-                              PartitionCols:_col0
-                              Select Operator [SEL_11] (rows=2300 width=1179)
-                                Output:["_col0"]
-                                Filter Operator [FIL_53] (rows=2300 width=1179)
-                                  predicate:(((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null)
-                                  TableScan [TS_9] (rows=2300 width=1179)
-                                    default@promotion,promotion,Tbl:COMPLETE,Col:NONE,Output:["p_promo_sk","p_channel_email","p_channel_event"]
-                          <-Reducer 3 [SIMPLE_EDGE]
-                            SHUFFLE [RS_21]
-                              PartitionCols:_col3
-                              Merge Join Operator [MERGEJOIN_56] (rows=348467716 width=135)
-                                Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col2","_col3","_col4","_col5","_col6","_col7"]
-                              <-Map 9 [SIMPLE_EDGE]
-                                SHUFFLE [RS_19]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_8] (rows=36524 width=1119)
-                                    Output:["_col0"]
-                                    Filter Operator [FIL_52] (rows=36524 width=1119)
-                                      predicate:((d_year = 1998) and d_date_sk is not null)
-                                      TableScan [TS_6] (rows=73049 width=1119)
-                                        default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
-                              <-Reducer 2 [SIMPLE_EDGE]
-                                SHUFFLE [RS_18]
-                                  PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_55] (rows=316788826 width=135)
-                                    Conds:RS_15._col1=RS_16._col0(Inner),Output:["_col0","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                  <-Map 1 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_15]
-                                      PartitionCols:_col1
-                                      Select Operator [SEL_2] (rows=287989836 width=135)
-                                        Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                        Filter Operator [FIL_50] (rows=287989836 width=135)
-                                          predicate:(cs_bill_cdemo_sk is not null and cs_sold_date_sk is not null and cs_item_sk is not null and cs_promo_sk is not null)
-                                          TableScan [TS_0] (rows=287989836 width=135)
-                                            default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_cdemo_sk","cs_item_sk","cs_promo_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt"]
-                                  <-Map 8 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_16]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_5] (rows=232725 width=385)
-                                        Output:["_col0"]
-                                        Filter Operator [FIL_51] (rows=232725 width=385)
-                                          predicate:((cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary') and cd_demo_sk is not null)
-                                          TableScan [TS_3] (rows=1861800 width=385)
-                                            default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"]
+                    Merge Join Operator [MERGEJOIN_58] (rows=421645953 width=135)
+                      Conds:RS_24._col2=RS_25._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col18"]
+                    <-Map 11 [SIMPLE_EDGE]
+                      SHUFFLE [RS_25]
+                        PartitionCols:_col0
+                        Select Operator [SEL_14] (rows=462000 width=1436)
+                          Output:["_col0","_col1"]
+                          Filter Operator [FIL_54] (rows=462000 width=1436)
+                            predicate:i_item_sk is not null
+                            TableScan [TS_12] (rows=462000 width=1436)
+                              default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
+                    <-Reducer 4 [SIMPLE_EDGE]
+                      SHUFFLE [RS_24]
+                        PartitionCols:_col2
+                        Merge Join Operator [MERGEJOIN_57] (rows=383314495 width=135)
+                          Conds:RS_21._col3=RS_22._col0(Inner),Output:["_col2","_col4","_col5","_col6","_col7"]
+                        <-Map 10 [SIMPLE_EDGE]
+                          SHUFFLE [RS_22]
+                            PartitionCols:_col0
+                            Select Operator [SEL_11] (rows=2300 width=1179)
+                              Output:["_col0"]
+                              Filter Operator [FIL_53] (rows=2300 width=1179)
+                                predicate:(((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null)
+                                TableScan [TS_9] (rows=2300 width=1179)
+                                  default@promotion,promotion,Tbl:COMPLETE,Col:NONE,Output:["p_promo_sk","p_channel_email","p_channel_event"]
+                        <-Reducer 3 [SIMPLE_EDGE]
+                          SHUFFLE [RS_21]
+                            PartitionCols:_col3
+                            Merge Join Operator [MERGEJOIN_56] (rows=348467716 width=135)
+                              Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col2","_col3","_col4","_col5","_col6","_col7"]
+                            <-Map 9 [SIMPLE_EDGE]
+                              SHUFFLE [RS_19]
+                                PartitionCols:_col0
+                                Select Operator [SEL_8] (rows=36524 width=1119)
+                                  Output:["_col0"]
+                                  Filter Operator [FIL_52] (rows=36524 width=1119)
+                                    predicate:((d_year = 1998) and d_date_sk is not null)
+                                    TableScan [TS_6] (rows=73049 width=1119)
+                                      default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
+                            <-Reducer 2 [SIMPLE_EDGE]
+                              SHUFFLE [RS_18]
+                                PartitionCols:_col0
+                                Merge Join Operator [MERGEJOIN_55] (rows=316788826 width=135)
+                                  Conds:RS_15._col1=RS_16._col0(Inner),Output:["_col0","_col2","_col3","_col4","_col5","_col6","_col7"]
+                                <-Map 1 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_15]
+                                    PartitionCols:_col1
+                                    Select Operator [SEL_2] (rows=287989836 width=135)
+                                      Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
+                                      Filter Operator [FIL_50] (rows=287989836 width=135)
+                                        predicate:(cs_bill_cdemo_sk is not null and cs_sold_date_sk is not null and cs_item_sk is not null and cs_promo_sk is not null)
+                                        TableScan [TS_0] (rows=287989836 width=135)
+                                          default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_cdemo_sk","cs_item_sk","cs_promo_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt"]
+                                <-Map 8 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_16]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_5] (rows=232725 width=385)
+                                      Output:["_col0"]
+                                      Filter Operator [FIL_51] (rows=232725 width=385)
+                                        predicate:((cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary') and cd_demo_sk is not null)
+                                        TableScan [TS_3] (rows=1861800 width=385)
+                                          default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"]