You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2018/06/13 11:49:40 UTC

[02/13] hive git commit: HIVE-19237: Only use an operatorId once in a plan (Zoltan Haindrich reviewed by Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/e8f283cf/ql/src/test/results/clientpositive/perf/tez/query8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query8.q.out b/ql/src/test/results/clientpositive/perf/tez/query8.q.out
index fef9ae9..e0742f2 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query8.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query8.q.out
@@ -231,14 +231,14 @@ Stage-0
     limit:100
     Stage-1
       Reducer 5 vectorized
-      File Output Operator [FS_107]
-        Limit [LIM_106] (rows=100 width=88)
+      File Output Operator [FS_115]
+        Limit [LIM_114] (rows=100 width=88)
           Number of rows:100
-          Select Operator [SEL_105] (rows=348477374 width=88)
+          Select Operator [SEL_113] (rows=348477374 width=88)
             Output:["_col0","_col1"]
           <-Reducer 4 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_104]
-              Group By Operator [GBY_103] (rows=348477374 width=88)
+            SHUFFLE [RS_112]
+              Group By Operator [GBY_111] (rows=348477374 width=88)
                 Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
               <-Reducer 3 [SIMPLE_EDGE]
                 SHUFFLE [RS_57]
@@ -251,43 +251,43 @@ Stage-0
                       SHUFFLE [RS_53]
                         PartitionCols:_col1
                         Merge Join Operator [MERGEJOIN_88] (rows=1874 width=1911)
-                          Conds:RS_99.substr(_col0, 1, 2)=RS_102.substr(_col2, 1, 2)(Inner),Output:["_col1","_col2"]
+                          Conds:RS_107.substr(_col0, 1, 2)=RS_110.substr(_col2, 1, 2)(Inner),Output:["_col1","_col2"]
                         <-Map 17 [SIMPLE_EDGE] vectorized
-                          SHUFFLE [RS_102]
+                          SHUFFLE [RS_110]
                             PartitionCols:substr(_col2, 1, 2)
-                            Select Operator [SEL_101] (rows=1704 width=1910)
+                            Select Operator [SEL_109] (rows=1704 width=1910)
                               Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_100] (rows=1704 width=1910)
+                              Filter Operator [FIL_108] (rows=1704 width=1910)
                                 predicate:(s_store_sk is not null and substr(s_zip, 1, 2) is not null)
                                 TableScan [TS_42] (rows=1704 width=1910)
                                   default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_store_name","s_zip"]
                         <-Reducer 10 [SIMPLE_EDGE] vectorized
-                          SHUFFLE [RS_99]
+                          SHUFFLE [RS_107]
                             PartitionCols:substr(_col0, 1, 2)
-                            Select Operator [SEL_98] (rows=1 width=1014)
+                            Select Operator [SEL_106] (rows=1 width=1014)
                               Output:["_col0"]
-                              Filter Operator [FIL_97] (rows=1 width=1014)
+                              Filter Operator [FIL_105] (rows=1 width=1014)
                                 predicate:(_col1 = 2L)
-                                Group By Operator [GBY_96] (rows=6833333 width=1014)
+                                Group By Operator [GBY_104] (rows=6833333 width=1014)
                                   Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                                 <-Union 9 [SIMPLE_EDGE]
                                   <-Reducer 15 [CONTAINS] vectorized
-                                    Reduce Output Operator [RS_128]
+                                    Reduce Output Operator [RS_136]
                                       PartitionCols:_col0
-                                      Group By Operator [GBY_127] (rows=13666666 width=1014)
+                                      Group By Operator [GBY_135] (rows=13666666 width=1014)
                                         Output:["_col0","_col1"],aggregations:["count(_col1)"],keys:_col0
-                                        Group By Operator [GBY_126] (rows=3666666 width=1014)
+                                        Group By Operator [GBY_134] (rows=3666666 width=1014)
                                           Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                                         <-Reducer 14 [SIMPLE_EDGE] vectorized
-                                          SHUFFLE [RS_125]
+                                          SHUFFLE [RS_133]
                                             PartitionCols:_col0
-                                            Group By Operator [GBY_124] (rows=7333333 width=1014)
+                                            Group By Operator [GBY_132] (rows=7333333 width=1014)
                                               Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                                              Select Operator [SEL_123] (rows=7333333 width=1014)
+                                              Select Operator [SEL_131] (rows=7333333 width=1014)
                                                 Output:["_col0"]
-                                                Filter Operator [FIL_122] (rows=7333333 width=1014)
+                                                Filter Operator [FIL_130] (rows=7333333 width=1014)
                                                   predicate:(_col1 > 10L)
-                                                  Group By Operator [GBY_121] (rows=22000000 width=1014)
+                                                  Group By Operator [GBY_129] (rows=22000000 width=1014)
                                                     Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                                                   <-Reducer 13 [SIMPLE_EDGE]
                                                     SHUFFLE [RS_25]
@@ -295,40 +295,40 @@ Stage-0
                                                       Group By Operator [GBY_24] (rows=44000000 width=1014)
                                                         Output:["_col0","_col1"],aggregations:["count()"],keys:_col1
                                                         Merge Join Operator [MERGEJOIN_87] (rows=44000000 width=1014)
-                                                          Conds:RS_117._col0=RS_120._col0(Inner),Output:["_col1"]
+                                                          Conds:RS_125._col0=RS_128._col0(Inner),Output:["_col1"]
                                                         <-Map 12 [SIMPLE_EDGE] vectorized
-                                                          SHUFFLE [RS_117]
+                                                          SHUFFLE [RS_125]
                                                             PartitionCols:_col0
-                                                            Select Operator [SEL_116] (rows=40000000 width=1014)
+                                                            Select Operator [SEL_124] (rows=40000000 width=1014)
                                                               Output:["_col0","_col1"]
-                                                              Filter Operator [FIL_115] (rows=40000000 width=1014)
+                                                              Filter Operator [FIL_123] (rows=40000000 width=1014)
                                                                 predicate:(ca_address_sk is not null and substr(substr(ca_zip, 1, 5), 1, 2) is not null)
                                                                 TableScan [TS_14] (rows=40000000 width=1014)
                                                                   default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_zip"]
                                                         <-Map 16 [SIMPLE_EDGE] vectorized
-                                                          SHUFFLE [RS_120]
+                                                          SHUFFLE [RS_128]
                                                             PartitionCols:_col0
-                                                            Select Operator [SEL_119] (rows=40000000 width=860)
+                                                            Select Operator [SEL_127] (rows=40000000 width=860)
                                                               Output:["_col0"]
-                                                              Filter Operator [FIL_118] (rows=40000000 width=860)
+                                                              Filter Operator [FIL_126] (rows=40000000 width=860)
                                                                 predicate:((c_preferred_cust_flag = 'Y') and c_current_addr_sk is not null)
                                                                 TableScan [TS_17] (rows=80000000 width=860)
                                                                   default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_current_addr_sk","c_preferred_cust_flag"]
                                   <-Reducer 8 [CONTAINS] vectorized
-                                    Reduce Output Operator [RS_114]
+                                    Reduce Output Operator [RS_122]
                                       PartitionCols:_col0
-                                      Group By Operator [GBY_113] (rows=13666666 width=1014)
+                                      Group By Operator [GBY_121] (rows=13666666 width=1014)
                                         Output:["_col0","_col1"],aggregations:["count(_col1)"],keys:_col0
-                                        Group By Operator [GBY_112] (rows=10000000 width=1014)
+                                        Group By Operator [GBY_120] (rows=10000000 width=1014)
                                           Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                                         <-Map 7 [SIMPLE_EDGE] vectorized
-                                          SHUFFLE [RS_111]
+                                          SHUFFLE [RS_119]
                                             PartitionCols:_col0
-                                            Group By Operator [GBY_110] (rows=20000000 width=1014)
+                                            Group By Operator [GBY_118] (rows=20000000 width=1014)
                                               Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                                              Select Operator [SEL_109] (rows=20000000 width=1014)
+                                              Select Operator [SEL_117] (rows=20000000 width=1014)
                                                 Output:["_col0"]
-                                                Filter Operator [FIL_108] (rows=20000000 width=1014)
+                                                Filter Operator [FIL_116] (rows=20000000 width=1014)
                                                   predicate:((substr(ca_zip, 1, 5)) IN ('89436', '30868', '65085', '22977', '83927', '77557', '58429', '40697', '80614', '10502', '32779', '91137', '61265', '98294', '17921', '18427', '21203', '59362', '87291', '84093', '21505', '17184', '10866', '67898', '25797', '28055', '18377', '80332', '74535', '21757', '29742', '90885', '29898', '17819', '40811', '25990', '47513', '89531', '91068', '10391', '18846', '99223', '82637', '41368', '83658', '86199', '81625', '26696', '89338', '88425', '32200', '81427', '19053', '77471', '36610', '99823', '43276', '41249', '48584', '83550', '82276', '18842', '78890', '14090', '38123', '40936', '34425', '19850', '43286', '80072', '79188', '54191', '11395', '50497', '84861', '90733', '21068', '57666', '37119', '25004', '57835', '70067', '62878', '95806', '19303', '18840', '19124', '29785', '16737', '16022', '49613', '89977', '68310', '60069', '98360', '48649', '39050', '41793', '25002', '27413', '39736', 
 '47208', '16515', '94808', '57648', '15009', '80015', '42961', '63982', '21744', '71853', '81087', '67468', '34175', '64008', '20261', '11201', '51799', '48043', '45645', '61163', '48375', '36447', '57042', '21218', '41100', '89951', '22745', '35851', '83326', '61125', '78298', '80752', '49858', '52940', '96976', '63792', '11376', '53582', '18717', '90226', '50530', '94203', '99447', '27670', '96577', '57856', '56372', '16165', '23427', '54561', '28806', '44439', '22926', '30123', '61451', '92397', '56979', '92309', '70873', '13355', '21801', '46346', '37562', '56458', '28286', '47306', '99555', '69399', '26234', '47546', '49661', '88601', '35943', '39936', '25632', '24611', '44166', '56648', '30379', '59785', '11110', '14329', '93815', '52226', '71381', '13842', '25612', '63294', '14664', '21077', '82626', '18799', '60915', '81020', '56447', '76619', '11433', '13414', '42548', '92713', '70467', '30884', '47484', '16072', '38936', '13036', '88376', '45539', '35901', '19506', '65690'
 , '73957', '71850', '49231', '14276', '20005', '18384', '76615', '11635', '38177', '55607', '41369', '95447', '58581', '58149', '91946', '33790', '76232', '75692', '95464', '22246', '51061', '56692', '53121', '77209', '15482', '10688', '14868', '45907', '73520', '72666', '25734', '17959', '24677', '66446', '94627', '53535', '15560', '41967', '69297', '11929', '59403', '33283', '52232', '57350', '43933', '40921', '36635', '10827', '71286', '19736', '80619', '25251', '95042', '15526', '36496', '55854', '49124', '81980', '35375', '49157', '63512', '28944', '14946', '36503', '54010', '18767', '23969', '43905', '66979', '33113', '21286', '58471', '59080', '13395', '79144', '70373', '67031', '38360', '26705', '50906', '52406', '26066', '73146', '15884', '31897', '30045', '61068', '45550', '92454', '13376', '14354', '19770', '22928', '97790', '50723', '46081', '30202', '14410', '20223', '88500', '67298', '13261', '14172', '81410', '93578', '83583', '46047', '94167', '82564', '21156', '1579
 9', '86709', '37931', '74703', '83103', '23054', '70470', '72008', '49247', '91911', '69998', '20961', '70070', '63197', '54853', '88191', '91830', '49521', '19454', '81450', '89091', '62378', '25683', '61869', '51744', '36580', '85778', '36871', '48121', '28810', '83712', '45486', '67393', '26935', '42393', '20132', '55349', '86057', '21309', '80218', '10094', '11357', '48819', '39734', '40758', '30432', '21204', '29467', '30214', '61024', '55307', '74621', '11622', '68908', '33032', '52868', '99194', '99900', '84936', '69036', '99149', '45013', '32895', '59004', '32322', '14933', '32936', '33562', '72550', '27385', '58049', '58200', '16808', '21360', '32961', '18586', '79307', '15492') and substr(substr(ca_zip, 1, 5), 1, 2) is not null)
                                                   TableScan [TS_6] (rows=40000000 width=1014)
                                                     default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_zip"]
@@ -336,22 +336,22 @@ Stage-0
                       SHUFFLE [RS_52]
                         PartitionCols:_col1
                         Merge Join Operator [MERGEJOIN_86] (rows=633595212 width=88)
-                          Conds:RS_92._col0=RS_95._col0(Inner),Output:["_col1","_col2"]
+                          Conds:RS_100._col0=RS_103._col0(Inner),Output:["_col1","_col2"]
                         <-Map 1 [SIMPLE_EDGE] vectorized
-                          SHUFFLE [RS_92]
+                          SHUFFLE [RS_100]
                             PartitionCols:_col0
-                            Select Operator [SEL_91] (rows=575995635 width=88)
+                            Select Operator [SEL_99] (rows=575995635 width=88)
                               Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_90] (rows=575995635 width=88)
+                              Filter Operator [FIL_98] (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)
                                   default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_store_sk","ss_net_profit"]
                         <-Map 6 [SIMPLE_EDGE] vectorized
-                          SHUFFLE [RS_95]
+                          SHUFFLE [RS_103]
                             PartitionCols:_col0
-                            Select Operator [SEL_94] (rows=18262 width=1119)
+                            Select Operator [SEL_102] (rows=18262 width=1119)
                               Output:["_col0"]
-                              Filter Operator [FIL_93] (rows=18262 width=1119)
+                              Filter Operator [FIL_101] (rows=18262 width=1119)
                                 predicate:((d_qoy = 1) and (d_year = 2002) 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/e8f283cf/ql/src/test/results/clientpositive/perf/tez/query80.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query80.q.out b/ql/src/test/results/clientpositive/perf/tez/query80.q.out
index 69f4770..6309900 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query80.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query80.q.out
@@ -217,26 +217,26 @@ Stage-0
     limit:100
     Stage-1
       Reducer 10 vectorized
-      File Output Operator [FS_251]
-        Limit [LIM_250] (rows=100 width=108)
+      File Output Operator [FS_266]
+        Limit [LIM_265] (rows=100 width=108)
           Number of rows:100
-          Select Operator [SEL_249] (rows=1217531358 width=108)
+          Select Operator [SEL_264] (rows=1217531358 width=108)
             Output:["_col0","_col1","_col2","_col3","_col4"]
           <-Reducer 9 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_248]
-              Select Operator [SEL_247] (rows=1217531358 width=108)
+            SHUFFLE [RS_263]
+              Select Operator [SEL_262] (rows=1217531358 width=108)
                 Output:["_col0","_col1","_col2","_col3","_col4"]
-                Group By Operator [GBY_246] (rows=1217531358 width=108)
+                Group By Operator [GBY_261] (rows=1217531358 width=108)
                   Output:["_col0","_col1","_col3","_col4","_col5"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"],keys:KEY._col0, KEY._col1, KEY._col2
                 <-Union 8 [SIMPLE_EDGE]
                   <-Reducer 17 [CONTAINS] vectorized
-                    Reduce Output Operator [RS_264]
+                    Reduce Output Operator [RS_279]
                       PartitionCols:_col0, _col1, _col2
-                      Group By Operator [GBY_263] (rows=2435062716 width=108)
+                      Group By Operator [GBY_278] (rows=2435062716 width=108)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0, _col1, 0L
-                        Select Operator [SEL_262] (rows=231905279 width=135)
+                        Select Operator [SEL_277] (rows=231905279 width=135)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
-                          Group By Operator [GBY_261] (rows=231905279 width=135)
+                          Group By Operator [GBY_276] (rows=231905279 width=135)
                             Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"],keys:KEY._col0
                           <-Reducer 16 [SIMPLE_EDGE]
                             SHUFFLE [RS_75]
@@ -246,13 +246,13 @@ Stage-0
                                 Select Operator [SEL_72] (rows=463810558 width=135)
                                   Output:["_col0","_col1","_col2","_col3"]
                                   Merge Join Operator [MERGEJOIN_212] (rows=463810558 width=135)
-                                    Conds:RS_69._col1=RS_260._col0(Inner),Output:["_col5","_col6","_col9","_col10","_col18"]
+                                    Conds:RS_69._col1=RS_275._col0(Inner),Output:["_col5","_col6","_col9","_col10","_col18"]
                                   <-Map 29 [SIMPLE_EDGE] vectorized
-                                    SHUFFLE [RS_260]
+                                    SHUFFLE [RS_275]
                                       PartitionCols:_col0
-                                      Select Operator [SEL_259] (rows=46000 width=460)
+                                      Select Operator [SEL_274] (rows=46000 width=460)
                                         Output:["_col0","_col1"]
-                                        Filter Operator [FIL_258] (rows=46000 width=460)
+                                        Filter Operator [FIL_273] (rows=46000 width=460)
                                           predicate:cp_catalog_page_sk is not null
                                           TableScan [TS_54] (rows=46000 width=460)
                                             default@catalog_page,catalog_page,Tbl:COMPLETE,Col:NONE,Output:["cp_catalog_page_sk","cp_catalog_page_id"]
@@ -260,13 +260,13 @@ Stage-0
                                     SHUFFLE [RS_69]
                                       PartitionCols:_col1
                                       Merge Join Operator [MERGEJOIN_211] (rows=421645953 width=135)
-                                        Conds:RS_66._col3=RS_237._col0(Inner),Output:["_col1","_col5","_col6","_col9","_col10"]
+                                        Conds:RS_66._col3=RS_252._col0(Inner),Output:["_col1","_col5","_col6","_col9","_col10"]
                                       <-Map 24 [SIMPLE_EDGE] vectorized
-                                        SHUFFLE [RS_237]
+                                        SHUFFLE [RS_252]
                                           PartitionCols:_col0
-                                          Select Operator [SEL_235] (rows=1150 width=1179)
+                                          Select Operator [SEL_250] (rows=1150 width=1179)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_234] (rows=1150 width=1179)
+                                            Filter Operator [FIL_249] (rows=1150 width=1179)
                                               predicate:((p_channel_tv = 'N') and p_promo_sk is not null)
                                               TableScan [TS_12] (rows=2300 width=1179)
                                                 default@promotion,promotion,Tbl:COMPLETE,Col:NONE,Output:["p_promo_sk","p_channel_tv"]
@@ -274,13 +274,13 @@ Stage-0
                                         SHUFFLE [RS_66]
                                           PartitionCols:_col3
                                           Merge Join Operator [MERGEJOIN_210] (rows=383314495 width=135)
-                                            Conds:RS_63._col2=RS_232._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col9","_col10"]
+                                            Conds:RS_63._col2=RS_247._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col9","_col10"]
                                           <-Map 23 [SIMPLE_EDGE] vectorized
-                                            SHUFFLE [RS_232]
+                                            SHUFFLE [RS_247]
                                               PartitionCols:_col0
-                                              Select Operator [SEL_230] (rows=154000 width=1436)
+                                              Select Operator [SEL_245] (rows=154000 width=1436)
                                                 Output:["_col0"]
-                                                Filter Operator [FIL_229] (rows=154000 width=1436)
+                                                Filter Operator [FIL_244] (rows=154000 width=1436)
                                                   predicate:((i_current_price > 50) and i_item_sk is not null)
                                                   TableScan [TS_9] (rows=462000 width=1436)
                                                     default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_current_price"]
@@ -288,13 +288,13 @@ Stage-0
                                             SHUFFLE [RS_63]
                                               PartitionCols:_col2
                                               Merge Join Operator [MERGEJOIN_209] (rows=348467716 width=135)
-                                                Conds:RS_60._col0=RS_227._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
+                                                Conds:RS_60._col0=RS_242._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                                               <-Map 12 [SIMPLE_EDGE] vectorized
-                                                SHUFFLE [RS_227]
+                                                SHUFFLE [RS_242]
                                                   PartitionCols:_col0
-                                                  Select Operator [SEL_225] (rows=8116 width=1119)
+                                                  Select Operator [SEL_240] (rows=8116 width=1119)
                                                     Output:["_col0"]
-                                                    Filter Operator [FIL_224] (rows=8116 width=1119)
+                                                    Filter Operator [FIL_239] (rows=8116 width=1119)
                                                       predicate:(CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and d_date_sk is not null)
                                                       TableScan [TS_6] (rows=73049 width=1119)
                                                         default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
@@ -302,33 +302,33 @@ Stage-0
                                                 SHUFFLE [RS_60]
                                                   PartitionCols:_col0
                                                   Merge Join Operator [MERGEJOIN_208] (rows=316788826 width=135)
-                                                    Conds:RS_254._col2, _col4=RS_257._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
+                                                    Conds:RS_269._col2, _col4=RS_272._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                                                   <-Map 26 [SIMPLE_EDGE] vectorized
-                                                    SHUFFLE [RS_254]
+                                                    SHUFFLE [RS_269]
                                                       PartitionCols:_col2, _col4
-                                                      Select Operator [SEL_253] (rows=287989836 width=135)
+                                                      Select Operator [SEL_268] (rows=287989836 width=135)
                                                         Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                                                        Filter Operator [FIL_252] (rows=287989836 width=135)
+                                                        Filter Operator [FIL_267] (rows=287989836 width=135)
                                                           predicate:(cs_catalog_page_sk is not null and cs_item_sk is not null and cs_promo_sk is not null and cs_sold_date_sk is not null)
                                                           TableScan [TS_39] (rows=287989836 width=135)
                                                             default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_catalog_page_sk","cs_item_sk","cs_promo_sk","cs_order_number","cs_ext_sales_price","cs_net_profit"]
                                                   <-Map 28 [SIMPLE_EDGE] vectorized
-                                                    SHUFFLE [RS_257]
+                                                    SHUFFLE [RS_272]
                                                       PartitionCols:_col0, _col1
-                                                      Select Operator [SEL_256] (rows=28798881 width=106)
+                                                      Select Operator [SEL_271] (rows=28798881 width=106)
                                                         Output:["_col0","_col1","_col2","_col3"]
-                                                        Filter Operator [FIL_255] (rows=28798881 width=106)
+                                                        Filter Operator [FIL_270] (rows=28798881 width=106)
                                                           predicate:cr_item_sk is not null
                                                           TableScan [TS_42] (rows=28798881 width=106)
                                                             default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:NONE,Output:["cr_item_sk","cr_order_number","cr_return_amount","cr_net_loss"]
                   <-Reducer 22 [CONTAINS] vectorized
-                    Reduce Output Operator [RS_277]
+                    Reduce Output Operator [RS_292]
                       PartitionCols:_col0, _col1, _col2
-                      Group By Operator [GBY_276] (rows=2435062716 width=108)
+                      Group By Operator [GBY_291] (rows=2435062716 width=108)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0, _col1, 0L
-                        Select Operator [SEL_275] (rows=115958879 width=135)
+                        Select Operator [SEL_290] (rows=115958879 width=135)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
-                          Group By Operator [GBY_274] (rows=115958879 width=135)
+                          Group By Operator [GBY_289] (rows=115958879 width=135)
                             Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"],keys:KEY._col0
                           <-Reducer 21 [SIMPLE_EDGE]
                             SHUFFLE [RS_115]
@@ -338,13 +338,13 @@ Stage-0
                                 Select Operator [SEL_112] (rows=231917759 width=135)
                                   Output:["_col0","_col1","_col2","_col3"]
                                   Merge Join Operator [MERGEJOIN_217] (rows=231917759 width=135)
-                                    Conds:RS_109._col2=RS_273._col0(Inner),Output:["_col5","_col6","_col9","_col10","_col18"]
+                                    Conds:RS_109._col2=RS_288._col0(Inner),Output:["_col5","_col6","_col9","_col10","_col18"]
                                   <-Map 33 [SIMPLE_EDGE] vectorized
-                                    SHUFFLE [RS_273]
+                                    SHUFFLE [RS_288]
                                       PartitionCols:_col0
-                                      Select Operator [SEL_272] (rows=84 width=1850)
+                                      Select Operator [SEL_287] (rows=84 width=1850)
                                         Output:["_col0","_col1"]
-                                        Filter Operator [FIL_271] (rows=84 width=1850)
+                                        Filter Operator [FIL_286] (rows=84 width=1850)
                                           predicate:web_site_sk is not null
                                           TableScan [TS_94] (rows=84 width=1850)
                                             default@web_site,web_site,Tbl:COMPLETE,Col:NONE,Output:["web_site_sk","web_site_id"]
@@ -352,60 +352,60 @@ Stage-0
                                     SHUFFLE [RS_109]
                                       PartitionCols:_col2
                                       Merge Join Operator [MERGEJOIN_216] (rows=210834322 width=135)
-                                        Conds:RS_106._col3=RS_238._col0(Inner),Output:["_col2","_col5","_col6","_col9","_col10"]
+                                        Conds:RS_106._col3=RS_253._col0(Inner),Output:["_col2","_col5","_col6","_col9","_col10"]
                                       <-Map 24 [SIMPLE_EDGE] vectorized
-                                        SHUFFLE [RS_238]
+                                        SHUFFLE [RS_253]
                                           PartitionCols:_col0
-                                           Please refer to the previous Select Operator [SEL_235]
+                                           Please refer to the previous Select Operator [SEL_250]
                                       <-Reducer 19 [SIMPLE_EDGE]
                                         SHUFFLE [RS_106]
                                           PartitionCols:_col3
                                           Merge Join Operator [MERGEJOIN_215] (rows=191667562 width=135)
-                                            Conds:RS_103._col1=RS_233._col0(Inner),Output:["_col2","_col3","_col5","_col6","_col9","_col10"]
+                                            Conds:RS_103._col1=RS_248._col0(Inner),Output:["_col2","_col3","_col5","_col6","_col9","_col10"]
                                           <-Map 23 [SIMPLE_EDGE] vectorized
-                                            SHUFFLE [RS_233]
+                                            SHUFFLE [RS_248]
                                               PartitionCols:_col0
-                                               Please refer to the previous Select Operator [SEL_230]
+                                               Please refer to the previous Select Operator [SEL_245]
                                           <-Reducer 18 [SIMPLE_EDGE]
                                             SHUFFLE [RS_103]
                                               PartitionCols:_col1
                                               Merge Join Operator [MERGEJOIN_214] (rows=174243235 width=135)
-                                                Conds:RS_100._col0=RS_228._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
+                                                Conds:RS_100._col0=RS_243._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                                               <-Map 12 [SIMPLE_EDGE] vectorized
-                                                SHUFFLE [RS_228]
+                                                SHUFFLE [RS_243]
                                                   PartitionCols:_col0
-                                                   Please refer to the previous Select Operator [SEL_225]
+                                                   Please refer to the previous Select Operator [SEL_240]
                                               <-Reducer 31 [SIMPLE_EDGE]
                                                 SHUFFLE [RS_100]
                                                   PartitionCols:_col0
                                                   Merge Join Operator [MERGEJOIN_213] (rows=158402938 width=135)
-                                                    Conds:RS_267._col1, _col4=RS_270._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
+                                                    Conds:RS_282._col1, _col4=RS_285._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                                                   <-Map 30 [SIMPLE_EDGE] vectorized
-                                                    SHUFFLE [RS_267]
+                                                    SHUFFLE [RS_282]
                                                       PartitionCols:_col1, _col4
-                                                      Select Operator [SEL_266] (rows=144002668 width=135)
+                                                      Select Operator [SEL_281] (rows=144002668 width=135)
                                                         Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                                                        Filter Operator [FIL_265] (rows=144002668 width=135)
+                                                        Filter Operator [FIL_280] (rows=144002668 width=135)
                                                           predicate:(ws_item_sk is not null and ws_promo_sk is not null and ws_sold_date_sk is not null and ws_web_site_sk is not null)
                                                           TableScan [TS_79] (rows=144002668 width=135)
                                                             default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_web_site_sk","ws_promo_sk","ws_order_number","ws_ext_sales_price","ws_net_profit"]
                                                   <-Map 32 [SIMPLE_EDGE] vectorized
-                                                    SHUFFLE [RS_270]
+                                                    SHUFFLE [RS_285]
                                                       PartitionCols:_col0, _col1
-                                                      Select Operator [SEL_269] (rows=14398467 width=92)
+                                                      Select Operator [SEL_284] (rows=14398467 width=92)
                                                         Output:["_col0","_col1","_col2","_col3"]
-                                                        Filter Operator [FIL_268] (rows=14398467 width=92)
+                                                        Filter Operator [FIL_283] (rows=14398467 width=92)
                                                           predicate:wr_item_sk is not null
                                                           TableScan [TS_82] (rows=14398467 width=92)
                                                             default@web_returns,web_returns,Tbl:COMPLETE,Col:NONE,Output:["wr_item_sk","wr_order_number","wr_return_amt","wr_net_loss"]
                   <-Reducer 7 [CONTAINS] vectorized
-                    Reduce Output Operator [RS_245]
+                    Reduce Output Operator [RS_260]
                       PartitionCols:_col0, _col1, _col2
-                      Group By Operator [GBY_244] (rows=2435062716 width=108)
+                      Group By Operator [GBY_259] (rows=2435062716 width=108)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0, _col1, 0L
-                        Select Operator [SEL_243] (rows=463823414 width=88)
+                        Select Operator [SEL_258] (rows=463823414 width=88)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
-                          Group By Operator [GBY_242] (rows=463823414 width=88)
+                          Group By Operator [GBY_257] (rows=463823414 width=88)
                             Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"],keys:KEY._col0
                           <-Reducer 6 [SIMPLE_EDGE]
                             SHUFFLE [RS_36]
@@ -415,13 +415,13 @@ Stage-0
                                 Select Operator [SEL_33] (rows=927646829 width=88)
                                   Output:["_col0","_col1","_col2","_col3"]
                                   Merge Join Operator [MERGEJOIN_207] (rows=927646829 width=88)
-                                    Conds:RS_30._col2=RS_241._col0(Inner),Output:["_col5","_col6","_col9","_col10","_col18"]
+                                    Conds:RS_30._col2=RS_256._col0(Inner),Output:["_col5","_col6","_col9","_col10","_col18"]
                                   <-Map 25 [SIMPLE_EDGE] vectorized
-                                    SHUFFLE [RS_241]
+                                    SHUFFLE [RS_256]
                                       PartitionCols:_col0
-                                      Select Operator [SEL_240] (rows=1704 width=1910)
+                                      Select Operator [SEL_255] (rows=1704 width=1910)
                                         Output:["_col0","_col1"]
-                                        Filter Operator [FIL_239] (rows=1704 width=1910)
+                                        Filter Operator [FIL_254] (rows=1704 width=1910)
                                           predicate:s_store_sk is not null
                                           TableScan [TS_15] (rows=1704 width=1910)
                                             default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_store_id"]
@@ -429,49 +429,49 @@ Stage-0
                                     SHUFFLE [RS_30]
                                       PartitionCols:_col2
                                       Merge Join Operator [MERGEJOIN_206] (rows=843315281 width=88)
-                                        Conds:RS_27._col3=RS_236._col0(Inner),Output:["_col2","_col5","_col6","_col9","_col10"]
+                                        Conds:RS_27._col3=RS_251._col0(Inner),Output:["_col2","_col5","_col6","_col9","_col10"]
                                       <-Map 24 [SIMPLE_EDGE] vectorized
-                                        SHUFFLE [RS_236]
+                                        SHUFFLE [RS_251]
                                           PartitionCols:_col0
-                                           Please refer to the previous Select Operator [SEL_235]
+                                           Please refer to the previous Select Operator [SEL_250]
                                       <-Reducer 4 [SIMPLE_EDGE]
                                         SHUFFLE [RS_27]
                                           PartitionCols:_col3
                                           Merge Join Operator [MERGEJOIN_205] (rows=766650239 width=88)
-                                            Conds:RS_24._col1=RS_231._col0(Inner),Output:["_col2","_col3","_col5","_col6","_col9","_col10"]
+                                            Conds:RS_24._col1=RS_246._col0(Inner),Output:["_col2","_col3","_col5","_col6","_col9","_col10"]
                                           <-Map 23 [SIMPLE_EDGE] vectorized
-                                            SHUFFLE [RS_231]
+                                            SHUFFLE [RS_246]
                                               PartitionCols:_col0
-                                               Please refer to the previous Select Operator [SEL_230]
+                                               Please refer to the previous Select Operator [SEL_245]
                                           <-Reducer 3 [SIMPLE_EDGE]
                                             SHUFFLE [RS_24]
                                               PartitionCols:_col1
                                               Merge Join Operator [MERGEJOIN_204] (rows=696954748 width=88)
-                                                Conds:RS_21._col0=RS_226._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
+                                                Conds:RS_21._col0=RS_241._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                                               <-Map 12 [SIMPLE_EDGE] vectorized
-                                                SHUFFLE [RS_226]
+                                                SHUFFLE [RS_241]
                                                   PartitionCols:_col0
-                                                   Please refer to the previous Select Operator [SEL_225]
+                                                   Please refer to the previous Select Operator [SEL_240]
                                               <-Reducer 2 [SIMPLE_EDGE]
                                                 SHUFFLE [RS_21]
                                                   PartitionCols:_col0
                                                   Merge Join Operator [MERGEJOIN_203] (rows=633595212 width=88)
-                                                    Conds:RS_220._col1, _col4=RS_223._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
+                                                    Conds:RS_235._col1, _col4=RS_238._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col9","_col10"]
                                                   <-Map 1 [SIMPLE_EDGE] vectorized
-                                                    SHUFFLE [RS_220]
+                                                    SHUFFLE [RS_235]
                                                       PartitionCols:_col1, _col4
-                                                      Select Operator [SEL_219] (rows=575995635 width=88)
+                                                      Select Operator [SEL_234] (rows=575995635 width=88)
                                                         Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                                                        Filter Operator [FIL_218] (rows=575995635 width=88)
+                                                        Filter Operator [FIL_233] (rows=575995635 width=88)
                                                           predicate:(ss_item_sk is not null and ss_promo_sk is not null and ss_sold_date_sk is not null and ss_store_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_store_sk","ss_promo_sk","ss_ticket_number","ss_ext_sales_price","ss_net_profit"]
                                                   <-Map 11 [SIMPLE_EDGE] vectorized
-                                                    SHUFFLE [RS_223]
+                                                    SHUFFLE [RS_238]
                                                       PartitionCols:_col0, _col1
-                                                      Select Operator [SEL_222] (rows=57591150 width=77)
+                                                      Select Operator [SEL_237] (rows=57591150 width=77)
                                                         Output:["_col0","_col1","_col2","_col3"]
-                                                        Filter Operator [FIL_221] (rows=57591150 width=77)
+                                                        Filter Operator [FIL_236] (rows=57591150 width=77)
                                                           predicate:sr_item_sk is not null
                                                           TableScan [TS_3] (rows=57591150 width=77)
                                                             default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_item_sk","sr_ticket_number","sr_return_amt","sr_net_loss"]

http://git-wip-us.apache.org/repos/asf/hive/blob/e8f283cf/ql/src/test/results/clientpositive/perf/tez/query87.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query87.q.out b/ql/src/test/results/clientpositive/perf/tez/query87.q.out
index 4171097..2a0f0f2 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query87.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query87.q.out
@@ -61,35 +61,35 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 9 vectorized
-      File Output Operator [FS_168]
-        Group By Operator [GBY_167] (rows=1 width=24)
+      File Output Operator [FS_201]
+        Group By Operator [GBY_200] (rows=1 width=24)
           Output:["_col0"],aggregations:["count(VALUE._col0)"]
         <-Reducer 8 [CUSTOM_SIMPLE_EDGE] vectorized
-          PARTITION_ONLY_SHUFFLE [RS_166]
-            Group By Operator [GBY_165] (rows=1 width=24)
+          PARTITION_ONLY_SHUFFLE [RS_199]
+            Group By Operator [GBY_198] (rows=1 width=24)
               Output:["_col0"],aggregations:["count()"]
-              Select Operator [SEL_164] (rows=4537552 width=129)
-                Filter Operator [FIL_163] (rows=4537552 width=129)
+              Select Operator [SEL_197] (rows=4537552 width=129)
+                Filter Operator [FIL_196] (rows=4537552 width=129)
                   predicate:(((_col3 * 2) = _col4) and (_col3 > 0L))
-                  Select Operator [SEL_162] (rows=27225312 width=129)
+                  Select Operator [SEL_195] (rows=27225312 width=129)
                     Output:["_col3","_col4"]
-                    Group By Operator [GBY_161] (rows=27225312 width=129)
+                    Group By Operator [GBY_194] (rows=27225312 width=129)
                       Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2
                     <-Union 7 [SIMPLE_EDGE]
                       <-Reducer 16 [CONTAINS] vectorized
-                        Reduce Output Operator [RS_188]
+                        Reduce Output Operator [RS_221]
                           PartitionCols:_col0, _col1, _col2
-                          Group By Operator [GBY_187] (rows=54450625 width=129)
+                          Group By Operator [GBY_220] (rows=54450625 width=129)
                             Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col3)","sum(_col4)"],keys:_col0, _col1, _col2
-                            Select Operator [SEL_186] (rows=54450625 width=129)
+                            Select Operator [SEL_219] (rows=54450625 width=129)
                               Output:["_col0","_col1","_col2","_col3","_col4"]
-                              Select Operator [SEL_185] (rows=43560808 width=135)
+                              Select Operator [SEL_218] (rows=43560808 width=135)
                                 Output:["_col0","_col1","_col2","_col3","_col4"]
-                                Group By Operator [GBY_184] (rows=43560808 width=135)
+                                Group By Operator [GBY_217] (rows=43560808 width=135)
                                   Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, _col0, _col2
-                                  Select Operator [SEL_183] (rows=87121617 width=135)
+                                  Select Operator [SEL_216] (rows=87121617 width=135)
                                     Output:["_col0","_col1","_col2"]
-                                    Group By Operator [GBY_182] (rows=87121617 width=135)
+                                    Group By Operator [GBY_215] (rows=87121617 width=135)
                                       Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
                                     <-Reducer 15 [SIMPLE_EDGE]
                                       SHUFFLE [RS_80]
@@ -97,13 +97,13 @@ Stage-0
                                         Group By Operator [GBY_79] (rows=174243235 width=135)
                                           Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
                                           Merge Join Operator [MERGEJOIN_132] (rows=174243235 width=135)
-                                            Conds:RS_75._col1=RS_145._col0(Inner),Output:["_col3","_col6","_col7"]
+                                            Conds:RS_75._col1=RS_178._col0(Inner),Output:["_col3","_col6","_col7"]
                                           <-Map 17 [SIMPLE_EDGE] vectorized
-                                            SHUFFLE [RS_145]
+                                            SHUFFLE [RS_178]
                                               PartitionCols:_col0
-                                              Select Operator [SEL_142] (rows=80000000 width=860)
+                                              Select Operator [SEL_175] (rows=80000000 width=860)
                                                 Output:["_col0","_col1","_col2"]
-                                                Filter Operator [FIL_141] (rows=80000000 width=860)
+                                                Filter Operator [FIL_174] (rows=80000000 width=860)
                                                   predicate:c_customer_sk is not null
                                                   TableScan [TS_6] (rows=80000000 width=860)
                                                     default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_first_name","c_last_name"]
@@ -111,57 +111,57 @@ Stage-0
                                             SHUFFLE [RS_75]
                                               PartitionCols:_col1
                                               Merge Join Operator [MERGEJOIN_131] (rows=158402938 width=135)
-                                                Conds:RS_181._col0=RS_140._col0(Inner),Output:["_col1","_col3"]
+                                                Conds:RS_214._col0=RS_173._col0(Inner),Output:["_col1","_col3"]
                                               <-Map 10 [SIMPLE_EDGE] vectorized
-                                                SHUFFLE [RS_140]
+                                                SHUFFLE [RS_173]
                                                   PartitionCols:_col0
-                                                  Select Operator [SEL_137] (rows=8116 width=1119)
+                                                  Select Operator [SEL_170] (rows=8116 width=1119)
                                                     Output:["_col0","_col1"]
-                                                    Filter Operator [FIL_136] (rows=8116 width=1119)
+                                                    Filter Operator [FIL_169] (rows=8116 width=1119)
                                                       predicate:(d_date_sk is not null and d_month_seq BETWEEN 1212 AND 1223)
                                                       TableScan [TS_3] (rows=73049 width=1119)
                                                         default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date","d_month_seq"]
                                               <-Map 19 [SIMPLE_EDGE] vectorized
-                                                SHUFFLE [RS_181]
+                                                SHUFFLE [RS_214]
                                                   PartitionCols:_col0
-                                                  Select Operator [SEL_180] (rows=144002668 width=135)
+                                                  Select Operator [SEL_213] (rows=144002668 width=135)
                                                     Output:["_col0","_col1"]
-                                                    Filter Operator [FIL_179] (rows=144002668 width=135)
+                                                    Filter Operator [FIL_212] (rows=144002668 width=135)
                                                       predicate:(ws_bill_customer_sk is not null and ws_sold_date_sk is not null)
                                                       TableScan [TS_63] (rows=144002668 width=135)
                                                         default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_bill_customer_sk"]
                       <-Reducer 6 [CONTAINS] vectorized
-                        Reduce Output Operator [RS_160]
+                        Reduce Output Operator [RS_193]
                           PartitionCols:_col0, _col1, _col2
-                          Group By Operator [GBY_159] (rows=54450625 width=129)
+                          Group By Operator [GBY_192] (rows=54450625 width=129)
                             Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col3)","sum(_col4)"],keys:_col0, _col1, _col2
-                            Select Operator [SEL_158] (rows=54450625 width=129)
+                            Select Operator [SEL_191] (rows=54450625 width=129)
                               Output:["_col0","_col1","_col2","_col3","_col4"]
-                              Select Operator [SEL_157] (rows=10889817 width=103)
+                              Select Operator [SEL_190] (rows=10889817 width=103)
                                 Output:["_col0","_col1","_col2","_col3","_col4"]
-                                Group By Operator [GBY_156] (rows=10889817 width=103)
+                                Group By Operator [GBY_189] (rows=10889817 width=103)
                                   Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col0, _col1, _col2
-                                  Select Operator [SEL_155] (rows=21779634 width=103)
+                                  Select Operator [SEL_188] (rows=21779634 width=103)
                                     Output:["_col0","_col1","_col2"]
-                                    Filter Operator [FIL_154] (rows=21779634 width=103)
+                                    Filter Operator [FIL_187] (rows=21779634 width=103)
                                       predicate:(((_col3 * 2) = _col4) and (_col3 > 0L))
-                                      Group By Operator [GBY_153] (rows=130677808 width=103)
+                                      Group By Operator [GBY_186] (rows=130677808 width=103)
                                         Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2
                                       <-Union 5 [SIMPLE_EDGE]
                                         <-Reducer 13 [CONTAINS] vectorized
-                                          Reduce Output Operator [RS_178]
+                                          Reduce Output Operator [RS_211]
                                             PartitionCols:_col0, _col1, _col2
-                                            Group By Operator [GBY_177] (rows=261355616 width=103)
+                                            Group By Operator [GBY_210] (rows=261355616 width=103)
                                               Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col3)","sum(_col4)"],keys:_col0, _col1, _col2
-                                              Select Operator [SEL_176] (rows=261355616 width=103)
+                                              Select Operator [SEL_209] (rows=261355616 width=103)
                                                 Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                Select Operator [SEL_175] (rows=87116929 width=135)
+                                                Select Operator [SEL_208] (rows=87116929 width=135)
                                                   Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                  Group By Operator [GBY_174] (rows=87116929 width=135)
+                                                  Group By Operator [GBY_207] (rows=87116929 width=135)
                                                     Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, _col0, _col2
-                                                    Select Operator [SEL_173] (rows=174233858 width=135)
+                                                    Select Operator [SEL_206] (rows=174233858 width=135)
                                                       Output:["_col0","_col1","_col2"]
-                                                      Group By Operator [GBY_172] (rows=174233858 width=135)
+                                                      Group By Operator [GBY_205] (rows=174233858 width=135)
                                                         Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
                                                       <-Reducer 12 [SIMPLE_EDGE]
                                                         SHUFFLE [RS_42]
@@ -169,43 +169,43 @@ Stage-0
                                                           Group By Operator [GBY_41] (rows=348467716 width=135)
                                                             Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
                                                             Merge Join Operator [MERGEJOIN_130] (rows=348467716 width=135)
-                                                              Conds:RS_37._col1=RS_144._col0(Inner),Output:["_col3","_col6","_col7"]
+                                                              Conds:RS_37._col1=RS_177._col0(Inner),Output:["_col3","_col6","_col7"]
                                                             <-Map 17 [SIMPLE_EDGE] vectorized
-                                                              SHUFFLE [RS_144]
+                                                              SHUFFLE [RS_177]
                                                                 PartitionCols:_col0
-                                                                 Please refer to the previous Select Operator [SEL_142]
+                                                                 Please refer to the previous Select Operator [SEL_175]
                                                             <-Reducer 11 [SIMPLE_EDGE]
                                                               SHUFFLE [RS_37]
                                                                 PartitionCols:_col1
                                                                 Merge Join Operator [MERGEJOIN_129] (rows=316788826 width=135)
-                                                                  Conds:RS_171._col0=RS_139._col0(Inner),Output:["_col1","_col3"]
+                                                                  Conds:RS_204._col0=RS_172._col0(Inner),Output:["_col1","_col3"]
                                                                 <-Map 10 [SIMPLE_EDGE] vectorized
-                                                                  SHUFFLE [RS_139]
+                                                                  SHUFFLE [RS_172]
                                                                     PartitionCols:_col0
-                                                                     Please refer to the previous Select Operator [SEL_137]
+                                                                     Please refer to the previous Select Operator [SEL_170]
                                                                 <-Map 18 [SIMPLE_EDGE] vectorized
-                                                                  SHUFFLE [RS_171]
+                                                                  SHUFFLE [RS_204]
                                                                     PartitionCols:_col0
-                                                                    Select Operator [SEL_170] (rows=287989836 width=135)
+                                                                    Select Operator [SEL_203] (rows=287989836 width=135)
                                                                       Output:["_col0","_col1"]
-                                                                      Filter Operator [FIL_169] (rows=287989836 width=135)
+                                                                      Filter Operator [FIL_202] (rows=287989836 width=135)
                                                                         predicate:(cs_bill_customer_sk is not null and cs_sold_date_sk is not null)
                                                                         TableScan [TS_25] (rows=287989836 width=135)
                                                                           default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk"]
                                         <-Reducer 4 [CONTAINS] vectorized
-                                          Reduce Output Operator [RS_152]
+                                          Reduce Output Operator [RS_185]
                                             PartitionCols:_col0, _col1, _col2
-                                            Group By Operator [GBY_151] (rows=261355616 width=103)
+                                            Group By Operator [GBY_184] (rows=261355616 width=103)
                                               Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col3)","sum(_col4)"],keys:_col0, _col1, _col2
-                                              Select Operator [SEL_150] (rows=261355616 width=103)
+                                              Select Operator [SEL_183] (rows=261355616 width=103)
                                                 Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                Select Operator [SEL_149] (rows=174238687 width=88)
+                                                Select Operator [SEL_182] (rows=174238687 width=88)
                                                   Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                  Group By Operator [GBY_148] (rows=174238687 width=88)
+                                                  Group By Operator [GBY_181] (rows=174238687 width=88)
                                                     Output:["_col0","_col1","_col2","_col3"],aggregations:["count()"],keys:_col1, _col0, _col2
-                                                    Select Operator [SEL_147] (rows=348477374 width=88)
+                                                    Select Operator [SEL_180] (rows=348477374 width=88)
                                                       Output:["_col0","_col1","_col2"]
-                                                      Group By Operator [GBY_146] (rows=348477374 width=88)
+                                                      Group By Operator [GBY_179] (rows=348477374 width=88)
                                                         Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
                                                       <-Reducer 3 [SIMPLE_EDGE]
                                                         SHUFFLE [RS_17]
@@ -213,26 +213,26 @@ Stage-0
                                                           Group By Operator [GBY_16] (rows=696954748 width=88)
                                                             Output:["_col0","_col1","_col2"],keys:_col7, _col6, _col3
                                                             Merge Join Operator [MERGEJOIN_128] (rows=696954748 width=88)
-                                                              Conds:RS_12._col1=RS_143._col0(Inner),Output:["_col3","_col6","_col7"]
+                                                              Conds:RS_12._col1=RS_176._col0(Inner),Output:["_col3","_col6","_col7"]
                                                             <-Map 17 [SIMPLE_EDGE] vectorized
-                                                              SHUFFLE [RS_143]
+                                                              SHUFFLE [RS_176]
                                                                 PartitionCols:_col0
-                                                                 Please refer to the previous Select Operator [SEL_142]
+                                                                 Please refer to the previous Select Operator [SEL_175]
                                                             <-Reducer 2 [SIMPLE_EDGE]
                                                               SHUFFLE [RS_12]
                                                                 PartitionCols:_col1
                                                                 Merge Join Operator [MERGEJOIN_127] (rows=633595212 width=88)
-                                                                  Conds:RS_135._col0=RS_138._col0(Inner),Output:["_col1","_col3"]
+                                                                  Conds:RS_168._col0=RS_171._col0(Inner),Output:["_col1","_col3"]
                                                                 <-Map 10 [SIMPLE_EDGE] vectorized
-                                                                  SHUFFLE [RS_138]
+                                                                  SHUFFLE [RS_171]
                                                                     PartitionCols:_col0
-                                                                     Please refer to the previous Select Operator [SEL_137]
+                                                                     Please refer to the previous Select Operator [SEL_170]
                                                                 <-Map 1 [SIMPLE_EDGE] vectorized
-                                                                  SHUFFLE [RS_135]
+                                                                  SHUFFLE [RS_168]
                                                                     PartitionCols:_col0
-                                                                    Select Operator [SEL_134] (rows=575995635 width=88)
+                                                                    Select Operator [SEL_167] (rows=575995635 width=88)
                                                                       Output:["_col0","_col1"]
-                                                                      Filter Operator [FIL_133] (rows=575995635 width=88)
+                                                                      Filter Operator [FIL_166] (rows=575995635 width=88)
                                                                         predicate:(ss_customer_sk is not null and ss_sold_date_sk is not null)
                                                                         TableScan [TS_0] (rows=575995635 width=88)
                                                                           default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_customer_sk"]

http://git-wip-us.apache.org/repos/asf/hive/blob/e8f283cf/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
index 6e57bca..19b686a 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
@@ -179,11 +179,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[34][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[33][bigTable=?] in task 'Stage-6:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[48][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[40][bigTable=?] in task 'Stage-6:MAPRED' is a cross product
 Warning: Shuffle Join JOIN[22][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[35][bigTable=?] in task 'Stage-9:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[36][bigTable=?] in task 'Stage-10:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[49][bigTable=?] in task 'Stage-9:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[50][bigTable=?] in task 'Stage-10:MAPRED' is a cross product
 PREHOOK: query: explain 
 select * from (select a.key from smb_bucket_1_n4 a join smb_bucket_2_n4 b on (a.key = b.key) where a.key = 5) t1 left outer join (select c.key from smb_bucket_2_n4 c join smb_bucket_3_n4 d on (c.key = d.key) where c.key=5) t2 on (t1.key=t2.key) where t2.key=5
 PREHOOK: type: QUERY
@@ -420,11 +420,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[34][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[33][bigTable=?] in task 'Stage-6:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[48][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[40][bigTable=?] in task 'Stage-6:MAPRED' is a cross product
 Warning: Shuffle Join JOIN[22][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-2:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[35][bigTable=?] in task 'Stage-9:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[36][bigTable=?] in task 'Stage-10:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[49][bigTable=?] in task 'Stage-9:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[50][bigTable=?] in task 'Stage-10:MAPRED' is a cross product
 PREHOOK: query: select * from (select a.key from smb_bucket_1_n4 a join smb_bucket_2_n4 b on (a.key = b.key) where a.key = 5) t1 left outer join (select c.key from smb_bucket_2_n4 c join smb_bucket_3_n4 d on (c.key = d.key) where c.key=5) t2 on (t1.key=t2.key) where t2.key=5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@smb_bucket_1_n4

http://git-wip-us.apache.org/repos/asf/hive/blob/e8f283cf/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out
index 9c00596..9788a5d 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out
@@ -954,7 +954,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test1_n8
 POSTHOOK: Input: default@test2_n5
 #### A masked pattern was here ####
-Warning: Map Join MAPJOIN[18][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[26][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
 PREHOOK: query: EXPLAIN
 SELECT *
 FROM test2_n5
@@ -1125,7 +1125,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[18][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[26][bigTable=?] in task 'Stage-7:MAPRED' is a cross product
 PREHOOK: query: SELECT *
 FROM test2_n5
 JOIN test1_n8 a ON (a.key+test2_n5.key >= 100)

http://git-wip-us.apache.org/repos/asf/hive/blob/e8f283cf/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
index 85d0b8a..b488129 100644
--- a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out
@@ -753,10 +753,10 @@ Stage-0
         Select Operator [SEL_24] (rows=3 width=87)
           Output:["_col0"]
         <-Reducer 2 [SORT]
-          SORT [RS_23]
-            Select Operator [SEL_5] (rows=1 width=87)
+          SORT [RS_29]
+            Select Operator [SEL_27] (rows=1 width=87)
               Output:["_col0"]
-              Group By Operator [GBY_4] (rows=1 width=8)
+              Group By Operator [GBY_26] (rows=1 width=8)
                 Output:["_col0"],aggregations:["count(VALUE._col0)"]
               <-Map 1 [GROUP]
                 GROUP [RS_3]
@@ -767,17 +767,17 @@ Stage-0
                       TableScan [TS_0] (rows=20 width=80)
                         default@cbo_t3,s1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
         <-Reducer 5 [SORT]
-          SORT [RS_23]
-            Select Operator [SEL_12] (rows=1 width=87)
+          SORT [RS_33]
+            Select Operator [SEL_31] (rows=1 width=87)
               Output:["_col0"]
-              Group By Operator [GBY_11] (rows=1 width=8)
+              Group By Operator [GBY_30] (rows=1 width=8)
                 Output:["_col0"],aggregations:["count(VALUE._col0)"]
               <- Please refer to the previous Map 1 [GROUP]
         <-Reducer 7 [SORT]
-          SORT [RS_23]
-            Select Operator [SEL_20] (rows=1 width=87)
+          SORT [RS_37]
+            Select Operator [SEL_35] (rows=1 width=87)
               Output:["_col0"]
-              Group By Operator [GBY_19] (rows=1 width=8)
+              Group By Operator [GBY_34] (rows=1 width=8)
                 Output:["_col0"],aggregations:["count(VALUE._col0)"]
               <- Please refer to the previous Map 1 [GROUP]
 
@@ -815,13 +815,13 @@ Stage-0
             Group By Operator [GBY_26] (rows=1 width=95)
               Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
             <-Reducer 2 [GROUP]
-              GROUP [RS_25]
+              GROUP [RS_35]
                 PartitionCols:_col0
-                Group By Operator [GBY_24] (rows=1 width=95)
+                Group By Operator [GBY_34] (rows=1 width=95)
                   Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                  Select Operator [SEL_5] (rows=1 width=87)
+                  Select Operator [SEL_32] (rows=1 width=87)
                     Output:["_col0"]
-                    Group By Operator [GBY_4] (rows=1 width=8)
+                    Group By Operator [GBY_31] (rows=1 width=8)
                       Output:["_col0"],aggregations:["count(VALUE._col0)"]
                     <-Map 1 [GROUP]
                       GROUP [RS_3]
@@ -832,23 +832,23 @@ Stage-0
                             TableScan [TS_0] (rows=20 width=80)
                               default@cbo_t3,s1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
             <-Reducer 6 [GROUP]
-              GROUP [RS_25]
+              GROUP [RS_40]
                 PartitionCols:_col0
-                Group By Operator [GBY_24] (rows=1 width=95)
+                Group By Operator [GBY_39] (rows=1 width=95)
                   Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                  Select Operator [SEL_12] (rows=1 width=87)
+                  Select Operator [SEL_37] (rows=1 width=87)
                     Output:["_col0"]
-                    Group By Operator [GBY_11] (rows=1 width=8)
+                    Group By Operator [GBY_36] (rows=1 width=8)
                       Output:["_col0"],aggregations:["count(VALUE._col0)"]
                     <- Please refer to the previous Map 1 [GROUP]
             <-Reducer 8 [GROUP]
-              GROUP [RS_25]
+              GROUP [RS_45]
                 PartitionCols:_col0
-                Group By Operator [GBY_24] (rows=1 width=95)
+                Group By Operator [GBY_44] (rows=1 width=95)
                   Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
-                  Select Operator [SEL_20] (rows=1 width=87)
+                  Select Operator [SEL_42] (rows=1 width=87)
                     Output:["_col0"]
-                    Group By Operator [GBY_19] (rows=1 width=8)
+                    Group By Operator [GBY_41] (rows=1 width=8)
                       Output:["_col0"],aggregations:["count(VALUE._col0)"]
                     <- Please refer to the previous Map 1 [GROUP]
 
@@ -4802,11 +4802,11 @@ Stage-3
                 Select Operator [SEL_5] (rows=26 width=499)
                   Output:["_col1","_col2","_col5","_col7"]
                 <-Reducer 6 [PARTITION-LEVEL SORT]
-                  PARTITION-LEVEL SORT [RS_4]
+                  PARTITION-LEVEL SORT [RS_24]
                     PartitionCols:_col2
-                    PTF Operator [PTF_3] (rows=26 width=499)
+                    PTF Operator [PTF_22] (rows=26 width=499)
                       Function definitions:[{},{"Partition table definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}}]
-                      Select Operator [SEL_2] (rows=26 width=499)
+                      Select Operator [SEL_21] (rows=26 width=499)
                         Output:["_col1","_col2","_col5","_col7"]
                       <-Map 1 [PARTITION-LEVEL SORT]
                         PARTITION-LEVEL SORT [RS_1]
@@ -4832,11 +4832,11 @@ Stage-3
                         Select Operator [SEL_11] (rows=26 width=491)
                           Output:["_col1","_col2","_col5"]
                         <-Reducer 7 [PARTITION-LEVEL SORT]
-                          PARTITION-LEVEL SORT [RS_10]
+                          PARTITION-LEVEL SORT [RS_27]
                             PartitionCols:_col2
-                            PTF Operator [PTF_3] (rows=26 width=499)
+                            PTF Operator [PTF_26] (rows=26 width=499)
                               Function definitions:[{},{"Partition table definition":{"name:":"noop","order by:":"_col1 ASC NULLS FIRST","partition by:":"_col2"}}]
-                              Select Operator [SEL_2] (rows=26 width=499)
+                              Select Operator [SEL_25] (rows=26 width=499)
                                 Output:["_col1","_col2","_col5","_col7"]
                               <- Please refer to the previous Map 1 [PARTITION-LEVEL SORT]
 Stage-4
@@ -5239,9 +5239,9 @@ Stage-2
                             default@src,src2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
         Stage-3
           Map 4
-          File Output Operator [FS_11]
+          File Output Operator [FS_19]
             table:{"name:":"default.dest_j1_n14"}
-            Select Operator [SEL_9] (rows=791 width=95)
+            Select Operator [SEL_18] (rows=791 width=95)
               Output:["_col0","_col1"]
               Map Join Operator [MAPJOIN_16]
                 Conds:TS_14.reducesinkkey0=TS_14.reducesinkkey0(Inner),Output:["_col0","_col2"]
@@ -5250,7 +5250,7 @@ Stage-2
           Map Reduce Local Work
             Stage-5(CONDITIONAL)
               Map 5
-              keys: [HASHTABLESINK_18]
+              keys: [HASHTABLESINK_21]
                 0reducesinkkey0,1reducesinkkey0
                 TableScan [TS_15]
                   Output:["1_VALUE_0","reducesinkkey0"]
@@ -5478,7 +5478,7 @@ Stage-0
     limit:-1
     Stage-2
       Map 4
-      File Output Operator [FS_10]
+      File Output Operator [FS_17]
         Map Join Operator [MAPJOIN_15]
           Conds:TS_13.reducesinkkey0=TS_13.reducesinkkey0(Inner),Output:["_col0","_col1","_col2","_col3"]
         <-TableScan [TS_13]
@@ -5486,7 +5486,7 @@ Stage-0
       Map Reduce Local Work
         Stage-4(CONDITIONAL)
           Map 5
-          keys: [HASHTABLESINK_17]
+          keys: [HASHTABLESINK_19]
             0reducesinkkey0,1reducesinkkey0
             TableScan [TS_14]
               Output:["1_VALUE_0","1_VALUE_1","reducesinkkey0"]

http://git-wip-us.apache.org/repos/asf/hive/blob/e8f283cf/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_multiinsert.q.out b/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
index b331a26..d427bc2 100644
--- a/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
+++ b/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
@@ -28,7 +28,7 @@ POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_5
 RUN: Stage-0:DDL
-Warning: Shuffle Join JOIN[31][tables = [b, sq_2_notin_nullcheck]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[38][tables = [b, sq_2_notin_nullcheck]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain
 from src b 
 INSERT OVERWRITE TABLE src_4 
@@ -366,7 +366,7 @@ STAGE PLANS:
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                 serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
-Warning: Shuffle Join JOIN[31][tables = [b, sq_2_notin_nullcheck]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[38][tables = [b, sq_2_notin_nullcheck]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: from src b 
 INSERT OVERWRITE TABLE src_4 
   select * 
@@ -559,8 +559,8 @@ POSTHOOK: Input: default@src_5
 199	val_199
 199	val_199
 2	val_2
-Warning: Map Join MAPJOIN[56][bigTable=b] in task 'Stage-14:MAPRED' is a cross product
-Warning: Shuffle Join JOIN[31][tables = [b, sq_2_notin_nullcheck]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[80][bigTable=b] in task 'Stage-14:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[38][tables = [b, sq_2_notin_nullcheck]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: explain
 from src b 
 INSERT OVERWRITE TABLE src_4 
@@ -948,8 +948,8 @@ STAGE PLANS:
                 output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                 serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-Warning: Map Join MAPJOIN[56][bigTable=b] in task 'Stage-14:MAPRED' is a cross product
-Warning: Shuffle Join JOIN[31][tables = [b, sq_2_notin_nullcheck]] in Stage 'Stage-2:MAPRED' is a cross product
+Warning: Map Join MAPJOIN[80][bigTable=b] in task 'Stage-14:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[38][tables = [b, sq_2_notin_nullcheck]] in Stage 'Stage-2:MAPRED' is a cross product
 PREHOOK: query: from src b 
 INSERT OVERWRITE TABLE src_4 
   select *