You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sp...@apache.org on 2016/05/26 15:40:33 UTC

[11/66] [abbrv] hive git commit: HIVE-13068: Disable Hive ConstantPropagate optimizer when CBO has optimized the plan II (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/10423f51/ql/src/test/results/clientpositive/perf/query31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query31.q.out b/ql/src/test/results/clientpositive/perf/query31.q.out
index 9d0a904..935631c 100644
--- a/ql/src/test/results/clientpositive/perf/query31.q.out
+++ b/ql/src/test/results/clientpositive/perf/query31.q.out
@@ -33,319 +33,305 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 7
-      File Output Operator [FS_145]
-        Select Operator [SEL_144] (rows=347867560 width=88)
+      File Output Operator [FS_140]
+        Select Operator [SEL_139] (rows=316243230 width=88)
           Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
         <-Reducer 6 [SIMPLE_EDGE]
-          SHUFFLE [RS_143]
-            Select Operator [SEL_142] (rows=347867560 width=88)
-              Output:["_col0","_col2","_col3","_col4","_col5"]
-              Filter Operator [FIL_141] (rows=347867560 width=88)
-                predicate:CASE WHEN ((_col7 > 0)) THEN (CASE WHEN ((_col19 > 0)) THEN (((_col23 / _col19) > (_col11 / _col7))) ELSE ((null > (_col11 / _col7))) END) ELSE (CASE WHEN ((_col19 > 0)) THEN (((_col23 / _col19) > null)) ELSE (null) END) END
-                Merge Join Operator [MERGEJOIN_277] (rows=695735121 width=88)
-                  Conds:RS_138._col12=RS_139._col0(Inner),Output:["_col0","_col3","_col7","_col11","_col15","_col19","_col23"]
+          SHUFFLE [RS_138]
+            Select Operator [SEL_137] (rows=316243230 width=88)
+              Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
+              Filter Operator [FIL_136] (rows=316243230 width=88)
+                predicate:CASE WHEN ((_col3 > 0)) THEN (CASE WHEN ((_col9 > 0)) THEN (((_col11 / _col9) > (_col5 / _col3))) ELSE ((null > (_col5 / _col3))) END) ELSE (CASE WHEN ((_col9 > 0)) THEN (((_col11 / _col9) > null)) ELSE (null) END) END
+                Merge Join Operator [MERGEJOIN_272] (rows=632486460 width=88)
+                  Conds:RS_132._col6=RS_133._col0(Inner),Output:["_col0","_col1","_col3","_col5","_col7","_col9","_col11"]
                 <-Reducer 38 [SIMPLE_EDGE]
-                  SHUFFLE [RS_139]
+                  SHUFFLE [RS_133]
                     PartitionCols:_col0
-                    Select Operator [SEL_137] (rows=87121617 width=135)
-                      Output:["_col0","_col3"]
-                      Group By Operator [GBY_136] (rows=87121617 width=135)
-                        Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 3, 1998
-                      <-Reducer 37 [SIMPLE_EDGE]
-                        SHUFFLE [RS_135]
-                          PartitionCols:_col0, 3, 1998
-                          Group By Operator [GBY_134] (rows=174243235 width=135)
-                            Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col3)"],keys:_col0, 3, 1998
-                            Select Operator [SEL_132] (rows=174243235 width=135)
-                              Output:["_col0","_col3"]
-                              Merge Join Operator [MERGEJOIN_274] (rows=174243235 width=135)
-                                Conds:RS_129._col1=RS_130._col0(Inner),Output:["_col2","_col7"]
-                              <-Map 40 [SIMPLE_EDGE]
-                                SHUFFLE [RS_130]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_125] (rows=40000000 width=1014)
-                                    Output:["_col0","_col1"]
-                                    Filter Operator [FIL_262] (rows=40000000 width=1014)
-                                      predicate:(ca_address_sk is not null and ca_county is not null)
-                                      TableScan [TS_123] (rows=40000000 width=1014)
-                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                              <-Reducer 36 [SIMPLE_EDGE]
-                                SHUFFLE [RS_129]
-                                  PartitionCols:_col1
-                                  Merge Join Operator [MERGEJOIN_273] (rows=158402938 width=135)
-                                    Conds:RS_126._col0=RS_127._col0(Inner),Output:["_col1","_col2"]
-                                  <-Map 35 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_126]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_119] (rows=144002668 width=135)
-                                        Output:["_col0","_col1","_col2"]
-                                        Filter Operator [FIL_260] (rows=144002668 width=135)
-                                          predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
-                                          TableScan [TS_117] (rows=144002668 width=135)
-                                            default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
-                                  <-Map 39 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_127]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_122] (rows=18262 width=1119)
-                                        Output:["_col0"]
-                                        Filter Operator [FIL_261] (rows=18262 width=1119)
-                                          predicate:((d_qoy = 3) and (d_year = 1998) and d_date_sk is not null)
-                                          TableScan [TS_120] (rows=73049 width=1119)
-                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                    Group By Operator [GBY_130] (rows=87121617 width=135)
+                      Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
+                    <-Reducer 37 [SIMPLE_EDGE]
+                      SHUFFLE [RS_129]
+                        PartitionCols:_col0
+                        Group By Operator [GBY_128] (rows=174243235 width=135)
+                          Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
+                          Select Operator [SEL_127] (rows=174243235 width=135)
+                            Output:["_col7","_col2"]
+                            Merge Join Operator [MERGEJOIN_269] (rows=174243235 width=135)
+                              Conds:RS_124._col1=RS_125._col0(Inner),Output:["_col2","_col7"]
+                            <-Map 40 [SIMPLE_EDGE]
+                              SHUFFLE [RS_125]
+                                PartitionCols:_col0
+                                Select Operator [SEL_120] (rows=40000000 width=1014)
+                                  Output:["_col0","_col1"]
+                                  Filter Operator [FIL_257] (rows=40000000 width=1014)
+                                    predicate:(ca_address_sk is not null and ca_county is not null)
+                                    TableScan [TS_118] (rows=40000000 width=1014)
+                                      default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                            <-Reducer 36 [SIMPLE_EDGE]
+                              SHUFFLE [RS_124]
+                                PartitionCols:_col1
+                                Merge Join Operator [MERGEJOIN_268] (rows=158402938 width=135)
+                                  Conds:RS_121._col0=RS_122._col0(Inner),Output:["_col1","_col2"]
+                                <-Map 35 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_121]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_114] (rows=144002668 width=135)
+                                      Output:["_col0","_col1","_col2"]
+                                      Filter Operator [FIL_255] (rows=144002668 width=135)
+                                        predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
+                                        TableScan [TS_112] (rows=144002668 width=135)
+                                          default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
+                                <-Map 39 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_122]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_117] (rows=18262 width=1119)
+                                      Output:["_col0"]
+                                      Filter Operator [FIL_256] (rows=18262 width=1119)
+                                        predicate:((d_qoy = 3) and (d_year = 1998) and d_date_sk is not null)
+                                        TableScan [TS_115] (rows=73049 width=1119)
+                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
                 <-Reducer 5 [SIMPLE_EDGE]
-                  SHUFFLE [RS_138]
-                    PartitionCols:_col12
-                    Select Operator [SEL_116] (rows=632486460 width=88)
-                      Output:["_col0","_col11","_col12","_col15","_col19","_col3","_col7"]
-                      Filter Operator [FIL_115] (rows=632486460 width=88)
-                        predicate:CASE WHEN ((_col3 > 0)) THEN (CASE WHEN ((_col15 > 0)) THEN (((_col19 / _col15) > (_col7 / _col3))) ELSE ((null > (_col7 / _col3))) END) ELSE (CASE WHEN ((_col15 > 0)) THEN (((_col19 / _col15) > null)) ELSE (null) END) END
-                        Select Operator [SEL_114] (rows=1264972920 width=88)
-                          Output:["_col0","_col3","_col7","_col11","_col12","_col15","_col19"]
-                          Merge Join Operator [MERGEJOIN_276] (rows=1264972920 width=88)
-                            Conds:RS_109._col0=RS_110._col0(Inner),RS_109._col0=RS_111._col0(Inner),RS_111._col0=RS_112._col4(Inner),Output:["_col0","_col3","_col7","_col8","_col11","_col15","_col19"]
-                          <-Reducer 13 [SIMPLE_EDGE]
-                            SHUFFLE [RS_110]
-                              PartitionCols:_col0
-                              Select Operator [SEL_41] (rows=87121617 width=135)
-                                Output:["_col0","_col3"]
-                                Group By Operator [GBY_40] (rows=87121617 width=135)
-                                  Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 2, 1998
-                                <-Reducer 12 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_39]
-                                    PartitionCols:_col0, 2, 1998
-                                    Group By Operator [GBY_38] (rows=174243235 width=135)
-                                      Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col3)"],keys:_col0, 2, 1998
-                                      Select Operator [SEL_36] (rows=174243235 width=135)
-                                        Output:["_col0","_col3"]
-                                        Merge Join Operator [MERGEJOIN_266] (rows=174243235 width=135)
-                                          Conds:RS_33._col1=RS_34._col0(Inner),Output:["_col2","_col7"]
-                                        <-Map 15 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_34]
+                  SHUFFLE [RS_132]
+                    PartitionCols:_col6
+                    Filter Operator [FIL_110] (rows=574987679 width=88)
+                      predicate:CASE WHEN ((_col1 > 0)) THEN (CASE WHEN ((_col7 > 0)) THEN (((_col9 / _col7) > (_col3 / _col1))) ELSE ((null > (_col3 / _col1))) END) ELSE (CASE WHEN ((_col7 > 0)) THEN (((_col9 / _col7) > null)) ELSE (null) END) END
+                      Select Operator [SEL_109] (rows=1149975359 width=88)
+                        Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col9"]
+                        Merge Join Operator [MERGEJOIN_271] (rows=1149975359 width=88)
+                          Conds:RS_104._col0=RS_105._col0(Inner),RS_104._col0=RS_106._col0(Inner),RS_104._col0=RS_107._col0(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col9"]
+                        <-Reducer 13 [SIMPLE_EDGE]
+                          SHUFFLE [RS_105]
+                            PartitionCols:_col0
+                            Group By Operator [GBY_38] (rows=348477374 width=88)
+                              Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
+                            <-Reducer 12 [SIMPLE_EDGE]
+                              SHUFFLE [RS_37]
+                                PartitionCols:_col0
+                                Group By Operator [GBY_36] (rows=696954748 width=88)
+                                  Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
+                                  Select Operator [SEL_35] (rows=696954748 width=88)
+                                    Output:["_col7","_col2"]
+                                    Merge Join Operator [MERGEJOIN_261] (rows=696954748 width=88)
+                                      Conds:RS_32._col1=RS_33._col0(Inner),Output:["_col2","_col7"]
+                                    <-Map 15 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_33]
+                                        PartitionCols:_col0
+                                        Select Operator [SEL_28] (rows=40000000 width=1014)
+                                          Output:["_col0","_col1"]
+                                          Filter Operator [FIL_245] (rows=40000000 width=1014)
+                                            predicate:(ca_address_sk is not null and ca_county is not null)
+                                            TableScan [TS_26] (rows=40000000 width=1014)
+                                              default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                    <-Reducer 11 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_32]
+                                        PartitionCols:_col1
+                                        Merge Join Operator [MERGEJOIN_260] (rows=633595212 width=88)
+                                          Conds:RS_29._col0=RS_30._col0(Inner),Output:["_col1","_col2"]
+                                        <-Map 10 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_29]
                                             PartitionCols:_col0
-                                            Select Operator [SEL_29] (rows=40000000 width=1014)
+                                            Select Operator [SEL_22] (rows=575995635 width=88)
+                                              Output:["_col0","_col1","_col2"]
+                                              Filter Operator [FIL_243] (rows=575995635 width=88)
+                                                predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
+                                                TableScan [TS_20] (rows=575995635 width=88)
+                                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
+                                        <-Map 14 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_30]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_25] (rows=18262 width=1119)
+                                              Output:["_col0"]
+                                              Filter Operator [FIL_244] (rows=18262 width=1119)
+                                                predicate:((d_qoy = 1) and (d_year = 1998) and d_date_sk is not null)
+                                                TableScan [TS_23] (rows=73049 width=1119)
+                                                  default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                        <-Reducer 19 [SIMPLE_EDGE]
+                          SHUFFLE [RS_106]
+                            PartitionCols:_col0
+                            Group By Operator [GBY_58] (rows=348477374 width=88)
+                              Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
+                            <-Reducer 18 [SIMPLE_EDGE]
+                              SHUFFLE [RS_57]
+                                PartitionCols:_col0
+                                Group By Operator [GBY_56] (rows=696954748 width=88)
+                                  Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
+                                  Select Operator [SEL_55] (rows=696954748 width=88)
+                                    Output:["_col7","_col2"]
+                                    Merge Join Operator [MERGEJOIN_263] (rows=696954748 width=88)
+                                      Conds:RS_52._col1=RS_53._col0(Inner),Output:["_col2","_col7"]
+                                    <-Map 21 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_53]
+                                        PartitionCols:_col0
+                                        Select Operator [SEL_48] (rows=40000000 width=1014)
+                                          Output:["_col0","_col1"]
+                                          Filter Operator [FIL_248] (rows=40000000 width=1014)
+                                            predicate:(ca_address_sk is not null and ca_county is not null)
+                                            TableScan [TS_46] (rows=40000000 width=1014)
+                                              default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                    <-Reducer 17 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_52]
+                                        PartitionCols:_col1
+                                        Merge Join Operator [MERGEJOIN_262] (rows=633595212 width=88)
+                                          Conds:RS_49._col0=RS_50._col0(Inner),Output:["_col1","_col2"]
+                                        <-Map 16 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_49]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_42] (rows=575995635 width=88)
+                                              Output:["_col0","_col1","_col2"]
+                                              Filter Operator [FIL_246] (rows=575995635 width=88)
+                                                predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
+                                                TableScan [TS_40] (rows=575995635 width=88)
+                                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
+                                        <-Map 20 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_50]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_45] (rows=18262 width=1119)
+                                              Output:["_col0"]
+                                              Filter Operator [FIL_247] (rows=18262 width=1119)
+                                                predicate:((d_qoy = 3) and (d_year = 1998) and d_date_sk is not null)
+                                                TableScan [TS_43] (rows=73049 width=1119)
+                                                  default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                        <-Reducer 26 [SIMPLE_EDGE]
+                          SHUFFLE [RS_107]
+                            PartitionCols:_col0
+                            Merge Join Operator [MERGEJOIN_270] (rows=95833780 width=135)
+                              Conds:RS_100._col0=RS_101._col0(Inner),Output:["_col0","_col1","_col3"]
+                            <-Reducer 25 [SIMPLE_EDGE]
+                              SHUFFLE [RS_100]
+                                PartitionCols:_col0
+                                Group By Operator [GBY_78] (rows=87121617 width=135)
+                                  Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
+                                <-Reducer 24 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_77]
+                                    PartitionCols:_col0
+                                    Group By Operator [GBY_76] (rows=174243235 width=135)
+                                      Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
+                                      Select Operator [SEL_75] (rows=174243235 width=135)
+                                        Output:["_col7","_col2"]
+                                        Merge Join Operator [MERGEJOIN_265] (rows=174243235 width=135)
+                                          Conds:RS_72._col1=RS_73._col0(Inner),Output:["_col2","_col7"]
+                                        <-Map 28 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_73]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_68] (rows=40000000 width=1014)
                                               Output:["_col0","_col1"]
-                                              Filter Operator [FIL_250] (rows=40000000 width=1014)
+                                              Filter Operator [FIL_251] (rows=40000000 width=1014)
                                                 predicate:(ca_address_sk is not null and ca_county is not null)
-                                                TableScan [TS_27] (rows=40000000 width=1014)
+                                                TableScan [TS_66] (rows=40000000 width=1014)
                                                   default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                        <-Reducer 11 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_33]
+                                        <-Reducer 23 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_72]
                                             PartitionCols:_col1
-                                            Merge Join Operator [MERGEJOIN_265] (rows=158402938 width=135)
-                                              Conds:RS_30._col0=RS_31._col0(Inner),Output:["_col1","_col2"]
-                                            <-Map 10 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_30]
+                                            Merge Join Operator [MERGEJOIN_264] (rows=158402938 width=135)
+                                              Conds:RS_69._col0=RS_70._col0(Inner),Output:["_col1","_col2"]
+                                            <-Map 22 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_69]
                                                 PartitionCols:_col0
-                                                Select Operator [SEL_23] (rows=144002668 width=135)
+                                                Select Operator [SEL_62] (rows=144002668 width=135)
                                                   Output:["_col0","_col1","_col2"]
-                                                  Filter Operator [FIL_248] (rows=144002668 width=135)
+                                                  Filter Operator [FIL_249] (rows=144002668 width=135)
                                                     predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
-                                                    TableScan [TS_21] (rows=144002668 width=135)
+                                                    TableScan [TS_60] (rows=144002668 width=135)
                                                       default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
-                                            <-Map 14 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_31]
+                                            <-Map 27 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_70]
                                                 PartitionCols:_col0
-                                                Select Operator [SEL_26] (rows=18262 width=1119)
+                                                Select Operator [SEL_65] (rows=18262 width=1119)
                                                   Output:["_col0"]
-                                                  Filter Operator [FIL_249] (rows=18262 width=1119)
-                                                    predicate:((d_qoy = 2) and (d_year = 1998) and d_date_sk is not null)
-                                                    TableScan [TS_24] (rows=73049 width=1119)
-                                                      default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                          <-Reducer 19 [SIMPLE_EDGE]
-                            SHUFFLE [RS_111]
-                              PartitionCols:_col0
-                              Select Operator [SEL_62] (rows=348477374 width=88)
-                                Output:["_col0","_col3"]
-                                Group By Operator [GBY_61] (rows=348477374 width=88)
-                                  Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 1, 1998
-                                <-Reducer 18 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_60]
-                                    PartitionCols:_col0, 1, 1998
-                                    Group By Operator [GBY_59] (rows=696954748 width=88)
-                                      Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col3)"],keys:_col0, 1, 1998
-                                      Select Operator [SEL_57] (rows=696954748 width=88)
-                                        Output:["_col0","_col3"]
-                                        Merge Join Operator [MERGEJOIN_268] (rows=696954748 width=88)
-                                          Conds:RS_54._col1=RS_55._col0(Inner),Output:["_col2","_col7"]
-                                        <-Map 21 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_55]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_50] (rows=40000000 width=1014)
-                                              Output:["_col0","_col1"]
-                                              Filter Operator [FIL_253] (rows=40000000 width=1014)
-                                                predicate:(ca_address_sk is not null and ca_county is not null)
-                                                TableScan [TS_48] (rows=40000000 width=1014)
-                                                  default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                        <-Reducer 17 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_54]
-                                            PartitionCols:_col1
-                                            Merge Join Operator [MERGEJOIN_267] (rows=633595212 width=88)
-                                              Conds:RS_51._col0=RS_52._col0(Inner),Output:["_col1","_col2"]
-                                            <-Map 16 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_51]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_44] (rows=575995635 width=88)
-                                                  Output:["_col0","_col1","_col2"]
-                                                  Filter Operator [FIL_251] (rows=575995635 width=88)
-                                                    predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
-                                                    TableScan [TS_42] (rows=575995635 width=88)
-                                                      default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
-                                            <-Map 20 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_52]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_47] (rows=18262 width=1119)
-                                                  Output:["_col0"]
-                                                  Filter Operator [FIL_252] (rows=18262 width=1119)
+                                                  Filter Operator [FIL_250] (rows=18262 width=1119)
                                                     predicate:((d_qoy = 1) and (d_year = 1998) and d_date_sk is not null)
-                                                    TableScan [TS_45] (rows=73049 width=1119)
+                                                    TableScan [TS_63] (rows=73049 width=1119)
                                                       default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                          <-Reducer 26 [SIMPLE_EDGE]
-                            SHUFFLE [RS_112]
-                              PartitionCols:_col4
-                              Merge Join Operator [MERGEJOIN_275] (rows=383325119 width=88)
-                                Conds:RS_105._col0=RS_106._col0(Inner),Output:["_col3","_col4","_col7"]
-                              <-Reducer 25 [SIMPLE_EDGE]
-                                SHUFFLE [RS_105]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_83] (rows=348477374 width=88)
-                                    Output:["_col0","_col3"]
-                                    Group By Operator [GBY_82] (rows=348477374 width=88)
-                                      Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 3, 1998
-                                    <-Reducer 24 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_81]
-                                        PartitionCols:_col0, 3, 1998
-                                        Group By Operator [GBY_80] (rows=696954748 width=88)
-                                          Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col3)"],keys:_col0, 3, 1998
-                                          Select Operator [SEL_78] (rows=696954748 width=88)
-                                            Output:["_col0","_col3"]
-                                            Merge Join Operator [MERGEJOIN_270] (rows=696954748 width=88)
-                                              Conds:RS_75._col1=RS_76._col0(Inner),Output:["_col2","_col7"]
-                                            <-Map 28 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_76]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_71] (rows=40000000 width=1014)
-                                                  Output:["_col0","_col1"]
-                                                  Filter Operator [FIL_256] (rows=40000000 width=1014)
-                                                    predicate:(ca_address_sk is not null and ca_county is not null)
-                                                    TableScan [TS_69] (rows=40000000 width=1014)
-                                                      default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                            <-Reducer 23 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_75]
-                                                PartitionCols:_col1
-                                                Merge Join Operator [MERGEJOIN_269] (rows=633595212 width=88)
-                                                  Conds:RS_72._col0=RS_73._col0(Inner),Output:["_col1","_col2"]
-                                                <-Map 22 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_72]
-                                                    PartitionCols:_col0
-                                                    Select Operator [SEL_65] (rows=575995635 width=88)
-                                                      Output:["_col0","_col1","_col2"]
-                                                      Filter Operator [FIL_254] (rows=575995635 width=88)
-                                                        predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
-                                                        TableScan [TS_63] (rows=575995635 width=88)
-                                                          default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
-                                                <-Map 27 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_73]
-                                                    PartitionCols:_col0
-                                                    Select Operator [SEL_68] (rows=18262 width=1119)
-                                                      Output:["_col0"]
-                                                      Filter Operator [FIL_255] (rows=18262 width=1119)
-                                                        predicate:((d_qoy = 3) and (d_year = 1998) and d_date_sk is not null)
-                                                        TableScan [TS_66] (rows=73049 width=1119)
-                                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                              <-Reducer 32 [SIMPLE_EDGE]
-                                SHUFFLE [RS_106]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_104] (rows=348477374 width=88)
-                                    Output:["_col0","_col3"]
-                                    Group By Operator [GBY_103] (rows=348477374 width=88)
-                                      Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 2, 1998
-                                    <-Reducer 31 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_102]
-                                        PartitionCols:_col0, 2, 1998
-                                        Group By Operator [GBY_101] (rows=696954748 width=88)
-                                          Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col3)"],keys:_col0, 2, 1998
-                                          Select Operator [SEL_99] (rows=696954748 width=88)
-                                            Output:["_col0","_col3"]
-                                            Merge Join Operator [MERGEJOIN_272] (rows=696954748 width=88)
-                                              Conds:RS_96._col1=RS_97._col0(Inner),Output:["_col2","_col7"]
-                                            <-Map 34 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_97]
-                                                PartitionCols:_col0
-                                                Select Operator [SEL_92] (rows=40000000 width=1014)
-                                                  Output:["_col0","_col1"]
-                                                  Filter Operator [FIL_259] (rows=40000000 width=1014)
-                                                    predicate:(ca_address_sk is not null and ca_county is not null)
-                                                    TableScan [TS_90] (rows=40000000 width=1014)
-                                                      default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                            <-Reducer 30 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_96]
-                                                PartitionCols:_col1
-                                                Merge Join Operator [MERGEJOIN_271] (rows=633595212 width=88)
-                                                  Conds:RS_93._col0=RS_94._col0(Inner),Output:["_col1","_col2"]
-                                                <-Map 29 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_93]
-                                                    PartitionCols:_col0
-                                                    Select Operator [SEL_86] (rows=575995635 width=88)
-                                                      Output:["_col0","_col1","_col2"]
-                                                      Filter Operator [FIL_257] (rows=575995635 width=88)
-                                                        predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
-                                                        TableScan [TS_84] (rows=575995635 width=88)
-                                                          default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
-                                                <-Map 33 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_94]
-                                                    PartitionCols:_col0
-                                                    Select Operator [SEL_89] (rows=18262 width=1119)
-                                                      Output:["_col0"]
-                                                      Filter Operator [FIL_258] (rows=18262 width=1119)
-                                                        predicate:((d_qoy = 2) and (d_year = 1998) and d_date_sk is not null)
-                                                        TableScan [TS_87] (rows=73049 width=1119)
-                                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
-                          <-Reducer 4 [SIMPLE_EDGE]
-                            SHUFFLE [RS_109]
-                              PartitionCols:_col0
-                              Select Operator [SEL_20] (rows=87121617 width=135)
-                                Output:["_col0","_col3"]
-                                Group By Operator [GBY_19] (rows=87121617 width=135)
-                                  Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, 1, 1998
-                                <-Reducer 3 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_18]
-                                    PartitionCols:_col0, 1, 1998
-                                    Group By Operator [GBY_17] (rows=174243235 width=135)
-                                      Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col3)"],keys:_col0, 1, 1998
-                                      Select Operator [SEL_15] (rows=174243235 width=135)
-                                        Output:["_col0","_col3"]
-                                        Merge Join Operator [MERGEJOIN_264] (rows=174243235 width=135)
-                                          Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7"]
-                                        <-Map 9 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_13]
+                            <-Reducer 32 [SIMPLE_EDGE]
+                              SHUFFLE [RS_101]
+                                PartitionCols:_col0
+                                Group By Operator [GBY_98] (rows=87121617 width=135)
+                                  Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
+                                <-Reducer 31 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_97]
+                                    PartitionCols:_col0
+                                    Group By Operator [GBY_96] (rows=174243235 width=135)
+                                      Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
+                                      Select Operator [SEL_95] (rows=174243235 width=135)
+                                        Output:["_col7","_col2"]
+                                        Merge Join Operator [MERGEJOIN_267] (rows=174243235 width=135)
+                                          Conds:RS_92._col1=RS_93._col0(Inner),Output:["_col2","_col7"]
+                                        <-Map 34 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_93]
                                             PartitionCols:_col0
-                                            Select Operator [SEL_8] (rows=40000000 width=1014)
+                                            Select Operator [SEL_88] (rows=40000000 width=1014)
                                               Output:["_col0","_col1"]
-                                              Filter Operator [FIL_247] (rows=40000000 width=1014)
+                                              Filter Operator [FIL_254] (rows=40000000 width=1014)
                                                 predicate:(ca_address_sk is not null and ca_county is not null)
-                                                TableScan [TS_6] (rows=40000000 width=1014)
+                                                TableScan [TS_86] (rows=40000000 width=1014)
                                                   default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
-                                        <-Reducer 2 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_12]
+                                        <-Reducer 30 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_92]
                                             PartitionCols:_col1
-                                            Merge Join Operator [MERGEJOIN_263] (rows=158402938 width=135)
-                                              Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
-                                            <-Map 1 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_9]
+                                            Merge Join Operator [MERGEJOIN_266] (rows=158402938 width=135)
+                                              Conds:RS_89._col0=RS_90._col0(Inner),Output:["_col1","_col2"]
+                                            <-Map 29 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_89]
                                                 PartitionCols:_col0
-                                                Select Operator [SEL_2] (rows=144002668 width=135)
+                                                Select Operator [SEL_82] (rows=144002668 width=135)
                                                   Output:["_col0","_col1","_col2"]
-                                                  Filter Operator [FIL_245] (rows=144002668 width=135)
+                                                  Filter Operator [FIL_252] (rows=144002668 width=135)
                                                     predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null)
-                                                    TableScan [TS_0] (rows=144002668 width=135)
+                                                    TableScan [TS_80] (rows=144002668 width=135)
                                                       default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_addr_sk","ws_ext_sales_price"]
-                                            <-Map 8 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_10]
+                                            <-Map 33 [SIMPLE_EDGE]
+                                              SHUFFLE [RS_90]
                                                 PartitionCols:_col0
-                                                Select Operator [SEL_5] (rows=18262 width=1119)
+                                                Select Operator [SEL_85] (rows=18262 width=1119)
                                                   Output:["_col0"]
-                                                  Filter Operator [FIL_246] (rows=18262 width=1119)
-                                                    predicate:((d_qoy = 1) and (d_year = 1998) and d_date_sk is not null)
-                                                    TableScan [TS_3] (rows=73049 width=1119)
+                                                  Filter Operator [FIL_253] (rows=18262 width=1119)
+                                                    predicate:((d_qoy = 2) and (d_year = 1998) and d_date_sk is not null)
+                                                    TableScan [TS_83] (rows=73049 width=1119)
                                                       default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_qoy"]
+                        <-Reducer 4 [SIMPLE_EDGE]
+                          SHUFFLE [RS_104]
+                            PartitionCols:_col0
+                            Group By Operator [GBY_18] (rows=348477374 width=88)
+                              Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
+                            <-Reducer 3 [SIMPLE_EDGE]
+                              SHUFFLE [RS_17]
+                                PartitionCols:_col0
+                                Group By Operator [GBY_16] (rows=696954748 width=88)
+                                  Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
+                                  Select Operator [SEL_15] (rows=696954748 width=88)
+                                    Output:["_col7","_col2"]
+                                    Merge Join Operator [MERGEJOIN_259] (rows=696954748 width=88)
+                                      Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7"]
+                                    <-Map 9 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_13]
+                                        PartitionCols:_col0
+                                        Select Operator [SEL_8] (rows=40000000 width=1014)
+                                          Output:["_col0","_col1"]
+                                          Filter Operator [FIL_242] (rows=40000000 width=1014)
+                                            predicate:(ca_address_sk is not null and ca_county is not null)
+                                            TableScan [TS_6] (rows=40000000 width=1014)
+                                              default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_county"]
+                                    <-Reducer 2 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_12]
+                                        PartitionCols:_col1
+                                        Merge Join Operator [MERGEJOIN_258] (rows=633595212 width=88)
+                                          Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
+                                        <-Map 1 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_9]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_2] (rows=575995635 width=88)
+                                              Output:["_col0","_col1","_col2"]
+                                              Filter Operator [FIL_240] (rows=575995635 width=88)
+                                                predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null)
+                                                TableScan [TS_0] (rows=575995635 width=88)
+                                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_addr_sk","ss_ext_sales_price"]
+                                        <-Map 8 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_10]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_5] (rows=18262 width=1119)
+                                              Output:["_col0"]
+                                              Filter Operator [FIL_241] (rows=18262 width=1119)
+                                                predicate:((d_qoy = 2) and (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","d_qoy"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/10423f51/ql/src/test/results/clientpositive/perf/query39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query39.q.out b/ql/src/test/results/clientpositive/perf/query39.q.out
index 04129c1..5c90a53 100644
--- a/ql/src/test/results/clientpositive/perf/query39.q.out
+++ b/ql/src/test/results/clientpositive/perf/query39.q.out
@@ -28,27 +28,27 @@ Stage-0
           SHUFFLE [RS_60]
             Select Operator [SEL_59] (rows=13756683 width=15)
               Output:["_col0","_col1","_col3","_col4","_col5","_col6","_col8","_col9"]
-              Merge Join Operator [MERGEJOIN_105] (rows=13756683 width=15)
-                Conds:RS_56._col2, _col1=RS_57._col2, _col1(Inner),Output:["_col1","_col2","_col4","_col5","_col7","_col8","_col10","_col11"]
+              Merge Join Operator [MERGEJOIN_103] (rows=13756683 width=15)
+                Conds:RS_56._col2, _col1=RS_57._col2, _col1(Inner),Output:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col9"]
               <-Reducer 15 [SIMPLE_EDGE]
                 SHUFFLE [RS_57]
                   PartitionCols:_col2, _col1
                   Select Operator [SEL_55] (rows=12506076 width=15)
-                    Output:["_col1","_col2","_col4","_col5"]
+                    Output:["_col1","_col2","_col3","_col4"]
                     Filter Operator [FIL_54] (rows=12506076 width=15)
-                      predicate:CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE (((_col5 / _col4) > 1.0)) END
-                      Select Operator [SEL_97] (rows=25012152 width=15)
-                        Output:["_col1","_col2","_col4","_col5"]
-                        Group By Operator [GBY_53] (rows=25012152 width=15)
-                          Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["avg(VALUE._col0)","stddev_samp(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2, 4
+                      predicate:CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE (((_col3 / _col4) > 1.0)) END
+                      Select Operator [SEL_53] (rows=25012152 width=15)
+                        Output:["_col1","_col2","_col3","_col4"]
+                        Group By Operator [GBY_52] (rows=25012152 width=15)
+                          Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["stddev_samp(VALUE._col0)","avg(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2
                         <-Reducer 14 [SIMPLE_EDGE]
-                          SHUFFLE [RS_52]
-                            PartitionCols:_col0, _col1, _col2, 4
-                            Group By Operator [GBY_51] (rows=50024305 width=15)
-                              Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["avg(_col4)","stddev_samp(_col4)"],keys:_col0, _col1, _col2, 4
+                          SHUFFLE [RS_51]
+                            PartitionCols:_col0, _col1, _col2
+                            Group By Operator [GBY_50] (rows=50024305 width=15)
+                              Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["stddev_samp(_col3)","avg(_col3)"],keys:_col7, _col8, _col9
                               Select Operator [SEL_49] (rows=50024305 width=15)
-                                Output:["_col0","_col1","_col2","_col4"]
-                                Merge Join Operator [MERGEJOIN_104] (rows=50024305 width=15)
+                                Output:["_col7","_col8","_col9","_col3"]
+                                Merge Join Operator [MERGEJOIN_102] (rows=50024305 width=15)
                                   Conds:RS_46._col2=RS_47._col0(Inner),Output:["_col3","_col7","_col8","_col9"]
                                 <-Map 18 [SIMPLE_EDGE]
                                   SHUFFLE [RS_47]
@@ -62,7 +62,7 @@ Stage-0
                                 <-Reducer 13 [SIMPLE_EDGE]
                                   SHUFFLE [RS_46]
                                     PartitionCols:_col2
-                                    Merge Join Operator [MERGEJOIN_103] (rows=45476640 width=15)
+                                    Merge Join Operator [MERGEJOIN_101] (rows=45476640 width=15)
                                       Conds:RS_43._col1=RS_44._col0(Inner),Output:["_col2","_col3","_col7"]
                                     <-Map 17 [SIMPLE_EDGE]
                                       SHUFFLE [RS_44]
@@ -76,7 +76,7 @@ Stage-0
                                     <-Reducer 12 [SIMPLE_EDGE]
                                       SHUFFLE [RS_43]
                                         PartitionCols:_col1
-                                        Merge Join Operator [MERGEJOIN_102] (rows=41342400 width=15)
+                                        Merge Join Operator [MERGEJOIN_100] (rows=41342400 width=15)
                                           Conds:RS_40._col0=RS_41._col0(Inner),Output:["_col1","_col2","_col3"]
                                         <-Map 11 [SIMPLE_EDGE]
                                           SHUFFLE [RS_40]
@@ -100,21 +100,21 @@ Stage-0
                 SHUFFLE [RS_56]
                   PartitionCols:_col2, _col1
                   Select Operator [SEL_27] (rows=12506076 width=15)
-                    Output:["_col1","_col2","_col4","_col5"]
+                    Output:["_col1","_col2","_col3","_col4"]
                     Filter Operator [FIL_26] (rows=12506076 width=15)
-                      predicate:CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE (((_col5 / _col4) > 1.0)) END
-                      Select Operator [SEL_98] (rows=25012152 width=15)
-                        Output:["_col1","_col2","_col4","_col5"]
-                        Group By Operator [GBY_25] (rows=25012152 width=15)
-                          Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["avg(VALUE._col0)","stddev_samp(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2, 3
+                      predicate:CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE (((_col3 / _col4) > 1.0)) END
+                      Select Operator [SEL_25] (rows=25012152 width=15)
+                        Output:["_col1","_col2","_col3","_col4"]
+                        Group By Operator [GBY_24] (rows=25012152 width=15)
+                          Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["stddev_samp(VALUE._col0)","avg(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2
                         <-Reducer 4 [SIMPLE_EDGE]
-                          SHUFFLE [RS_24]
-                            PartitionCols:_col0, _col1, _col2, 3
-                            Group By Operator [GBY_23] (rows=50024305 width=15)
-                              Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["avg(_col4)","stddev_samp(_col4)"],keys:_col0, _col1, _col2, 3
+                          SHUFFLE [RS_23]
+                            PartitionCols:_col0, _col1, _col2
+                            Group By Operator [GBY_22] (rows=50024305 width=15)
+                              Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["stddev_samp(_col3)","avg(_col3)"],keys:_col7, _col8, _col9
                               Select Operator [SEL_21] (rows=50024305 width=15)
-                                Output:["_col0","_col1","_col2","_col4"]
-                                Merge Join Operator [MERGEJOIN_101] (rows=50024305 width=15)
+                                Output:["_col7","_col8","_col9","_col3"]
+                                Merge Join Operator [MERGEJOIN_99] (rows=50024305 width=15)
                                   Conds:RS_18._col2=RS_19._col0(Inner),Output:["_col3","_col7","_col8","_col9"]
                                 <-Map 10 [SIMPLE_EDGE]
                                   SHUFFLE [RS_19]
@@ -128,7 +128,7 @@ Stage-0
                                 <-Reducer 3 [SIMPLE_EDGE]
                                   SHUFFLE [RS_18]
                                     PartitionCols:_col2
-                                    Merge Join Operator [MERGEJOIN_100] (rows=45476640 width=15)
+                                    Merge Join Operator [MERGEJOIN_98] (rows=45476640 width=15)
                                       Conds:RS_15._col1=RS_16._col0(Inner),Output:["_col2","_col3","_col7"]
                                     <-Map 9 [SIMPLE_EDGE]
                                       SHUFFLE [RS_16]
@@ -142,7 +142,7 @@ Stage-0
                                     <-Reducer 2 [SIMPLE_EDGE]
                                       SHUFFLE [RS_15]
                                         PartitionCols:_col1
-                                        Merge Join Operator [MERGEJOIN_99] (rows=41342400 width=15)
+                                        Merge Join Operator [MERGEJOIN_97] (rows=41342400 width=15)
                                           Conds:RS_12._col0=RS_13._col0(Inner),Output:["_col1","_col2","_col3"]
                                         <-Map 1 [SIMPLE_EDGE]
                                           SHUFFLE [RS_12]

http://git-wip-us.apache.org/repos/asf/hive/blob/10423f51/ql/src/test/results/clientpositive/perf/query42.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query42.q.out b/ql/src/test/results/clientpositive/perf/query42.q.out
index c6c4a3c..7100bb3 100644
--- a/ql/src/test/results/clientpositive/perf/query42.q.out
+++ b/ql/src/test/results/clientpositive/perf/query42.q.out
@@ -15,46 +15,46 @@ Stage-0
     limit:100
     Stage-1
       Reducer 5
-      File Output Operator [FS_24]
-        Limit [LIM_23] (rows=100 width=88)
+      File Output Operator [FS_23]
+        Limit [LIM_22] (rows=100 width=88)
           Number of rows:100
-          Select Operator [SEL_22] (rows=348477374 width=88)
+          Select Operator [SEL_21] (rows=348477374 width=88)
             Output:["_col0","_col1","_col2","_col3"]
           <-Reducer 4 [SIMPLE_EDGE]
-            SHUFFLE [RS_21]
-              Select Operator [SEL_20] (rows=348477374 width=88)
+            SHUFFLE [RS_20]
+              Select Operator [SEL_19] (rows=348477374 width=88)
                 Output:["_col1","_col2","_col3"]
-                Group By Operator [GBY_19] (rows=348477374 width=88)
-                  Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:1998, KEY._col1, KEY._col2
+                Group By Operator [GBY_18] (rows=348477374 width=88)
+                  Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1
                 <-Reducer 3 [SIMPLE_EDGE]
-                  SHUFFLE [RS_18]
-                    PartitionCols:1998, _col1, _col2
-                    Group By Operator [GBY_17] (rows=696954748 width=88)
-                      Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col3)"],keys:1998, _col1, _col2
+                  SHUFFLE [RS_17]
+                    PartitionCols:_col0, _col1
+                    Group By Operator [GBY_16] (rows=696954748 width=88)
+                      Output:["_col0","_col1","_col2"],aggregations:["sum(_col2)"],keys:_col7, _col8
                       Select Operator [SEL_15] (rows=696954748 width=88)
-                        Output:["_col1","_col2","_col3"]
-                        Merge Join Operator [MERGEJOIN_34] (rows=696954748 width=88)
+                        Output:["_col7","_col8","_col2"]
+                        Merge Join Operator [MERGEJOIN_33] (rows=696954748 width=88)
                           Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7","_col8"]
                         <-Map 7 [SIMPLE_EDGE]
                           SHUFFLE [RS_13]
                             PartitionCols:_col0
                             Select Operator [SEL_8] (rows=231000 width=1436)
                               Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_32] (rows=231000 width=1436)
+                              Filter Operator [FIL_31] (rows=231000 width=1436)
                                 predicate:((i_manager_id = 1) and i_item_sk is not null)
                                 TableScan [TS_6] (rows=462000 width=1436)
                                   default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_category_id","i_category","i_manager_id"]
                         <-Reducer 2 [SIMPLE_EDGE]
                           SHUFFLE [RS_12]
                             PartitionCols:_col1
-                            Merge Join Operator [MERGEJOIN_33] (rows=633595212 width=88)
+                            Merge Join Operator [MERGEJOIN_32] (rows=633595212 width=88)
                               Conds:RS_9._col0=RS_10._col0(Inner),Output:["_col1","_col2"]
                             <-Map 1 [SIMPLE_EDGE]
                               SHUFFLE [RS_9]
                                 PartitionCols:_col0
                                 Select Operator [SEL_2] (rows=575995635 width=88)
                                   Output:["_col0","_col1","_col2"]
-                                  Filter Operator [FIL_30] (rows=575995635 width=88)
+                                  Filter Operator [FIL_29] (rows=575995635 width=88)
                                     predicate:(ss_sold_date_sk is not null and ss_item_sk is not null)
                                     TableScan [TS_0] (rows=575995635 width=88)
                                       default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
@@ -63,7 +63,7 @@ Stage-0
                                 PartitionCols:_col0
                                 Select Operator [SEL_5] (rows=18262 width=1119)
                                   Output:["_col0"]
-                                  Filter Operator [FIL_31] (rows=18262 width=1119)
+                                  Filter Operator [FIL_30] (rows=18262 width=1119)
                                     predicate:((d_moy = 12) and (d_year = 1998) and d_date_sk is not null)
                                     TableScan [TS_3] (rows=73049 width=1119)
                                       default@date_dim,dt,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]

http://git-wip-us.apache.org/repos/asf/hive/blob/10423f51/ql/src/test/results/clientpositive/perf/query48.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query48.q.out b/ql/src/test/results/clientpositive/perf/query48.q.out
index 0964564..6473ad8 100644
--- a/ql/src/test/results/clientpositive/perf/query48.q.out
+++ b/ql/src/test/results/clientpositive/perf/query48.q.out
@@ -48,11 +48,11 @@ Stage-0
                         <-Map 10 [SIMPLE_EDGE]
                           SHUFFLE [RS_22]
                             PartitionCols:_col0
-                            Select Operator [SEL_14] (rows=5047 width=16)
+                            Select Operator [SEL_14] (rows=395 width=204)
                               Output:["_col0"]
-                              Filter Operator [FIL_54] (rows=5047 width=16)
+                              Filter Operator [FIL_54] (rows=395 width=204)
                                 predicate:((cd_marital_status = 'M') and (cd_education_status = '4 yr Degree') and cd_demo_sk is not null)
-                                TableScan [TS_12] (rows=20191 width=16)
+                                TableScan [TS_12] (rows=1583 width=204)
                                   default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"]
                         <-Reducer 6 [SIMPLE_EDGE]
                           SHUFFLE [RS_21]

http://git-wip-us.apache.org/repos/asf/hive/blob/10423f51/ql/src/test/results/clientpositive/perf/query52.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query52.q.out b/ql/src/test/results/clientpositive/perf/query52.q.out
index 21f3a39..c61ed30 100644
--- a/ql/src/test/results/clientpositive/perf/query52.q.out
+++ b/ql/src/test/results/clientpositive/perf/query52.q.out
@@ -22,17 +22,17 @@ Stage-0
             Output:["_col0","_col1","_col2","_col3"]
           <-Reducer 4 [SIMPLE_EDGE]
             SHUFFLE [RS_21]
-              Select Operator [SEL_20] (rows=348477374 width=88)
+              Select Operator [SEL_19] (rows=348477374 width=88)
                 Output:["_col1","_col2","_col3"]
-                Group By Operator [GBY_19] (rows=348477374 width=88)
-                  Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:1998, KEY._col1, KEY._col2
+                Group By Operator [GBY_18] (rows=348477374 width=88)
+                  Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1
                 <-Reducer 3 [SIMPLE_EDGE]
-                  SHUFFLE [RS_18]
-                    PartitionCols:1998, _col1, _col2
-                    Group By Operator [GBY_17] (rows=696954748 width=88)
-                      Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col3)"],keys:1998, _col1, _col2
+                  SHUFFLE [RS_17]
+                    PartitionCols:_col0, _col1
+                    Group By Operator [GBY_16] (rows=696954748 width=88)
+                      Output:["_col0","_col1","_col2"],aggregations:["sum(_col2)"],keys:_col7, _col8
                       Select Operator [SEL_15] (rows=696954748 width=88)
-                        Output:["_col1","_col2","_col3"]
+                        Output:["_col7","_col8","_col2"]
                         Merge Join Operator [MERGEJOIN_34] (rows=696954748 width=88)
                           Conds:RS_12._col1=RS_13._col0(Inner),Output:["_col2","_col7","_col8"]
                         <-Map 7 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/10423f51/ql/src/test/results/clientpositive/perf/query64.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query64.q.out b/ql/src/test/results/clientpositive/perf/query64.q.out
index 3654f42..5a5ee74 100644
--- a/ql/src/test/results/clientpositive/perf/query64.q.out
+++ b/ql/src/test/results/clientpositive/perf/query64.q.out
@@ -59,25 +59,25 @@ Stage-0
         <-Reducer 5 [SIMPLE_EDGE]
           SHUFFLE [RS_265]
             Select Operator [SEL_264] (rows=331415616 width=88)
-              Output:["_col0","_col1","_col10","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col2","_col20","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
+              Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20"]
               Filter Operator [FIL_263] (rows=331415616 width=88)
-                predicate:(_col34 <= _col15)
+                predicate:(_col30 <= _col13)
                 Merge Join Operator [MERGEJOIN_658] (rows=994246850 width=88)
-                  Conds:RS_260._col1, _col2, _col3=RS_261._col1, _col2, _col3(Inner),Output:["_col0","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col15","_col16","_col17","_col18","_col34","_col35","_col36","_col37"]
+                  Conds:RS_260._col1, _col2, _col3=RS_261._col1, _col2, _col3(Inner),Output:["_col0","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col13","_col14","_col15","_col16","_col30","_col31","_col32","_col33"]
                 <-Reducer 4 [SIMPLE_EDGE]
                   SHUFFLE [RS_260]
                     PartitionCols:_col1, _col2, _col3
-                    Select Operator [SEL_129] (rows=903860754 width=88)
-                      Output:["_col0","_col1","_col10","_col11","_col15","_col16","_col17","_col18","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
-                      Group By Operator [GBY_128] (rows=903860754 width=88)
-                        Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9, KEY._col10, KEY._col11, 2000, KEY._col13, KEY._col14
+                    Select Operator [SEL_128] (rows=903860754 width=88)
+                      Output:["_col0","_col1","_col10","_col11","_col13","_col14","_col15","_col16","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
+                      Group By Operator [GBY_127] (rows=903860754 width=88)
+                        Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9, KEY._col10, KEY._col11, KEY._col12, KEY._col13
                       <-Reducer 3 [SIMPLE_EDGE]
-                        SHUFFLE [RS_127]
-                          PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, 2000, _col13, _col14
-                          Group By Operator [GBY_126] (rows=1807721509 width=88)
-                            Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["count()","sum(_col15)","sum(_col16)","sum(_col17)"],keys:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, 2000, _col13, _col14
+                        SHUFFLE [RS_126]
+                          PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13
+                          Group By Operator [GBY_125] (rows=1807721509 width=88)
+                            Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count()","sum(_col26)","sum(_col27)","sum(_col28)"],keys:_col4, _col5, _col6, _col7, _col9, _col10, _col11, _col12, _col40, _col42, _col44, _col45, _col50, _col53
                             Select Operator [SEL_124] (rows=1807721509 width=88)
-                              Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col13","_col14","_col15","_col16","_col17"]
+                              Output:["_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col12","_col40","_col42","_col44","_col45","_col50","_col53","_col26","_col27","_col28"]
                               Merge Join Operator [MERGEJOIN_656] (rows=1807721509 width=88)
                                 Conds:RS_121._col0=RS_122._col18(Inner),Output:["_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col12","_col26","_col27","_col28","_col40","_col42","_col44","_col45","_col50","_col53"]
                               <-Reducer 13 [SIMPLE_EDGE]
@@ -364,17 +364,17 @@ Stage-0
                 <-Reducer 45 [SIMPLE_EDGE]
                   SHUFFLE [RS_261]
                     PartitionCols:_col1, _col2, _col3
-                    Select Operator [SEL_259] (rows=903860754 width=88)
-                      Output:["_col1","_col15","_col16","_col17","_col18","_col2","_col3"]
-                      Group By Operator [GBY_258] (rows=903860754 width=88)
-                        Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9, KEY._col10, KEY._col11, 2001, KEY._col13, KEY._col14
+                    Select Operator [SEL_258] (rows=903860754 width=88)
+                      Output:["_col1","_col13","_col14","_col15","_col16","_col2","_col3"]
+                      Group By Operator [GBY_257] (rows=903860754 width=88)
+                        Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9, KEY._col10, KEY._col11, KEY._col12, KEY._col13
                       <-Reducer 44 [SIMPLE_EDGE]
-                        SHUFFLE [RS_257]
-                          PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, 2001, _col13, _col14
-                          Group By Operator [GBY_256] (rows=1807721509 width=88)
-                            Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["count()","sum(_col15)","sum(_col16)","sum(_col17)"],keys:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, 2001, _col13, _col14
+                        SHUFFLE [RS_256]
+                          PartitionCols:_col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13
+                          Group By Operator [GBY_255] (rows=1807721509 width=88)
+                            Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17"],aggregations:["count()","sum(_col26)","sum(_col27)","sum(_col28)"],keys:_col4, _col5, _col6, _col7, _col9, _col10, _col11, _col12, _col40, _col42, _col44, _col45, _col50, _col53
                             Select Operator [SEL_254] (rows=1807721509 width=88)
-                              Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col13","_col14","_col15","_col16","_col17"]
+                              Output:["_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col12","_col40","_col42","_col44","_col45","_col50","_col53","_col26","_col27","_col28"]
                               Merge Join Operator [MERGEJOIN_657] (rows=1807721509 width=88)
                                 Conds:RS_251._col0=RS_252._col18(Inner),Output:["_col4","_col5","_col6","_col7","_col9","_col10","_col11","_col12","_col26","_col27","_col28","_col40","_col42","_col44","_col45","_col50","_col53"]
                               <-Reducer 43 [SIMPLE_EDGE]