You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2018/11/26 23:32:48 UTC

[30/37] hive git commit: HIVE-20775: Factor cost of each SJ reduction when costing a follow-up reduction (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/e986fc56/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out
index f2c0b4b..8158608 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query36.q.out
@@ -69,11 +69,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Map 1 <- Reducer 11 (BROADCAST_EDGE), Reducer 9 (BROADCAST_EDGE)
-Reducer 11 <- Map 10 (CUSTOM_SIMPLE_EDGE)
+Map 1 <- Reducer 9 (BROADCAST_EDGE)
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
 Reducer 3 <- Map 10 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 12 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
+Reducer 4 <- Map 11 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
 Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
 Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
 Reducer 7 <- Reducer 6 (SIMPLE_EDGE)
@@ -84,25 +83,25 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 7 vectorized
-      File Output Operator [FS_112]
-        Limit [LIM_111] (rows=100 width=490)
+      File Output Operator [FS_107]
+        Limit [LIM_106] (rows=100 width=490)
           Number of rows:100
-          Select Operator [SEL_110] (rows=3060 width=490)
+          Select Operator [SEL_105] (rows=3060 width=490)
             Output:["_col0","_col1","_col2","_col3","_col4"]
           <-Reducer 6 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_109]
-              Select Operator [SEL_108] (rows=3060 width=490)
+            SHUFFLE [RS_104]
+              Select Operator [SEL_103] (rows=3060 width=490)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                PTF Operator [PTF_107] (rows=3060 width=414)
+                PTF Operator [PTF_102] (rows=3060 width=414)
                   Function definitions:[{},{"name:":"windowingtablefunction","order by:":"(_col2 / _col3) ASC NULLS FIRST","partition by:":"(grouping(_col4, 1) + grouping(_col4, 0)), CASE WHEN ((grouping(_col4, 0) = 0)) THEN (_col0) ELSE (CAST( null AS STRING)) END"}]
-                  Select Operator [SEL_106] (rows=3060 width=414)
+                  Select Operator [SEL_101] (rows=3060 width=414)
                     Output:["_col0","_col1","_col2","_col3","_col4"]
                   <-Reducer 5 [SIMPLE_EDGE] vectorized
-                    SHUFFLE [RS_105]
+                    SHUFFLE [RS_100]
                       PartitionCols:(grouping(_col4, 1) + grouping(_col4, 0)), CASE WHEN ((grouping(_col4, 0) = 0)) THEN (_col0) ELSE (CAST( null AS STRING)) END
-                      Select Operator [SEL_104] (rows=3060 width=414)
+                      Select Operator [SEL_99] (rows=3060 width=414)
                         Output:["_col0","_col1","_col2","_col3","_col4"]
-                        Group By Operator [GBY_103] (rows=3060 width=414)
+                        Group By Operator [GBY_98] (rows=3060 width=414)
                           Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2
                         <-Reducer 4 [SIMPLE_EDGE]
                           SHUFFLE [RS_23]
@@ -112,11 +111,11 @@ Stage-0
                               Select Operator [SEL_20] (rows=30601888 width=232)
                                 Output:["_col0","_col1","_col2","_col3"]
                                 Merge Join Operator [MERGEJOIN_81] (rows=30601888 width=232)
-                                  Conds:RS_17._col1=RS_102._col0(Inner),Output:["_col3","_col4","_col8","_col9"]
-                                <-Map 12 [SIMPLE_EDGE] vectorized
-                                  SHUFFLE [RS_102]
+                                  Conds:RS_17._col1=RS_97._col0(Inner),Output:["_col3","_col4","_col8","_col9"]
+                                <-Map 11 [SIMPLE_EDGE] vectorized
+                                  SHUFFLE [RS_97]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_101] (rows=462000 width=186)
+                                    Select Operator [SEL_96] (rows=462000 width=186)
                                       Output:["_col0","_col1","_col2"]
                                       TableScan [TS_9] (rows=462000 width=186)
                                         default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_class","i_category"]
@@ -124,13 +123,13 @@ Stage-0
                                   SHUFFLE [RS_17]
                                     PartitionCols:_col1
                                     Merge Join Operator [MERGEJOIN_80] (rows=30601888 width=54)
-                                      Conds:RS_14._col2=RS_92._col0(Inner),Output:["_col1","_col3","_col4"]
+                                      Conds:RS_14._col2=RS_95._col0(Inner),Output:["_col1","_col3","_col4"]
                                     <-Map 10 [SIMPLE_EDGE] vectorized
-                                      SHUFFLE [RS_92]
+                                      SHUFFLE [RS_95]
                                         PartitionCols:_col0
-                                        Select Operator [SEL_91] (rows=278 width=4)
+                                        Select Operator [SEL_94] (rows=278 width=4)
                                           Output:["_col0"]
-                                          Filter Operator [FIL_90] (rows=278 width=90)
+                                          Filter Operator [FIL_93] (rows=278 width=90)
                                             predicate:(s_state) IN ('SD', 'FL', 'MI', 'LA', 'MO', 'SC', 'AL', 'GA')
                                             TableScan [TS_6] (rows=1704 width=90)
                                               default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_state"]
@@ -138,7 +137,7 @@ Stage-0
                                       SHUFFLE [RS_14]
                                         PartitionCols:_col2
                                         Merge Join Operator [MERGEJOIN_79] (rows=187574154 width=203)
-                                          Conds:RS_100._col0=RS_84._col0(Inner),Output:["_col1","_col2","_col3","_col4"]
+                                          Conds:RS_92._col0=RS_84._col0(Inner),Output:["_col1","_col2","_col3","_col4"]
                                         <-Map 8 [SIMPLE_EDGE] vectorized
                                           PARTITION_ONLY_SHUFFLE [RS_84]
                                             PartitionCols:_col0
@@ -149,25 +148,14 @@ Stage-0
                                                 TableScan [TS_3] (rows=73049 width=8)
                                                   default@date_dim,d1,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year"]
                                         <-Map 1 [SIMPLE_EDGE] vectorized
-                                          SHUFFLE [RS_100]
+                                          SHUFFLE [RS_92]
                                             PartitionCols:_col0
-                                            Select Operator [SEL_99] (rows=525329897 width=225)
+                                            Select Operator [SEL_91] (rows=525329897 width=225)
                                               Output:["_col0","_col1","_col2","_col3","_col4"]
-                                              Filter Operator [FIL_98] (rows=525329897 width=225)
-                                                predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_12_d1_d_date_sk_min) AND DynamicValue(RS_12_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_12_d1_d_date_sk_bloom_filter))) and (ss_store_sk BETWEEN DynamicValue(RS_15_store_s_store_sk_min) AND DynamicValue(RS_15_store_s_store_sk_max) and in_bloom_filter(ss_store_sk, DynamicValue(RS_15_store_s_store_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null)
+                                              Filter Operator [FIL_90] (rows=525329897 width=225)
+                                                predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_12_d1_d_date_sk_min) AND DynamicValue(RS_12_d1_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_12_d1_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null)
                                                 TableScan [TS_0] (rows=575995635 width=225)
                                                   default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_store_sk","ss_ext_sales_price","ss_net_profit"]
-                                                <-Reducer 11 [BROADCAST_EDGE] vectorized
-                                                  BROADCAST [RS_97]
-                                                    Group By Operator [GBY_96] (rows=1 width=12)
-                                                      Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"]
-                                                    <-Map 10 [CUSTOM_SIMPLE_EDGE] vectorized
-                                                      SHUFFLE [RS_95]
-                                                        Group By Operator [GBY_94] (rows=1 width=12)
-                                                          Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                                          Select Operator [SEL_93] (rows=278 width=4)
-                                                            Output:["_col0"]
-                                                             Please refer to the previous Select Operator [SEL_91]
                                                 <-Reducer 9 [BROADCAST_EDGE] vectorized
                                                   BROADCAST [RS_89]
                                                     Group By Operator [GBY_88] (rows=1 width=12)

http://git-wip-us.apache.org/repos/asf/hive/blob/e986fc56/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out
index fb4cbf4..9ecd2bd 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query37.q.out
@@ -43,28 +43,27 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Map 1 <- Reducer 10 (BROADCAST_EDGE), Reducer 7 (BROADCAST_EDGE)
-Reducer 10 <- Reducer 9 (CUSTOM_SIMPLE_EDGE)
+Map 1 <- Reducer 7 (BROADCAST_EDGE)
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
 Reducer 3 <- Reducer 2 (ONE_TO_ONE_EDGE), Reducer 9 (SIMPLE_EDGE)
 Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
 Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
 Reducer 7 <- Map 6 (CUSTOM_SIMPLE_EDGE)
-Reducer 9 <- Map 11 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
+Reducer 9 <- Map 10 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
       Reducer 5 vectorized
-      File Output Operator [FS_102]
-        Limit [LIM_101] (rows=1 width=396)
+      File Output Operator [FS_100]
+        Limit [LIM_99] (rows=1 width=396)
           Number of rows:100
-          Select Operator [SEL_100] (rows=1 width=396)
+          Select Operator [SEL_98] (rows=1 width=396)
             Output:["_col0","_col1","_col2"]
           <-Reducer 4 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_99]
-              Group By Operator [GBY_98] (rows=1 width=396)
+            SHUFFLE [RS_97]
+              Group By Operator [GBY_96] (rows=1 width=396)
                 Output:["_col0","_col1","_col2"],keys:KEY._col0, KEY._col1, KEY._col2
               <-Reducer 3 [SIMPLE_EDGE]
                 SHUFFLE [RS_23]
@@ -75,34 +74,11 @@ Stage-0
                       keys:_col2, _col3, _col4,sort order:+++,top n:100
                       Merge Join Operator [MERGEJOIN_78] (rows=2871 width=396)
                         Conds:RS_18._col1=RS_19._col1(Inner),Output:["_col2","_col3","_col4"]
-                      <-Reducer 9 [SIMPLE_EDGE]
-                        SHUFFLE [RS_19]
-                          PartitionCols:_col1
-                          Merge Join Operator [MERGEJOIN_77] (rows=463969 width=4)
-                            Conds:RS_89._col0=RS_92._col0(Inner),Output:["_col1"]
-                          <-Map 11 [SIMPLE_EDGE] vectorized
-                            SHUFFLE [RS_92]
-                              PartitionCols:_col0
-                              Select Operator [SEL_91] (rows=8116 width=4)
-                                Output:["_col0"]
-                                Filter Operator [FIL_90] (rows=8116 width=98)
-                                  predicate:CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-06-02 00:00:00' AND TIMESTAMP'2001-08-01 00:00:00'
-                                  TableScan [TS_8] (rows=73049 width=98)
-                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"]
-                          <-Map 8 [SIMPLE_EDGE] vectorized
-                            SHUFFLE [RS_89]
-                              PartitionCols:_col0
-                              Select Operator [SEL_88] (rows=4176000 width=8)
-                                Output:["_col0","_col1"]
-                                Filter Operator [FIL_87] (rows=4176000 width=11)
-                                  predicate:inv_quantity_on_hand BETWEEN 100 AND 500
-                                  TableScan [TS_5] (rows=37584000 width=11)
-                                    default@inventory,inventory,Tbl:COMPLETE,Col:COMPLETE,Output:["inv_date_sk","inv_item_sk","inv_quantity_on_hand"]
                       <-Reducer 2 [ONE_TO_ONE_EDGE]
                         FORWARD [RS_18]
                           PartitionCols:_col1
                           Merge Join Operator [MERGEJOIN_76] (rows=1781971 width=400)
-                            Conds:RS_97._col0=RS_81._col0(Inner),Output:["_col1","_col2","_col3","_col4"]
+                            Conds:RS_89._col0=RS_81._col0(Inner),Output:["_col1","_col2","_col3","_col4"]
                           <-Map 6 [SIMPLE_EDGE] vectorized
                             PARTITION_ONLY_SHUFFLE [RS_81]
                               PartitionCols:_col0
@@ -113,25 +89,14 @@ Stage-0
                                   TableScan [TS_2] (rows=462000 width=403)
                                     default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id","i_item_desc","i_current_price","i_manufact_id"]
                           <-Map 1 [SIMPLE_EDGE] vectorized
-                            SHUFFLE [RS_97]
+                            SHUFFLE [RS_89]
                               PartitionCols:_col0
-                              Select Operator [SEL_96] (rows=287989836 width=4)
+                              Select Operator [SEL_88] (rows=287989836 width=4)
                                 Output:["_col0"]
-                                Filter Operator [FIL_95] (rows=287989836 width=4)
-                                  predicate:((cs_item_sk BETWEEN DynamicValue(RS_16_item_i_item_sk_min) AND DynamicValue(RS_16_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_16_item_i_item_sk_bloom_filter))) and (cs_item_sk BETWEEN DynamicValue(RS_19_inventory_inv_item_sk_min) AND DynamicValue(RS_19_inventory_inv_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_19_inventory_inv_item_sk_bloom_filter))))
+                                Filter Operator [FIL_87] (rows=287989836 width=4)
+                                  predicate:(cs_item_sk BETWEEN DynamicValue(RS_16_item_i_item_sk_min) AND DynamicValue(RS_16_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_16_item_i_item_sk_bloom_filter)))
                                   TableScan [TS_0] (rows=287989836 width=4)
                                     default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_item_sk"]
-                                  <-Reducer 10 [BROADCAST_EDGE] vectorized
-                                    BROADCAST [RS_94]
-                                      Group By Operator [GBY_93] (rows=1 width=12)
-                                        Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"]
-                                      <-Reducer 9 [CUSTOM_SIMPLE_EDGE]
-                                        SHUFFLE [RS_50]
-                                          Group By Operator [GBY_49] (rows=1 width=12)
-                                            Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                            Select Operator [SEL_48] (rows=463969 width=8)
-                                              Output:["_col0"]
-                                               Please refer to the previous Merge Join Operator [MERGEJOIN_77]
                                   <-Reducer 7 [BROADCAST_EDGE] vectorized
                                     BROADCAST [RS_86]
                                       Group By Operator [GBY_85] (rows=1 width=12)
@@ -143,4 +108,27 @@ Stage-0
                                             Select Operator [SEL_82] (rows=297 width=4)
                                               Output:["_col0"]
                                                Please refer to the previous Select Operator [SEL_80]
+                      <-Reducer 9 [SIMPLE_EDGE]
+                        SHUFFLE [RS_19]
+                          PartitionCols:_col1
+                          Merge Join Operator [MERGEJOIN_77] (rows=463969 width=4)
+                            Conds:RS_92._col0=RS_95._col0(Inner),Output:["_col1"]
+                          <-Map 10 [SIMPLE_EDGE] vectorized
+                            SHUFFLE [RS_95]
+                              PartitionCols:_col0
+                              Select Operator [SEL_94] (rows=8116 width=4)
+                                Output:["_col0"]
+                                Filter Operator [FIL_93] (rows=8116 width=98)
+                                  predicate:CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-06-02 00:00:00' AND TIMESTAMP'2001-08-01 00:00:00'
+                                  TableScan [TS_8] (rows=73049 width=98)
+                                    default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"]
+                          <-Map 8 [SIMPLE_EDGE] vectorized
+                            SHUFFLE [RS_92]
+                              PartitionCols:_col0
+                              Select Operator [SEL_91] (rows=4176000 width=8)
+                                Output:["_col0","_col1"]
+                                Filter Operator [FIL_90] (rows=4176000 width=11)
+                                  predicate:inv_quantity_on_hand BETWEEN 100 AND 500
+                                  TableScan [TS_5] (rows=37584000 width=11)
+                                    default@inventory,inventory,Tbl:COMPLETE,Col:COMPLETE,Output:["inv_date_sk","inv_item_sk","inv_quantity_on_hand"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e986fc56/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out
index c05256f..fceed07 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query40.q.out
@@ -67,13 +67,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Map 1 <- Reducer 10 (BROADCAST_EDGE), Reducer 12 (BROADCAST_EDGE)
-Reducer 10 <- Map 9 (CUSTOM_SIMPLE_EDGE)
-Reducer 12 <- Map 11 (CUSTOM_SIMPLE_EDGE)
+Map 1 <- Reducer 11 (BROADCAST_EDGE)
+Reducer 11 <- Map 10 (CUSTOM_SIMPLE_EDGE)
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
 Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 11 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Map 13 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
+Reducer 4 <- Map 10 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
+Reducer 5 <- Map 12 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
 Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
 Reducer 7 <- Reducer 6 (SIMPLE_EDGE)
 
@@ -82,14 +81,14 @@ Stage-0
     limit:100
     Stage-1
       Reducer 7 vectorized
-      File Output Operator [FS_127]
-        Limit [LIM_126] (rows=100 width=410)
+      File Output Operator [FS_122]
+        Limit [LIM_121] (rows=100 width=410)
           Number of rows:100
-          Select Operator [SEL_125] (rows=769995 width=410)
+          Select Operator [SEL_120] (rows=769995 width=410)
             Output:["_col0","_col1","_col2","_col3"]
           <-Reducer 6 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_124]
-              Group By Operator [GBY_123] (rows=769995 width=410)
+            SHUFFLE [RS_119]
+              Group By Operator [GBY_118] (rows=769995 width=410)
                 Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1
               <-Reducer 5 [SIMPLE_EDGE]
                 SHUFFLE [RS_28]
@@ -101,11 +100,11 @@ Stage-0
                       Select Operator [SEL_25] (rows=5757278 width=278)
                         Output:["_col0","_col1","_col2","_col3"]
                         Merge Join Operator [MERGEJOIN_99] (rows=5757278 width=278)
-                          Conds:RS_22._col1=RS_122._col0(Inner),Output:["_col4","_col7","_col9","_col10","_col12","_col14"]
-                        <-Map 13 [SIMPLE_EDGE] vectorized
-                          SHUFFLE [RS_122]
+                          Conds:RS_22._col1=RS_117._col0(Inner),Output:["_col4","_col7","_col9","_col10","_col12","_col14"]
+                        <-Map 12 [SIMPLE_EDGE] vectorized
+                          SHUFFLE [RS_117]
                             PartitionCols:_col0
-                            Select Operator [SEL_121] (rows=27 width=90)
+                            Select Operator [SEL_116] (rows=27 width=90)
                               Output:["_col0","_col1"]
                               TableScan [TS_11] (rows=27 width=90)
                                 default@warehouse,warehouse,Tbl:COMPLETE,Col:COMPLETE,Output:["w_warehouse_sk","w_state"]
@@ -113,13 +112,13 @@ Stage-0
                           SHUFFLE [RS_22]
                             PartitionCols:_col1
                             Merge Join Operator [MERGEJOIN_98] (rows=5757278 width=195)
-                              Conds:RS_19._col2=RS_110._col0(Inner),Output:["_col1","_col4","_col7","_col9","_col10","_col12"]
-                            <-Map 11 [SIMPLE_EDGE] vectorized
-                              SHUFFLE [RS_110]
+                              Conds:RS_19._col2=RS_102._col0(Inner),Output:["_col1","_col4","_col7","_col9","_col10","_col12"]
+                            <-Map 10 [SIMPLE_EDGE] vectorized
+                              SHUFFLE [RS_102]
                                 PartitionCols:_col0
-                                Select Operator [SEL_109] (rows=51333 width=104)
+                                Select Operator [SEL_101] (rows=51333 width=104)
                                   Output:["_col0","_col1"]
-                                  Filter Operator [FIL_108] (rows=51333 width=215)
+                                  Filter Operator [FIL_100] (rows=51333 width=215)
                                     predicate:i_current_price BETWEEN 0.99 AND 1.49
                                     TableScan [TS_8] (rows=462000 width=215)
                                       default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_item_id","i_current_price"]
@@ -127,13 +126,13 @@ Stage-0
                               SHUFFLE [RS_19]
                                 PartitionCols:_col2
                                 Merge Join Operator [MERGEJOIN_97] (rows=51815831 width=124)
-                                  Conds:RS_16._col0=RS_102._col0(Inner),Output:["_col1","_col2","_col4","_col7","_col9","_col10"]
+                                  Conds:RS_16._col0=RS_115._col0(Inner),Output:["_col1","_col2","_col4","_col7","_col9","_col10"]
                                 <-Map 9 [SIMPLE_EDGE] vectorized
-                                  SHUFFLE [RS_102]
+                                  SHUFFLE [RS_115]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_101] (rows=8116 width=12)
+                                    Select Operator [SEL_114] (rows=8116 width=12)
                                       Output:["_col0","_col1","_col2"]
-                                      Filter Operator [FIL_100] (rows=8116 width=98)
+                                      Filter Operator [FIL_113] (rows=8116 width=98)
                                         predicate:CAST( d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1998-03-09 00:00:00' AND TIMESTAMP'1998-05-08 00:00:00'
                                         TableScan [TS_5] (rows=73049 width=98)
                                           default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_date"]
@@ -141,42 +140,31 @@ Stage-0
                                   SHUFFLE [RS_16]
                                     PartitionCols:_col0
                                     Merge Join Operator [MERGEJOIN_96] (rows=466374405 width=167)
-                                      Conds:RS_118._col2, _col3=RS_120._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col4","_col7"]
+                                      Conds:RS_110._col2, _col3=RS_112._col0, _col1(Left Outer),Output:["_col0","_col1","_col2","_col4","_col7"]
                                     <-Map 1 [SIMPLE_EDGE] vectorized
-                                      SHUFFLE [RS_118]
+                                      SHUFFLE [RS_110]
                                         PartitionCols:_col2, _col3
-                                        Select Operator [SEL_117] (rows=285115816 width=127)
+                                        Select Operator [SEL_109] (rows=285115816 width=127)
                                           Output:["_col0","_col1","_col2","_col3","_col4"]
-                                          Filter Operator [FIL_116] (rows=285115816 width=127)
-                                            predicate:((cs_item_sk BETWEEN DynamicValue(RS_20_item_i_item_sk_min) AND DynamicValue(RS_20_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_20_item_i_item_sk_bloom_filter))) and (cs_sold_date_sk BETWEEN DynamicValue(RS_17_date_dim_d_date_sk_min) AND DynamicValue(RS_17_date_dim_d_date_sk_max) and in_bloom_filter(cs_sold_date_sk, DynamicValue(RS_17_date_dim_d_date_sk_bloom_filter))) and cs_sold_date_sk is not null and cs_warehouse_sk is not null)
+                                          Filter Operator [FIL_108] (rows=285115816 width=127)
+                                            predicate:((cs_item_sk BETWEEN DynamicValue(RS_20_item_i_item_sk_min) AND DynamicValue(RS_20_item_i_item_sk_max) and in_bloom_filter(cs_item_sk, DynamicValue(RS_20_item_i_item_sk_bloom_filter))) and cs_sold_date_sk is not null and cs_warehouse_sk is not null)
                                             TableScan [TS_0] (rows=287989836 width=127)
                                               default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["cs_sold_date_sk","cs_warehouse_sk","cs_item_sk","cs_order_number","cs_sales_price"]
-                                            <-Reducer 10 [BROADCAST_EDGE] vectorized
+                                            <-Reducer 11 [BROADCAST_EDGE] vectorized
                                               BROADCAST [RS_107]
                                                 Group By Operator [GBY_106] (rows=1 width=12)
                                                   Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"]
-                                                <-Map 9 [CUSTOM_SIMPLE_EDGE] vectorized
+                                                <-Map 10 [CUSTOM_SIMPLE_EDGE] vectorized
                                                   SHUFFLE [RS_105]
                                                     Group By Operator [GBY_104] (rows=1 width=12)
                                                       Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                                      Select Operator [SEL_103] (rows=8116 width=4)
+                                                      Select Operator [SEL_103] (rows=51333 width=4)
                                                         Output:["_col0"]
                                                          Please refer to the previous Select Operator [SEL_101]
-                                            <-Reducer 12 [BROADCAST_EDGE] vectorized
-                                              BROADCAST [RS_115]
-                                                Group By Operator [GBY_114] (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_113]
-                                                    Group By Operator [GBY_112] (rows=1 width=12)
-                                                      Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                                      Select Operator [SEL_111] (rows=51333 width=4)
-                                                        Output:["_col0"]
-                                                         Please refer to the previous Select Operator [SEL_109]
                                     <-Map 8 [SIMPLE_EDGE] vectorized
-                                      SHUFFLE [RS_120]
+                                      SHUFFLE [RS_112]
                                         PartitionCols:_col0, _col1
-                                        Select Operator [SEL_119] (rows=28798881 width=117)
+                                        Select Operator [SEL_111] (rows=28798881 width=117)
                                           Output:["_col0","_col1","_col2"]
                                           TableScan [TS_3] (rows=28798881 width=117)
                                             default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["cr_item_sk","cr_order_number","cr_refunded_cash"]

http://git-wip-us.apache.org/repos/asf/hive/blob/e986fc56/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out
index 02b9f7c..66fe357 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query42.q.out
@@ -51,29 +51,28 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Map 1 <- Reducer 7 (BROADCAST_EDGE), Reducer 9 (BROADCAST_EDGE)
+Map 1 <- Reducer 7 (BROADCAST_EDGE)
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
 Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
 Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
 Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
 Reducer 7 <- Map 6 (CUSTOM_SIMPLE_EDGE)
-Reducer 9 <- Map 8 (CUSTOM_SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
       Reducer 5 vectorized
-      File Output Operator [FS_79]
-        Limit [LIM_78] (rows=100 width=210)
+      File Output Operator [FS_74]
+        Limit [LIM_73] (rows=100 width=210)
           Number of rows:100
-          Select Operator [SEL_77] (rows=110 width=210)
+          Select Operator [SEL_72] (rows=110 width=210)
             Output:["_col0","_col1","_col2","_col3"]
           <-Reducer 4 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_76]
-              Select Operator [SEL_75] (rows=110 width=318)
+            SHUFFLE [RS_71]
+              Select Operator [SEL_70] (rows=110 width=318)
                 Output:["_col0","_col1","_col3"]
-                Group By Operator [GBY_74] (rows=110 width=206)
+                Group By Operator [GBY_69] (rows=110 width=206)
                   Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1
                 <-Reducer 3 [SIMPLE_EDGE]
                   SHUFFLE [RS_17]
@@ -81,13 +80,13 @@ Stage-0
                     Group By Operator [GBY_16] (rows=120 width=206)
                       Output:["_col0","_col1","_col2"],aggregations:["sum(_col2)"],keys:_col5, _col6
                       Merge Join Operator [MERGEJOIN_54] (rows=2301098 width=94)
-                        Conds:RS_12._col1=RS_65._col0(Inner),Output:["_col2","_col5","_col6"]
+                        Conds:RS_12._col1=RS_68._col0(Inner),Output:["_col2","_col5","_col6"]
                       <-Map 8 [SIMPLE_EDGE] vectorized
-                        PARTITION_ONLY_SHUFFLE [RS_65]
+                        SHUFFLE [RS_68]
                           PartitionCols:_col0
-                          Select Operator [SEL_64] (rows=7333 width=97)
+                          Select Operator [SEL_67] (rows=7333 width=97)
                             Output:["_col0","_col1","_col2"]
-                            Filter Operator [FIL_63] (rows=7333 width=101)
+                            Filter Operator [FIL_66] (rows=7333 width=101)
                               predicate:(i_manager_id = 1)
                               TableScan [TS_6] (rows=462000 width=101)
                                 default@item,item,Tbl:COMPLETE,Col:COMPLETE,Output:["i_item_sk","i_category_id","i_category","i_manager_id"]
@@ -95,7 +94,7 @@ Stage-0
                         SHUFFLE [RS_12]
                           PartitionCols:_col1
                           Merge Join Operator [MERGEJOIN_53] (rows=15062131 width=4)
-                            Conds:RS_73._col0=RS_57._col0(Inner),Output:["_col1","_col2"]
+                            Conds:RS_65._col0=RS_57._col0(Inner),Output:["_col1","_col2"]
                           <-Map 6 [SIMPLE_EDGE] vectorized
                             PARTITION_ONLY_SHUFFLE [RS_57]
                               PartitionCols:_col0
@@ -106,12 +105,12 @@ Stage-0
                                   TableScan [TS_3] (rows=73049 width=12)
                                     default@date_dim,dt,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"]
                           <-Map 1 [SIMPLE_EDGE] vectorized
-                            SHUFFLE [RS_73]
+                            SHUFFLE [RS_65]
                               PartitionCols:_col0
-                              Select Operator [SEL_72] (rows=550076554 width=114)
+                              Select Operator [SEL_64] (rows=550076554 width=114)
                                 Output:["_col0","_col1","_col2"]
-                                Filter Operator [FIL_71] (rows=550076554 width=114)
-                                  predicate:((ss_item_sk BETWEEN DynamicValue(RS_13_item_i_item_sk_min) AND DynamicValue(RS_13_item_i_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_13_item_i_item_sk_bloom_filter))) and (ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null)
+                                Filter Operator [FIL_63] (rows=550076554 width=114)
+                                  predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_dt_d_date_sk_min) AND DynamicValue(RS_10_dt_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_dt_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null)
                                   TableScan [TS_0] (rows=575995635 width=114)
                                     default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_ext_sales_price"]
                                   <-Reducer 7 [BROADCAST_EDGE] vectorized
@@ -125,15 +124,4 @@ Stage-0
                                             Select Operator [SEL_58] (rows=50 width=4)
                                               Output:["_col0"]
                                                Please refer to the previous Select Operator [SEL_56]
-                                  <-Reducer 9 [BROADCAST_EDGE] vectorized
-                                    BROADCAST [RS_70]
-                                      Group By Operator [GBY_69] (rows=1 width=12)
-                                        Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"]
-                                      <-Map 8 [CUSTOM_SIMPLE_EDGE] vectorized
-                                        PARTITION_ONLY_SHUFFLE [RS_68]
-                                          Group By Operator [GBY_67] (rows=1 width=12)
-                                            Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                            Select Operator [SEL_66] (rows=7333 width=4)
-                                              Output:["_col0"]
-                                               Please refer to the previous Select Operator [SEL_64]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e986fc56/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out
index 495b6bd..d467fd6 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query43.q.out
@@ -45,27 +45,26 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Map 1 <- Reducer 7 (BROADCAST_EDGE), Reducer 9 (BROADCAST_EDGE)
+Map 1 <- Reducer 7 (BROADCAST_EDGE)
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
 Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
 Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
 Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
 Reducer 7 <- Map 6 (CUSTOM_SIMPLE_EDGE)
-Reducer 9 <- Map 8 (CUSTOM_SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
       Reducer 5 vectorized
-      File Output Operator [FS_79]
-        Limit [LIM_78] (rows=100 width=972)
+      File Output Operator [FS_74]
+        Limit [LIM_73] (rows=100 width=972)
           Number of rows:100
-          Select Operator [SEL_77] (rows=3751 width=972)
+          Select Operator [SEL_72] (rows=3751 width=972)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
           <-Reducer 4 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_76]
-              Group By Operator [GBY_75] (rows=3751 width=972)
+            SHUFFLE [RS_71]
+              Group By Operator [GBY_70] (rows=3751 width=972)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)","sum(VALUE._col4)","sum(VALUE._col5)","sum(VALUE._col6)"],keys:KEY._col0, KEY._col1
               <-Reducer 3 [SIMPLE_EDGE]
                 SHUFFLE [RS_18]
@@ -77,13 +76,13 @@ Stage-0
                       Select Operator [SEL_15] (rows=37536846 width=257)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                         Merge Join Operator [MERGEJOIN_55] (rows=37536846 width=257)
-                          Conds:RS_12._col1=RS_66._col0(Inner),Output:["_col2","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col12","_col13"]
+                          Conds:RS_12._col1=RS_69._col0(Inner),Output:["_col2","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col12","_col13"]
                         <-Map 8 [SIMPLE_EDGE] vectorized
-                          PARTITION_ONLY_SHUFFLE [RS_66]
+                          SHUFFLE [RS_69]
                             PartitionCols:_col0
-                            Select Operator [SEL_65] (rows=341 width=192)
+                            Select Operator [SEL_68] (rows=341 width=192)
                               Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_64] (rows=341 width=303)
+                              Filter Operator [FIL_67] (rows=341 width=303)
                                 predicate:(s_gmt_offset = -6)
                                 TableScan [TS_6] (rows=1704 width=303)
                                   default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_store_id","s_store_name","s_gmt_offset"]
@@ -91,7 +90,7 @@ Stage-0
                           SHUFFLE [RS_12]
                             PartitionCols:_col1
                             Merge Join Operator [MERGEJOIN_54] (rows=187574154 width=129)
-                              Conds:RS_74._col0=RS_58._col0(Inner),Output:["_col1","_col2","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
+                              Conds:RS_66._col0=RS_58._col0(Inner),Output:["_col1","_col2","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
                             <-Map 6 [SIMPLE_EDGE] vectorized
                               PARTITION_ONLY_SHUFFLE [RS_58]
                                 PartitionCols:_col0
@@ -102,12 +101,12 @@ Stage-0
                                     TableScan [TS_3] (rows=73049 width=99)
                                       default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_day_name"]
                             <-Map 1 [SIMPLE_EDGE] vectorized
-                              SHUFFLE [RS_74]
+                              SHUFFLE [RS_66]
                                 PartitionCols:_col0
-                                Select Operator [SEL_73] (rows=525329897 width=114)
+                                Select Operator [SEL_65] (rows=525329897 width=114)
                                   Output:["_col0","_col1","_col2"]
-                                  Filter Operator [FIL_72] (rows=525329897 width=114)
-                                    predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and (ss_store_sk BETWEEN DynamicValue(RS_13_store_s_store_sk_min) AND DynamicValue(RS_13_store_s_store_sk_max) and in_bloom_filter(ss_store_sk, DynamicValue(RS_13_store_s_store_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null)
+                                  Filter Operator [FIL_64] (rows=525329897 width=114)
+                                    predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_10_date_dim_d_date_sk_min) AND DynamicValue(RS_10_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_10_date_dim_d_date_sk_bloom_filter))) and ss_sold_date_sk is not null and ss_store_sk is not null)
                                     TableScan [TS_0] (rows=575995635 width=114)
                                       default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_store_sk","ss_sales_price"]
                                     <-Reducer 7 [BROADCAST_EDGE] vectorized
@@ -121,15 +120,4 @@ Stage-0
                                               Select Operator [SEL_59] (rows=652 width=4)
                                                 Output:["_col0"]
                                                  Please refer to the previous Select Operator [SEL_57]
-                                    <-Reducer 9 [BROADCAST_EDGE] vectorized
-                                      BROADCAST [RS_71]
-                                        Group By Operator [GBY_70] (rows=1 width=12)
-                                          Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"]
-                                        <-Map 8 [CUSTOM_SIMPLE_EDGE] vectorized
-                                          PARTITION_ONLY_SHUFFLE [RS_69]
-                                            Group By Operator [GBY_68] (rows=1 width=12)
-                                              Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                              Select Operator [SEL_67] (rows=341 width=4)
-                                                Output:["_col0"]
-                                                 Please refer to the previous Select Operator [SEL_65]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e986fc56/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out
index 72a6b26..dde72e0 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query46.q.out
@@ -83,28 +83,26 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Map 5 <- Reducer 12 (BROADCAST_EDGE), Reducer 14 (BROADCAST_EDGE), Reducer 16 (BROADCAST_EDGE)
+Map 5 <- Reducer 12 (BROADCAST_EDGE)
 Reducer 10 <- Reducer 9 (SIMPLE_EDGE)
 Reducer 12 <- Map 11 (CUSTOM_SIMPLE_EDGE)
-Reducer 14 <- Map 13 (CUSTOM_SIMPLE_EDGE)
-Reducer 16 <- Map 15 (CUSTOM_SIMPLE_EDGE)
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 10 (SIMPLE_EDGE)
-Reducer 3 <- Map 17 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 3 <- Map 15 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
 Reducer 4 <- Reducer 3 (SIMPLE_EDGE)
 Reducer 6 <- Map 11 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
 Reducer 7 <- Map 13 (SIMPLE_EDGE), Reducer 6 (SIMPLE_EDGE)
-Reducer 8 <- Map 15 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
-Reducer 9 <- Map 17 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE)
+Reducer 8 <- Map 14 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
+Reducer 9 <- Map 15 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
       Reducer 4 vectorized
-      File Output Operator [FS_186]
-        Limit [LIM_185] (rows=100 width=594)
+      File Output Operator [FS_176]
+        Limit [LIM_175] (rows=100 width=594)
           Number of rows:100
-          Select Operator [SEL_184] (rows=8380115 width=594)
+          Select Operator [SEL_174] (rows=8380115 width=594)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
           <-Reducer 3 [SIMPLE_EDGE]
             SHUFFLE [RS_44]
@@ -113,11 +111,11 @@ Stage-0
                 Filter Operator [FIL_42] (rows=8380115 width=594)
                   predicate:(_col10 <> _col6)
                   Merge Join Operator [MERGEJOIN_147] (rows=8380115 width=594)
-                    Conds:RS_39._col1=RS_179._col0(Inner),Output:["_col2","_col3","_col4","_col6","_col7","_col8","_col10"]
-                  <-Map 17 [SIMPLE_EDGE] vectorized
-                    SHUFFLE [RS_179]
+                    Conds:RS_39._col1=RS_169._col0(Inner),Output:["_col2","_col3","_col4","_col6","_col7","_col8","_col10"]
+                  <-Map 15 [SIMPLE_EDGE] vectorized
+                    SHUFFLE [RS_169]
                       PartitionCols:_col0
-                      Select Operator [SEL_178] (rows=40000000 width=97)
+                      Select Operator [SEL_168] (rows=40000000 width=97)
                         Output:["_col0","_col1"]
                         TableScan [TS_34] (rows=40000000 width=97)
                           default@customer_address,current_addr,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_city"]
@@ -125,7 +123,7 @@ Stage-0
                     SHUFFLE [RS_39]
                       PartitionCols:_col1
                       Merge Join Operator [MERGEJOIN_146] (rows=8380115 width=505)
-                        Conds:RS_150._col0=RS_183._col1(Inner),Output:["_col1","_col2","_col3","_col4","_col6","_col7","_col8"]
+                        Conds:RS_150._col0=RS_173._col1(Inner),Output:["_col1","_col2","_col3","_col4","_col6","_col7","_col8"]
                       <-Map 1 [SIMPLE_EDGE] vectorized
                         SHUFFLE [RS_150]
                           PartitionCols:_col0
@@ -136,11 +134,11 @@ Stage-0
                               TableScan [TS_0] (rows=80000000 width=188)
                                 default@customer,customer,Tbl:COMPLETE,Col:COMPLETE,Output:["c_customer_sk","c_current_addr_sk","c_first_name","c_last_name"]
                       <-Reducer 10 [SIMPLE_EDGE] vectorized
-                        SHUFFLE [RS_183]
+                        SHUFFLE [RS_173]
                           PartitionCols:_col1
-                          Select Operator [SEL_182] (rows=8380115 width=321)
+                          Select Operator [SEL_172] (rows=8380115 width=321)
                             Output:["_col0","_col1","_col2","_col3","_col4"]
-                            Group By Operator [GBY_181] (rows=8380115 width=321)
+                            Group By Operator [GBY_171] (rows=8380115 width=321)
                               Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3
                             <-Reducer 9 [SIMPLE_EDGE]
                               SHUFFLE [RS_31]
@@ -148,22 +146,22 @@ Stage-0
                                 Group By Operator [GBY_30] (rows=8380115 width=321)
                                   Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col6)","sum(_col7)"],keys:_col1, _col12, _col3, _col5
                                   Merge Join Operator [MERGEJOIN_145] (rows=8380115 width=97)
-                                    Conds:RS_26._col3=RS_180._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col12"]
-                                  <-Map 17 [SIMPLE_EDGE] vectorized
-                                    SHUFFLE [RS_180]
+                                    Conds:RS_26._col3=RS_170._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col12"]
+                                  <-Map 15 [SIMPLE_EDGE] vectorized
+                                    SHUFFLE [RS_170]
                                       PartitionCols:_col0
-                                       Please refer to the previous Select Operator [SEL_178]
+                                       Please refer to the previous Select Operator [SEL_168]
                                   <-Reducer 8 [SIMPLE_EDGE]
                                     SHUFFLE [RS_26]
                                       PartitionCols:_col3
                                       Merge Join Operator [MERGEJOIN_144] (rows=8380115 width=4)
-                                        Conds:RS_23._col2=RS_169._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7"]
-                                      <-Map 15 [SIMPLE_EDGE] vectorized
-                                        SHUFFLE [RS_169]
+                                        Conds:RS_23._col2=RS_167._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7"]
+                                      <-Map 14 [SIMPLE_EDGE] vectorized
+                                        SHUFFLE [RS_167]
                                           PartitionCols:_col0
-                                          Select Operator [SEL_168] (rows=1855 width=4)
+                                          Select Operator [SEL_166] (rows=1855 width=4)
                                             Output:["_col0"]
-                                            Filter Operator [FIL_167] (rows=1855 width=12)
+                                            Filter Operator [FIL_165] (rows=1855 width=12)
                                               predicate:((hd_dep_count = 2) or (hd_vehicle_count = 1))
                                               TableScan [TS_12] (rows=7200 width=12)
                                                 default@household_demographics,household_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["hd_demo_sk","hd_dep_count","hd_vehicle_count"]
@@ -171,13 +169,13 @@ Stage-0
                                         SHUFFLE [RS_23]
                                           PartitionCols:_col2
                                           Merge Join Operator [MERGEJOIN_143] (rows=32526589 width=90)
-                                            Conds:RS_20._col4=RS_161._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col7"]
+                                            Conds:RS_20._col4=RS_164._col0(Inner),Output:["_col1","_col2","_col3","_col5","_col6","_col7"]
                                           <-Map 13 [SIMPLE_EDGE] vectorized
-                                            SHUFFLE [RS_161]
+                                            SHUFFLE [RS_164]
                                               PartitionCols:_col0
-                                              Select Operator [SEL_160] (rows=35 width=4)
+                                              Select Operator [SEL_163] (rows=35 width=4)
                                                 Output:["_col0"]
-                                                Filter Operator [FIL_159] (rows=35 width=97)
+                                                Filter Operator [FIL_162] (rows=35 width=97)
                                                   predicate:(s_city) IN ('Cedar Grove', 'Wildwood', 'Union', 'Salem', 'Highland Park')
                                                   TableScan [TS_9] (rows=1704 width=97)
                                                     default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_city"]
@@ -185,7 +183,7 @@ Stage-0
                                             SHUFFLE [RS_20]
                                               PartitionCols:_col4
                                               Merge Join Operator [MERGEJOIN_142] (rows=196204013 width=218)
-                                                Conds:RS_177._col0=RS_153._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
+                                                Conds:RS_161._col0=RS_153._col0(Inner),Output:["_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
                                               <-Map 11 [SIMPLE_EDGE] vectorized
                                                 SHUFFLE [RS_153]
                                                   PartitionCols:_col0
@@ -196,12 +194,12 @@ Stage-0
                                                       TableScan [TS_6] (rows=73049 width=12)
                                                         default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_dow"]
                                               <-Map 5 [SIMPLE_EDGE] vectorized
-                                                SHUFFLE [RS_177]
+                                                SHUFFLE [RS_161]
                                                   PartitionCols:_col0
-                                                  Select Operator [SEL_176] (rows=457565061 width=237)
+                                                  Select Operator [SEL_160] (rows=457565061 width=237)
                                                     Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                                                    Filter Operator [FIL_175] (rows=457565061 width=237)
-                                                      predicate:((ss_hdemo_sk BETWEEN DynamicValue(RS_24_household_demographics_hd_demo_sk_min) AND DynamicValue(RS_24_household_demographics_hd_demo_sk_max) and in_bloom_filter(ss_hdemo_sk, DynamicValue(RS_24_household_demographics_hd_demo_sk_bloom_filter))) and (ss_sold_date_sk BETWEEN DynamicValue(RS_18_date_dim_d_date_sk_min) AND DynamicValue(RS_18_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_18_date_dim_d_date_sk_bloom_filter))) and (ss_store_sk BETWEEN DynamicValue(RS_21_store_s_store_sk_min) AND DynamicValue(RS_21_store_s_store_sk_max) and in_bloom_filter(ss_store_sk, DynamicValue(RS_21_store_s_store_sk_bloom_filter))) and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
+                                                    Filter Operator [FIL_159] (rows=457565061 width=237)
+                                                      predicate:((ss_sold_date_sk BETWEEN DynamicValue(RS_18_date_dim_d_date_sk_min) AND DynamicValue(RS_18_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_18_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_customer_sk is not null and ss_hdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
                                                       TableScan [TS_3] (rows=575995635 width=237)
                                                         default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_customer_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_ticket_number","ss_coupon_amt","ss_net_profit"]
                                                       <-Reducer 12 [BROADCAST_EDGE] vectorized
@@ -215,26 +213,4 @@ Stage-0
                                                                 Select Operator [SEL_154] (rows=783 width=4)
                                                                   Output:["_col0"]
                                                                    Please refer to the previous Select Operator [SEL_152]
-                                                      <-Reducer 14 [BROADCAST_EDGE] vectorized
-                                                        BROADCAST [RS_166]
-                                                          Group By Operator [GBY_165] (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
-                                                            SHUFFLE [RS_164]
-                                                              Group By Operator [GBY_163] (rows=1 width=12)
-                                                                Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                                                Select Operator [SEL_162] (rows=35 width=4)
-                                                                  Output:["_col0"]
-                                                                   Please refer to the previous Select Operator [SEL_160]
-                                                      <-Reducer 16 [BROADCAST_EDGE] vectorized
-                                                        BROADCAST [RS_174]
-                                                          Group By Operator [GBY_173] (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_172]
-                                                              Group By Operator [GBY_171] (rows=1 width=12)
-                                                                Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                                                Select Operator [SEL_170] (rows=1855 width=4)
-                                                                  Output:["_col0"]
-                                                                   Please refer to the previous Select Operator [SEL_168]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e986fc56/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out
index b84dfce..af9d442 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query48.q.out
@@ -143,22 +143,20 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Map 7 <- Reducer 11 (BROADCAST_EDGE), Reducer 6 (BROADCAST_EDGE), Reducer 9 (BROADCAST_EDGE)
-Reducer 11 <- Map 10 (CUSTOM_SIMPLE_EDGE)
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
-Reducer 3 <- Map 8 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 10 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
+Map 6 <- Reducer 8 (BROADCAST_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 6 (SIMPLE_EDGE)
+Reducer 3 <- Map 7 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 4 <- Map 9 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
 Reducer 5 <- Reducer 4 (CUSTOM_SIMPLE_EDGE)
-Reducer 6 <- Map 1 (CUSTOM_SIMPLE_EDGE)
-Reducer 9 <- Map 8 (CUSTOM_SIMPLE_EDGE)
+Reducer 8 <- Map 7 (CUSTOM_SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:-1
     Stage-1
       Reducer 5 vectorized
-      File Output Operator [FS_102]
-        Group By Operator [GBY_101] (rows=1 width=8)
+      File Output Operator [FS_92]
+        Group By Operator [GBY_91] (rows=1 width=8)
           Output:["_col0"],aggregations:["sum(VALUE._col0)"]
         <-Reducer 4 [CUSTOM_SIMPLE_EDGE]
           PARTITION_ONLY_SHUFFLE [RS_24]
@@ -169,13 +167,13 @@ Stage-0
                 Filter Operator [FIL_21] (rows=20247 width=24)
                   predicate:((_col10 and _col5) or (_col11 and _col6) or (_col12 and _col7))
                   Merge Join Operator [MERGEJOIN_73] (rows=26999 width=24)
-                    Conds:RS_18._col3=RS_92._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col10","_col11","_col12"]
-                  <-Map 10 [SIMPLE_EDGE] vectorized
-                    SHUFFLE [RS_92]
+                    Conds:RS_18._col3=RS_90._col0(Inner),Output:["_col4","_col5","_col6","_col7","_col10","_col11","_col12"]
+                  <-Map 9 [SIMPLE_EDGE] vectorized
+                    SHUFFLE [RS_90]
                       PartitionCols:_col0
-                      Select Operator [SEL_91] (rows=3529412 width=16)
+                      Select Operator [SEL_89] (rows=3529412 width=16)
                         Output:["_col0","_col1","_col2","_col3"]
-                        Filter Operator [FIL_90] (rows=3529412 width=187)
+                        Filter Operator [FIL_88] (rows=3529412 width=187)
                           predicate:((ca_country = 'United States') and (ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV'))
                           TableScan [TS_9] (rows=40000000 width=187)
                             default@customer_address,customer_address,Tbl:COMPLETE,Col:COMPLETE,Output:["ca_address_sk","ca_state","ca_country"]
@@ -183,13 +181,13 @@ Stage-0
                     SHUFFLE [RS_18]
                       PartitionCols:_col3
                       Merge Join Operator [MERGEJOIN_72] (rows=305980 width=12)
-                        Conds:RS_15._col1=RS_84._col0(Inner),Output:["_col3","_col4","_col5","_col6","_col7"]
-                      <-Map 8 [SIMPLE_EDGE] vectorized
-                        PARTITION_ONLY_SHUFFLE [RS_84]
+                        Conds:RS_15._col1=RS_79._col0(Inner),Output:["_col3","_col4","_col5","_col6","_col7"]
+                      <-Map 7 [SIMPLE_EDGE] vectorized
+                        PARTITION_ONLY_SHUFFLE [RS_79]
                           PartitionCols:_col0
-                          Select Operator [SEL_83] (rows=652 width=4)
+                          Select Operator [SEL_78] (rows=652 width=4)
                             Output:["_col0"]
-                            Filter Operator [FIL_82] (rows=652 width=8)
+                            Filter Operator [FIL_77] (rows=652 width=8)
                               predicate:(d_year = 1998)
                               TableScan [TS_6] (rows=73049 width=8)
                                 default@date_dim,date_dim,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year"]
@@ -197,9 +195,9 @@ Stage-0
                         SHUFFLE [RS_15]
                           PartitionCols:_col1
                           Merge Join Operator [MERGEJOIN_71] (rows=856943 width=12)
-                            Conds:RS_76._col0=RS_100._col1(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7"]
+                            Conds:RS_76._col0=RS_87._col1(Inner),Output:["_col1","_col3","_col4","_col5","_col6","_col7"]
                           <-Map 1 [SIMPLE_EDGE] vectorized
-                            PARTITION_ONLY_SHUFFLE [RS_76]
+                            SHUFFLE [RS_76]
                               PartitionCols:_col0
                               Select Operator [SEL_75] (rows=29552 width=4)
                                 Output:["_col0"]
@@ -207,46 +205,24 @@ Stage-0
                                   predicate:((cd_education_status = '4 yr Degree') and (cd_marital_status = 'M'))
                                   TableScan [TS_0] (rows=1861800 width=183)
                                     default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:COMPLETE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"]
-                          <-Map 7 [SIMPLE_EDGE] vectorized
-                            SHUFFLE [RS_100]
+                          <-Map 6 [SIMPLE_EDGE] vectorized
+                            SHUFFLE [RS_87]
                               PartitionCols:_col1
-                              Select Operator [SEL_99] (rows=53235296 width=27)
+                              Select Operator [SEL_86] (rows=53235296 width=27)
                                 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                                Filter Operator [FIL_98] (rows=53235296 width=233)
-                                  predicate:((ss_addr_sk BETWEEN DynamicValue(RS_19_customer_address_ca_address_sk_min) AND DynamicValue(RS_19_customer_address_ca_address_sk_max) and in_bloom_filter(ss_addr_sk, DynamicValue(RS_19_customer_address_ca_address_sk_bloom_filter))) and (ss_cdemo_sk BETWEEN DynamicValue(RS_12_customer_demographics_cd_demo_sk_min) AND DynamicValue(RS_12_customer_demographics_cd_demo_sk_max) and in_bloom_filter(ss_cdemo_sk, DynamicValue(RS_12_customer_demographics_cd_demo_sk_bloom_filter))) and (ss_net_profit BETWEEN 0 AND 2000 or ss_net_profit BETWEEN 150 AND 3000 or ss_net_profit BETWEEN 50 AND 25000) and (ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_c
 demo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
+                                Filter Operator [FIL_85] (rows=53235296 width=233)
+                                  predicate:((ss_net_profit BETWEEN 0 AND 2000 or ss_net_profit BETWEEN 150 AND 3000 or ss_net_profit BETWEEN 50 AND 25000) and (ss_sales_price BETWEEN 100 AND 150 or ss_sales_price BETWEEN 50 AND 100 or ss_sales_price BETWEEN 150 AND 200) and (ss_sold_date_sk BETWEEN DynamicValue(RS_16_date_dim_d_date_sk_min) AND DynamicValue(RS_16_date_dim_d_date_sk_max) and in_bloom_filter(ss_sold_date_sk, DynamicValue(RS_16_date_dim_d_date_sk_bloom_filter))) and ss_addr_sk is not null and ss_cdemo_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
                                   TableScan [TS_3] (rows=575995635 width=233)
                                     default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_net_profit"]
-                                  <-Reducer 11 [BROADCAST_EDGE] vectorized
-                                    BROADCAST [RS_97]
-                                      Group By Operator [GBY_96] (rows=1 width=12)
-                                        Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=3529412)"]
-                                      <-Map 10 [CUSTOM_SIMPLE_EDGE] vectorized
-                                        SHUFFLE [RS_95]
-                                          Group By Operator [GBY_94] (rows=1 width=12)
-                                            Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=3529412)"]
-                                            Select Operator [SEL_93] (rows=3529412 width=4)
-                                              Output:["_col0"]
-                                               Please refer to the previous Select Operator [SEL_91]
-                                  <-Reducer 6 [BROADCAST_EDGE] vectorized
-                                    BROADCAST [RS_81]
-                                      Group By Operator [GBY_80] (rows=1 width=12)
-                                        Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"]
-                                      <-Map 1 [CUSTOM_SIMPLE_EDGE] vectorized
-                                        PARTITION_ONLY_SHUFFLE [RS_79]
-                                          Group By Operator [GBY_78] (rows=1 width=12)
-                                            Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                            Select Operator [SEL_77] (rows=29552 width=4)
-                                              Output:["_col0"]
-                                               Please refer to the previous Select Operator [SEL_75]
-                                  <-Reducer 9 [BROADCAST_EDGE] vectorized
-                                    BROADCAST [RS_89]
-                                      Group By Operator [GBY_88] (rows=1 width=12)
+                                  <-Reducer 8 [BROADCAST_EDGE] vectorized
+                                    BROADCAST [RS_84]
+                                      Group By Operator [GBY_83] (rows=1 width=12)
                                         Output:["_col0","_col1","_col2"],aggregations:["min(VALUE._col0)","max(VALUE._col1)","bloom_filter(VALUE._col2, expectedEntries=1000000)"]
-                                      <-Map 8 [CUSTOM_SIMPLE_EDGE] vectorized
-                                        PARTITION_ONLY_SHUFFLE [RS_87]
-                                          Group By Operator [GBY_86] (rows=1 width=12)
+                                      <-Map 7 [CUSTOM_SIMPLE_EDGE] vectorized
+                                        PARTITION_ONLY_SHUFFLE [RS_82]
+                                          Group By Operator [GBY_81] (rows=1 width=12)
                                             Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                            Select Operator [SEL_85] (rows=652 width=4)
+                                            Select Operator [SEL_80] (rows=652 width=4)
                                               Output:["_col0"]
-                                               Please refer to the previous Select Operator [SEL_83]
+                                               Please refer to the previous Select Operator [SEL_78]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e986fc56/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out
index 05d84d8..9eebd05 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query50.q.out
@@ -127,29 +127,27 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Map 11 <- Reducer 7 (BROADCAST_EDGE), Reducer 8 (BROADCAST_EDGE), Reducer 9 (BROADCAST_EDGE)
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 10 (SIMPLE_EDGE)
-Reducer 3 <- Map 11 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 12 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
+Map 9 <- Reducer 7 (BROADCAST_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
+Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 4 <- Map 10 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
 Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
 Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
 Reducer 7 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
-Reducer 8 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
-Reducer 9 <- Reducer 2 (CUSTOM_SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
       Reducer 6 vectorized
-      File Output Operator [FS_118]
-        Limit [LIM_117] (rows=100 width=858)
+      File Output Operator [FS_114]
+        Limit [LIM_113] (rows=100 width=858)
           Number of rows:100
-          Select Operator [SEL_116] (rows=11945216 width=857)
+          Select Operator [SEL_112] (rows=11945216 width=857)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
           <-Reducer 5 [SIMPLE_EDGE] vectorized
-            SHUFFLE [RS_115]
-              Group By Operator [GBY_114] (rows=11945216 width=857)
+            SHUFFLE [RS_111]
+              Group By Operator [GBY_110] (rows=11945216 width=857)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)","sum(VALUE._col3)","sum(VALUE._col4)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4, KEY._col5, KEY._col6, KEY._col7, KEY._col8, KEY._col9
               <-Reducer 4 [SIMPLE_EDGE]
                 SHUFFLE [RS_23]
@@ -161,11 +159,11 @@ Stage-0
                       Select Operator [SEL_20] (rows=11945216 width=821)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
                         Merge Join Operator [MERGEJOIN_96] (rows=11945216 width=821)
-                          Conds:RS_17._col8=RS_113._col0(Inner),Output:["_col0","_col5","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20"]
-                        <-Map 12 [SIMPLE_EDGE] vectorized
-                          SHUFFLE [RS_113]
+                          Conds:RS_17._col8=RS_109._col0(Inner),Output:["_col0","_col5","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20"]
+                        <-Map 10 [SIMPLE_EDGE] vectorized
+                          SHUFFLE [RS_109]
                             PartitionCols:_col0
-                            Select Operator [SEL_112] (rows=1704 width=821)
+                            Select Operator [SEL_108] (rows=1704 width=821)
                               Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
                               TableScan [TS_9] (rows=1704 width=821)
                                 default@store,store,Tbl:COMPLETE,Col:COMPLETE,Output:["s_store_sk","s_store_name","s_company_id","s_street_number","s_street_name","s_street_type","s_suite_number","s_city","s_county","s_state","s_zip"]
@@ -173,7 +171,7 @@ Stage-0
                           SHUFFLE [RS_17]
                             PartitionCols:_col8
                             Merge Join Operator [MERGEJOIN_95] (rows=11945216 width=3)
-                              Conds:RS_14._col1, _col2, _col3=RS_111._col1, _col2, _col4(Inner),Output:["_col0","_col5","_col8"]
+                              Conds:RS_14._col1, _col2, _col3=RS_107._col1, _col2, _col4(Inner),Output:["_col0","_col5","_col8"]
                             <-Reducer 2 [SIMPLE_EDGE]
                               PARTITION_ONLY_SHUFFLE [RS_14]
                                 PartitionCols:_col1, _col2, _col3
@@ -188,7 +186,7 @@ Stage-0
                                         predicate:(sr_customer_sk is not null and sr_returned_date_sk is not null)
                                         TableScan [TS_0] (rows=57591150 width=15)
                                           default@store_returns,store_returns,Tbl:COMPLETE,Col:COMPLETE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number"]
-                                <-Map 10 [SIMPLE_EDGE] vectorized
+                                <-Map 8 [SIMPLE_EDGE] vectorized
                                   SHUFFLE [RS_102]
                                     PartitionCols:_col0
                                     Select Operator [SEL_101] (rows=50 width=4)
@@ -197,13 +195,13 @@ Stage-0
                                         predicate:((d_moy = 9) and (d_year = 2000))
                                         TableScan [TS_3] (rows=73049 width=12)
                                           default@date_dim,d2,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year","d_moy"]
-                            <-Map 11 [SIMPLE_EDGE] vectorized
-                              SHUFFLE [RS_111]
+                            <-Map 9 [SIMPLE_EDGE] vectorized
+                              SHUFFLE [RS_107]
                                 PartitionCols:_col1, _col2, _col4
-                                Select Operator [SEL_110] (rows=501694138 width=19)
+                                Select Operator [SEL_106] (rows=501694138 width=19)
                                   Output:["_col0","_col1","_col2","_col3","_col4"]
-                                  Filter Operator [FIL_109] (rows=501694138 width=19)
-                                    predicate:((ss_customer_sk BETWEEN DynamicValue(RS_14_store_returns_sr_customer_sk_min) AND DynamicValue(RS_14_store_returns_sr_customer_sk_max) and in_bloom_filter(ss_customer_sk, DynamicValue(RS_14_store_returns_sr_customer_sk_bloom_filter))) and (ss_item_sk BETWEEN DynamicValue(RS_14_store_returns_sr_item_sk_min) AND DynamicValue(RS_14_store_returns_sr_item_sk_max) and in_bloom_filter(ss_item_sk, DynamicValue(RS_14_store_returns_sr_item_sk_bloom_filter))) and (ss_ticket_number BETWEEN DynamicValue(RS_14_store_returns_sr_ticket_number_min) AND DynamicValue(RS_14_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_14_store_returns_sr_ticket_number_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
+                                  Filter Operator [FIL_105] (rows=501694138 width=19)
+                                    predicate:((ss_ticket_number BETWEEN DynamicValue(RS_14_store_returns_sr_ticket_number_min) AND DynamicValue(RS_14_store_returns_sr_ticket_number_max) and in_bloom_filter(ss_ticket_number, DynamicValue(RS_14_store_returns_sr_ticket_number_bloom_filter))) and ss_customer_sk is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
                                     TableScan [TS_6] (rows=575995635 width=19)
                                       default@store_sales,store_sales,Tbl:COMPLETE,Col:COMPLETE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number"]
                                     <-Reducer 7 [BROADCAST_EDGE] vectorized
@@ -211,28 +209,6 @@ Stage-0
                                         Group By Operator [GBY_103] (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]
-                                          PARTITION_ONLY_SHUFFLE [RS_71]
-                                            Group By Operator [GBY_70] (rows=1 width=12)
-                                              Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                              Select Operator [SEL_69] (rows=1339446 width=8)
-                                                Output:["_col0"]
-                                                 Please refer to the previous Merge Join Operator [MERGEJOIN_94]
-                                    <-Reducer 8 [BROADCAST_EDGE] vectorized
-                                      BROADCAST [RS_106]
-                                        Group By Operator [GBY_105] (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]
-                                          PARTITION_ONLY_SHUFFLE [RS_76]
-                                            Group By Operator [GBY_75] (rows=1 width=12)
-                                              Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]
-                                              Select Operator [SEL_74] (rows=1339446 width=0)
-                                                Output:["_col0"]
-                                                 Please refer to the previous Merge Join Operator [MERGEJOIN_94]
-                                    <-Reducer 9 [BROADCAST_EDGE] vectorized
-                                      BROADCAST [RS_108]
-                                        Group By Operator [GBY_107] (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]
                                           PARTITION_ONLY_SHUFFLE [RS_81]
                                             Group By Operator [GBY_80] (rows=1 width=12)
                                               Output:["_col0","_col1","_col2"],aggregations:["min(_col0)","max(_col0)","bloom_filter(_col0, expectedEntries=1000000)"]