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 2016/05/06 20:56:06 UTC

[14/15] hive git commit: HIVE-13542 : Missing stats for tables in TPCDS performance regression suite (Hari Subramaniyan via Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/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 1014bc1..a1c9da5 100644
--- a/ql/src/test/results/clientpositive/perf/query18.q.out
+++ b/ql/src/test/results/clientpositive/perf/query18.q.out
@@ -5,126 +5,128 @@ POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 10 (SIMPLE_EDGE)
-Reducer 3 <- Map 11 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 12 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Map 13 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Map 14 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Map 15 (SIMPLE_EDGE), Reducer 6 (SIMPLE_EDGE)
-Reducer 8 <- Reducer 7 (SIMPLE_EDGE)
-Reducer 9 <- Reducer 8 (SIMPLE_EDGE)
+Reducer 10 <- Map 13 (SIMPLE_EDGE), Map 9 (SIMPLE_EDGE)
+Reducer 11 <- Map 14 (SIMPLE_EDGE), Reducer 10 (SIMPLE_EDGE)
+Reducer 12 <- Map 15 (SIMPLE_EDGE), Reducer 11 (SIMPLE_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
+Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 4 <- Reducer 12 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
+Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
+Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
-      Reducer 9
-      File Output Operator [FS_48]
-        Limit [LIM_47] (rows=100 width=860)
+      Reducer 6
+      File Output Operator [FS_49]
+        Limit [LIM_48] (rows=100 width=135)
           Number of rows:100
-          Select Operator [SEL_46] (rows=133100005 width=860)
+          Select Operator [SEL_47] (rows=1054114882 width=135)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
-          <-Reducer 8 [SIMPLE_EDGE]
-            SHUFFLE [RS_45]
-              Select Operator [SEL_44] (rows=133100005 width=860)
+          <-Reducer 5 [SIMPLE_EDGE]
+            SHUFFLE [RS_46]
+              Select Operator [SEL_45] (rows=1054114882 width=135)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
-                Group By Operator [GBY_43] (rows=133100005 width=860)
+                Group By Operator [GBY_44] (rows=1054114882 width=135)
                   Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)","avg(VALUE._col3)","avg(VALUE._col4)","avg(VALUE._col5)","avg(VALUE._col6)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4
-                <-Reducer 7 [SIMPLE_EDGE]
-                  SHUFFLE [RS_42]
+                <-Reducer 4 [SIMPLE_EDGE]
+                  SHUFFLE [RS_43]
                     PartitionCols:_col0, _col1, _col2, _col3, _col4
-                    Group By Operator [GBY_41] (rows=266200010 width=860)
+                    Group By Operator [GBY_42] (rows=2108229765 width=135)
                       Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["avg(_col4)","avg(_col5)","avg(_col6)","avg(_col7)","avg(_col8)","avg(_col9)","avg(_col10)"],keys:_col0, _col1, _col2, _col3, '0'
-                      Select Operator [SEL_39] (rows=53240002 width=860)
+                      Select Operator [SEL_40] (rows=421645953 width=135)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
-                        Merge Join Operator [MERGEJOIN_88] (rows=53240002 width=860)
-                          Conds:RS_36._col18=RS_37._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col8","_col14","_col16","_col21","_col23","_col24","_col25"]
-                        <-Map 15 [SIMPLE_EDGE]
+                        Merge Join Operator [MERGEJOIN_83] (rows=421645953 width=135)
+                          Conds:RS_37._col0=RS_38._col1(Inner),Output:["_col4","_col6","_col7","_col8","_col14","_col15","_col16","_col17","_col18","_col22","_col26"]
+                        <-Reducer 12 [SIMPLE_EDGE]
+                          SHUFFLE [RS_38]
+                            PartitionCols:_col1
+                            Select Operator [SEL_30] (rows=383314495 width=135)
+                              Output:["_col1","_col12","_col16","_col4","_col5","_col6","_col7","_col8"]
+                              Merge Join Operator [MERGEJOIN_82] (rows=383314495 width=135)
+                                Conds:RS_27._col2=RS_28._col0(Inner),Output:["_col1","_col4","_col5","_col6","_col7","_col8","_col12","_col16"]
+                              <-Map 15 [SIMPLE_EDGE]
+                                SHUFFLE [RS_28]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_20] (rows=5047 width=16)
+                                    Output:["_col0","_col3"]
+                                    Filter Operator [FIL_77] (rows=5047 width=16)
+                                      predicate:((cd_gender = 'M') and (cd_education_status = 'College') and cd_demo_sk is not null)
+                                      TableScan [TS_18] (rows=20191 width=16)
+                                        default@customer_demographics,cd1,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_gender","cd_education_status","cd_dep_count"]
+                              <-Reducer 11 [SIMPLE_EDGE]
+                                SHUFFLE [RS_27]
+                                  PartitionCols:_col2
+                                  Merge Join Operator [MERGEJOIN_81] (rows=348467716 width=135)
+                                    Conds:RS_24._col3=RS_25._col0(Inner),Output:["_col1","_col2","_col4","_col5","_col6","_col7","_col8","_col12"]
+                                  <-Map 14 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_25]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_17] (rows=462000 width=1436)
+                                        Output:["_col0","_col1"]
+                                        Filter Operator [FIL_76] (rows=462000 width=1436)
+                                          predicate:i_item_sk is not null
+                                          TableScan [TS_15] (rows=462000 width=1436)
+                                            default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
+                                  <-Reducer 10 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_24]
+                                      PartitionCols:_col3
+                                      Merge Join Operator [MERGEJOIN_80] (rows=316788826 width=135)
+                                        Conds:RS_21._col0=RS_22._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
+                                      <-Map 13 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_22]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_14] (rows=36524 width=1119)
+                                            Output:["_col0"]
+                                            Filter Operator [FIL_75] (rows=36524 width=1119)
+                                              predicate:((d_year = 2001) and d_date_sk is not null)
+                                              TableScan [TS_12] (rows=73049 width=1119)
+                                                default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
+                                      <-Map 9 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_21]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_11] (rows=287989836 width=135)
+                                            Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
+                                            Filter Operator [FIL_74] (rows=287989836 width=135)
+                                              predicate:(cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null and cs_item_sk is not null and cs_bill_customer_sk is not null)
+                                              TableScan [TS_9] (rows=287989836 width=135)
+                                                default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_bill_cdemo_sk","cs_item_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt","cs_net_profit"]
+                        <-Reducer 3 [SIMPLE_EDGE]
                           SHUFFLE [RS_37]
                             PartitionCols:_col0
-                            Select Operator [SEL_20] (rows=19800 width=362)
-                              Output:["_col0"]
-                              Filter Operator [FIL_82] (rows=19800 width=362)
-                                predicate:cd_demo_sk is not null
-                                TableScan [TS_18] (rows=19800 width=362)
-                                  default@customer_demographics,cd1,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk"]
-                        <-Reducer 6 [SIMPLE_EDGE]
-                          SHUFFLE [RS_36]
-                            PartitionCols:_col18
-                            Merge Join Operator [MERGEJOIN_87] (rows=48400001 width=860)
-                              Conds:RS_33._col19=RS_34._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col8","_col14","_col16","_col18","_col21","_col23","_col24","_col25"]
-                            <-Map 14 [SIMPLE_EDGE]
-                              SHUFFLE [RS_34]
+                            Merge Join Operator [MERGEJOIN_79] (rows=48400001 width=860)
+                              Conds:RS_34._col1=RS_35._col0(Inner),Output:["_col0","_col4","_col6","_col7","_col8"]
+                            <-Map 8 [SIMPLE_EDGE]
+                              SHUFFLE [RS_35]
                                 PartitionCols:_col0
-                                Select Operator [SEL_17] (rows=20000000 width=1014)
-                                  Output:["_col0","_col1","_col2","_col3"]
-                                  Filter Operator [FIL_81] (rows=20000000 width=1014)
-                                    predicate:((ca_state) IN ('ND', 'WI', 'AL', 'NC', 'OK', 'MS', 'TN') and ca_address_sk is not null)
-                                    TableScan [TS_15] (rows=40000000 width=1014)
-                                      default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county","ca_state","ca_country"]
-                            <-Reducer 5 [SIMPLE_EDGE]
-                              SHUFFLE [RS_33]
-                                PartitionCols:_col19
-                                Merge Join Operator [MERGEJOIN_86] (rows=44000000 width=860)
-                                  Conds:RS_30._col1=RS_31._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col8","_col14","_col16","_col18","_col19","_col21"]
-                                <-Map 13 [SIMPLE_EDGE]
+                                Select Operator [SEL_8] (rows=80765 width=4)
+                                  Output:["_col0"]
+                                  Filter Operator [FIL_73] (rows=80765 width=4)
+                                    predicate:cd_demo_sk is not null
+                                    TableScan [TS_6] (rows=80765 width=4)
+                                      default@customer_demographics,cd1,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk"]
+                            <-Reducer 2 [SIMPLE_EDGE]
+                              SHUFFLE [RS_34]
+                                PartitionCols:_col1
+                                Merge Join Operator [MERGEJOIN_78] (rows=44000000 width=860)
+                                  Conds:RS_31._col2=RS_32._col0(Inner),Output:["_col0","_col1","_col4","_col6","_col7","_col8"]
+                                <-Map 1 [SIMPLE_EDGE]
                                   SHUFFLE [RS_31]
-                                    PartitionCols:_col0
-                                    Select Operator [SEL_14] (rows=40000000 width=860)
+                                    PartitionCols:_col2
+                                    Select Operator [SEL_2] (rows=40000000 width=860)
                                       Output:["_col0","_col1","_col2","_col4"]
-                                      Filter Operator [FIL_80] (rows=40000000 width=860)
+                                      Filter Operator [FIL_71] (rows=40000000 width=860)
                                         predicate:((c_birth_month) IN (9, 5, 12, 4, 1, 10) and c_customer_sk is not null and c_current_addr_sk is not null and c_current_cdemo_sk is not null)
-                                        TableScan [TS_12] (rows=80000000 width=860)
+                                        TableScan [TS_0] (rows=80000000 width=860)
                                           default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk","c_birth_month","c_birth_year"]
-                                <-Reducer 4 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_30]
-                                    PartitionCols:_col1
-                                    Merge Join Operator [MERGEJOIN_85] (rows=508200 width=1436)
-                                      Conds:RS_27._col3=RS_28._col0(Inner),Output:["_col1","_col4","_col5","_col6","_col7","_col8","_col14","_col16"]
-                                    <-Map 12 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_28]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_11] (rows=462000 width=1436)
-                                          Output:["_col0","_col1"]
-                                          Filter Operator [FIL_79] (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_item_id"]
-                                    <-Reducer 3 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_27]
-                                        PartitionCols:_col3
-                                        Merge Join Operator [MERGEJOIN_84] (rows=44193 width=1119)
-                                          Conds:RS_24._col2=RS_25._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col14"]
-                                        <-Map 11 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_25]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_8] (rows=4950 width=362)
-                                              Output:["_col0","_col3"]
-                                              Filter Operator [FIL_78] (rows=4950 width=362)
-                                                predicate:((cd_gender = 'M') and (cd_education_status = 'College') and cd_demo_sk is not null)
-                                                TableScan [TS_6] (rows=19800 width=362)
-                                                  default@customer_demographics,cd1,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_gender","cd_education_status","cd_dep_count"]
-                                        <-Reducer 2 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_24]
-                                            PartitionCols:_col2
-                                            Merge Join Operator [MERGEJOIN_83] (rows=40176 width=1119)
-                                              Conds:RS_21._col0=RS_22._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
-                                            <-Map 1 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_21]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_2] (rows=1 width=0)
-                                                  Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
-                                                  Filter Operator [FIL_76] (rows=1 width=0)
-                                                    predicate:(cs_sold_date_sk is not null and cs_bill_cdemo_sk is not null and cs_item_sk is not null and cs_bill_customer_sk is not null)
-                                                    TableScan [TS_0] (rows=1 width=0)
-                                                      default@catalog_sales,catalog_sales,Tbl:PARTIAL,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_bill_cdemo_sk","cs_item_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt","cs_net_profit"]
-                                            <-Map 10 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_22]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_5] (rows=36524 width=1119)
-                                                  Output:["_col0"]
-                                                  Filter Operator [FIL_77] (rows=36524 width=1119)
-                                                    predicate:((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"]
+                                <-Map 7 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_32]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_5] (rows=20000000 width=1014)
+                                      Output:["_col0","_col1","_col2","_col3"]
+                                      Filter Operator [FIL_72] (rows=20000000 width=1014)
+                                        predicate:((ca_state) IN ('ND', 'WI', 'AL', 'NC', 'OK', 'MS', 'TN') and ca_address_sk is not null)
+                                        TableScan [TS_3] (rows=40000000 width=1014)
+                                          default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county","ca_state","ca_country"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/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 855c91e..f5eeae4 100644
--- a/ql/src/test/results/clientpositive/perf/query19.q.out
+++ b/ql/src/test/results/clientpositive/perf/query19.q.out
@@ -5,111 +5,115 @@ POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 9 (SIMPLE_EDGE)
-Reducer 3 <- Map 10 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 11 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Map 12 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Map 13 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Reducer 6 (SIMPLE_EDGE)
-Reducer 8 <- Reducer 7 (SIMPLE_EDGE)
+Reducer 10 <- Map 13 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
+Reducer 3 <- Reducer 10 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
+Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
+Reducer 8 <- Map 11 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
+Reducer 9 <- Map 12 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
-      Reducer 8
-      File Output Operator [FS_43]
-        Limit [LIM_42] (rows=100 width=860)
+      Reducer 5
+      File Output Operator [FS_45]
+        Limit [LIM_44] (rows=100 width=88)
           Number of rows:100
-          Select Operator [SEL_41] (rows=53240002 width=860)
+          Select Operator [SEL_43] (rows=421657640 width=88)
             Output:["_col0","_col1","_col2","_col3","_col4"]
-          <-Reducer 7 [SIMPLE_EDGE]
-            SHUFFLE [RS_40]
-              Group By Operator [GBY_37] (rows=53240002 width=860)
+          <-Reducer 4 [SIMPLE_EDGE]
+            SHUFFLE [RS_42]
+              Group By Operator [GBY_39] (rows=421657640 width=88)
                 Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3
-              <-Reducer 6 [SIMPLE_EDGE]
-                SHUFFLE [RS_36]
+              <-Reducer 3 [SIMPLE_EDGE]
+                SHUFFLE [RS_38]
                   PartitionCols:_col0, _col1, _col2, _col3
-                  Group By Operator [GBY_35] (rows=106480005 width=860)
+                  Group By Operator [GBY_37] (rows=843315281 width=88)
                     Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col7)"],keys:_col9, _col10, _col11, _col12
-                    Select Operator [SEL_34] (rows=106480005 width=860)
+                    Select Operator [SEL_36] (rows=843315281 width=88)
                       Output:["_col9","_col10","_col11","_col12","_col7"]
-                      Filter Operator [FIL_33] (rows=106480005 width=860)
+                      Filter Operator [FIL_35] (rows=843315281 width=88)
                         predicate:(substr(_col17, 1, 5) <> substr(_col19, 1, 5))
-                        Merge Join Operator [MERGEJOIN_74] (rows=106480005 width=860)
-                          Conds:RS_30._col6=RS_31._col0(Inner),Output:["_col7","_col9","_col10","_col11","_col12","_col17","_col19"]
-                        <-Map 13 [SIMPLE_EDGE]
-                          SHUFFLE [RS_31]
-                            PartitionCols:_col0
-                            Select Operator [SEL_17] (rows=1704 width=1910)
-                              Output:["_col0","_col1"]
-                              Filter Operator [FIL_69] (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 5 [SIMPLE_EDGE]
-                          SHUFFLE [RS_30]
-                            PartitionCols:_col6
-                            Merge Join Operator [MERGEJOIN_73] (rows=96800003 width=860)
-                              Conds:RS_27._col15=RS_28._col0(Inner),Output:["_col6","_col7","_col9","_col10","_col11","_col12","_col17"]
-                            <-Map 12 [SIMPLE_EDGE]
-                              SHUFFLE [RS_28]
-                                PartitionCols:_col0
-                                Select Operator [SEL_14] (rows=40000000 width=1014)
-                                  Output:["_col0","_col1"]
-                                  Filter Operator [FIL_68] (rows=40000000 width=1014)
-                                    predicate:ca_address_sk is not null
-                                    TableScan [TS_12] (rows=40000000 width=1014)
-                                      default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_zip"]
-                            <-Reducer 4 [SIMPLE_EDGE]
-                              SHUFFLE [RS_27]
-                                PartitionCols:_col15
-                                Merge Join Operator [MERGEJOIN_72] (rows=88000001 width=860)
-                                  Conds:RS_24._col5=RS_25._col0(Inner),Output:["_col6","_col7","_col9","_col10","_col11","_col12","_col15"]
-                                <-Map 11 [SIMPLE_EDGE]
+                        Select Operator [SEL_34] (rows=843315281 width=88)
+                          Output:["_col7","_col9","_col10","_col11","_col12","_col17","_col19"]
+                          Merge Join Operator [MERGEJOIN_73] (rows=843315281 width=88)
+                            Conds:RS_31._col0=RS_32._col2(Inner),Output:["_col3","_col8","_col13","_col14","_col15","_col16","_col19"]
+                          <-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_11] (rows=80000000 width=860)
+                                    Select Operator [SEL_17] (rows=1704 width=1910)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_67] (rows=80000000 width=860)
-                                        predicate:(c_customer_sk is not null and c_current_addr_sk is not null)
-                                        TableScan [TS_9] (rows=80000000 width=860)
-                                          default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
-                                <-Reducer 3 [SIMPLE_EDGE]
+                                      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:_col5
-                                    Merge Join Operator [MERGEJOIN_71] (rows=254100 width=1436)
-                                      Conds:RS_21._col4=RS_22._col0(Inner),Output:["_col5","_col6","_col7","_col9","_col10","_col11","_col12"]
-                                    <-Map 10 [SIMPLE_EDGE]
+                                    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_8] (rows=231000 width=1436)
+                                        Select Operator [SEL_14] (rows=231000 width=1436)
                                           Output:["_col0","_col1","_col2","_col3","_col4"]
-                                          Filter Operator [FIL_66] (rows=231000 width=1436)
+                                          Filter Operator [FIL_67] (rows=231000 width=1436)
                                             predicate:((i_manager_id = 7) and i_item_sk is not null)
-                                            TableScan [TS_6] (rows=462000 width=1436)
+                                            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 2 [SIMPLE_EDGE]
+                                    <-Reducer 8 [SIMPLE_EDGE]
                                       SHUFFLE [RS_21]
-                                        PartitionCols:_col4
-                                        Merge Join Operator [MERGEJOIN_70] (rows=20088 width=1119)
-                                          Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col4","_col5","_col6","_col7"]
-                                        <-Map 1 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_18]
+                                        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_2] (rows=18262 width=1119)
+                                            Select Operator [SEL_11] (rows=18262 width=1119)
                                               Output:["_col0"]
-                                              Filter Operator [FIL_64] (rows=18262 width=1119)
+                                              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_0] (rows=73049 width=1119)
+                                                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 9 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_19]
+                                        <-Map 7 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_18]
                                             PartitionCols:_col0
-                                            Select Operator [SEL_5] (rows=1 width=0)
+                                            Select Operator [SEL_8] (rows=575995635 width=88)
                                               Output:["_col0","_col1","_col2","_col3","_col4"]
-                                              Filter Operator [FIL_65] (rows=1 width=0)
+                                              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_3] (rows=1 width=0)
-                                                  default@store_sales,store_sales,Tbl:PARTIAL,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ext_sales_price"]
+                                                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
+                              Merge Join Operator [MERGEJOIN_69] (rows=88000001 width=860)
+                                Conds:RS_28._col1=RS_29._col0(Inner),Output:["_col0","_col3"]
+                              <-Map 1 [SIMPLE_EDGE]
+                                SHUFFLE [RS_28]
+                                  PartitionCols:_col1
+                                  Select Operator [SEL_2] (rows=80000000 width=860)
+                                    Output:["_col0","_col1"]
+                                    Filter Operator [FIL_63] (rows=80000000 width=860)
+                                      predicate:(c_customer_sk is not null and c_current_addr_sk is not null)
+                                      TableScan [TS_0] (rows=80000000 width=860)
+                                        default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
+                              <-Map 6 [SIMPLE_EDGE]
+                                SHUFFLE [RS_29]
+                                  PartitionCols:_col0
+                                  Select Operator [SEL_5] (rows=40000000 width=1014)
+                                    Output:["_col0","_col1"]
+                                    Filter Operator [FIL_64] (rows=40000000 width=1014)
+                                      predicate:ca_address_sk is not null
+                                      TableScan [TS_3] (rows=40000000 width=1014)
+                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_zip"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/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 9af7729..3eed0a8 100644
--- a/ql/src/test/results/clientpositive/perf/query20.q.out
+++ b/ql/src/test/results/clientpositive/perf/query20.q.out
@@ -17,64 +17,64 @@ Stage-0
     Stage-1
       Reducer 6
       File Output Operator [FS_28]
-        Limit [LIM_27] (rows=100 width=1436)
+        Limit [LIM_27] (rows=100 width=135)
           Number of rows:100
-          Select Operator [SEL_26] (rows=139755 width=1436)
+          Select Operator [SEL_26] (rows=174233858 width=135)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
           <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_25]
-              Select Operator [SEL_23] (rows=139755 width=1436)
+              Select Operator [SEL_23] (rows=174233858 width=135)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                PTF Operator [PTF_22] (rows=139755 width=1436)
+                PTF Operator [PTF_22] (rows=174233858 width=135)
                   Function definitions:[{},{"name:":"windowingtablefunction","order by:":"_col3 ASC NULLS FIRST","partition by:":"_col3"}]
-                  Select Operator [SEL_21] (rows=139755 width=1436)
+                  Select Operator [SEL_21] (rows=174233858 width=135)
                     Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                   <-Reducer 4 [SIMPLE_EDGE]
                     SHUFFLE [RS_20]
                       PartitionCols:_col3
-                      Select Operator [SEL_19] (rows=139755 width=1436)
+                      Select Operator [SEL_19] (rows=174233858 width=135)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                        Group By Operator [GBY_18] (rows=139755 width=1436)
+                        Group By Operator [GBY_18] (rows=174233858 width=135)
                           Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4
                         <-Reducer 3 [SIMPLE_EDGE]
                           SHUFFLE [RS_17]
                             PartitionCols:_col0, _col1, _col2, _col3, _col4
-                            Group By Operator [GBY_16] (rows=279510 width=1436)
-                              Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)"],keys:_col4, _col5, _col6, _col7, _col8
-                              Select Operator [SEL_15] (rows=279510 width=1436)
-                                Output:["_col4","_col5","_col6","_col7","_col8","_col2"]
-                                Merge Join Operator [MERGEJOIN_38] (rows=279510 width=1436)
-                                  Conds:RS_12._col0=RS_13._col0(Inner),Output:["_col2","_col4","_col5","_col6","_col7","_col8"]
+                            Group By Operator [GBY_16] (rows=348467716 width=135)
+                              Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)"],keys:_col6, _col7, _col8, _col9, _col10
+                              Select Operator [SEL_15] (rows=348467716 width=135)
+                                Output:["_col6","_col7","_col8","_col9","_col10","_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=36524 width=1119)
-                                      Output:["_col0"]
-                                      Filter Operator [FIL_36] (rows=36524 width=1119)
-                                        predicate:(d_date BETWEEN '2001-01-12' AND '2001-02-11' 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_date"]
+                                    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:_col0
-                                    Merge Join Operator [MERGEJOIN_37] (rows=254100 width=1436)
-                                      Conds:RS_9._col1=RS_10._col0(Inner),Output:["_col0","_col2","_col4","_col5","_col6","_col7","_col8"]
+                                    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:_col1
-                                        Select Operator [SEL_2] (rows=1 width=0)
+                                        PartitionCols:_col0
+                                        Select Operator [SEL_2] (rows=287989836 width=135)
                                           Output:["_col0","_col1","_col2"]
-                                          Filter Operator [FIL_34] (rows=1 width=0)
+                                          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=1 width=0)
-                                              default@catalog_sales,catalog_sales,Tbl:PARTIAL,Col:NONE,Output:["cs_sold_date_sk","cs_item_sk","cs_ext_sales_price"]
+                                            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=231000 width=1436)
-                                          Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                          Filter Operator [FIL_35] (rows=231000 width=1436)
-                                            predicate:((i_category) IN ('Jewelry', 'Sports', 'Books') and i_item_sk is not null)
-                                            TableScan [TS_3] (rows=462000 width=1436)
-                                              default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id","i_item_desc","i_current_price","i_class","i_category"]
+                                        Select Operator [SEL_5] (rows=36524 width=1119)
+                                          Output:["_col0"]
+                                          Filter Operator [FIL_35] (rows=36524 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/db8a6db9/ql/src/test/results/clientpositive/perf/query21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query21.q.out b/ql/src/test/results/clientpositive/perf/query21.q.out
index 1be6627..52dc0d2 100644
--- a/ql/src/test/results/clientpositive/perf/query21.q.out
+++ b/ql/src/test/results/clientpositive/perf/query21.q.out
@@ -67,39 +67,39 @@ Stage-0
     Stage-1
       Reducer 6
       File Output Operator [FS_31]
-        Limit [LIM_30] (rows=100 width=1436)
+        Limit [LIM_30] (rows=100 width=15)
           Number of rows:100
-          Select Operator [SEL_29] (rows=69877 width=1436)
+          Select Operator [SEL_29] (rows=12506076 width=15)
             Output:["_col0","_col1","_col2","_col3"]
           <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_28]
-              Filter Operator [FIL_26] (rows=69877 width=1436)
+              Filter Operator [FIL_26] (rows=12506076 width=15)
                 predicate:CASE WHEN ((_col2 > 0)) THEN ((UDFToDouble(_col3) / UDFToDouble(_col2)) BETWEEN 0.6666666666666666 AND 1.5) ELSE (null) END
-                Group By Operator [GBY_25] (rows=139755 width=1436)
+                Group By Operator [GBY_25] (rows=25012152 width=15)
                   Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1
                 <-Reducer 4 [SIMPLE_EDGE]
                   SHUFFLE [RS_24]
                     PartitionCols:_col0, _col1
-                    Group By Operator [GBY_23] (rows=279510 width=1436)
+                    Group By Operator [GBY_23] (rows=50024305 width=15)
                       Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col2)","sum(_col3)"],keys:_col0, _col1
-                      Select Operator [SEL_21] (rows=279510 width=1436)
+                      Select Operator [SEL_21] (rows=50024305 width=15)
                         Output:["_col0","_col1","_col2","_col3"]
-                        Merge Join Operator [MERGEJOIN_47] (rows=279510 width=1436)
-                          Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col3","_col5","_col7","_col10"]
+                        Merge Join Operator [MERGEJOIN_47] (rows=50024305 width=15)
+                          Conds:RS_18._col2=RS_19._col0(Inner),Output:["_col3","_col5","_col7","_col10"]
                         <-Map 9 [SIMPLE_EDGE]
                           SHUFFLE [RS_19]
                             PartitionCols:_col0
-                            Select Operator [SEL_11] (rows=36524 width=1119)
+                            Select Operator [SEL_11] (rows=27 width=1029)
                               Output:["_col0","_col1"]
-                              Filter Operator [FIL_44] (rows=36524 width=1119)
-                                predicate:(d_date BETWEEN '1998-03-09' AND '1998-05-07' 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_date"]
+                              Filter Operator [FIL_44] (rows=27 width=1029)
+                                predicate:w_warehouse_sk is not null
+                                TableScan [TS_9] (rows=27 width=1029)
+                                  default@warehouse,warehouse,Tbl:COMPLETE,Col:NONE,Output:["w_warehouse_sk","w_warehouse_name"]
                         <-Reducer 3 [SIMPLE_EDGE]
                           SHUFFLE [RS_18]
-                            PartitionCols:_col0
-                            Merge Join Operator [MERGEJOIN_46] (rows=254100 width=1436)
-                              Conds:RS_15._col1=RS_16._col0(Inner),Output:["_col0","_col3","_col5","_col7"]
+                            PartitionCols:_col2
+                            Merge Join Operator [MERGEJOIN_46] (rows=45476640 width=15)
+                              Conds:RS_15._col1=RS_16._col0(Inner),Output:["_col2","_col3","_col5","_col7"]
                             <-Map 8 [SIMPLE_EDGE]
                               SHUFFLE [RS_16]
                                 PartitionCols:_col0
@@ -112,24 +112,24 @@ Stage-0
                             <-Reducer 2 [SIMPLE_EDGE]
                               SHUFFLE [RS_15]
                                 PartitionCols:_col1
-                                Merge Join Operator [MERGEJOIN_45] (rows=29 width=1054)
-                                  Conds:RS_12._col2=RS_13._col0(Inner),Output:["_col0","_col1","_col3","_col5"]
+                                Merge Join Operator [MERGEJOIN_45] (rows=41342400 width=15)
+                                  Conds:RS_12._col0=RS_13._col0(Inner),Output:["_col1","_col2","_col3","_col5"]
                                 <-Map 1 [SIMPLE_EDGE]
                                   SHUFFLE [RS_12]
-                                    PartitionCols:_col2
-                                    Select Operator [SEL_2] (rows=1 width=0)
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_2] (rows=37584000 width=15)
                                       Output:["_col0","_col1","_col2","_col3"]
-                                      Filter Operator [FIL_41] (rows=1 width=0)
+                                      Filter Operator [FIL_41] (rows=37584000 width=15)
                                         predicate:(inv_warehouse_sk is not null and inv_item_sk is not null and inv_date_sk is not null)
-                                        TableScan [TS_0] (rows=1 width=0)
-                                          default@inventory,inventory,Tbl:PARTIAL,Col:NONE,Output:["inv_date_sk","inv_item_sk","inv_warehouse_sk","inv_quantity_on_hand"]
+                                        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=27 width=1029)
+                                    Select Operator [SEL_5] (rows=36524 width=1119)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_42] (rows=27 width=1029)
-                                        predicate:w_warehouse_sk is not null
-                                        TableScan [TS_3] (rows=27 width=1029)
-                                          default@warehouse,warehouse,Tbl:COMPLETE,Col:NONE,Output:["w_warehouse_sk","w_warehouse_name"]
+                                      Filter Operator [FIL_42] (rows=36524 width=1119)
+                                        predicate:(d_date BETWEEN '1998-03-09' AND '1998-05-07' 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/db8a6db9/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 4729bba..ac2df5c 100644
--- a/ql/src/test/results/clientpositive/perf/query22.q.out
+++ b/ql/src/test/results/clientpositive/perf/query22.q.out
@@ -17,62 +17,62 @@ Stage-0
     Stage-1
       Reducer 6
       File Output Operator [FS_30]
-        Limit [LIM_29] (rows=100 width=1436)
+        Limit [LIM_29] (rows=100 width=15)
           Number of rows:100
-          Select Operator [SEL_28] (rows=1397550 width=1436)
+          Select Operator [SEL_28] (rows=125060762 width=15)
             Output:["_col0","_col1","_col2","_col3","_col4"]
           <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_27]
-              Select Operator [SEL_25] (rows=1397550 width=1436)
+              Select Operator [SEL_25] (rows=125060762 width=15)
                 Output:["_col0","_col1","_col2","_col3","_col4"]
-                Group By Operator [GBY_24] (rows=1397550 width=1436)
+                Group By Operator [GBY_24] (rows=125060762 width=15)
                   Output:["_col0","_col1","_col2","_col3","_col5"],aggregations:["avg(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4
                 <-Reducer 4 [SIMPLE_EDGE]
                   SHUFFLE [RS_23]
                     PartitionCols:_col0, _col1, _col2, _col3, _col4
-                    Group By Operator [GBY_22] (rows=2795100 width=1436)
-                      Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["avg(_col3)"],keys:_col7, _col8, _col9, _col10, '0'
-                      Select Operator [SEL_21] (rows=559020 width=1436)
-                        Output:["_col7","_col8","_col9","_col10","_col3"]
-                        Merge Join Operator [MERGEJOIN_46] (rows=559020 width=1436)
-                          Conds:RS_18._col2=RS_19._col0(Inner),Output:["_col3","_col7","_col8","_col9","_col10"]
+                    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=27 width=1029)
-                              Output:["_col0"]
-                              Filter Operator [FIL_43] (rows=27 width=1029)
-                                predicate:w_warehouse_sk is not null
-                                TableScan [TS_9] (rows=27 width=1029)
-                                  default@warehouse,warehouse,Tbl:COMPLETE,Col:NONE,Output:["w_warehouse_sk"]
+                            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:_col2
-                            Merge Join Operator [MERGEJOIN_45] (rows=508200 width=1436)
-                              Conds:RS_15._col1=RS_16._col0(Inner),Output:["_col2","_col3","_col7","_col8","_col9","_col10"]
+                            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=462000 width=1436)
-                                  Output:["_col0","_col1","_col2","_col3","_col4"]
-                                  Filter Operator [FIL_42] (rows=462000 width=1436)
-                                    predicate: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","i_class","i_category","i_product_name"]
+                                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:_col1
-                                Merge Join Operator [MERGEJOIN_44] (rows=40176 width=1119)
+                                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=1 width=0)
+                                    Select Operator [SEL_2] (rows=37584000 width=15)
                                       Output:["_col0","_col1","_col2","_col3"]
-                                      Filter Operator [FIL_40] (rows=1 width=0)
+                                      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=1 width=0)
-                                          default@inventory,inventory,Tbl:PARTIAL,Col:NONE,Output:["inv_date_sk","inv_item_sk","inv_warehouse_sk","inv_quantity_on_hand"]
+                                        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

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/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 f6d1d0d..94b575f 100644
--- a/ql/src/test/results/clientpositive/perf/query25.q.out
+++ b/ql/src/test/results/clientpositive/perf/query25.q.out
@@ -5,141 +5,141 @@ POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Reducer 10 <- Reducer 9 (SIMPLE_EDGE)
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 11 (SIMPLE_EDGE)
-Reducer 3 <- Map 12 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 13 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Map 14 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Map 15 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Map 16 (SIMPLE_EDGE), Reducer 6 (SIMPLE_EDGE)
-Reducer 8 <- Map 17 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
-Reducer 9 <- Reducer 8 (SIMPLE_EDGE)
+Reducer 10 <- Map 14 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE)
+Reducer 11 <- Map 15 (SIMPLE_EDGE), Reducer 10 (SIMPLE_EDGE)
+Reducer 12 <- Map 16 (SIMPLE_EDGE), Reducer 11 (SIMPLE_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
+Reducer 3 <- Reducer 12 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 4 <- Map 17 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
+Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
+Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
+Reducer 9 <- Map 13 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
-      Reducer 10
-      File Output Operator [FS_53]
-        Limit [LIM_52] (rows=100 width=1436)
+      Reducer 6
+      File Output Operator [FS_54]
+        Limit [LIM_53] (rows=100 width=88)
           Number of rows:100
-          Select Operator [SEL_51] (rows=254100 width=1436)
+          Select Operator [SEL_52] (rows=510205767 width=88)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-          <-Reducer 9 [SIMPLE_EDGE]
-            SHUFFLE [RS_50]
-              Select Operator [SEL_49] (rows=254100 width=1436)
-                Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                Group By Operator [GBY_48] (rows=254100 width=1436)
-                  Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3
-                <-Reducer 8 [SIMPLE_EDGE]
-                  SHUFFLE [RS_47]
-                    PartitionCols:_col0, _col1, _col2, _col3
-                    Group By Operator [GBY_46] (rows=508200 width=1436)
-                      Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(_col5)","sum(_col10)","sum(_col14)"],keys:_col25, _col26, _col28, _col29
-                      Select Operator [SEL_45] (rows=508200 width=1436)
-                        Output:["_col25","_col26","_col28","_col29","_col5","_col10","_col14"]
-                        Merge Join Operator [MERGEJOIN_103] (rows=508200 width=1436)
-                          Conds:RS_42._col1=RS_43._col0(Inner),Output:["_col5","_col10","_col14","_col25","_col26","_col28","_col29"]
-                        <-Map 17 [SIMPLE_EDGE]
-                          SHUFFLE [RS_43]
-                            PartitionCols:_col0
-                            Select Operator [SEL_23] (rows=462000 width=1436)
-                              Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_96] (rows=462000 width=1436)
-                                predicate:i_item_sk is not null
-                                TableScan [TS_21] (rows=462000 width=1436)
-                                  default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id","i_item_desc"]
-                        <-Reducer 7 [SIMPLE_EDGE]
-                          SHUFFLE [RS_42]
-                            PartitionCols:_col1
-                            Merge Join Operator [MERGEJOIN_102] (rows=26735 width=1119)
-                              Conds:RS_39._col3=RS_40._col0(Inner),Output:["_col1","_col5","_col10","_col14","_col25","_col26"]
-                            <-Map 16 [SIMPLE_EDGE]
-                              SHUFFLE [RS_40]
-                                PartitionCols:_col0
-                                Select Operator [SEL_20] (rows=1704 width=1910)
-                                  Output:["_col0","_col1","_col2"]
-                                  Filter Operator [FIL_95] (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 6 [SIMPLE_EDGE]
-                              SHUFFLE [RS_39]
-                                PartitionCols:_col3
-                                Merge Join Operator [MERGEJOIN_101] (rows=24305 width=1119)
-                                  Conds:RS_36._col11=RS_37._col0(Inner),Output:["_col1","_col3","_col5","_col10","_col14"]
-                                <-Map 15 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_37]
+          <-Reducer 5 [SIMPLE_EDGE]
+            SHUFFLE [RS_51]
+              Group By Operator [GBY_49] (rows=510205767 width=88)
+                Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3
+              <-Reducer 4 [SIMPLE_EDGE]
+                SHUFFLE [RS_48]
+                  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_17] (rows=18262 width=1119)
-                                      Output:["_col0"]
-                                      Filter Operator [FIL_94] (rows=18262 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,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                <-Reducer 5 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_36]
-                                    PartitionCols:_col11
-                                    Merge Join Operator [MERGEJOIN_100] (rows=22096 width=1119)
-                                      Conds:RS_33._col6=RS_34._col0(Inner),Output:["_col1","_col3","_col5","_col10","_col11","_col14"]
-                                    <-Map 14 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_34]
+                                    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_14] (rows=18262 width=1119)
+                                        Select Operator [SEL_17] (rows=18262 width=1119)
                                           Output:["_col0"]
-                                          Filter Operator [FIL_93] (rows=18262 width=1119)
+                                          Filter Operator [FIL_91] (rows=18262 width=1119)
                                             predicate:(d_moy BETWEEN 4 AND 10 and (d_year = 1998) and d_date_sk is not null)
-                                            TableScan [TS_12] (rows=73049 width=1119)
+                                            TableScan [TS_15] (rows=73049 width=1119)
                                               default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                    <-Reducer 4 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_33]
+                                    <-Reducer 10 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_27]
                                         PartitionCols:_col6
-                                        Merge Join Operator [MERGEJOIN_99] (rows=20088 width=1119)
-                                          Conds:RS_30._col0=RS_31._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col10","_col11","_col14"]
-                                        <-Map 13 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_31]
+                                        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_11] (rows=18262 width=1119)
+                                            Select Operator [SEL_14] (rows=18262 width=1119)
                                               Output:["_col0"]
-                                              Filter Operator [FIL_92] (rows=18262 width=1119)
+                                              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_9] (rows=73049 width=1119)
+                                                TableScan [TS_12] (rows=73049 width=1119)
                                                   default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
-                                        <-Reducer 3 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_30]
+                                        <-Reducer 9 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_24]
                                             PartitionCols:_col0
-                                            Merge Join Operator [MERGEJOIN_98] (rows=1 width=0)
-                                              Conds:RS_27._col8, _col7=RS_28._col1, _col2(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col10","_col11","_col14"]
-                                            <-Map 12 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_28]
-                                                PartitionCols:_col1, _col2
-                                                Select Operator [SEL_8] (rows=1 width=0)
-                                                  Output:["_col0","_col1","_col2","_col3"]
-                                                  Filter Operator [FIL_91] (rows=1 width=0)
-                                                    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_6] (rows=1 width=0)
-                                                      default@catalog_sales,catalog_sales,Tbl:PARTIAL,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_net_profit"]
-                                            <-Reducer 2 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_27]
-                                                PartitionCols:_col8, _col7
-                                                Merge Join Operator [MERGEJOIN_97] (rows=1 width=0)
-                                                  Conds:RS_24._col2, _col1, _col4=RS_25._col2, _col1, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
-                                                <-Map 1 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_24]
-                                                    PartitionCols:_col2, _col1, _col4
-                                                    Select Operator [SEL_2] (rows=1 width=0)
-                                                      Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                                      Filter Operator [FIL_89] (rows=1 width=0)
-                                                        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_0] (rows=1 width=0)
-                                                          default@store_sales,store_sales,Tbl:PARTIAL,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_net_profit"]
-                                                <-Map 11 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_25]
-                                                    PartitionCols:_col2, _col1, _col3
-                                                    Select Operator [SEL_5] (rows=1 width=0)
-                                                      Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                      Filter Operator [FIL_90] (rows=1 width=0)
-                                                        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_3] (rows=1 width=0)
-                                                          default@store_returns,store_returns,Tbl:PARTIAL,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_net_loss"]
+                                            Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
+                                              Conds:RS_21._col2, _col1, _col4=RS_22._col2, _col1, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                            <-Map 13 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_22]
+                                                PartitionCols:_col2, _col1, _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:_col2, _col1, _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=18262 width=1119)
+                                    Output:["_col0"]
+                                    Filter Operator [FIL_87] (rows=18262 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,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/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 9471100..98a85f7 100644
--- a/ql/src/test/results/clientpositive/perf/query26.q.out
+++ b/ql/src/test/results/clientpositive/perf/query26.q.out
@@ -18,37 +18,37 @@ Stage-0
     Stage-1
       Reducer 7
       File Output Operator [FS_35]
-        Limit [LIM_34] (rows=100 width=1436)
+        Limit [LIM_34] (rows=100 width=135)
           Number of rows:100
-          Select Operator [SEL_33] (rows=279510 width=1436)
+          Select Operator [SEL_33] (rows=210822976 width=135)
             Output:["_col0","_col1","_col2","_col3","_col4"]
           <-Reducer 6 [SIMPLE_EDGE]
             SHUFFLE [RS_32]
-              Group By Operator [GBY_30] (rows=279510 width=1436)
+              Group By Operator [GBY_30] (rows=210822976 width=135)
                 Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)","avg(VALUE._col3)"],keys:KEY._col0
               <-Reducer 5 [SIMPLE_EDGE]
                 SHUFFLE [RS_29]
                   PartitionCols:_col0
-                  Group By Operator [GBY_28] (rows=559020 width=1436)
-                    Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["avg(_col4)","avg(_col5)","avg(_col7)","avg(_col6)"],keys:_col15
-                    Select Operator [SEL_27] (rows=559020 width=1436)
-                      Output:["_col15","_col4","_col5","_col7","_col6"]
-                      Merge Join Operator [MERGEJOIN_58] (rows=559020 width=1436)
-                        Conds:RS_24._col3=RS_25._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col15"]
+                  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:_col14
+                    Select Operator [SEL_27] (rows=421645953 width=135)
+                      Output:["_col14","_col4","_col5","_col7","_col6"]
+                      Merge Join Operator [MERGEJOIN_58] (rows=421645953 width=135)
+                        Conds:RS_24._col1=RS_25._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col14"]
                       <-Map 11 [SIMPLE_EDGE]
                         SHUFFLE [RS_25]
                           PartitionCols:_col0
-                          Select Operator [SEL_14] (rows=2300 width=1179)
+                          Select Operator [SEL_14] (rows=3106 width=13)
                             Output:["_col0"]
-                            Filter Operator [FIL_54] (rows=2300 width=1179)
-                              predicate:(((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null)
-                              TableScan [TS_12] (rows=2300 width=1179)
-                                default@promotion,promotion,Tbl:COMPLETE,Col:NONE,Output:["p_promo_sk","p_channel_email","p_channel_event"]
+                            Filter Operator [FIL_54] (rows=3106 width=13)
+                              predicate:((cd_gender = 'F') and (cd_marital_status = 'W') and (cd_education_status = 'Primary') and cd_demo_sk is not null)
+                              TableScan [TS_12] (rows=24850 width=13)
+                                default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"]
                       <-Reducer 4 [SIMPLE_EDGE]
                         SHUFFLE [RS_24]
-                          PartitionCols:_col3
-                          Merge Join Operator [MERGEJOIN_57] (rows=508200 width=1436)
-                            Conds:RS_21._col2=RS_22._col0(Inner),Output:["_col3","_col4","_col5","_col6","_col7","_col15"]
+                          PartitionCols:_col1
+                          Merge Join Operator [MERGEJOIN_57] (rows=383314495 width=135)
+                            Conds:RS_21._col2=RS_22._col0(Inner),Output:["_col1","_col4","_col5","_col6","_col7","_col14"]
                           <-Map 10 [SIMPLE_EDGE]
                             SHUFFLE [RS_22]
                               PartitionCols:_col0
@@ -61,38 +61,38 @@ Stage-0
                           <-Reducer 3 [SIMPLE_EDGE]
                             SHUFFLE [RS_21]
                               PartitionCols:_col2
-                              Merge Join Operator [MERGEJOIN_56] (rows=40176 width=1119)
-                                Conds:RS_18._col0=RS_19._col0(Inner),Output:["_col2","_col3","_col4","_col5","_col6","_col7"]
+                              Merge Join Operator [MERGEJOIN_56] (rows=348467716 width=135)
+                                Conds:RS_18._col3=RS_19._col0(Inner),Output:["_col1","_col2","_col4","_col5","_col6","_col7"]
                               <-Map 9 [SIMPLE_EDGE]
                                 SHUFFLE [RS_19]
                                   PartitionCols:_col0
-                                  Select Operator [SEL_8] (rows=36524 width=1119)
+                                  Select Operator [SEL_8] (rows=2300 width=1179)
                                     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"]
+                                    Filter Operator [FIL_52] (rows=2300 width=1179)
+                                      predicate:(((p_channel_email = 'N') or (p_channel_event = 'N')) and p_promo_sk is not null)
+                                      TableScan [TS_6] (rows=2300 width=1179)
+                                        default@promotion,promotion,Tbl:COMPLETE,Col:NONE,Output:["p_promo_sk","p_channel_email","p_channel_event"]
                               <-Reducer 2 [SIMPLE_EDGE]
                                 SHUFFLE [RS_18]
-                                  PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_55] (rows=2722 width=362)
-                                    Conds:RS_15._col1=RS_16._col0(Inner),Output:["_col0","_col2","_col3","_col4","_col5","_col6","_col7"]
+                                  PartitionCols:_col3
+                                  Merge Join Operator [MERGEJOIN_55] (rows=316788826 width=135)
+                                    Conds:RS_15._col0=RS_16._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                   <-Map 1 [SIMPLE_EDGE]
                                     SHUFFLE [RS_15]
-                                      PartitionCols:_col1
-                                      Select Operator [SEL_2] (rows=1 width=0)
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_2] (rows=287989836 width=135)
                                         Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                        Filter Operator [FIL_50] (rows=1 width=0)
+                                        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=1 width=0)
-                                            default@catalog_sales,catalog_sales,Tbl:PARTIAL,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"]
+                                          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=2475 width=362)
+                                      Select Operator [SEL_5] (rows=36524 width=1119)
                                         Output:["_col0"]
-                                        Filter Operator [FIL_51] (rows=2475 width=362)
-                                          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=19800 width=362)
-                                            default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_gender","cd_marital_status","cd_education_status"]
+                                        Filter Operator [FIL_51] (rows=36524 width=1119)
+                                          predicate:((d_year = 1998) 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"]