hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pxi...@apache.org
Subject [3/9] hive git commit: HIVE-16797: Enhance HiveFilterSetOpTransposeRule to remove union branches (Pengcheng Xiong, reviewed by Ashutosh Chauhan)
Date Tue, 20 Jun 2017 17:05:53 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/8c5f55ee/ql/src/test/results/clientpositive/perf/query5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query5.q.out b/ql/src/test/results/clientpositive/perf/query5.q.out
index a3f2d58..f3f122c 100644
--- a/ql/src/test/results/clientpositive/perf/query5.q.out
+++ b/ql/src/test/results/clientpositive/perf/query5.q.out
@@ -278,22 +278,22 @@ Stage-0
     limit:100
     Stage-1
       Reducer 8
-      File Output Operator [FS_93]
-        Limit [LIM_92] (rows=100 width=110)
+      File Output Operator [FS_92]
+        Limit [LIM_91] (rows=100 width=110)
           Number of rows:100
-          Select Operator [SEL_91] (rows=1136898901 width=110)
+          Select Operator [SEL_90] (rows=1136898901 width=110)
             Output:["_col0","_col1","_col2","_col3","_col4"]
           <-Reducer 7 [SIMPLE_EDGE]
-            SHUFFLE [RS_90]
-              Select Operator [SEL_89] (rows=1136898901 width=110)
+            SHUFFLE [RS_89]
+              Select Operator [SEL_88] (rows=1136898901 width=110)
                 Output:["_col0","_col1","_col2","_col3","_col4"]
-                Group By Operator [GBY_88] (rows=1136898901 width=110)
+                Group By Operator [GBY_87] (rows=1136898901 width=110)
                   Output:["_col0","_col1","_col3","_col4","_col5"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"],keys:KEY._col0, KEY._col1, KEY._col2
                 <-Union 6 [SIMPLE_EDGE]
                   <-Reducer 13 [CONTAINS]
-                    Reduce Output Operator [RS_87]
+                    Reduce Output Operator [RS_86]
                       PartitionCols:_col0, _col1, _col2
-                      Group By Operator [GBY_86] (rows=2273797803 width=110)
+                      Group By Operator [GBY_85] (rows=2273797803 width=110)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0, _col1, 0
                         Select Operator [SEL_49] (rows=191657181 width=132)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
@@ -304,28 +304,28 @@ Stage-0
                               PartitionCols:_col0
                               Group By Operator [GBY_46] (rows=383314363 width=132)
                                 Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col2)","sum(_col4)","sum(_col3)","sum(_col5)"],keys:_col9
-                                Merge Join Operator [MERGEJOIN_136] (rows=383314363 width=132)
+                                Merge Join Operator [MERGEJOIN_135] (rows=383314363 width=132)
                                   Conds:RS_42._col0=RS_43._col0(Inner),Output:["_col2","_col3","_col4","_col5","_col9"]
                                 <-Map 21 [SIMPLE_EDGE]
                                   SHUFFLE [RS_43]
                                     PartitionCols:_col0
                                     Select Operator [SEL_38] (rows=46000 width=460)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_126] (rows=46000 width=460)
+                                      Filter Operator [FIL_125] (rows=46000 width=460)
                                         predicate:cp_catalog_page_sk is not null
                                         TableScan [TS_36] (rows=46000 width=460)
                                           default@catalog_page,catalog_page,Tbl:COMPLETE,Col:NONE,Output:["cp_catalog_page_sk","cp_catalog_page_id"]
                                 <-Reducer 11 [SIMPLE_EDGE]
                                   SHUFFLE [RS_42]
                                     PartitionCols:_col0
-                                    Merge Join Operator [MERGEJOIN_135] (rows=348467596 width=132)
+                                    Merge Join Operator [MERGEJOIN_134] (rows=348467596 width=132)
                                       Conds:Union 19._col1=RS_40._col0(Inner),Output:["_col0","_col2","_col3","_col4","_col5"]
                                     <-Map 10 [SIMPLE_EDGE]
                                       SHUFFLE [RS_40]
                                         PartitionCols:_col0
                                         Select Operator [SEL_35] (rows=8116 width=1119)
                                           Output:["_col0"]
-                                          Filter Operator [FIL_125] (rows=8116 width=1119)
+                                          Filter Operator [FIL_124] (rows=8116 width=1119)
                                             predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
                                             TableScan [TS_8] (rows=73049 width=1119)
                                               default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
@@ -335,7 +335,7 @@ Stage-0
                                           PartitionCols:_col1
                                           Select Operator [SEL_27] (rows=287989836 width=135)
                                             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                            Filter Operator [FIL_123] (rows=287989836 width=135)
+                                            Filter Operator [FIL_122] (rows=287989836 width=135)
                                               predicate:(cs_sold_date_sk is not null and cs_catalog_page_sk is not null)
                                               TableScan [TS_25] (rows=287989836 width=135)
                                                 Output:["cs_sold_date_sk","cs_catalog_page_sk","cs_ext_sales_price","cs_net_profit"]
@@ -344,87 +344,87 @@ Stage-0
                                           PartitionCols:_col1
                                           Select Operator [SEL_30] (rows=28798881 width=106)
                                             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                            Filter Operator [FIL_124] (rows=28798881 width=106)
+                                            Filter Operator [FIL_123] (rows=28798881 width=106)
                                               predicate:(cr_returned_date_sk is not null and cr_catalog_page_sk is not null)
                                               TableScan [TS_28] (rows=28798881 width=106)
                                                 Output:["cr_returned_date_sk","cr_catalog_page_sk","cr_return_amount","cr_net_loss"]
                   <-Reducer 16 [CONTAINS]
-                    Reduce Output Operator [RS_87]
+                    Reduce Output Operator [RS_86]
                       PartitionCols:_col0, _col1, _col2
-                      Group By Operator [GBY_86] (rows=2273797803 width=110)
+                      Group By Operator [GBY_85] (rows=2273797803 width=110)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0, _col1, 0
-                        Select Operator [SEL_83] (rows=182955399 width=135)
+                        Select Operator [SEL_82] (rows=182955399 width=135)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
-                          Group By Operator [GBY_82] (rows=182955399 width=135)
+                          Group By Operator [GBY_81] (rows=182955399 width=135)
                             Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)"],keys:KEY._col0
                           <-Reducer 15 [SIMPLE_EDGE]
-                            SHUFFLE [RS_81]
+                            SHUFFLE [RS_80]
                               PartitionCols:_col0
-                              Group By Operator [GBY_80] (rows=365910798 width=135)
+                              Group By Operator [GBY_79] (rows=365910798 width=135)
                                 Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col2)","sum(_col4)","sum(_col3)","sum(_col5)"],keys:_col9
-                                Merge Join Operator [MERGEJOIN_138] (rows=365910798 width=135)
-                                  Conds:RS_76._col0=RS_77._col0(Inner),Output:["_col2","_col3","_col4","_col5","_col9"]
+                                Merge Join Operator [MERGEJOIN_137] (rows=365910798 width=135)
+                                  Conds:RS_75._col0=RS_76._col0(Inner),Output:["_col2","_col3","_col4","_col5","_col9"]
                                 <-Map 27 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_77]
+                                  SHUFFLE [RS_76]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_72] (rows=84 width=1850)
+                                    Select Operator [SEL_71] (rows=84 width=1850)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_131] (rows=84 width=1850)
+                                      Filter Operator [FIL_130] (rows=84 width=1850)
                                         predicate:web_site_sk is not null
-                                        TableScan [TS_70] (rows=84 width=1850)
+                                        TableScan [TS_69] (rows=84 width=1850)
                                           default@web_site,web_site,Tbl:COMPLETE,Col:NONE,Output:["web_site_sk","web_site_id"]
                                 <-Reducer 14 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_76]
+                                  SHUFFLE [RS_75]
                                     PartitionCols:_col0
-                                    Merge Join Operator [MERGEJOIN_137] (rows=332646173 width=135)
-                                      Conds:Union 23._col1=RS_74._col0(Inner),Output:["_col0","_col2","_col3","_col4","_col5"]
+                                    Merge Join Operator [MERGEJOIN_136] (rows=332646173 width=135)
+                                      Conds:Union 23._col1=RS_73._col0(Inner),Output:["_col0","_col2","_col3","_col4","_col5"]
                                     <-Map 10 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_74]
+                                      SHUFFLE [RS_73]
                                         PartitionCols:_col0
-                                        Select Operator [SEL_69] (rows=8116 width=1119)
+                                        Select Operator [SEL_68] (rows=8116 width=1119)
                                           Output:["_col0"]
-                                          Filter Operator [FIL_130] (rows=8116 width=1119)
+                                          Filter Operator [FIL_129] (rows=8116 width=1119)
                                             predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
                                              Please refer to the previous TableScan [TS_8]
                                     <-Union 23 [SIMPLE_EDGE]
                                       <-Map 22 [CONTAINS]
-                                        Reduce Output Operator [RS_73]
+                                        Reduce Output Operator [RS_72]
                                           PartitionCols:_col1
-                                          Select Operator [SEL_54] (rows=144002668 width=135)
+                                          Select Operator [SEL_53] (rows=144002668 width=135)
                                             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                            Filter Operator [FIL_127] (rows=144002668 width=135)
+                                            Filter Operator [FIL_126] (rows=144002668 width=135)
                                               predicate:(ws_sold_date_sk is not null and ws_web_site_sk is not null)
-                                              TableScan [TS_52] (rows=144002668 width=135)
+                                              TableScan [TS_51] (rows=144002668 width=135)
                                                 Output:["ws_sold_date_sk","ws_web_site_sk","ws_ext_sales_price","ws_net_profit"]
                                       <-Reducer 25 [CONTAINS]
-                                        Reduce Output Operator [RS_73]
+                                        Reduce Output Operator [RS_72]
                                           PartitionCols:_col1
-                                          Select Operator [SEL_64] (rows=158402938 width=135)
+                                          Select Operator [SEL_63] (rows=158402938 width=135)
                                             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                            Merge Join Operator [MERGEJOIN_132] (rows=158402938 width=135)
-                                              Conds:RS_61._col0, _col2=RS_62._col1, _col2(Inner),Output:["_col1","_col3","_col6","_col7"]
+                                            Merge Join Operator [MERGEJOIN_131] (rows=158402938 width=135)
+                                              Conds:RS_60._col0, _col2=RS_61._col1, _col2(Inner),Output:["_col1","_col3","_col6","_col7"]
                                             <-Map 24 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_61]
+                                              SHUFFLE [RS_60]
                                                 PartitionCols:_col0, _col2
-                                                Select Operator [SEL_57] (rows=144002668 width=135)
+                                                Select Operator [SEL_56] (rows=144002668 width=135)
                                                   Output:["_col0","_col1","_col2"]
-                                                  Filter Operator [FIL_128] (rows=144002668 width=135)
+                                                  Filter Operator [FIL_127] (rows=144002668 width=135)
                                                     predicate:(ws_web_site_sk is not null and ws_order_number is not null and ws_item_sk is not null)
-                                                    TableScan [TS_55] (rows=144002668 width=135)
+                                                    TableScan [TS_54] (rows=144002668 width=135)
                                                       default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_item_sk","ws_web_site_sk","ws_order_number"]
                                             <-Map 26 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_62]
+                                              SHUFFLE [RS_61]
                                                 PartitionCols:_col1, _col2
-                                                Select Operator [SEL_60] (rows=14398467 width=92)
+                                                Select Operator [SEL_59] (rows=14398467 width=92)
                                                   Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                  Filter Operator [FIL_129] (rows=14398467 width=92)
+                                                  Filter Operator [FIL_128] (rows=14398467 width=92)
                                                     predicate:(wr_returned_date_sk is not null and wr_item_sk is not null and wr_order_number is not null)
-                                                    TableScan [TS_58] (rows=14398467 width=92)
+                                                    TableScan [TS_57] (rows=14398467 width=92)
                                                       default@web_returns,web_returns,Tbl:COMPLETE,Col:NONE,Output:["wr_returned_date_sk","wr_item_sk","wr_order_number","wr_return_amt","wr_net_loss"]
                   <-Reducer 5 [CONTAINS]
-                    Reduce Output Operator [RS_87]
+                    Reduce Output Operator [RS_86]
                       PartitionCols:_col0, _col1, _col2
-                      Group By Operator [GBY_86] (rows=2273797803 width=110)
+                      Group By Operator [GBY_85] (rows=2273797803 width=110)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0, _col1, 0
                         Select Operator [SEL_24] (rows=383320021 width=87)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
@@ -435,28 +435,28 @@ Stage-0
                               PartitionCols:_col0
                               Group By Operator [GBY_21] (rows=766640042 width=87)
                                 Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col2)","sum(_col4)","sum(_col3)","sum(_col5)"],keys:_col9
-                                Merge Join Operator [MERGEJOIN_134] (rows=766640042 width=87)
+                                Merge Join Operator [MERGEJOIN_133] (rows=766640042 width=87)
                                   Conds:RS_17._col0=RS_18._col0(Inner),Output:["_col2","_col3","_col4","_col5","_col9"]
                                 <-Map 17 [SIMPLE_EDGE]
                                   SHUFFLE [RS_18]
                                     PartitionCols:_col0
                                     Select Operator [SEL_13] (rows=1704 width=1910)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_122] (rows=1704 width=1910)
+                                      Filter Operator [FIL_121] (rows=1704 width=1910)
                                         predicate:s_store_sk is not null
                                         TableScan [TS_11] (rows=1704 width=1910)
                                           default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_store_id"]
                                 <-Reducer 3 [SIMPLE_EDGE]
                                   SHUFFLE [RS_17]
                                     PartitionCols:_col0
-                                    Merge Join Operator [MERGEJOIN_133] (rows=696945478 width=87)
+                                    Merge Join Operator [MERGEJOIN_132] (rows=696945478 width=87)
                                       Conds:Union 2._col1=RS_15._col0(Inner),Output:["_col0","_col2","_col3","_col4","_col5"]
                                     <-Map 10 [SIMPLE_EDGE]
                                       SHUFFLE [RS_15]
                                         PartitionCols:_col0
                                         Select Operator [SEL_10] (rows=8116 width=1119)
                                           Output:["_col0"]
-                                          Filter Operator [FIL_121] (rows=8116 width=1119)
+                                          Filter Operator [FIL_120] (rows=8116 width=1119)
                                             predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-08-18 00:00:00.0 and d_date_sk is not null)
                                              Please refer to the previous TableScan [TS_8]
                                     <-Union 2 [SIMPLE_EDGE]
@@ -465,7 +465,7 @@ Stage-0
                                           PartitionCols:_col1
                                           Select Operator [SEL_2] (rows=575995635 width=88)
                                             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                            Filter Operator [FIL_119] (rows=575995635 width=88)
+                                            Filter Operator [FIL_118] (rows=575995635 width=88)
                                               predicate:(ss_sold_date_sk is not null and ss_store_sk is not null)
                                               TableScan [TS_0] (rows=575995635 width=88)
                                                 Output:["ss_sold_date_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"]
@@ -474,7 +474,7 @@ Stage-0
                                           PartitionCols:_col1
                                           Select Operator [SEL_5] (rows=57591150 width=77)
                                             Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                            Filter Operator [FIL_120] (rows=57591150 width=77)
+                                            Filter Operator [FIL_119] (rows=57591150 width=77)
                                               predicate:(sr_returned_date_sk is not null and sr_store_sk is not null)
                                               TableScan [TS_3] (rows=57591150 width=77)
                                                 Output:["sr_returned_date_sk","sr_store_sk","sr_return_amt","sr_net_loss"]

http://git-wip-us.apache.org/repos/asf/hive/blob/8c5f55ee/ql/src/test/results/clientpositive/perf/query56.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query56.q.out b/ql/src/test/results/clientpositive/perf/query56.q.out
index 4ec7201..4c11d01 100644
--- a/ql/src/test/results/clientpositive/perf/query56.q.out
+++ b/ql/src/test/results/clientpositive/perf/query56.q.out
@@ -161,20 +161,20 @@ Stage-0
     limit:100
     Stage-1
       Reducer 7
-      File Output Operator [FS_122]
-        Limit [LIM_121] (rows=100 width=108)
+      File Output Operator [FS_121]
+        Limit [LIM_120] (rows=100 width=108)
           Number of rows:100
-          Select Operator [SEL_120] (rows=335408073 width=108)
+          Select Operator [SEL_119] (rows=335408073 width=108)
             Output:["_col0","_col1"]
           <-Reducer 6 [SIMPLE_EDGE]
-            SHUFFLE [RS_119]
-              Group By Operator [GBY_117] (rows=335408073 width=108)
+            SHUFFLE [RS_118]
+              Group By Operator [GBY_116] (rows=335408073 width=108)
                 Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
               <-Union 5 [SIMPLE_EDGE]
                 <-Reducer 10 [CONTAINS]
-                  Reduce Output Operator [RS_116]
+                  Reduce Output Operator [RS_115]
                     PartitionCols:_col0
-                    Group By Operator [GBY_115] (rows=670816147 width=108)
+                    Group By Operator [GBY_114] (rows=670816147 width=108)
                       Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
                       Group By Operator [GBY_72] (rows=191657247 width=135)
                         Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
@@ -183,35 +183,35 @@ Stage-0
                           PartitionCols:_col0
                           Group By Operator [GBY_70] (rows=383314495 width=135)
                             Output:["_col0","_col1"],aggregations:["sum(_col8)"],keys:_col1
-                            Merge Join Operator [MERGEJOIN_184] (rows=383314495 width=135)
+                            Merge Join Operator [MERGEJOIN_183] (rows=383314495 width=135)
                               Conds:RS_66._col0=RS_67._col4(Inner),Output:["_col1","_col8"]
                             <-Reducer 23 [SIMPLE_EDGE]
                               SHUFFLE [RS_67]
                                 PartitionCols:_col4
                                 Select Operator [SEL_62] (rows=348467716 width=135)
                                   Output:["_col4","_col5"]
-                                  Merge Join Operator [MERGEJOIN_179] (rows=348467716 width=135)
+                                  Merge Join Operator [MERGEJOIN_178] (rows=348467716 width=135)
                                     Conds:RS_59._col1=RS_60._col0(Inner),Output:["_col2","_col3"]
                                   <-Map 26 [SIMPLE_EDGE]
                                     SHUFFLE [RS_60]
                                       PartitionCols:_col0
                                       Select Operator [SEL_55] (rows=20000000 width=1014)
                                         Output:["_col0"]
-                                        Filter Operator [FIL_168] (rows=20000000 width=1014)
+                                        Filter Operator [FIL_167] (rows=20000000 width=1014)
                                           predicate:((ca_gmt_offset = -8) and ca_address_sk is not null)
                                           TableScan [TS_16] (rows=40000000 width=1014)
                                             default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_gmt_offset"]
                                   <-Reducer 22 [SIMPLE_EDGE]
                                     SHUFFLE [RS_59]
                                       PartitionCols:_col1
-                                      Merge Join Operator [MERGEJOIN_178] (rows=316788826 width=135)
+                                      Merge Join Operator [MERGEJOIN_177] (rows=316788826 width=135)
                                         Conds:RS_56._col0=RS_57._col0(Inner),Output:["_col1","_col2","_col3"]
                                       <-Map 21 [SIMPLE_EDGE]
                                         SHUFFLE [RS_57]
                                           PartitionCols:_col0
                                           Select Operator [SEL_52] (rows=18262 width=1119)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_167] (rows=18262 width=1119)
+                                            Filter Operator [FIL_166] (rows=18262 width=1119)
                                               predicate:((d_year = 2000) and (d_moy = 1) and d_date_sk is not null)
                                               TableScan [TS_13] (rows=73049 width=1119)
                                                 default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
@@ -220,21 +220,21 @@ Stage-0
                                           PartitionCols:_col0
                                           Select Operator [SEL_49] (rows=287989836 width=135)
                                             Output:["_col0","_col1","_col2","_col3"]
-                                            Filter Operator [FIL_166] (rows=287989836 width=135)
+                                            Filter Operator [FIL_165] (rows=287989836 width=135)
                                               predicate:(cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null)
                                               TableScan [TS_47] (rows=287989836 width=135)
                                                 default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"]
                             <-Reducer 8 [SIMPLE_EDGE]
                               SHUFFLE [RS_66]
                                 PartitionCols:_col0
-                                Merge Join Operator [MERGEJOIN_177] (rows=508200 width=1436)
+                                Merge Join Operator [MERGEJOIN_176] (rows=508200 width=1436)
                                   Conds:RS_63._col1=RS_64._col0(Inner),Output:["_col0","_col1"]
                                 <-Map 1 [SIMPLE_EDGE]
                                   SHUFFLE [RS_63]
                                     PartitionCols:_col1
                                     Select Operator [SEL_39] (rows=462000 width=1436)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_164] (rows=462000 width=1436)
+                                      Filter Operator [FIL_163] (rows=462000 width=1436)
                                         predicate:(i_item_id is not null and i_item_sk is not null)
                                         TableScan [TS_0] (rows=462000 width=1436)
                                           default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
@@ -250,93 +250,93 @@ Stage-0
                                           Output:["_col0"],keys:i_item_id
                                           Select Operator [SEL_42] (rows=231000 width=1436)
                                             Output:["i_item_id"]
-                                            Filter Operator [FIL_165] (rows=231000 width=1436)
+                                            Filter Operator [FIL_164] (rows=231000 width=1436)
                                               predicate:((i_color) IN ('orchid', 'chiffon', 'lace') and i_item_id is not null)
                                               TableScan [TS_3] (rows=462000 width=1436)
                                                 default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_id","i_color"]
                 <-Reducer 13 [CONTAINS]
-                  Reduce Output Operator [RS_116]
+                  Reduce Output Operator [RS_115]
                     PartitionCols:_col0
-                    Group By Operator [GBY_115] (rows=670816147 width=108)
+                    Group By Operator [GBY_114] (rows=670816147 width=108)
                       Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
-                      Group By Operator [GBY_111] (rows=95833781 width=135)
+                      Group By Operator [GBY_110] (rows=95833781 width=135)
                         Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                       <-Reducer 12 [SIMPLE_EDGE]
-                        SHUFFLE [RS_110]
+                        SHUFFLE [RS_109]
                           PartitionCols:_col0
-                          Group By Operator [GBY_109] (rows=191667562 width=135)
+                          Group By Operator [GBY_108] (rows=191667562 width=135)
                             Output:["_col0","_col1"],aggregations:["sum(_col8)"],keys:_col1
-                            Merge Join Operator [MERGEJOIN_185] (rows=191667562 width=135)
-                              Conds:RS_105._col0=RS_106._col3(Inner),Output:["_col1","_col8"]
+                            Merge Join Operator [MERGEJOIN_184] (rows=191667562 width=135)
+                              Conds:RS_104._col0=RS_105._col3(Inner),Output:["_col1","_col8"]
                             <-Reducer 11 [SIMPLE_EDGE]
-                              SHUFFLE [RS_105]
+                              SHUFFLE [RS_104]
                                 PartitionCols:_col0
-                                Merge Join Operator [MERGEJOIN_180] (rows=508200 width=1436)
-                                  Conds:RS_102._col1=RS_103._col0(Inner),Output:["_col0","_col1"]
+                                Merge Join Operator [MERGEJOIN_179] (rows=508200 width=1436)
+                                  Conds:RS_101._col1=RS_102._col0(Inner),Output:["_col0","_col1"]
                                 <-Map 1 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_102]
+                                  SHUFFLE [RS_101]
                                     PartitionCols:_col1
-                                    Select Operator [SEL_78] (rows=462000 width=1436)
+                                    Select Operator [SEL_77] (rows=462000 width=1436)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_169] (rows=462000 width=1436)
+                                      Filter Operator [FIL_168] (rows=462000 width=1436)
                                         predicate:(i_item_id is not null and i_item_sk is not null)
                                          Please refer to the previous TableScan [TS_0]
                                 <-Reducer 17 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_103]
+                                  SHUFFLE [RS_102]
                                     PartitionCols:_col0
-                                    Group By Operator [GBY_84] (rows=115500 width=1436)
+                                    Group By Operator [GBY_83] (rows=115500 width=1436)
                                       Output:["_col0"],keys:KEY._col0
                                     <-Map 14 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_83]
+                                      SHUFFLE [RS_82]
                                         PartitionCols:_col0
-                                        Group By Operator [GBY_82] (rows=231000 width=1436)
+                                        Group By Operator [GBY_81] (rows=231000 width=1436)
                                           Output:["_col0"],keys:i_item_id
-                                          Select Operator [SEL_81] (rows=231000 width=1436)
+                                          Select Operator [SEL_80] (rows=231000 width=1436)
                                             Output:["i_item_id"]
-                                            Filter Operator [FIL_170] (rows=231000 width=1436)
+                                            Filter Operator [FIL_169] (rows=231000 width=1436)
                                               predicate:((i_color) IN ('orchid', 'chiffon', 'lace') and i_item_id is not null)
                                                Please refer to the previous TableScan [TS_3]
                             <-Reducer 25 [SIMPLE_EDGE]
-                              SHUFFLE [RS_106]
+                              SHUFFLE [RS_105]
                                 PartitionCols:_col3
-                                Select Operator [SEL_101] (rows=174243235 width=135)
+                                Select Operator [SEL_100] (rows=174243235 width=135)
                                   Output:["_col3","_col5"]
-                                  Merge Join Operator [MERGEJOIN_182] (rows=174243235 width=135)
-                                    Conds:RS_98._col2=RS_99._col0(Inner),Output:["_col1","_col3"]
+                                  Merge Join Operator [MERGEJOIN_181] (rows=174243235 width=135)
+                                    Conds:RS_97._col2=RS_98._col0(Inner),Output:["_col1","_col3"]
                                   <-Map 26 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_99]
+                                    SHUFFLE [RS_98]
                                       PartitionCols:_col0
-                                      Select Operator [SEL_94] (rows=20000000 width=1014)
+                                      Select Operator [SEL_93] (rows=20000000 width=1014)
                                         Output:["_col0"]
-                                        Filter Operator [FIL_173] (rows=20000000 width=1014)
+                                        Filter Operator [FIL_172] (rows=20000000 width=1014)
                                           predicate:((ca_gmt_offset = -8) and ca_address_sk is not null)
                                            Please refer to the previous TableScan [TS_16]
                                   <-Reducer 24 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_98]
+                                    SHUFFLE [RS_97]
                                       PartitionCols:_col2
-                                      Merge Join Operator [MERGEJOIN_181] (rows=158402938 width=135)
-                                        Conds:RS_95._col0=RS_96._col0(Inner),Output:["_col1","_col2","_col3"]
+                                      Merge Join Operator [MERGEJOIN_180] (rows=158402938 width=135)
+                                        Conds:RS_94._col0=RS_95._col0(Inner),Output:["_col1","_col2","_col3"]
                                       <-Map 21 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_96]
+                                        SHUFFLE [RS_95]
                                           PartitionCols:_col0
-                                          Select Operator [SEL_91] (rows=18262 width=1119)
+                                          Select Operator [SEL_90] (rows=18262 width=1119)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_172] (rows=18262 width=1119)
+                                            Filter Operator [FIL_171] (rows=18262 width=1119)
                                               predicate:((d_year = 2000) and (d_moy = 1) and d_date_sk is not null)
                                                Please refer to the previous TableScan [TS_13]
                                       <-Map 28 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_95]
+                                        SHUFFLE [RS_94]
                                           PartitionCols:_col0
-                                          Select Operator [SEL_88] (rows=144002668 width=135)
+                                          Select Operator [SEL_87] (rows=144002668 width=135)
                                             Output:["_col0","_col1","_col2","_col3"]
-                                            Filter Operator [FIL_171] (rows=144002668 width=135)
+                                            Filter Operator [FIL_170] (rows=144002668 width=135)
                                               predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null)
-                                              TableScan [TS_86] (rows=144002668 width=135)
+                                              TableScan [TS_85] (rows=144002668 width=135)
                                                 default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"]
                 <-Reducer 4 [CONTAINS]
-                  Reduce Output Operator [RS_116]
+                  Reduce Output Operator [RS_115]
                     PartitionCols:_col0
-                    Group By Operator [GBY_115] (rows=670816147 width=108)
+                    Group By Operator [GBY_114] (rows=670816147 width=108)
                       Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
                       Group By Operator [GBY_35] (rows=383325119 width=88)
                         Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
@@ -345,19 +345,19 @@ Stage-0
                           PartitionCols:_col0
                           Group By Operator [GBY_33] (rows=766650239 width=88)
                             Output:["_col0","_col1"],aggregations:["sum(_col8)"],keys:_col1
-                            Merge Join Operator [MERGEJOIN_183] (rows=766650239 width=88)
+                            Merge Join Operator [MERGEJOIN_182] (rows=766650239 width=88)
                               Conds:RS_29._col0=RS_30._col3(Inner),Output:["_col1","_col8"]
                             <-Reducer 2 [SIMPLE_EDGE]
                               SHUFFLE [RS_29]
                                 PartitionCols:_col0
-                                Merge Join Operator [MERGEJOIN_174] (rows=508200 width=1436)
+                                Merge Join Operator [MERGEJOIN_173] (rows=508200 width=1436)
                                   Conds:RS_26._col1=RS_27._col0(Inner),Output:["_col0","_col1"]
                                 <-Map 1 [SIMPLE_EDGE]
                                   SHUFFLE [RS_26]
                                     PartitionCols:_col1
                                     Select Operator [SEL_2] (rows=462000 width=1436)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_159] (rows=462000 width=1436)
+                                      Filter Operator [FIL_158] (rows=462000 width=1436)
                                         predicate:(i_item_id is not null and i_item_sk is not null)
                                          Please refer to the previous TableScan [TS_0]
                                 <-Reducer 15 [SIMPLE_EDGE]
@@ -372,7 +372,7 @@ Stage-0
                                           Output:["_col0"],keys:i_item_id
                                           Select Operator [SEL_5] (rows=231000 width=1436)
                                             Output:["i_item_id"]
-                                            Filter Operator [FIL_160] (rows=231000 width=1436)
+                                            Filter Operator [FIL_159] (rows=231000 width=1436)
                                               predicate:((i_color) IN ('orchid', 'chiffon', 'lace') and i_item_id is not null)
                                                Please refer to the previous TableScan [TS_3]
                             <-Reducer 20 [SIMPLE_EDGE]
@@ -380,27 +380,27 @@ Stage-0
                                 PartitionCols:_col3
                                 Select Operator [SEL_25] (rows=696954748 width=88)
                                   Output:["_col3","_col5"]
-                                  Merge Join Operator [MERGEJOIN_176] (rows=696954748 width=88)
+                                  Merge Join Operator [MERGEJOIN_175] (rows=696954748 width=88)
                                     Conds:RS_22._col2=RS_23._col0(Inner),Output:["_col1","_col3"]
                                   <-Map 26 [SIMPLE_EDGE]
                                     SHUFFLE [RS_23]
                                       PartitionCols:_col0
                                       Select Operator [SEL_18] (rows=20000000 width=1014)
                                         Output:["_col0"]
-                                        Filter Operator [FIL_163] (rows=20000000 width=1014)
+                                        Filter Operator [FIL_162] (rows=20000000 width=1014)
                                           predicate:((ca_gmt_offset = -8) and ca_address_sk is not null)
                                            Please refer to the previous TableScan [TS_16]
                                   <-Reducer 19 [SIMPLE_EDGE]
                                     SHUFFLE [RS_22]
                                       PartitionCols:_col2
-                                      Merge Join Operator [MERGEJOIN_175] (rows=633595212 width=88)
+                                      Merge Join Operator [MERGEJOIN_174] (rows=633595212 width=88)
                                         Conds:RS_19._col0=RS_20._col0(Inner),Output:["_col1","_col2","_col3"]
                                       <-Map 21 [SIMPLE_EDGE]
                                         SHUFFLE [RS_20]
                                           PartitionCols:_col0
                                           Select Operator [SEL_15] (rows=18262 width=1119)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_162] (rows=18262 width=1119)
+                                            Filter Operator [FIL_161] (rows=18262 width=1119)
                                               predicate:((d_year = 2000) and (d_moy = 1) and d_date_sk is not null)
                                                Please refer to the previous TableScan [TS_13]
                                       <-Map 18 [SIMPLE_EDGE]
@@ -408,7 +408,7 @@ Stage-0
                                           PartitionCols:_col0
                                           Select Operator [SEL_12] (rows=575995635 width=88)
                                             Output:["_col0","_col1","_col2","_col3"]
-                                            Filter Operator [FIL_161] (rows=575995635 width=88)
+                                            Filter Operator [FIL_160] (rows=575995635 width=88)
                                               predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null)
                                               TableScan [TS_10] (rows=575995635 width=88)
                                                 default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"]

http://git-wip-us.apache.org/repos/asf/hive/blob/8c5f55ee/ql/src/test/results/clientpositive/perf/query60.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query60.q.out b/ql/src/test/results/clientpositive/perf/query60.q.out
index 12d8cdd..4b7f8b3 100644
--- a/ql/src/test/results/clientpositive/perf/query60.q.out
+++ b/ql/src/test/results/clientpositive/perf/query60.q.out
@@ -181,20 +181,20 @@ Stage-0
     limit:100
     Stage-1
       Reducer 7
-      File Output Operator [FS_122]
-        Limit [LIM_121] (rows=100 width=108)
+      File Output Operator [FS_121]
+        Limit [LIM_120] (rows=100 width=108)
           Number of rows:100
-          Select Operator [SEL_120] (rows=335408073 width=108)
+          Select Operator [SEL_119] (rows=335408073 width=108)
             Output:["_col0","_col1"]
           <-Reducer 6 [SIMPLE_EDGE]
-            SHUFFLE [RS_119]
-              Group By Operator [GBY_117] (rows=335408073 width=108)
+            SHUFFLE [RS_118]
+              Group By Operator [GBY_116] (rows=335408073 width=108)
                 Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
               <-Union 5 [SIMPLE_EDGE]
                 <-Reducer 10 [CONTAINS]
-                  Reduce Output Operator [RS_116]
+                  Reduce Output Operator [RS_115]
                     PartitionCols:_col0
-                    Group By Operator [GBY_115] (rows=670816147 width=108)
+                    Group By Operator [GBY_114] (rows=670816147 width=108)
                       Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
                       Group By Operator [GBY_72] (rows=191657247 width=135)
                         Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
@@ -203,35 +203,35 @@ Stage-0
                           PartitionCols:_col0
                           Group By Operator [GBY_70] (rows=383314495 width=135)
                             Output:["_col0","_col1"],aggregations:["sum(_col8)"],keys:_col1
-                            Merge Join Operator [MERGEJOIN_184] (rows=383314495 width=135)
+                            Merge Join Operator [MERGEJOIN_183] (rows=383314495 width=135)
                               Conds:RS_66._col0=RS_67._col4(Inner),Output:["_col1","_col8"]
                             <-Reducer 23 [SIMPLE_EDGE]
                               SHUFFLE [RS_67]
                                 PartitionCols:_col4
                                 Select Operator [SEL_62] (rows=348467716 width=135)
                                   Output:["_col4","_col5"]
-                                  Merge Join Operator [MERGEJOIN_179] (rows=348467716 width=135)
+                                  Merge Join Operator [MERGEJOIN_178] (rows=348467716 width=135)
                                     Conds:RS_59._col1=RS_60._col0(Inner),Output:["_col2","_col3"]
                                   <-Map 26 [SIMPLE_EDGE]
                                     SHUFFLE [RS_60]
                                       PartitionCols:_col0
                                       Select Operator [SEL_55] (rows=20000000 width=1014)
                                         Output:["_col0"]
-                                        Filter Operator [FIL_168] (rows=20000000 width=1014)
+                                        Filter Operator [FIL_167] (rows=20000000 width=1014)
                                           predicate:((ca_gmt_offset = -6) and ca_address_sk is not null)
                                           TableScan [TS_16] (rows=40000000 width=1014)
                                             default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_gmt_offset"]
                                   <-Reducer 22 [SIMPLE_EDGE]
                                     SHUFFLE [RS_59]
                                       PartitionCols:_col1
-                                      Merge Join Operator [MERGEJOIN_178] (rows=316788826 width=135)
+                                      Merge Join Operator [MERGEJOIN_177] (rows=316788826 width=135)
                                         Conds:RS_56._col0=RS_57._col0(Inner),Output:["_col1","_col2","_col3"]
                                       <-Map 21 [SIMPLE_EDGE]
                                         SHUFFLE [RS_57]
                                           PartitionCols:_col0
                                           Select Operator [SEL_52] (rows=18262 width=1119)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_167] (rows=18262 width=1119)
+                                            Filter Operator [FIL_166] (rows=18262 width=1119)
                                               predicate:((d_year = 1999) and (d_moy = 9) and d_date_sk is not null)
                                               TableScan [TS_13] (rows=73049 width=1119)
                                                 default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
@@ -240,21 +240,21 @@ Stage-0
                                           PartitionCols:_col0
                                           Select Operator [SEL_49] (rows=287989836 width=135)
                                             Output:["_col0","_col1","_col2","_col3"]
-                                            Filter Operator [FIL_166] (rows=287989836 width=135)
+                                            Filter Operator [FIL_165] (rows=287989836 width=135)
                                               predicate:(cs_sold_date_sk is not null and cs_bill_addr_sk is not null and cs_item_sk is not null)
                                               TableScan [TS_47] (rows=287989836 width=135)
                                                 default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"]
                             <-Reducer 8 [SIMPLE_EDGE]
                               SHUFFLE [RS_66]
                                 PartitionCols:_col0
-                                Merge Join Operator [MERGEJOIN_177] (rows=508200 width=1436)
+                                Merge Join Operator [MERGEJOIN_176] (rows=508200 width=1436)
                                   Conds:RS_63._col1=RS_64._col0(Inner),Output:["_col0","_col1"]
                                 <-Map 1 [SIMPLE_EDGE]
                                   SHUFFLE [RS_63]
                                     PartitionCols:_col1
                                     Select Operator [SEL_39] (rows=462000 width=1436)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_164] (rows=462000 width=1436)
+                                      Filter Operator [FIL_163] (rows=462000 width=1436)
                                         predicate:(i_item_id is not null and i_item_sk is not null)
                                         TableScan [TS_0] (rows=462000 width=1436)
                                           default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
@@ -270,93 +270,93 @@ Stage-0
                                           Output:["_col0"],keys:i_item_id
                                           Select Operator [SEL_42] (rows=231000 width=1436)
                                             Output:["i_item_id"]
-                                            Filter Operator [FIL_165] (rows=231000 width=1436)
+                                            Filter Operator [FIL_164] (rows=231000 width=1436)
                                               predicate:((i_category) IN ('Children') and i_item_id is not null)
                                               TableScan [TS_3] (rows=462000 width=1436)
                                                 default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_id","i_category"]
                 <-Reducer 13 [CONTAINS]
-                  Reduce Output Operator [RS_116]
+                  Reduce Output Operator [RS_115]
                     PartitionCols:_col0
-                    Group By Operator [GBY_115] (rows=670816147 width=108)
+                    Group By Operator [GBY_114] (rows=670816147 width=108)
                       Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
-                      Group By Operator [GBY_111] (rows=95833781 width=135)
+                      Group By Operator [GBY_110] (rows=95833781 width=135)
                         Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                       <-Reducer 12 [SIMPLE_EDGE]
-                        SHUFFLE [RS_110]
+                        SHUFFLE [RS_109]
                           PartitionCols:_col0
-                          Group By Operator [GBY_109] (rows=191667562 width=135)
+                          Group By Operator [GBY_108] (rows=191667562 width=135)
                             Output:["_col0","_col1"],aggregations:["sum(_col8)"],keys:_col1
-                            Merge Join Operator [MERGEJOIN_185] (rows=191667562 width=135)
-                              Conds:RS_105._col0=RS_106._col3(Inner),Output:["_col1","_col8"]
+                            Merge Join Operator [MERGEJOIN_184] (rows=191667562 width=135)
+                              Conds:RS_104._col0=RS_105._col3(Inner),Output:["_col1","_col8"]
                             <-Reducer 11 [SIMPLE_EDGE]
-                              SHUFFLE [RS_105]
+                              SHUFFLE [RS_104]
                                 PartitionCols:_col0
-                                Merge Join Operator [MERGEJOIN_180] (rows=508200 width=1436)
-                                  Conds:RS_102._col1=RS_103._col0(Inner),Output:["_col0","_col1"]
+                                Merge Join Operator [MERGEJOIN_179] (rows=508200 width=1436)
+                                  Conds:RS_101._col1=RS_102._col0(Inner),Output:["_col0","_col1"]
                                 <-Map 1 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_102]
+                                  SHUFFLE [RS_101]
                                     PartitionCols:_col1
-                                    Select Operator [SEL_78] (rows=462000 width=1436)
+                                    Select Operator [SEL_77] (rows=462000 width=1436)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_169] (rows=462000 width=1436)
+                                      Filter Operator [FIL_168] (rows=462000 width=1436)
                                         predicate:(i_item_id is not null and i_item_sk is not null)
                                          Please refer to the previous TableScan [TS_0]
                                 <-Reducer 17 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_103]
+                                  SHUFFLE [RS_102]
                                     PartitionCols:_col0
-                                    Group By Operator [GBY_84] (rows=115500 width=1436)
+                                    Group By Operator [GBY_83] (rows=115500 width=1436)
                                       Output:["_col0"],keys:KEY._col0
                                     <-Map 14 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_83]
+                                      SHUFFLE [RS_82]
                                         PartitionCols:_col0
-                                        Group By Operator [GBY_82] (rows=231000 width=1436)
+                                        Group By Operator [GBY_81] (rows=231000 width=1436)
                                           Output:["_col0"],keys:i_item_id
-                                          Select Operator [SEL_81] (rows=231000 width=1436)
+                                          Select Operator [SEL_80] (rows=231000 width=1436)
                                             Output:["i_item_id"]
-                                            Filter Operator [FIL_170] (rows=231000 width=1436)
+                                            Filter Operator [FIL_169] (rows=231000 width=1436)
                                               predicate:((i_category) IN ('Children') and i_item_id is not null)
                                                Please refer to the previous TableScan [TS_3]
                             <-Reducer 25 [SIMPLE_EDGE]
-                              SHUFFLE [RS_106]
+                              SHUFFLE [RS_105]
                                 PartitionCols:_col3
-                                Select Operator [SEL_101] (rows=174243235 width=135)
+                                Select Operator [SEL_100] (rows=174243235 width=135)
                                   Output:["_col3","_col5"]
-                                  Merge Join Operator [MERGEJOIN_182] (rows=174243235 width=135)
-                                    Conds:RS_98._col2=RS_99._col0(Inner),Output:["_col1","_col3"]
+                                  Merge Join Operator [MERGEJOIN_181] (rows=174243235 width=135)
+                                    Conds:RS_97._col2=RS_98._col0(Inner),Output:["_col1","_col3"]
                                   <-Map 26 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_99]
+                                    SHUFFLE [RS_98]
                                       PartitionCols:_col0
-                                      Select Operator [SEL_94] (rows=20000000 width=1014)
+                                      Select Operator [SEL_93] (rows=20000000 width=1014)
                                         Output:["_col0"]
-                                        Filter Operator [FIL_173] (rows=20000000 width=1014)
+                                        Filter Operator [FIL_172] (rows=20000000 width=1014)
                                           predicate:((ca_gmt_offset = -6) and ca_address_sk is not null)
                                            Please refer to the previous TableScan [TS_16]
                                   <-Reducer 24 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_98]
+                                    SHUFFLE [RS_97]
                                       PartitionCols:_col2
-                                      Merge Join Operator [MERGEJOIN_181] (rows=158402938 width=135)
-                                        Conds:RS_95._col0=RS_96._col0(Inner),Output:["_col1","_col2","_col3"]
+                                      Merge Join Operator [MERGEJOIN_180] (rows=158402938 width=135)
+                                        Conds:RS_94._col0=RS_95._col0(Inner),Output:["_col1","_col2","_col3"]
                                       <-Map 21 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_96]
+                                        SHUFFLE [RS_95]
                                           PartitionCols:_col0
-                                          Select Operator [SEL_91] (rows=18262 width=1119)
+                                          Select Operator [SEL_90] (rows=18262 width=1119)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_172] (rows=18262 width=1119)
+                                            Filter Operator [FIL_171] (rows=18262 width=1119)
                                               predicate:((d_year = 1999) and (d_moy = 9) and d_date_sk is not null)
                                                Please refer to the previous TableScan [TS_13]
                                       <-Map 28 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_95]
+                                        SHUFFLE [RS_94]
                                           PartitionCols:_col0
-                                          Select Operator [SEL_88] (rows=144002668 width=135)
+                                          Select Operator [SEL_87] (rows=144002668 width=135)
                                             Output:["_col0","_col1","_col2","_col3"]
-                                            Filter Operator [FIL_171] (rows=144002668 width=135)
+                                            Filter Operator [FIL_170] (rows=144002668 width=135)
                                               predicate:(ws_sold_date_sk is not null and ws_bill_addr_sk is not null and ws_item_sk is not null)
-                                              TableScan [TS_86] (rows=144002668 width=135)
+                                              TableScan [TS_85] (rows=144002668 width=135)
                                                 default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"]
                 <-Reducer 4 [CONTAINS]
-                  Reduce Output Operator [RS_116]
+                  Reduce Output Operator [RS_115]
                     PartitionCols:_col0
-                    Group By Operator [GBY_115] (rows=670816147 width=108)
+                    Group By Operator [GBY_114] (rows=670816147 width=108)
                       Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
                       Group By Operator [GBY_35] (rows=383325119 width=88)
                         Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
@@ -365,19 +365,19 @@ Stage-0
                           PartitionCols:_col0
                           Group By Operator [GBY_33] (rows=766650239 width=88)
                             Output:["_col0","_col1"],aggregations:["sum(_col8)"],keys:_col1
-                            Merge Join Operator [MERGEJOIN_183] (rows=766650239 width=88)
+                            Merge Join Operator [MERGEJOIN_182] (rows=766650239 width=88)
                               Conds:RS_29._col0=RS_30._col3(Inner),Output:["_col1","_col8"]
                             <-Reducer 2 [SIMPLE_EDGE]
                               SHUFFLE [RS_29]
                                 PartitionCols:_col0
-                                Merge Join Operator [MERGEJOIN_174] (rows=508200 width=1436)
+                                Merge Join Operator [MERGEJOIN_173] (rows=508200 width=1436)
                                   Conds:RS_26._col1=RS_27._col0(Inner),Output:["_col0","_col1"]
                                 <-Map 1 [SIMPLE_EDGE]
                                   SHUFFLE [RS_26]
                                     PartitionCols:_col1
                                     Select Operator [SEL_2] (rows=462000 width=1436)
                                       Output:["_col0","_col1"]
-                                      Filter Operator [FIL_159] (rows=462000 width=1436)
+                                      Filter Operator [FIL_158] (rows=462000 width=1436)
                                         predicate:(i_item_id is not null and i_item_sk is not null)
                                          Please refer to the previous TableScan [TS_0]
                                 <-Reducer 15 [SIMPLE_EDGE]
@@ -392,7 +392,7 @@ Stage-0
                                           Output:["_col0"],keys:i_item_id
                                           Select Operator [SEL_5] (rows=231000 width=1436)
                                             Output:["i_item_id"]
-                                            Filter Operator [FIL_160] (rows=231000 width=1436)
+                                            Filter Operator [FIL_159] (rows=231000 width=1436)
                                               predicate:((i_category) IN ('Children') and i_item_id is not null)
                                                Please refer to the previous TableScan [TS_3]
                             <-Reducer 20 [SIMPLE_EDGE]
@@ -400,27 +400,27 @@ Stage-0
                                 PartitionCols:_col3
                                 Select Operator [SEL_25] (rows=696954748 width=88)
                                   Output:["_col3","_col5"]
-                                  Merge Join Operator [MERGEJOIN_176] (rows=696954748 width=88)
+                                  Merge Join Operator [MERGEJOIN_175] (rows=696954748 width=88)
                                     Conds:RS_22._col2=RS_23._col0(Inner),Output:["_col1","_col3"]
                                   <-Map 26 [SIMPLE_EDGE]
                                     SHUFFLE [RS_23]
                                       PartitionCols:_col0
                                       Select Operator [SEL_18] (rows=20000000 width=1014)
                                         Output:["_col0"]
-                                        Filter Operator [FIL_163] (rows=20000000 width=1014)
+                                        Filter Operator [FIL_162] (rows=20000000 width=1014)
                                           predicate:((ca_gmt_offset = -6) and ca_address_sk is not null)
                                            Please refer to the previous TableScan [TS_16]
                                   <-Reducer 19 [SIMPLE_EDGE]
                                     SHUFFLE [RS_22]
                                       PartitionCols:_col2
-                                      Merge Join Operator [MERGEJOIN_175] (rows=633595212 width=88)
+                                      Merge Join Operator [MERGEJOIN_174] (rows=633595212 width=88)
                                         Conds:RS_19._col0=RS_20._col0(Inner),Output:["_col1","_col2","_col3"]
                                       <-Map 21 [SIMPLE_EDGE]
                                         SHUFFLE [RS_20]
                                           PartitionCols:_col0
                                           Select Operator [SEL_15] (rows=18262 width=1119)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_162] (rows=18262 width=1119)
+                                            Filter Operator [FIL_161] (rows=18262 width=1119)
                                               predicate:((d_year = 1999) and (d_moy = 9) and d_date_sk is not null)
                                                Please refer to the previous TableScan [TS_13]
                                       <-Map 18 [SIMPLE_EDGE]
@@ -428,7 +428,7 @@ Stage-0
                                           PartitionCols:_col0
                                           Select Operator [SEL_12] (rows=575995635 width=88)
                                             Output:["_col0","_col1","_col2","_col3"]
-                                            Filter Operator [FIL_161] (rows=575995635 width=88)
+                                            Filter Operator [FIL_160] (rows=575995635 width=88)
                                               predicate:(ss_sold_date_sk is not null and ss_addr_sk is not null and ss_item_sk is not null)
                                               TableScan [TS_10] (rows=575995635 width=88)
                                                 default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"]

http://git-wip-us.apache.org/repos/asf/hive/blob/8c5f55ee/ql/src/test/results/clientpositive/perf/query71.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query71.q.out b/ql/src/test/results/clientpositive/perf/query71.q.out
index 4465808..1dc8ba5 100644
--- a/ql/src/test/results/clientpositive/perf/query71.q.out
+++ b/ql/src/test/results/clientpositive/perf/query71.q.out
@@ -90,59 +90,59 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 7
-      File Output Operator [FS_53]
-        Select Operator [SEL_52] (rows=670816149 width=108)
+      File Output Operator [FS_52]
+        Select Operator [SEL_51] (rows=670816149 width=108)
           Output:["_col0","_col1","_col2","_col3","_col4"]
         <-Reducer 6 [SIMPLE_EDGE]
-          SHUFFLE [RS_51]
-            Select Operator [SEL_49] (rows=670816149 width=108)
+          SHUFFLE [RS_50]
+            Select Operator [SEL_48] (rows=670816149 width=108)
               Output:["_col0","_col1","_col2","_col3","_col4"]
-              Group By Operator [GBY_48] (rows=670816149 width=108)
+              Group By Operator [GBY_47] (rows=670816149 width=108)
                 Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3
               <-Reducer 5 [SIMPLE_EDGE]
-                SHUFFLE [RS_47]
+                SHUFFLE [RS_46]
                   PartitionCols:_col0, _col1, _col2, _col3
-                  Group By Operator [GBY_46] (rows=1341632299 width=108)
+                  Group By Operator [GBY_45] (rows=1341632299 width=108)
                     Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col0)"],keys:_col4, _col8, _col9, _col5
-                    Merge Join Operator [MERGEJOIN_87] (rows=1341632299 width=108)
-                      Conds:RS_42._col2=RS_43._col0(Inner),Output:["_col0","_col4","_col5","_col8","_col9"]
+                    Merge Join Operator [MERGEJOIN_86] (rows=1341632299 width=108)
+                      Conds:RS_41._col2=RS_42._col0(Inner),Output:["_col0","_col4","_col5","_col8","_col9"]
                     <-Map 16 [SIMPLE_EDGE]
-                      SHUFFLE [RS_43]
+                      SHUFFLE [RS_42]
                         PartitionCols:_col0
-                        Select Operator [SEL_38] (rows=86400 width=471)
+                        Select Operator [SEL_37] (rows=86400 width=471)
                           Output:["_col0","_col1","_col2"]
-                          Filter Operator [FIL_82] (rows=86400 width=471)
+                          Filter Operator [FIL_81] (rows=86400 width=471)
                             predicate:(((t_meal_time = 'breakfast') or (t_meal_time = 'dinner')) and t_time_sk is not null)
-                            TableScan [TS_36] (rows=86400 width=471)
+                            TableScan [TS_35] (rows=86400 width=471)
                               default@time_dim,time_dim,Tbl:COMPLETE,Col:NONE,Output:["t_time_sk","t_hour","t_minute","t_meal_time"]
                     <-Reducer 4 [SIMPLE_EDGE]
-                      SHUFFLE [RS_42]
+                      SHUFFLE [RS_41]
                         PartitionCols:_col2
-                        Merge Join Operator [MERGEJOIN_86] (rows=1219665700 width=108)
-                          Conds:Union 3._col1=RS_40._col0(Inner),Output:["_col0","_col2","_col4","_col5"]
+                        Merge Join Operator [MERGEJOIN_85] (rows=1219665700 width=108)
+                          Conds:Union 3._col1=RS_39._col0(Inner),Output:["_col0","_col2","_col4","_col5"]
                         <-Map 15 [SIMPLE_EDGE]
-                          SHUFFLE [RS_40]
+                          SHUFFLE [RS_39]
                             PartitionCols:_col0
-                            Select Operator [SEL_35] (rows=231000 width=1436)
+                            Select Operator [SEL_34] (rows=231000 width=1436)
                               Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_81] (rows=231000 width=1436)
+                              Filter Operator [FIL_80] (rows=231000 width=1436)
                                 predicate:((i_manager_id = 1) and i_item_sk is not null)
-                                TableScan [TS_33] (rows=462000 width=1436)
+                                TableScan [TS_32] (rows=462000 width=1436)
                                   default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_brand_id","i_brand","i_manager_id"]
                         <-Union 3 [SIMPLE_EDGE]
                           <-Reducer 10 [CONTAINS]
-                            Reduce Output Operator [RS_39]
+                            Reduce Output Operator [RS_38]
                               PartitionCols:_col1
                               Select Operator [SEL_19] (rows=316788826 width=135)
                                 Output:["_col0","_col1","_col2"]
-                                Merge Join Operator [MERGEJOIN_84] (rows=316788826 width=135)
+                                Merge Join Operator [MERGEJOIN_83] (rows=316788826 width=135)
                                   Conds:RS_16._col0=RS_17._col0(Inner),Output:["_col1","_col2","_col3"]
                                 <-Map 11 [SIMPLE_EDGE]
                                   SHUFFLE [RS_17]
                                     PartitionCols:_col0
                                     Select Operator [SEL_15] (rows=18262 width=1119)
                                       Output:["_col0"]
-                                      Filter Operator [FIL_78] (rows=18262 width=1119)
+                                      Filter Operator [FIL_77] (rows=18262 width=1119)
                                         predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null)
                                         TableScan [TS_13] (rows=73049 width=1119)
                                           default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
@@ -151,48 +151,48 @@ Stage-0
                                     PartitionCols:_col0
                                     Select Operator [SEL_12] (rows=287989836 width=135)
                                       Output:["_col0","_col1","_col2","_col3"]
-                                      Filter Operator [FIL_77] (rows=287989836 width=135)
+                                      Filter Operator [FIL_76] (rows=287989836 width=135)
                                         predicate:(cs_sold_date_sk is not null and cs_item_sk is not null and cs_sold_time_sk is not null)
                                         TableScan [TS_10] (rows=287989836 width=135)
                                           default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_sold_time_sk","cs_item_sk","cs_ext_sales_price"]
                           <-Reducer 13 [CONTAINS]
-                            Reduce Output Operator [RS_39]
+                            Reduce Output Operator [RS_38]
                               PartitionCols:_col1
-                              Select Operator [SEL_31] (rows=633595212 width=88)
+                              Select Operator [SEL_30] (rows=633595212 width=88)
                                 Output:["_col0","_col1","_col2"]
-                                Merge Join Operator [MERGEJOIN_85] (rows=633595212 width=88)
-                                  Conds:RS_28._col0=RS_29._col0(Inner),Output:["_col1","_col2","_col3"]
+                                Merge Join Operator [MERGEJOIN_84] (rows=633595212 width=88)
+                                  Conds:RS_27._col0=RS_28._col0(Inner),Output:["_col1","_col2","_col3"]
                                 <-Map 12 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_28]
+                                  SHUFFLE [RS_27]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_24] (rows=575995635 width=88)
+                                    Select Operator [SEL_23] (rows=575995635 width=88)
                                       Output:["_col0","_col1","_col2","_col3"]
-                                      Filter Operator [FIL_79] (rows=575995635 width=88)
+                                      Filter Operator [FIL_78] (rows=575995635 width=88)
                                         predicate:(ss_sold_date_sk is not null and ss_item_sk is not null and ss_sold_time_sk is not null)
-                                        TableScan [TS_22] (rows=575995635 width=88)
+                                        TableScan [TS_21] (rows=575995635 width=88)
                                           default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_sold_time_sk","ss_item_sk","ss_ext_sales_price"]
                                 <-Map 14 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_29]
+                                  SHUFFLE [RS_28]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_27] (rows=18262 width=1119)
+                                    Select Operator [SEL_26] (rows=18262 width=1119)
                                       Output:["_col0"]
-                                      Filter Operator [FIL_80] (rows=18262 width=1119)
+                                      Filter Operator [FIL_79] (rows=18262 width=1119)
                                         predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null)
-                                        TableScan [TS_25] (rows=73049 width=1119)
+                                        TableScan [TS_24] (rows=73049 width=1119)
                                           default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]
                           <-Reducer 2 [CONTAINS]
-                            Reduce Output Operator [RS_39]
+                            Reduce Output Operator [RS_38]
                               PartitionCols:_col1
                               Select Operator [SEL_9] (rows=158402938 width=135)
                                 Output:["_col0","_col1","_col2"]
-                                Merge Join Operator [MERGEJOIN_83] (rows=158402938 width=135)
+                                Merge Join Operator [MERGEJOIN_82] (rows=158402938 width=135)
                                   Conds:RS_6._col0=RS_7._col0(Inner),Output:["_col1","_col2","_col3"]
                                 <-Map 1 [SIMPLE_EDGE]
                                   SHUFFLE [RS_6]
                                     PartitionCols:_col0
                                     Select Operator [SEL_2] (rows=144002668 width=135)
                                       Output:["_col0","_col1","_col2","_col3"]
-                                      Filter Operator [FIL_75] (rows=144002668 width=135)
+                                      Filter Operator [FIL_74] (rows=144002668 width=135)
                                         predicate:(ws_sold_date_sk is not null and ws_item_sk is not null and ws_sold_time_sk is not null)
                                         TableScan [TS_0] (rows=144002668 width=135)
                                           default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_sold_time_sk","ws_item_sk","ws_ext_sales_price"]
@@ -201,7 +201,7 @@ Stage-0
                                     PartitionCols:_col0
                                     Select Operator [SEL_5] (rows=18262 width=1119)
                                       Output:["_col0"]
-                                      Filter Operator [FIL_76] (rows=18262 width=1119)
+                                      Filter Operator [FIL_75] (rows=18262 width=1119)
                                         predicate:((d_moy = 12) and (d_year = 2001) and d_date_sk is not null)
                                         TableScan [TS_3] (rows=73049 width=1119)
                                           default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year","d_moy"]


Mime
View raw message