http://git-wip-us.apache.org/repos/asf/hive/blob/3cbc13e9/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out 
b/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out
index cb94e4f..5ba912a 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query60.q.out
@@ -203,57 +203,57 @@ Stage-0
     limit:100
     Stage-1
       Reducer 7 vectorized
-      File Output Operator [FS_375]
-        Limit [LIM_374] (rows=100 width=212)
+      File Output Operator [FS_371]
+        Limit [LIM_370] (rows=100 width=212)
           Number of rows:100
-          Select Operator [SEL_373] (rows=1717 width=212)
+          Select Operator [SEL_369] (rows=1717 width=212)
             Output:["_col0","_col1"]
           <-Reducer 6 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_372]
-              Group By Operator [GBY_371] (rows=1717 width=212)
+            SHUFFLE [RS_368]
+              Group By Operator [GBY_367] (rows=1717 width=212)
                 
Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
               <-Union 5 [SIMPLE_EDGE]
                 <-Reducer 10 [CONTAINS] vectorized
-                  Reduce Output Operator [RS_388]
+                  Reduce Output Operator [RS_384]
                     PartitionCols:_col0
-                    Group By Operator [GBY_387] (rows=1717 width=212)
+                    Group By Operator [GBY_383] (rows=1717 width=212)
                       
Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
-                      Top N Key Operator [TNK_386] (rows=5151 width=212)
+                      Top N Key Operator [TNK_382] (rows=5151 width=212)
                         keys:_col0,sort order:+,top n:100
-                        Group By Operator [GBY_385] (rows=1717 width=212)
+                        Group By Operator [GBY_381] (rows=1717 width=212)
                           
Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                         <-Reducer 9 [SIMPLE_EDGE]
                           SHUFFLE [RS_69]
                             PartitionCols:_col0
                             Group By Operator [GBY_68] (rows=1717 width=212)
                               
Output:["_col0","_col1"],aggregations:["sum(_col7)"],keys:_col1
-                              Merge Join Operator [MERGEJOIN_305] (rows=746132 
width=100)
+                              Merge Join Operator [MERGEJOIN_301] (rows=746132 
width=100)
                                 
Conds:RS_64._col0=RS_65._col3(Inner),Output:["_col1","_col7"]
                               <-Reducer 2 [SIMPLE_EDGE]
                                 SHUFFLE [RS_64]
                                   PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_295] 
(rows=34340 width=104)
-                                    
Conds:RS_323._col1=RS_329._col0(Inner),Output:["_col0","_col1"]
+                                  Merge Join Operator [MERGEJOIN_291] 
(rows=34340 width=104)
+                                    
Conds:RS_319._col1=RS_325._col0(Inner),Output:["_col0","_col1"]
                                   <-Map 1 [SIMPLE_EDGE] vectorized
-                                    SHUFFLE [RS_323]
+                                    SHUFFLE [RS_319]
                                       PartitionCols:_col1
-                                      Select Operator [SEL_322] (rows=462000 
width=104)
+                                      Select Operator [SEL_318] (rows=462000 
width=104)
                                         Output:["_col0","_col1"]
                                         TableScan [TS_0] (rows=462000 
width=104)
                                           
default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id"]
                                   <-Reducer 16 [ONE_TO_ONE_EDGE] vectorized
-                                    FORWARD [RS_329]
+                                    FORWARD [RS_325]
                                       PartitionCols:_col0
-                                      Group By Operator [GBY_328] (rows=23100 
width=100)
+                                      Group By Operator [GBY_324] (rows=23100 
width=100)
                                         Output:["_col0"],keys:KEY._col0
                                       <-Map 15 [SIMPLE_EDGE] vectorized
-                                        SHUFFLE [RS_327]
+                                        SHUFFLE [RS_323]
                                           PartitionCols:_col0
-                                          Group By Operator [GBY_326] 
(rows=23100 width=100)
+                                          Group By Operator [GBY_322] 
(rows=23100 width=100)
                                             Output:["_col0"],keys:i_item_id
-                                            Select Operator [SEL_325] 
(rows=46200 width=190)
+                                            Select Operator [SEL_321] 
(rows=46200 width=190)
                                               Output:["i_item_id"]
-                                              Filter Operator [FIL_324] 
(rows=46200 width=190)
+                                              Filter Operator [FIL_320] 
(rows=46200 width=190)
                                                 predicate:(i_category = 
'Children')
                                                 TableScan [TS_2] (rows=462000 
width=190)
                                                   
default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_id","i_category"]
@@ -262,235 +262,235 @@ Stage-0
                                   PartitionCols:_col3
                                   Select Operator [SEL_60] (rows=1550375 
width=13)
                                     Output:["_col3","_col4"]
-                                    Merge Join Operator [MERGEJOIN_300] 
(rows=1550375 width=13)
-                                      
Conds:RS_57._col1=RS_350._col0(Inner),Output:["_col2","_col3"]
+                                    Merge Join Operator [MERGEJOIN_296] 
(rows=1550375 width=13)
+                                      
Conds:RS_57._col1=RS_346._col0(Inner),Output:["_col2","_col3"]
                                     <-Map 28 [SIMPLE_EDGE] vectorized
-                                      PARTITION_ONLY_SHUFFLE [RS_350]
+                                      PARTITION_ONLY_SHUFFLE [RS_346]
                                         PartitionCols:_col0
-                                        Select Operator [SEL_347] 
(rows=8000000 width=4)
+                                        Select Operator [SEL_343] 
(rows=8000000 width=4)
                                           Output:["_col0"]
-                                          Filter Operator [FIL_346] 
(rows=8000000 width=112)
+                                          Filter Operator [FIL_342] 
(rows=8000000 width=112)
                                             predicate:(ca_gmt_offset = -6)
                                             TableScan [TS_15] (rows=40000000 
width=112)
                                               
default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_gmt_offset"]
                                     <-Reducer 22 [SIMPLE_EDGE]
                                       SHUFFLE [RS_57]
                                         PartitionCols:_col1
-                                        Merge Join Operator [MERGEJOIN_299] 
(rows=7751872 width=98)
-                                          
Conds:RS_384._col0=RS_334._col0(Inner),Output:["_col1","_col2","_col3"]
+                                        Merge Join Operator [MERGEJOIN_295] 
(rows=7751872 width=98)
+                                          
Conds:RS_380._col0=RS_330._col0(Inner),Output:["_col1","_col2","_col3"]
                                         <-Map 20 [SIMPLE_EDGE] vectorized
-                                          PARTITION_ONLY_SHUFFLE [RS_334]
+                                          PARTITION_ONLY_SHUFFLE [RS_330]
                                             PartitionCols:_col0
-                                            Select Operator [SEL_331] (rows=50 
width=4)
+                                            Select Operator [SEL_327] (rows=50 
width=4)
                                               Output:["_col0"]
-                                              Filter Operator [FIL_330] 
(rows=50 width=12)
+                                              Filter Operator [FIL_326] 
(rows=50 width=12)
                                                 predicate:((d_moy = 9) and 
(d_year = 1999))
                                                 TableScan [TS_12] (rows=73049 
width=12)
                                                   
default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"]
                                         <-Map 32 [SIMPLE_EDGE] vectorized
-                                          SHUFFLE [RS_384]
+                                          SHUFFLE [RS_380]
                                             PartitionCols:_col0
-                                            Select Operator [SEL_383] 
(rows=285117733 width=123)
+                                            Select Operator [SEL_379] 
(rows=285117733 width=123)
                                               
Output:["_col0","_col1","_col2","_col3"]
-                                              Filter Operator [FIL_382] 
(rows=285117733 width=123)
+                                              Filter Operator [FIL_378] 
(rows=285117733 width=123)
                                                 predicate:((cs_bill_addr_sk 
BETWEEN DynamicValue(RS_58_customer_address_ca_address_sk_min) AND 
DynamicValue(RS_58_customer_address_ca_address_sk_max) and 
in_bloom_filter(cs_bill_addr_sk, 
DynamicValue(RS_58_customer_address_ca_address_sk_bloom_filter))) and 
(cs_item_sk BETWEEN DynamicValue(RS_64_item_i_item_sk_min) AND 
DynamicValue(RS_64_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, 
DynamicValue(RS_64_item_i_item_sk_bloom_filter))) and (cs_sold_date_sk BETWEEN 
DynamicValue(RS_55_date_dim_d_date_sk_min) AND 
DynamicValue(RS_55_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, 
DynamicValue(RS_55_date_dim_d_date_sk_bloom_filter))) and cs_bill_addr_sk is 
not null and cs_sold_date_sk is not null)
                                                 TableScan [TS_45] 
(rows=287989836 width=123)
                                                   
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_addr_sk","cs_item_sk","cs_ext_sales_price"]
                                                 <-Reducer 11 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_381]
-                                                    Group By Operator 
[GBY_380] (rows=1 width=12)
+                                                  BROADCAST [RS_377]
+                                                    Group By Operator 
[GBY_376] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                     <-Reducer 2 
[CUSTOM_SIMPLE_EDGE]
-                                                      SHUFFLE [RS_240]
-                                                        Group By Operator 
[GBY_239] (rows=1 width=12)
+                                                      SHUFFLE [RS_238]
+                                                        Group By Operator 
[GBY_237] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                          Select Operator 
[SEL_238] (rows=34340 width=4)
+                                                          Select Operator 
[SEL_236] (rows=34340 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Merge Join Operator [MERGEJOIN_295]
+                                                             Please refer to 
the previous Merge Join Operator [MERGEJOIN_291]
                                                 <-Reducer 24 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_377]
-                                                    Group By Operator 
[GBY_376] (rows=1 width=12)
+                                                  BROADCAST [RS_373]
+                                                    Group By Operator 
[GBY_372] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                     <-Map 20 
[CUSTOM_SIMPLE_EDGE] vectorized
-                                                      PARTITION_ONLY_SHUFFLE 
[RS_342]
-                                                        Group By Operator 
[GBY_339] (rows=1 width=12)
+                                                      PARTITION_ONLY_SHUFFLE 
[RS_338]
+                                                        Group By Operator 
[GBY_335] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                          Select Operator 
[SEL_335] (rows=50 width=4)
+                                                          Select Operator 
[SEL_331] (rows=50 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Select Operator [SEL_331]
+                                                             Please refer to 
the previous Select Operator [SEL_327]
                                                 <-Reducer 30 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_379]
-                                                    Group By Operator 
[GBY_378] (rows=1 width=12)
+                                                  BROADCAST [RS_375]
+                                                    Group By Operator 
[GBY_374] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=8000000)"]
                                                     <-Map 28 
[CUSTOM_SIMPLE_EDGE] vectorized
-                                                      PARTITION_ONLY_SHUFFLE 
[RS_358]
-                                                        Group By Operator 
[GBY_355] (rows=1 width=12)
+                                                      PARTITION_ONLY_SHUFFLE 
[RS_354]
+                                                        Group By Operator 
[GBY_351] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=8000000)"]
-                                                          Select Operator 
[SEL_351] (rows=8000000 width=4)
+                                                          Select Operator 
[SEL_347] (rows=8000000 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Select Operator [SEL_347]
+                                                             Please refer to 
the previous Select Operator [SEL_343]
                 <-Reducer 13 [CONTAINS] vectorized
-                  Reduce Output Operator [RS_401]
+                  Reduce Output Operator [RS_397]
                     PartitionCols:_col0
-                    Group By Operator [GBY_400] (rows=1717 width=212)
+                    Group By Operator [GBY_396] (rows=1717 width=212)
                       
Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
-                      Top N Key Operator [TNK_399] (rows=5151 width=212)
+                      Top N Key Operator [TNK_395] (rows=5151 width=212)
                         keys:_col0,sort order:+,top n:100
-                        Group By Operator [GBY_398] (rows=1717 width=212)
+                        Group By Operator [GBY_394] (rows=1717 width=212)
                           
Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                         <-Reducer 12 [SIMPLE_EDGE]
                           SHUFFLE [RS_106]
                             PartitionCols:_col0
                             Group By Operator [GBY_105] (rows=1717 width=212)
                               
Output:["_col0","_col1"],aggregations:["sum(_col7)"],keys:_col1
-                              Merge Join Operator [MERGEJOIN_306] (rows=379339 
width=201)
+                              Merge Join Operator [MERGEJOIN_302] (rows=379339 
width=201)
                                 
Conds:RS_101._col0=RS_102._col2(Inner),Output:["_col1","_col7"]
                               <-Reducer 2 [SIMPLE_EDGE]
                                 SHUFFLE [RS_101]
                                   PartitionCols:_col0
-                                   Please refer to the previous Merge Join 
Operator [MERGEJOIN_295]
+                                   Please refer to the previous Merge Join 
Operator [MERGEJOIN_291]
                               <-Reducer 26 [SIMPLE_EDGE]
                                 SHUFFLE [RS_102]
                                   PartitionCols:_col2
                                   Select Operator [SEL_97] (rows=788222 
width=110)
                                     Output:["_col2","_col4"]
-                                    Merge Join Operator [MERGEJOIN_303] 
(rows=788222 width=110)
-                                      
Conds:RS_94._col2=RS_352._col0(Inner),Output:["_col1","_col3"]
+                                    Merge Join Operator [MERGEJOIN_299] 
(rows=788222 width=110)
+                                      
Conds:RS_94._col2=RS_348._col0(Inner),Output:["_col1","_col3"]
                                     <-Map 28 [SIMPLE_EDGE] vectorized
-                                      PARTITION_ONLY_SHUFFLE [RS_352]
+                                      PARTITION_ONLY_SHUFFLE [RS_348]
                                         PartitionCols:_col0
-                                         Please refer to the previous Select 
Operator [SEL_347]
+                                         Please refer to the previous Select 
Operator [SEL_343]
                                     <-Reducer 25 [SIMPLE_EDGE]
                                       SHUFFLE [RS_94]
                                         PartitionCols:_col2
-                                        Merge Join Operator [MERGEJOIN_302] 
(rows=3941109 width=118)
-                                          
Conds:RS_397._col0=RS_336._col0(Inner),Output:["_col1","_col2","_col3"]
+                                        Merge Join Operator [MERGEJOIN_298] 
(rows=3941109 width=118)
+                                          
Conds:RS_393._col0=RS_332._col0(Inner),Output:["_col1","_col2","_col3"]
                                         <-Map 20 [SIMPLE_EDGE] vectorized
-                                          PARTITION_ONLY_SHUFFLE [RS_336]
+                                          PARTITION_ONLY_SHUFFLE [RS_332]
                                             PartitionCols:_col0
-                                             Please refer to the previous 
Select Operator [SEL_331]
+                                             Please refer to the previous 
Select Operator [SEL_327]
                                         <-Map 33 [SIMPLE_EDGE] vectorized
-                                          SHUFFLE [RS_397]
+                                          SHUFFLE [RS_393]
                                             PartitionCols:_col0
-                                            Select Operator [SEL_396] 
(rows=143931246 width=123)
+                                            Select Operator [SEL_392] 
(rows=143931246 width=123)
                                               
Output:["_col0","_col1","_col2","_col3"]
-                                              Filter Operator [FIL_395] 
(rows=143931246 width=123)
+                                              Filter Operator [FIL_391] 
(rows=143931246 width=123)
                                                 predicate:((ws_bill_addr_sk 
BETWEEN DynamicValue(RS_95_customer_address_ca_address_sk_min) AND 
DynamicValue(RS_95_customer_address_ca_address_sk_max) and 
in_bloom_filter(ws_bill_addr_sk, 
DynamicValue(RS_95_customer_address_ca_address_sk_bloom_filter))) and 
(ws_item_sk BETWEEN DynamicValue(RS_101_item_i_item_sk_min) AND 
DynamicValue(RS_101_item_i_item_sk_max) and in_bloom_filter(ws_item_sk, 
DynamicValue(RS_101_item_i_item_sk_bloom_filter))) and (ws_sold_date_sk BETWEEN 
DynamicValue(RS_92_date_dim_d_date_sk_min) AND 
DynamicValue(RS_92_date_dim_d_date_sk_max) and in_bloom_filter(ws_sold_date_sk, 
DynamicValue(RS_92_date_dim_d_date_sk_bloom_filter))) and ws_bill_addr_sk is 
not null and ws_sold_date_sk is not null)
                                                 TableScan [TS_82] 
(rows=144002668 width=123)
                                                   
default@web_sales,web_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_sold_date_sk","ws_item_sk","ws_bill_addr_sk","ws_ext_sales_price"]
                                                 <-Reducer 14 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_394]
-                                                    Group By Operator 
[GBY_393] (rows=1 width=12)
+                                                  BROADCAST [RS_390]
+                                                    Group By Operator 
[GBY_389] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                     <-Reducer 2 
[CUSTOM_SIMPLE_EDGE]
-                                                      SHUFFLE [RS_286]
-                                                        Group By Operator 
[GBY_285] (rows=1 width=12)
+                                                      SHUFFLE [RS_278]
+                                                        Group By Operator 
[GBY_277] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                          Select Operator 
[SEL_284] (rows=34340 width=4)
+                                                          Select Operator 
[SEL_276] (rows=34340 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Merge Join Operator [MERGEJOIN_295]
+                                                             Please refer to 
the previous Merge Join Operator [MERGEJOIN_291]
                                                 <-Reducer 27 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_390]
-                                                    Group By Operator 
[GBY_389] (rows=1 width=12)
+                                                  BROADCAST [RS_386]
+                                                    Group By Operator 
[GBY_385] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                     <-Map 20 
[CUSTOM_SIMPLE_EDGE] vectorized
-                                                      PARTITION_ONLY_SHUFFLE 
[RS_343]
-                                                        Group By Operator 
[GBY_340] (rows=1 width=12)
+                                                      PARTITION_ONLY_SHUFFLE 
[RS_339]
+                                                        Group By Operator 
[GBY_336] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                          Select Operator 
[SEL_337] (rows=50 width=4)
+                                                          Select Operator 
[SEL_333] (rows=50 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Select Operator [SEL_331]
+                                                             Please refer to 
the previous Select Operator [SEL_327]
                                                 <-Reducer 31 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_392]
-                                                    Group By Operator 
[GBY_391] (rows=1 width=12)
+                                                  BROADCAST [RS_388]
+                                                    Group By Operator 
[GBY_387] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=8000000)"]
                                                     <-Map 28 
[CUSTOM_SIMPLE_EDGE] vectorized
-                                                      PARTITION_ONLY_SHUFFLE 
[RS_359]
-                                                        Group By Operator 
[GBY_356] (rows=1 width=12)
+                                                      PARTITION_ONLY_SHUFFLE 
[RS_355]
+                                                        Group By Operator 
[GBY_352] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=8000000)"]
-                                                          Select Operator 
[SEL_353] (rows=8000000 width=4)
+                                                          Select Operator 
[SEL_349] (rows=8000000 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Select Operator [SEL_347]
+                                                             Please refer to 
the previous Select Operator [SEL_343]
                 <-Reducer 4 [CONTAINS] vectorized
-                  Reduce Output Operator [RS_370]
+                  Reduce Output Operator [RS_366]
                     PartitionCols:_col0
-                    Group By Operator [GBY_369] (rows=1717 width=212)
+                    Group By Operator [GBY_365] (rows=1717 width=212)
                       
Output:["_col0","_col1"],aggregations:["sum(_col1)"],keys:_col0
-                      Top N Key Operator [TNK_368] (rows=5151 width=212)
+                      Top N Key Operator [TNK_364] (rows=5151 width=212)
                         keys:_col0,sort order:+,top n:100
-                        Group By Operator [GBY_367] (rows=1717 width=212)
+                        Group By Operator [GBY_363] (rows=1717 width=212)
                           
Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                         <-Reducer 3 [SIMPLE_EDGE]
                           SHUFFLE [RS_33]
                             PartitionCols:_col0
                             Group By Operator [GBY_32] (rows=1717 width=212)
                               
Output:["_col0","_col1"],aggregations:["sum(_col7)"],keys:_col1
-                              Merge Join Operator [MERGEJOIN_304] 
(rows=1384530 width=100)
+                              Merge Join Operator [MERGEJOIN_300] 
(rows=1384530 width=100)
                                 
Conds:RS_28._col0=RS_29._col2(Inner),Output:["_col1","_col7"]
                               <-Reducer 2 [SIMPLE_EDGE]
                                 SHUFFLE [RS_28]
                                   PartitionCols:_col0
-                                   Please refer to the previous Merge Join 
Operator [MERGEJOIN_295]
+                                   Please refer to the previous Merge Join 
Operator [MERGEJOIN_291]
                               <-Reducer 19 [SIMPLE_EDGE]
                                 SHUFFLE [RS_29]
                                   PartitionCols:_col2
                                   Select Operator [SEL_24] (rows=2876890 
width=4)
                                     Output:["_col2","_col4"]
-                                    Merge Join Operator [MERGEJOIN_297] 
(rows=2876890 width=4)
-                                      
Conds:RS_21._col2=RS_348._col0(Inner),Output:["_col1","_col3"]
+                                    Merge Join Operator [MERGEJOIN_293] 
(rows=2876890 width=4)
+                                      
Conds:RS_21._col2=RS_344._col0(Inner),Output:["_col1","_col3"]
                                     <-Map 28 [SIMPLE_EDGE] vectorized
-                                      PARTITION_ONLY_SHUFFLE [RS_348]
+                                      PARTITION_ONLY_SHUFFLE [RS_344]
                                         PartitionCols:_col0
-                                         Please refer to the previous Select 
Operator [SEL_347]
+                                         Please refer to the previous Select 
Operator [SEL_343]
                                     <-Reducer 18 [SIMPLE_EDGE]
                                       SHUFFLE [RS_21]
                                         PartitionCols:_col2
-                                        Merge Join Operator [MERGEJOIN_296] 
(rows=14384447 width=4)
-                                          
Conds:RS_366._col0=RS_332._col0(Inner),Output:["_col1","_col2","_col3"]
+                                        Merge Join Operator [MERGEJOIN_292] 
(rows=14384447 width=4)
+                                          
Conds:RS_362._col0=RS_328._col0(Inner),Output:["_col1","_col2","_col3"]
                                         <-Map 20 [SIMPLE_EDGE] vectorized
-                                          PARTITION_ONLY_SHUFFLE [RS_332]
+                                          PARTITION_ONLY_SHUFFLE [RS_328]
                                             PartitionCols:_col0
-                                             Please refer to the previous 
Select Operator [SEL_331]
+                                             Please refer to the previous 
Select Operator [SEL_327]
                                         <-Map 17 [SIMPLE_EDGE] vectorized
-                                          SHUFFLE [RS_366]
+                                          SHUFFLE [RS_362]
                                             PartitionCols:_col0
-                                            Select Operator [SEL_365] 
(rows=525327191 width=118)
+                                            Select Operator [SEL_361] 
(rows=525327191 width=118)
                                               
Output:["_col0","_col1","_col2","_col3"]
-                                              Filter Operator [FIL_364] 
(rows=525327191 width=118)
+                                              Filter Operator [FIL_360] 
(rows=525327191 width=118)
                                                 predicate:((ss_addr_sk BETWEEN 
DynamicValue(RS_22_customer_address_ca_address_sk_min) AND 
DynamicValue(RS_22_customer_address_ca_address_sk_max) and 
in_bloom_filter(ss_addr_sk, 
DynamicValue(RS_22_customer_address_ca_address_sk_bloom_filter))) and 
(ss_item_sk BETWEEN DynamicValue(RS_28_item_i_item_sk_min) AND 
DynamicValue(RS_28_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, 
DynamicValue(RS_28_item_i_item_sk_bloom_filter))) and (ss_sold_date_sk BETWEEN 
DynamicValue(RS_19_date_dim_d_date_sk_min) AND 
DynamicValue(RS_19_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, 
DynamicValue(RS_19_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not 
null and ss_sold_date_sk is not null)
                                                 TableScan [TS_9] 
(rows=575995635 width=118)
                                                   
default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_addr_sk","ss_ext_sales_price"]
                                                 <-Reducer 21 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_345]
-                                                    Group By Operator 
[GBY_344] (rows=1 width=12)
+                                                  BROADCAST [RS_341]
+                                                    Group By Operator 
[GBY_340] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                     <-Map 20 
[CUSTOM_SIMPLE_EDGE] vectorized
-                                                      PARTITION_ONLY_SHUFFLE 
[RS_341]
-                                                        Group By Operator 
[GBY_338] (rows=1 width=12)
+                                                      PARTITION_ONLY_SHUFFLE 
[RS_337]
+                                                        Group By Operator 
[GBY_334] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                          Select Operator 
[SEL_333] (rows=50 width=4)
+                                                          Select Operator 
[SEL_329] (rows=50 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Select Operator [SEL_331]
+                                                             Please refer to 
the previous Select Operator [SEL_327]
                                                 <-Reducer 29 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_361]
-                                                    Group By Operator 
[GBY_360] (rows=1 width=12)
+                                                  BROADCAST [RS_357]
+                                                    Group By Operator 
[GBY_356] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=8000000)"]
                                                     <-Map 28 
[CUSTOM_SIMPLE_EDGE] vectorized
-                                                      PARTITION_ONLY_SHUFFLE 
[RS_357]
-                                                        Group By Operator 
[GBY_354] (rows=1 width=12)
+                                                      PARTITION_ONLY_SHUFFLE 
[RS_353]
+                                                        Group By Operator 
[GBY_350] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=8000000)"]
-                                                          Select Operator 
[SEL_349] (rows=8000000 width=4)
+                                                          Select Operator 
[SEL_345] (rows=8000000 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Select Operator [SEL_347]
+                                                             Please refer to 
the previous Select Operator [SEL_343]
                                                 <-Reducer 8 [BROADCAST_EDGE] 
vectorized
-                                                  BROADCAST [RS_363]
-                                                    Group By Operator 
[GBY_362] (rows=1 width=12)
+                                                  BROADCAST [RS_359]
+                                                    Group By Operator 
[GBY_358] (rows=1 width=12)
                                                       
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                     <-Reducer 2 
[CUSTOM_SIMPLE_EDGE]
-                                                      SHUFFLE [RS_204]
-                                                        Group By Operator 
[GBY_203] (rows=1 width=12)
+                                                      SHUFFLE [RS_198]
+                                                        Group By Operator 
[GBY_197] (rows=1 width=12)
                                                           
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                          Select Operator 
[SEL_202] (rows=34340 width=4)
+                                                          Select Operator 
[SEL_196] (rows=34340 width=4)
                                                             Output:["_col0"]
-                                                             Please refer to 
the previous Merge Join Operator [MERGEJOIN_295]
+                                                             Please refer to 
the previous Merge Join Operator [MERGEJOIN_291]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/3cbc13e9/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out 
b/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out
index c286c74..fd709f9 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query95.q.out
@@ -98,37 +98,37 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 9 vectorized
-      File Output Operator [FS_265]
-        Limit [LIM_264] (rows=1 width=240)
+      File Output Operator [FS_273]
+        Limit [LIM_272] (rows=1 width=240)
           Number of rows:100
-          Select Operator [SEL_263] (rows=1 width=240)
+          Select Operator [SEL_271] (rows=1 width=240)
             Output:["_col0","_col1","_col2"]
           <-Reducer 8 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_262]
-              Select Operator [SEL_261] (rows=1 width=240)
+            SHUFFLE [RS_270]
+              Select Operator [SEL_269] (rows=1 width=240)
                 Output:["_col1","_col2","_col3"]
-                Group By Operator [GBY_260] (rows=1 width=232)
+                Group By Operator [GBY_268] (rows=1 width=232)
                   
Output:["_col0","_col1","_col2"],aggregations:["count(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
                 <-Reducer 7 [CUSTOM_SIMPLE_EDGE] vectorized
-                  PARTITION_ONLY_SHUFFLE [RS_259]
-                    Group By Operator [GBY_258] (rows=1 width=232)
+                  PARTITION_ONLY_SHUFFLE [RS_267]
+                    Group By Operator [GBY_266] (rows=1 width=232)
                       
Output:["_col0","_col1","_col2"],aggregations:["count(_col0)","sum(_col1)","sum(_col2)"]
-                      Group By Operator [GBY_257] (rows=143895019 width=228)
+                      Group By Operator [GBY_265] (rows=143895019 width=228)
                         
Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0
                       <-Reducer 6 [SIMPLE_EDGE]
                         SHUFFLE [RS_101]
                           PartitionCols:_col0
                           Group By Operator [GBY_100] (rows=143895019 
width=228)
                             
Output:["_col0","_col2","_col3"],aggregations:["sum(_col4)","sum(_col5)"],keys:_col3
-                            Merge Join Operator [MERGEJOIN_219] 
(rows=83469759007 width=227)
+                            Merge Join Operator [MERGEJOIN_227] 
(rows=83469759007 width=227)
                               
Conds:RS_47._col3=RS_48._col0(Inner),Output:["_col3","_col4","_col5"]
                             <-Reducer 19 [ONE_TO_ONE_EDGE]
                               FORWARD [RS_48]
                                 PartitionCols:_col0
                                 Select Operator [SEL_34] (rows=1384229738 
width=4)
                                   Output:["_col0"]
-                                  Merge Join Operator [MERGEJOIN_213] 
(rows=1384229738 width=4)
-                                    
Conds:RS_31._col0=RS_256.wr_order_number(Inner),Output:["_col14"]
+                                  Merge Join Operator [MERGEJOIN_221] 
(rows=1384229738 width=4)
+                                    
Conds:RS_31._col0=RS_264.wr_order_number(Inner),Output:["_col14"]
                                   <-Reducer 18 [ONE_TO_ONE_EDGE]
                                     FORWARD [RS_31]
                                       PartitionCols:_col0
@@ -136,129 +136,129 @@ Stage-0
                                         Output:["_col0"]
                                         Filter Operator [FIL_28] 
(rows=1411940834 width=11)
                                           predicate:(_col0 <> _col2)
-                                          Merge Join Operator [MERGEJOIN_212] 
(rows=1411940834 width=11)
-                                            
Conds:RS_252._col1=RS_255._col1(Inner),Output:["_col0","_col1","_col2"]
+                                          Merge Join Operator [MERGEJOIN_220] 
(rows=1411940834 width=11)
+                                            
Conds:RS_260._col1=RS_263._col1(Inner),Output:["_col0","_col1","_col2"]
                                           <-Map 17 [SIMPLE_EDGE] vectorized
-                                            SHUFFLE [RS_252]
+                                            SHUFFLE [RS_260]
                                               PartitionCols:_col1
-                                              Select Operator [SEL_251] 
(rows=144002668 width=7)
+                                              Select Operator [SEL_259] 
(rows=144002668 width=7)
                                                 Output:["_col0","_col1"]
-                                                Filter Operator [FIL_250] 
(rows=144002668 width=7)
+                                                Filter Operator [FIL_258] 
(rows=144002668 width=7)
                                                   
predicate:(in_bloom_filter(ws_order_number, 
DynamicValue(RS_44_ws1_ws_order_number_bloom_filter)) and ws_order_number 
BETWEEN DynamicValue(RS_44_ws1_ws_order_number_min) AND 
DynamicValue(RS_44_ws1_ws_order_number_max))
                                                   TableScan [TS_21] 
(rows=144002668 width=7)
                                                     
default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"]
                                                   <-Reducer 10 
[BROADCAST_EDGE] vectorized
-                                                    BROADCAST [RS_248]
-                                                      Group By Operator 
[GBY_247] (rows=1 width=12)
+                                                    BROADCAST [RS_256]
+                                                      Group By Operator 
[GBY_255] (rows=1 width=12)
                                                         
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                       <-Reducer 4 
[CUSTOM_SIMPLE_EDGE]
-                                                        SHUFFLE [RS_163]
-                                                          Group By Operator 
[GBY_162] (rows=1 width=12)
+                                                        SHUFFLE [RS_179]
+                                                          Group By Operator 
[GBY_178] (rows=1 width=12)
                                                             
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                            Select Operator 
[SEL_161] (rows=5022875 width=8)
+                                                            Select Operator 
[SEL_177] (rows=5022875 width=8)
                                                               Output:["_col0"]
-                                                              Merge Join 
Operator [MERGEJOIN_216] (rows=5022875 width=227)
-                                                                
Conds:RS_41._col2=RS_238._col0(Inner),Output:["_col3","_col4","_col5"]
+                                                              Merge Join 
Operator [MERGEJOIN_224] (rows=5022875 width=227)
+                                                                
Conds:RS_41._col2=RS_246._col0(Inner),Output:["_col3","_col4","_col5"]
                                                               <-Map 15 
[SIMPLE_EDGE] vectorized
-                                                                SHUFFLE 
[RS_238]
+                                                                SHUFFLE 
[RS_246]
                                                                   
PartitionCols:_col0
-                                                                  Select 
Operator [SEL_237] (rows=12 width=4)
+                                                                  Select 
Operator [SEL_245] (rows=12 width=4)
                                                                     
Output:["_col0"]
-                                                                    Filter 
Operator [FIL_236] (rows=12 width=92)
+                                                                    Filter 
Operator [FIL_244] (rows=12 width=92)
                                                                       
predicate:(web_company_name = 'pri')
                                                                       
TableScan [TS_9] (rows=84 width=92)
                                                                         
default@web_site,web_site,Tbl:COMPLETE,Col:COMPLETE,Output:["web_site_sk","web_company_name"]
                                                               <-Reducer 3 
[SIMPLE_EDGE]
                                                                 SHUFFLE [RS_41]
                                                                   
PartitionCols:_col2
-                                                                  Merge Join 
Operator [MERGEJOIN_215] (rows=15673790 width=231)
-                                                                    
Conds:RS_38._col1=RS_230._col0(Inner),Output:["_col2","_col3","_col4","_col5"]
+                                                                  Merge Join 
Operator [MERGEJOIN_223] (rows=15673790 width=231)
+                                                                    
Conds:RS_38._col1=RS_238._col0(Inner),Output:["_col2","_col3","_col4","_col5"]
                                                                   <-Map 13 
[SIMPLE_EDGE] vectorized
-                                                                    SHUFFLE 
[RS_230]
+                                                                    SHUFFLE 
[RS_238]
                                                                       
PartitionCols:_col0
-                                                                      Select 
Operator [SEL_229] (rows=784314 width=4)
+                                                                      Select 
Operator [SEL_237] (rows=784314 width=4)
                                                                         
Output:["_col0"]
-                                                                        Filter 
Operator [FIL_228] (rows=784314 width=90)
+                                                                        Filter 
Operator [FIL_236] (rows=784314 width=90)
                                                                           
predicate:(ca_state = 'TX')
                                                                           
TableScan [TS_6] (rows=40000000 width=90)
                                                                             
default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state"]
                                                                   <-Reducer 2 
[SIMPLE_EDGE]
                                                                     SHUFFLE 
[RS_38]
                                                                       
PartitionCols:_col1
-                                                                      Merge 
Join Operator [MERGEJOIN_214] (rows=15987241 width=235)
-                                                                        
Conds:RS_246._col0=RS_222._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5"]
+                                                                      Merge 
Join Operator [MERGEJOIN_222] (rows=15987241 width=235)
+                                                                        
Conds:RS_254._col0=RS_230._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5"]
                                                                       <-Map 11 
[SIMPLE_EDGE] vectorized
-                                                                        
SHUFFLE [RS_222]
+                                                                        
SHUFFLE [RS_230]
                                                                           
PartitionCols:_col0
-                                                                          
Select Operator [SEL_221] (rows=8116 width=98)
+                                                                          
Select Operator [SEL_229] (rows=8116 width=98)
                                                                             
Output:["_col0"]
-                                                                            
Filter Operator [FIL_220] (rows=8116 width=98)
+                                                                            
Filter Operator [FIL_228] (rows=8116 width=98)
                                                                               
predicate:CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00' AND 
TIMESTAMP'1999-06-30 00:00:00'
                                                                               
TableScan [TS_3] (rows=73049 width=98)
                                                                                
 
default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"]
                                                                       <-Map 1 
[SIMPLE_EDGE] vectorized
-                                                                        
SHUFFLE [RS_246]
+                                                                        
SHUFFLE [RS_254]
                                                                           
PartitionCols:_col0
-                                                                          
Select Operator [SEL_245] (rows=143895019 width=239)
+                                                                          
Select Operator [SEL_253] (rows=143895019 width=239)
                                                                             
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                                                            
Filter Operator [FIL_244] (rows=143895019 width=239)
+                                                                            
Filter Operator [FIL_252] (rows=143895019 width=239)
                                                                               
predicate:((ws_ship_addr_sk BETWEEN 
DynamicValue(RS_39_customer_address_ca_address_sk_min) AND 
DynamicValue(RS_39_customer_address_ca_address_sk_max) and 
in_bloom_filter(ws_ship_addr_sk, 
DynamicValue(RS_39_customer_address_ca_address_sk_bloom_filter))) and 
(ws_ship_date_sk BETWEEN DynamicValue(RS_36_date_dim_d_date_sk_min) AND 
DynamicValue(RS_36_date_dim_d_date_sk_max) and in_bloom_filter(ws_ship_date_sk, 
DynamicValue(RS_36_date_dim_d_date_sk_bloom_filter))) and (ws_web_site_sk 
BETWEEN DynamicValue(RS_42_web_site_web_site_sk_min) AND 
DynamicValue(RS_42_web_site_web_site_sk_max) and 
in_bloom_filter(ws_web_site_sk, 
DynamicValue(RS_42_web_site_web_site_sk_bloom_filter))) and ws_ship_addr_sk is 
not null and ws_ship_date_sk is not null and ws_web_site_sk is not null)
                                                                               
TableScan [TS_0] (rows=144002668 width=239)
                                                                                
 
default@web_sales,ws1,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_ship_date_sk","ws_ship_addr_sk","ws_web_site_sk","ws_order_number","ws_ext_ship_cost","ws_net_profit"]
                                                                               
<-Reducer 12 [BROADCAST_EDGE] vectorized
-                                                                               
 BROADCAST [RS_227]
-                                                                               
   Group By Operator [GBY_226] (rows=1 width=12)
-                                                                               
     
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
-                                                                               
   <-Map 11 [CUSTOM_SIMPLE_EDGE] vectorized
-                                                                               
     SHUFFLE [RS_225]
-                                                                               
       Group By Operator [GBY_224] (rows=1 width=12)
-                                                                               
         
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                                               
         Select Operator [SEL_223] (rows=8116 width=4)
-                                                                               
           Output:["_col0"]
-                                                                               
            Please refer to the previous Select Operator [SEL_221]
-                                                                              
<-Reducer 14 [BROADCAST_EDGE] vectorized
                                                                                
 BROADCAST [RS_235]
                                                                                
   Group By Operator [GBY_234] (rows=1 width=12)
                                                                                
     
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
-                                                                               
   <-Map 13 [CUSTOM_SIMPLE_EDGE] vectorized
+                                                                               
   <-Map 11 [CUSTOM_SIMPLE_EDGE] vectorized
                                                                                
     SHUFFLE [RS_233]
                                                                                
       Group By Operator [GBY_232] (rows=1 width=12)
                                                                                
         
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                                               
         Select Operator [SEL_231] (rows=784314 width=4)
+                                                                               
         Select Operator [SEL_231] (rows=8116 width=4)
                                                                                
           Output:["_col0"]
                                                                                
            Please refer to the previous Select Operator [SEL_229]
-                                                                              
<-Reducer 16 [BROADCAST_EDGE] vectorized
+                                                                              
<-Reducer 14 [BROADCAST_EDGE] vectorized
                                                                                
 BROADCAST [RS_243]
                                                                                
   Group By Operator [GBY_242] (rows=1 width=12)
                                                                                
     
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
-                                                                               
   <-Map 15 [CUSTOM_SIMPLE_EDGE] vectorized
+                                                                               
   <-Map 13 [CUSTOM_SIMPLE_EDGE] vectorized
                                                                                
     SHUFFLE [RS_241]
                                                                                
       Group By Operator [GBY_240] (rows=1 width=12)
                                                                                
         
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                                               
         Select Operator [SEL_239] (rows=12 width=4)
+                                                                               
         Select Operator [SEL_239] (rows=784314 width=4)
                                                                                
           Output:["_col0"]
                                                                                
            Please refer to the previous Select Operator [SEL_237]
+                                                                              
<-Reducer 16 [BROADCAST_EDGE] vectorized
+                                                                               
 BROADCAST [RS_251]
+                                                                               
   Group By Operator [GBY_250] (rows=1 width=12)
+                                                                               
     
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
+                                                                               
   <-Map 15 [CUSTOM_SIMPLE_EDGE] vectorized
+                                                                               
     SHUFFLE [RS_249]
+                                                                               
       Group By Operator [GBY_248] (rows=1 width=12)
+                                                                               
         
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
+                                                                               
         Select Operator [SEL_247] (rows=12 width=4)
+                                                                               
           Output:["_col0"]
+                                                                               
            Please refer to the previous Select Operator [SEL_245]
                                           <-Map 20 [SIMPLE_EDGE] vectorized
-                                            SHUFFLE [RS_255]
+                                            SHUFFLE [RS_263]
                                               PartitionCols:_col1
-                                              Select Operator [SEL_254] 
(rows=144002668 width=7)
+                                              Select Operator [SEL_262] 
(rows=144002668 width=7)
                                                 Output:["_col0","_col1"]
-                                                Filter Operator [FIL_253] 
(rows=144002668 width=7)
+                                                Filter Operator [FIL_261] 
(rows=144002668 width=7)
                                                   
predicate:(in_bloom_filter(ws_order_number, 
DynamicValue(RS_44_ws1_ws_order_number_bloom_filter)) and ws_order_number 
BETWEEN DynamicValue(RS_44_ws1_ws_order_number_min) AND 
DynamicValue(RS_44_ws1_ws_order_number_max))
                                                   TableScan [TS_23] 
(rows=144002668 width=7)
                                                     
default@web_sales,ws2,Tbl:COMPLETE,Col:COMPLETE,Output:["ws_warehouse_sk","ws_order_number"]
                                                   <-Reducer 10 
[BROADCAST_EDGE] vectorized
-                                                    BROADCAST [RS_249]
-                                                       Please refer to the 
previous Group By Operator [GBY_247]
+                                                    BROADCAST [RS_257]
+                                                       Please refer to the 
previous Group By Operator [GBY_255]
                                   <-Map 21 [SIMPLE_EDGE] vectorized
-                                    SHUFFLE [RS_256]
+                                    SHUFFLE [RS_264]
                                       PartitionCols:wr_order_number
                                       TableScan [TS_30] (rows=14398467 width=4)
                                         
default@web_returns,web_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["wr_order_number"]
                             <-Reducer 5 [ONE_TO_ONE_EDGE]
                               FORWARD [RS_47]
                                 PartitionCols:_col3
-                                Merge Join Operator [MERGEJOIN_218] 
(rows=482885639 width=227)
+                                Merge Join Operator [MERGEJOIN_226] 
(rows=482885639 width=227)
                                   
Conds:RS_44._col3=RS_45._col0(Inner),Output:["_col3","_col4","_col5"]
                                 <-Reducer 18 [ONE_TO_ONE_EDGE]
                                   FORWARD [RS_45]
@@ -267,5 +267,5 @@ Stage-0
                                 <-Reducer 4 [SIMPLE_EDGE]
                                   SHUFFLE [RS_44]
                                     PartitionCols:_col3
-                                     Please refer to the previous Merge Join 
Operator [MERGEJOIN_216]
+                                     Please refer to the previous Merge Join 
Operator [MERGEJOIN_224]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/3cbc13e9/ql/src/test/results/clientpositive/perf/tez/query18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query18.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query18.q.out
index 1fa1b9e..58fb7a7 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query18.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query18.q.out
@@ -99,16 +99,16 @@ Stage-0
     limit:100
     Stage-1
       Reducer 6 vectorized
-      File Output Operator [FS_184]
-        Limit [LIM_183] (rows=100 width=1165)
+      File Output Operator [FS_182]
+        Limit [LIM_181] (rows=100 width=1165)
           Number of rows:100
-          Select Operator [SEL_182] (rows=10969055 width=1165)
+          Select Operator [SEL_180] (rows=10969055 width=1165)
             
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
           <-Reducer 5 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_181]
-              Select Operator [SEL_180] (rows=10969055 width=1165)
+            SHUFFLE [RS_179]
+              Select Operator [SEL_178] (rows=10969055 width=1165)
                 
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
-                Group By Operator [GBY_179] (rows=10969055 width=1229)
+                Group By Operator [GBY_177] (rows=10969055 width=1229)
                   
Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["sum(VALUE._col0)","count(VALUE._col1)","sum(VALUE._col2)","count(VALUE._col3)","sum(VALUE._col4)","count(VALUE._col5)","sum(VALUE._col6)","count(VALUE._col7)","sum(VALUE._col8)","count(VALUE._col9)","sum(VALUE._col10)","count(VALUE._col11)","sum(VALUE._col12)","count(VALUE._col13)"],keys:KEY._col0,
 KEY._col1, KEY._col2, KEY._col3, KEY._col4
                 <-Reducer 4 [SIMPLE_EDGE]
                   SHUFFLE [RS_43]
@@ -117,42 +117,42 @@ Stage-0
                       
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18"],aggregations:["sum(_col4)","count(_col4)","sum(_col5)","count(_col5)","sum(_col6)","count(_col6)","sum(_col7)","count(_col7)","sum(_col8)","count(_col8)","sum(_col9)","count(_col9)","sum(_col10)","count(_col10)"],keys:_col0,
 _col1, _col2, _col3, 0L
                       Select Operator [SEL_40] (rows=2193811 width=618)
                         
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
-                        Merge Join Operator [MERGEJOIN_145] (rows=2193811 
width=618)
+                        Merge Join Operator [MERGEJOIN_143] (rows=2193811 
width=618)
                           
Conds:RS_37._col0=RS_38._col3(Inner),Output:["_col4","_col6","_col7","_col8","_col11","_col16","_col17","_col18","_col19","_col20","_col26"]
                         <-Reducer 3 [SIMPLE_EDGE]
                           PARTITION_ONLY_SHUFFLE [RS_37]
                             PartitionCols:_col0
-                            Merge Join Operator [MERGEJOIN_141] (rows=4959744 
width=287)
-                              
Conds:RS_34._col1=RS_154._col0(Inner),Output:["_col0","_col4","_col6","_col7","_col8"]
+                            Merge Join Operator [MERGEJOIN_139] (rows=4959744 
width=287)
+                              
Conds:RS_34._col1=RS_152._col0(Inner),Output:["_col0","_col4","_col6","_col7","_col8"]
                             <-Map 9 [SIMPLE_EDGE] vectorized
-                              SHUFFLE [RS_154]
+                              SHUFFLE [RS_152]
                                 PartitionCols:_col0
-                                Select Operator [SEL_153] (rows=1861800 
width=4)
+                                Select Operator [SEL_151] (rows=1861800 
width=4)
                                   Output:["_col0"]
-                                  Filter Operator [FIL_152] (rows=1861800 
width=4)
+                                  Filter Operator [FIL_150] (rows=1861800 
width=4)
                                     predicate:cd_demo_sk is not null
                                     TableScan [TS_6] (rows=1861800 width=4)
                                       
default@customer_demographics,cd2,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk"]
                             <-Reducer 2 [SIMPLE_EDGE]
                               SHUFFLE [RS_34]
                                 PartitionCols:_col1
-                                Merge Join Operator [MERGEJOIN_140] 
(rows=4890586 width=290)
-                                  
Conds:RS_148._col2=RS_151._col0(Inner),Output:["_col0","_col1","_col4","_col6","_col7","_col8"]
+                                Merge Join Operator [MERGEJOIN_138] 
(rows=4890586 width=290)
+                                  
Conds:RS_146._col2=RS_149._col0(Inner),Output:["_col0","_col1","_col4","_col6","_col7","_col8"]
                                 <-Map 1 [SIMPLE_EDGE] vectorized
-                                  SHUFFLE [RS_148]
+                                  SHUFFLE [RS_146]
                                     PartitionCols:_col2
-                                    Select Operator [SEL_147] (rows=35631408 
width=19)
+                                    Select Operator [SEL_145] (rows=35631408 
width=19)
                                       Output:["_col0","_col1","_col2","_col4"]
-                                      Filter Operator [FIL_146] (rows=35631408 
width=19)
+                                      Filter Operator [FIL_144] (rows=35631408 
width=19)
                                         predicate:((c_birth_month) IN (9, 5, 
12, 4, 1, 10) and c_current_addr_sk is not null and c_current_cdemo_sk is not 
null and c_customer_sk is not null)
                                         TableScan [TS_0] (rows=80000000 
width=19)
                                           
default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_cdemo_sk","c_current_addr_sk","c_birth_month","c_birth_year"]
                                 <-Map 8 [SIMPLE_EDGE] vectorized
-                                  SHUFFLE [RS_151]
+                                  SHUFFLE [RS_149]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_150] (rows=5490196 
width=285)
+                                    Select Operator [SEL_148] (rows=5490196 
width=285)
                                       Output:["_col0","_col1","_col2","_col3"]
-                                      Filter Operator [FIL_149] (rows=5490196 
width=285)
+                                      Filter Operator [FIL_147] (rows=5490196 
width=285)
                                         predicate:((ca_state) IN ('ND', 'WI', 
'AL', 'NC', 'OK', 'MS', 'TN') and ca_address_sk is not null)
                                         TableScan [TS_3] (rows=40000000 
width=285)
                                           
default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_county","ca_state","ca_country"]
@@ -161,85 +161,85 @@ Stage-0
                             PartitionCols:_col3
                             Select Operator [SEL_30] (rows=15983481 width=529)
                               
Output:["_col1","_col3","_col6","_col7","_col8","_col9","_col10","_col16"]
-                              Merge Join Operator [MERGEJOIN_144] 
(rows=15983481 width=529)
-                                
Conds:RS_27._col3=RS_178._col0(Inner),Output:["_col1","_col4","_col5","_col6","_col7","_col8","_col14","_col16"]
+                              Merge Join Operator [MERGEJOIN_142] 
(rows=15983481 width=529)
+                                
Conds:RS_27._col3=RS_176._col0(Inner),Output:["_col1","_col4","_col5","_col6","_col7","_col8","_col14","_col16"]
                               <-Map 18 [SIMPLE_EDGE] vectorized
-                                SHUFFLE [RS_178]
+                                SHUFFLE [RS_176]
                                   PartitionCols:_col0
-                                  Select Operator [SEL_177] (rows=462000 
width=104)
+                                  Select Operator [SEL_175] (rows=462000 
width=104)
                                     Output:["_col0","_col1"]
-                                    Filter Operator [FIL_176] (rows=462000 
width=104)
+                                    Filter Operator [FIL_174] (rows=462000 
width=104)
                                       predicate:i_item_sk is not null
                                       TableScan [TS_18] (rows=462000 width=104)
                                         
default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id"]
                               <-Reducer 12 [SIMPLE_EDGE]
                                 SHUFFLE [RS_27]
                                   PartitionCols:_col3
-                                  Merge Join Operator [MERGEJOIN_143] 
(rows=15983481 width=433)
-                                    
Conds:RS_24._col2=RS_165._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col14"]
+                                  Merge Join Operator [MERGEJOIN_141] 
(rows=15983481 width=433)
+                                    
Conds:RS_24._col2=RS_163._col0(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7","_col8","_col14"]
                                   <-Map 16 [SIMPLE_EDGE] vectorized
-                                    PARTITION_ONLY_SHUFFLE [RS_165]
+                                    PARTITION_ONLY_SHUFFLE [RS_163]
                                       PartitionCols:_col0
-                                      Select Operator [SEL_164] (rows=103433 
width=184)
+                                      Select Operator [SEL_162] (rows=103433 
width=184)
                                         Output:["_col0","_col3"]
-                                        Filter Operator [FIL_163] (rows=103433 
width=187)
+                                        Filter Operator [FIL_161] (rows=103433 
width=187)
                                           predicate:((cd_education_status = 
'College') and (cd_gender = 'M') and cd_demo_sk is not null)
                                           TableScan [TS_15] (rows=1861800 
width=187)
                                             
default@customer_demographics,cd1,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_gender","cd_education_status","cd_dep_count"]
                                   <-Reducer 11 [SIMPLE_EDGE]
                                     SHUFFLE [RS_24]
                                       PartitionCols:_col2
-                                      Merge Join Operator [MERGEJOIN_142] 
(rows=100578970 width=459)
-                                        
Conds:RS_175._col0=RS_157._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
+                                      Merge Join Operator [MERGEJOIN_140] 
(rows=100578970 width=459)
+                                        
Conds:RS_173._col0=RS_155._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                       <-Map 14 [SIMPLE_EDGE] vectorized
-                                        PARTITION_ONLY_SHUFFLE [RS_157]
+                                        PARTITION_ONLY_SHUFFLE [RS_155]
                                           PartitionCols:_col0
-                                          Select Operator [SEL_156] (rows=652 
width=8)
+                                          Select Operator [SEL_154] (rows=652 
width=8)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_155] 
(rows=652 width=8)
+                                            Filter Operator [FIL_153] 
(rows=652 width=8)
                                               predicate:((d_year = 2001) and 
d_date_sk is not null)
                                               TableScan [TS_12] (rows=73049 
width=8)
                                                 
default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year"]
                                       <-Map 10 [SIMPLE_EDGE] vectorized
-                                        SHUFFLE [RS_175]
+                                        SHUFFLE [RS_173]
                                           PartitionCols:_col0
-                                          Select Operator [SEL_174] 
(rows=283692098 width=466)
+                                          Select Operator [SEL_172] 
(rows=283692098 width=466)
                                             
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
-                                            Filter Operator [FIL_173] 
(rows=283692098 width=466)
+                                            Filter Operator [FIL_171] 
(rows=283692098 width=466)
                                               predicate:((cs_bill_cdemo_sk 
BETWEEN DynamicValue(RS_25_cd1_cd_demo_sk_min) AND 
DynamicValue(RS_25_cd1_cd_demo_sk_max) and in_bloom_filter(cs_bill_cdemo_sk, 
DynamicValue(RS_25_cd1_cd_demo_sk_bloom_filter))) and (cs_bill_customer_sk 
BETWEEN DynamicValue(RS_37_customer_c_customer_sk_min) AND 
DynamicValue(RS_37_customer_c_customer_sk_max) and 
in_bloom_filter(cs_bill_customer_sk, 
DynamicValue(RS_37_customer_c_customer_sk_bloom_filter))) and (cs_sold_date_sk 
BETWEEN DynamicValue(RS_22_date_dim_d_date_sk_min) AND 
DynamicValue(RS_22_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, 
DynamicValue(RS_22_date_dim_d_date_sk_bloom_filter))) and cs_bill_cdemo_sk is 
not null and cs_bill_customer_sk is not null and cs_item_sk is not null and 
cs_sold_date_sk is not null)
                                               TableScan [TS_9] (rows=287989836 
width=466)
                                                 
default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_bill_cdemo_sk","cs_item_sk","cs_quantity","cs_list_price","cs_sales_price","cs_coupon_amt","cs_net_profit"]
                                               <-Reducer 15 [BROADCAST_EDGE] 
vectorized
-                                                BROADCAST [RS_162]
-                                                  Group By Operator [GBY_161] 
(rows=1 width=12)
+                                                BROADCAST [RS_160]
+                                                  Group By Operator [GBY_159] 
(rows=1 width=12)
                                                     
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                   <-Map 14 
[CUSTOM_SIMPLE_EDGE] vectorized
-                                                    PARTITION_ONLY_SHUFFLE 
[RS_160]
-                                                      Group By Operator 
[GBY_159] (rows=1 width=12)
+                                                    PARTITION_ONLY_SHUFFLE 
[RS_158]
+                                                      Group By Operator 
[GBY_157] (rows=1 width=12)
                                                         
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                        Select Operator 
[SEL_158] (rows=652 width=4)
+                                                        Select Operator 
[SEL_156] (rows=652 width=4)
                                                           Output:["_col0"]
-                                                           Please refer to the 
previous Select Operator [SEL_156]
+                                                           Please refer to the 
previous Select Operator [SEL_154]
                                               <-Reducer 17 [BROADCAST_EDGE] 
vectorized
-                                                BROADCAST [RS_170]
-                                                  Group By Operator [GBY_169] 
(rows=1 width=12)
+                                                BROADCAST [RS_168]
+                                                  Group By Operator [GBY_167] 
(rows=1 width=12)
                                                     
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=1000000)"]
                                                   <-Map 16 
[CUSTOM_SIMPLE_EDGE] vectorized
-                                                    PARTITION_ONLY_SHUFFLE 
[RS_168]
-                                                      Group By Operator 
[GBY_167] (rows=1 width=12)
+                                                    PARTITION_ONLY_SHUFFLE 
[RS_166]
+                                                      Group By Operator 
[GBY_165] (rows=1 width=12)
                                                         
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=1000000)"]
-                                                        Select Operator 
[SEL_166] (rows=103433 width=4)
+                                                        Select Operator 
[SEL_164] (rows=103433 width=4)
                                                           Output:["_col0"]
-                                                           Please refer to the 
previous Select Operator [SEL_164]
+                                                           Please refer to the 
previous Select Operator [SEL_162]
                                               <-Reducer 7 [BROADCAST_EDGE] 
vectorized
-                                                BROADCAST [RS_172]
-                                                  Group By Operator [GBY_171] 
(rows=1 width=12)
+                                                BROADCAST [RS_170]
+                                                  Group By Operator [GBY_169] 
(rows=1 width=12)
                                                     
Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2,
 expectedEntries=4890586)"]
                                                   <-Reducer 3 
[CUSTOM_SIMPLE_EDGE]
-                                                    PARTITION_ONLY_SHUFFLE 
[RS_126]
-                                                      Group By Operator 
[GBY_125] (rows=1 width=12)
+                                                    PARTITION_ONLY_SHUFFLE 
[RS_120]
+                                                      Group By Operator 
[GBY_119] (rows=1 width=12)
                                                         
Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0,
 expectedEntries=4890586)"]
-                                                        Select Operator 
[SEL_124] (rows=4959744 width=4)
+                                                        Select Operator 
[SEL_118] (rows=4959744 width=4)
                                                           Output:["_col0"]
-                                                           Please refer to the 
previous Merge Join Operator [MERGEJOIN_141]
+                                                           Please refer to the 
previous Merge Join Operator [MERGEJOIN_139]
 

Reply via email to