You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2019/08/29 23:08:42 UTC

[hive] branch master updated: HIVE-22151 : Turn off hybrid grace hash join by default (Ashutosh Chauhan via Vineet Garg)

This is an automated email from the ASF dual-hosted git repository.

hashutosh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 04397e5  HIVE-22151 : Turn off hybrid grace hash join by default (Ashutosh Chauhan via Vineet Garg)
04397e5 is described below

commit 04397e5357811eff186448dd92322f8d4f241475
Author: Ashutosh Chauhan <as...@cloudera.com>
AuthorDate: Tue Aug 27 15:01:10 2019 -0700

    HIVE-22151 : Turn off hybrid grace hash join by default (Ashutosh Chauhan via Vineet Garg)
---
 .../java/org/apache/hadoop/hive/conf/HiveConf.java |  2 +-
 .../llap/dynamic_partition_join_noncbo.q.out       |  3 -
 .../clientpositive/llap/explainuser_4.q.out        |  6 +-
 .../clientpositive/llap/join_max_hashtable.q.out   |  6 --
 .../results/clientpositive/llap/partialdhj.q.out   | 96 +++++++++++-----------
 .../llap/tez_dynpart_hashjoin_1.q.out              |  4 -
 .../llap/tez_vector_dynpart_hashjoin_1.q.out       |  3 -
 .../clientpositive/llap/unionDistinct_1.q.out      | 10 ---
 .../perf/tez/constraints/query1b.q.out             |  4 -
 .../perf/tez/constraints/query6.q.out              |  8 +-
 .../results/clientpositive/perf/tez/query1b.q.out  |  4 -
 .../results/clientpositive/perf/tez/query6.q.out   |  6 +-
 .../clientpositive/tez/explainanalyze_3.q.out      |  2 +-
 .../clientpositive/tez/explainanalyze_4.q.out      |  6 +-
 .../results/clientpositive/tez/explainuser_3.q.out |  2 +-
 15 files changed, 62 insertions(+), 100 deletions(-)

diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 69408f6..97cffff 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -1736,7 +1736,7 @@ public class HiveConf extends Configuration {
         "Only works on Tez and Spark, because memory-optimized hashtable cannot be serialized."),
     HIVEMAPJOINOPTIMIZEDTABLEPROBEPERCENT("hive.mapjoin.optimized.hashtable.probe.percent",
         (float) 0.5, "Probing space percentage of the optimized hashtable"),
-    HIVEUSEHYBRIDGRACEHASHJOIN("hive.mapjoin.hybridgrace.hashtable", true, "Whether to use hybrid" +
+    HIVEUSEHYBRIDGRACEHASHJOIN("hive.mapjoin.hybridgrace.hashtable", false, "Whether to use hybrid" +
         "grace hash join as the join method for mapjoin. Tez only."),
     HIVEHYBRIDGRACEHASHJOINMEMCHECKFREQ("hive.mapjoin.hybridgrace.memcheckfrequency", 1024, "For " +
         "hybrid grace hash join, how often (how many rows apart) we check if memory is full. " +
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_join_noncbo.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_join_noncbo.q.out
index 4e31672..53f2810 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_partition_join_noncbo.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_join_noncbo.q.out
@@ -1074,7 +1074,6 @@ STAGE PLANS:
                   0 Map 1
                 Statistics: Num rows: 17248483 Data size: 61798098712 Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Reduce Output Operator
                   key expressions: _col314 (type: bigint), 'P30' (type: string)
                   sort order: ++
@@ -1095,7 +1094,6 @@ STAGE PLANS:
                   1 Map 5
                 Statistics: Num rows: 18973331 Data size: 67977910056 Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Select Operator
                   expressions: 'P30' (type: string), _col1 (type: string), _col314 (type: bigint), _col406 (type: bigint), _col1 (type: string)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
@@ -2681,7 +2679,6 @@ STAGE PLANS:
                   0 Map 6
                 Statistics: Num rows: 76968669 Data size: 14747197116 Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
index d7edf0a..f216d64 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
@@ -286,7 +286,7 @@ Stage-0
         <-Reducer 2 [SIMPLE_EDGE] vectorized, llap
           SHUFFLE [RS_36]
             Map Join Operator [MAPJOIN_35] (rows=1501 width=236)
-              Conds:RS_31.KEY.reducesinkkey0=RS_34.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,HybridGraceHashJoin:true,Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23"]
+              Conds:RS_31.KEY.reducesinkkey0=RS_34.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23"]
             <-Map 4 [CUSTOM_SIMPLE_EDGE] vectorized, llap
               PARTITION_ONLY_SHUFFLE [RS_34]
                 PartitionCols:_col2
@@ -371,7 +371,7 @@ Stage-0
             Group By Operator [GBY_38] (rows=1 width=8)
               Output:["_col0"],aggregations:["count()"]
               Map Join Operator [MAPJOIN_37] (rows=1501 width=236)
-                Conds:RS_33.KEY.reducesinkkey0=RS_36.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,HybridGraceHashJoin:true
+                Conds:RS_33.KEY.reducesinkkey0=RS_36.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true
               <-Map 4 [CUSTOM_SIMPLE_EDGE] vectorized, llap
                 PARTITION_ONLY_SHUFFLE [RS_36]
                   PartitionCols:_col0
@@ -455,7 +455,7 @@ Stage-0
                 Group By Operator [GBY_40] (rows=1501 width=236)
                   Output:["_col0","_col1"],aggregations:["count()"],keys:_col0
                   Map Join Operator [MAPJOIN_39] (rows=1501 width=236)
-                    Conds:RS_35.KEY.reducesinkkey0=RS_38.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,HybridGraceHashJoin:true,Output:["_col0"]
+                    Conds:RS_35.KEY.reducesinkkey0=RS_38.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,Output:["_col0"]
                   <-Map 5 [CUSTOM_SIMPLE_EDGE] vectorized, llap
                     PARTITION_ONLY_SHUFFLE [RS_38]
                       PartitionCols:_col0
diff --git a/ql/src/test/results/clientpositive/llap/join_max_hashtable.q.out b/ql/src/test/results/clientpositive/llap/join_max_hashtable.q.out
index 79e242d..60acbd7 100644
--- a/ql/src/test/results/clientpositive/llap/join_max_hashtable.q.out
+++ b/ql/src/test/results/clientpositive/llap/join_max_hashtable.q.out
@@ -243,7 +243,6 @@ STAGE PLANS:
                   1 Map 3
                 Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
                   Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
@@ -336,7 +335,6 @@ STAGE PLANS:
                   1 Map 3
                 Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
                   Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
@@ -430,7 +428,6 @@ STAGE PLANS:
                   1 Map 3
                 Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
                   Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
@@ -523,7 +520,6 @@ STAGE PLANS:
                   1 Map 3
                 Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
                   Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
@@ -617,7 +613,6 @@ STAGE PLANS:
                   1 Map 3
                 Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
                   Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
@@ -710,7 +705,6 @@ STAGE PLANS:
                   1 Map 3
                 Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
                   Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE
diff --git a/ql/src/test/results/clientpositive/llap/partialdhj.q.out b/ql/src/test/results/clientpositive/llap/partialdhj.q.out
index 34822d8..66503eb 100644
--- a/ql/src/test/results/clientpositive/llap/partialdhj.q.out
+++ b/ql/src/test/results/clientpositive/llap/partialdhj.q.out
@@ -117,7 +117,6 @@ STAGE PLANS:
                   1 Map 4
                 Statistics: Num rows: 32 Data size: 2848 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Group By Operator
                   keys: _col0 (type: string)
                   minReductionHashAggr: 0.5
@@ -156,7 +155,6 @@ STAGE PLANS:
                   0 Reducer 3
                 Statistics: Num rows: 26 Data size: 6942 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
                   Statistics: Num rows: 26 Data size: 6942 Basic stats: COMPLETE Column stats: COMPLETE
@@ -199,47 +197,47 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
+val_238	238	val_238
 val_311	311	val_311
+val_27	27	val_27
 val_165	165	val_165
 val_409	409	val_409
+val_255	255	val_255
+val_278	278	val_278
 val_98	98	val_98
 val_484	484	val_484
+val_265	265	val_265
+val_193	193	val_193
+val_401	401	val_401
+val_150	150	val_150
+val_273	273	val_273
+val_66	66	val_66
+val_213	213	val_213
+val_146	146	val_146
+val_406	406	val_406
+val_193	193	val_193
 val_311	311	val_311
+val_213	213	val_213
+val_278	278	val_278
 val_311	311	val_311
 val_165	165	val_165
 val_98	98	val_98
 val_409	409	val_409
-val_409	409	val_409
-val_27	27	val_27
-val_146	146	val_146
-val_146	146	val_146
-val_238	238	val_238
 val_238	238	val_238
-val_193	193	val_193
-val_273	273	val_273
-val_193	193	val_193
 val_273	273	val_273
+val_401	401	val_401
+val_401	401	val_401
 val_193	193	val_193
-val_273	273	val_273
-val_406	406	val_406
-val_406	406	val_406
 val_406	406	val_406
+val_409	409	val_409
 val_406	406	val_406
-val_66	66	val_66
-val_213	213	val_213
-val_213	213	val_213
-val_278	278	val_278
 val_401	401	val_401
-val_278	278	val_278
-val_401	401	val_401
-val_401	401	val_401
-val_401	401	val_401
-val_401	401	val_401
-val_150	150	val_150
-val_255	255	val_255
-val_265	265	val_265
 val_255	255	val_255
 val_265	265	val_265
+val_406	406	val_406
+val_401	401	val_401
+val_146	146	val_146
+val_273	273	val_273
 PREHOOK: query: EXPLAIN
 SELECT *
 FROM src
@@ -359,7 +357,6 @@ STAGE PLANS:
                   1 Reducer 5
                 Statistics: Num rows: 26 Data size: 6942 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 File Output Operator
                   compressed: false
                   Statistics: Num rows: 26 Data size: 6942 Basic stats: COMPLETE Column stats: COMPLETE
@@ -381,7 +378,6 @@ STAGE PLANS:
                   1 Map 6
                 Statistics: Num rows: 32 Data size: 2848 Basic stats: COMPLETE Column stats: COMPLETE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Group By Operator
                   keys: _col0 (type: string)
                   minReductionHashAggr: 0.5
@@ -441,44 +437,44 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
+238	val_238	val_238
 311	val_311	val_311
+27	val_27	val_27
 165	val_165	val_165
 409	val_409	val_409
+255	val_255	val_255
+278	val_278	val_278
 98	val_98	val_98
 484	val_484	val_484
+265	val_265	val_265
+193	val_193	val_193
+401	val_401	val_401
+150	val_150	val_150
+273	val_273	val_273
+66	val_66	val_66
+213	val_213	val_213
+146	val_146	val_146
+406	val_406	val_406
+193	val_193	val_193
 311	val_311	val_311
+213	val_213	val_213
+278	val_278	val_278
 311	val_311	val_311
 165	val_165	val_165
 98	val_98	val_98
 409	val_409	val_409
-409	val_409	val_409
-27	val_27	val_27
-146	val_146	val_146
-146	val_146	val_146
-238	val_238	val_238
 238	val_238	val_238
-193	val_193	val_193
-273	val_273	val_273
-193	val_193	val_193
 273	val_273	val_273
+401	val_401	val_401
+401	val_401	val_401
 193	val_193	val_193
-273	val_273	val_273
-406	val_406	val_406
-406	val_406	val_406
 406	val_406	val_406
+409	val_409	val_409
 406	val_406	val_406
-66	val_66	val_66
-213	val_213	val_213
-213	val_213	val_213
-278	val_278	val_278
 401	val_401	val_401
-278	val_278	val_278
-401	val_401	val_401
-401	val_401	val_401
-401	val_401	val_401
-401	val_401	val_401
-150	val_150	val_150
-255	val_255	val_255
-265	val_265	val_265
 255	val_255	val_255
 265	val_265	val_265
+406	val_406	val_406
+401	val_401	val_401
+146	val_146	val_146
+273	val_273	val_273
diff --git a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
index d83b7c9..3c7183e 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
@@ -519,7 +519,6 @@ STAGE PLANS:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Select Operator
                   expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean), _col13 (type: tinyint), _col14 (type: smallint), _col15 (type: int), _col16 (type: bigint), _col17 (type: float), _col18 (type: double), _col19 (type: string), _col20 (type: string), _col2 [...]
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23
@@ -667,7 +666,6 @@ STAGE PLANS:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Reduce Output Operator
                   key expressions: _col2 (type: int)
                   sort order: +
@@ -806,7 +804,6 @@ STAGE PLANS:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Group By Operator
                   aggregations: count()
                   minReductionHashAggr: 0.99
@@ -947,7 +944,6 @@ STAGE PLANS:
                   1 Map 5
                 Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: smallint)
diff --git a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
index a7bd2b6..116bb11 100644
--- a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
@@ -518,7 +518,6 @@ STAGE PLANS:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Reduce Output Operator
                   key expressions: _col2 (type: int)
                   sort order: +
@@ -657,7 +656,6 @@ STAGE PLANS:
                   1 Map 4
                 Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Group By Operator
                   aggregations: count()
                   minReductionHashAggr: 0.99
@@ -798,7 +796,6 @@ STAGE PLANS:
                   1 Map 5
                 Statistics: Num rows: ###Masked### Data size: ###Masked### Basic stats: COMPLETE Column stats: NONE
                 DynamicPartitionHashJoin: true
-                HybridGraceHashJoin: true
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: smallint)
diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
index 635be07..0db56b5 100644
--- a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
@@ -3979,7 +3979,6 @@ STAGE PLANS:
                           1 Map 6
                         Position of Big Table: 0
                         Statistics: Num rows: 221 Data size: 49306 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
                           outputColumnNames: _col0, _col1, _col2, _col3
@@ -6029,7 +6028,6 @@ STAGE PLANS:
                           0 Map 7
                         Position of Big Table: 1
                         Statistics: Num rows: 103 Data size: 9785 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: string), _col2 (type: bigint)
                           outputColumnNames: _col0, _col1
@@ -6463,7 +6461,6 @@ STAGE PLANS:
                           1 Map 9
                         Position of Big Table: 0
                         Statistics: Num rows: 103 Data size: 8961 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           keys: _col0 (type: string)
@@ -7096,7 +7093,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 4
                       Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         keys: _col0 (type: string), _col1 (type: string)
                         minReductionHashAggr: 0.99
@@ -8439,7 +8435,6 @@ STAGE PLANS:
                   input vertices:
                     0 Map 1
                   Statistics: Num rows: 250 Data size: 44500 Basic stats: COMPLETE Column stats: COMPLETE
-                  HybridGraceHashJoin: true
                   Select Operator
                     expressions: _col1 (type: string), _col2 (type: string)
                     outputColumnNames: _col0, _col1
@@ -11042,7 +11037,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 16 Data size: 128 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: UDFToDouble(_col1) (type: double)
                           outputColumnNames: _col0
@@ -11221,7 +11215,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 5
                         Statistics: Num rows: 16 Data size: 128 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: UDFToDouble(_col1) (type: double)
                           outputColumnNames: _col0
@@ -11358,7 +11351,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 16 Data size: 1488 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: UDFToDouble(_col1) (type: double), _col2 (type: string)
                           outputColumnNames: _col0, _col1
@@ -11557,7 +11549,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 4
                         Statistics: Num rows: 16 Data size: 1792 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: UDFToDouble(_col1) (type: double), CAST( _col3 AS STRING) (type: string)
                           outputColumnNames: _col0, _col1
@@ -12219,7 +12210,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 10 Data size: 1780 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           keys: _col0 (type: string), _col1 (type: string)
                           minReductionHashAggr: 0.0
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query1b.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query1b.q.out
index 126edca..72661a7 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query1b.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query1b.q.out
@@ -169,7 +169,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 9
                         Statistics: Num rows: 16855704 Data size: 1805298496 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: sum(_col3)
                           keys: _col2 (type: int), _col1 (type: int)
@@ -200,7 +199,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 10
                         Statistics: Num rows: 17467258 Data size: 1870797840 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: sum(_col3)
                           keys: _col2 (type: int), _col1 (type: int)
@@ -272,7 +270,6 @@ STAGE PLANS:
                       input vertices:
                         0 Map 1
                       Statistics: Num rows: 1923224 Data size: 220816368 Basic stats: COMPLETE Column stats: COMPLETE
-                      HybridGraceHashJoin: true
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -283,7 +280,6 @@ STAGE PLANS:
                         input vertices:
                           1 Reducer 8
                         Statistics: Num rows: 1991910 Data size: 449166736 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Filter Operator
                           predicate: (_col3 > _col4) (type: boolean)
                           Statistics: Num rows: 663970 Data size: 149722248 Basic stats: COMPLETE Column stats: COMPLETE
diff --git a/ql/src/test/results/clientpositive/perf/tez/constraints/query6.q.out b/ql/src/test/results/clientpositive/perf/tez/constraints/query6.q.out
index de17aea..e783704 100644
--- a/ql/src/test/results/clientpositive/perf/tez/constraints/query6.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/constraints/query6.q.out
@@ -100,12 +100,12 @@ Stage-0
                     Group By Operator [GBY_68] (rows=1 width=94)
                       Output:["_col0","_col1"],aggregations:["count()"],keys:_col4
                       Map Join Operator [MAPJOIN_175] (rows=40 width=86)
-                        Conds:MAPJOIN_174._col5=RS_220._col0(Inner),HybridGraceHashJoin:true,Output:["_col4"]
+                        Conds:MAPJOIN_174._col5=RS_220._col0(Inner),Output:["_col4"]
                       <-Map 15 [BROADCAST_EDGE] vectorized
                         BROADCAST [RS_220]
                           PartitionCols:_col0
                           Map Join Operator [MAPJOIN_219] (rows=52 width=4)
-                            Conds:SEL_218._col1=RS_216._col0(Inner),HybridGraceHashJoin:true,Output:["_col0"]
+                            Conds:SEL_218._col1=RS_216._col0(Inner),Output:["_col0"]
                           <-Reducer 8 [BROADCAST_EDGE] vectorized
                             BROADCAST [RS_216]
                               PartitionCols:_col0
@@ -129,7 +129,7 @@ Stage-0
                                 TableScan [TS_41] (rows=73049 width=8)
                                   default@date_dim,d,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_month_seq"]
                       <-Map Join Operator [MAPJOIN_174] (rows=36482 width=86)
-                          Conds:MERGEJOIN_170._col0=RS_62._col2(Inner),HybridGraceHashJoin:true,Output:["_col4","_col5"]
+                          Conds:MERGEJOIN_170._col0=RS_62._col2(Inner),Output:["_col4","_col5"]
                         <-Reducer 11 [BROADCAST_EDGE]
                           BROADCAST [RS_62]
                             PartitionCols:_col2
@@ -143,7 +143,7 @@ Stage-0
                                   Filter Operator [FIL_213] (rows=153611 width=227)
                                     predicate:(_col1 > _col4)
                                     Map Join Operator [MAPJOIN_212] (rows=460833 width=227)
-                                      Conds:SEL_211._col2=RS_209._col0(Inner),HybridGraceHashJoin:true,Output:["_col0","_col1","_col4"]
+                                      Conds:SEL_211._col2=RS_209._col0(Inner),Output:["_col0","_col1","_col4"]
                                     <-Reducer 13 [BROADCAST_EDGE] vectorized
                                       BROADCAST [RS_209]
                                         PartitionCols:_col0
diff --git a/ql/src/test/results/clientpositive/perf/tez/query1b.q.out b/ql/src/test/results/clientpositive/perf/tez/query1b.q.out
index c030334..2a83e94 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query1b.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query1b.q.out
@@ -170,7 +170,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 9
                         Statistics: Num rows: 16855704 Data size: 1805298496 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: sum(_col3)
                           keys: _col2 (type: int), _col1 (type: int)
@@ -201,7 +200,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 11
                         Statistics: Num rows: 17467258 Data size: 1870797840 Basic stats: COMPLETE Column stats: COMPLETE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: sum(_col3)
                           keys: _col2 (type: int), _col1 (type: int)
@@ -273,7 +271,6 @@ STAGE PLANS:
                       input vertices:
                         0 Map 1
                       Statistics: Num rows: 1923224 Data size: 220816368 Basic stats: COMPLETE Column stats: COMPLETE
-                      HybridGraceHashJoin: true
                       Reduce Output Operator
                         key expressions: _col1 (type: int)
                         sort order: +
@@ -314,7 +311,6 @@ STAGE PLANS:
                   input vertices:
                     1 Reducer 8
                   Statistics: Num rows: 1991910 Data size: 645378840 Basic stats: COMPLETE Column stats: COMPLETE
-                  HybridGraceHashJoin: true
                   Filter Operator
                     predicate: (_col3 > _col6) (type: boolean)
                     Statistics: Num rows: 663970 Data size: 215126280 Basic stats: COMPLETE Column stats: COMPLETE
diff --git a/ql/src/test/results/clientpositive/perf/tez/query6.q.out b/ql/src/test/results/clientpositive/perf/tez/query6.q.out
index d7d045a..f87a560 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query6.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query6.q.out
@@ -109,7 +109,7 @@ Stage-0
                             Filter Operator [FIL_213] (rows=153611 width=227)
                               predicate:(_col4 > _col1)
                               Map Join Operator [MAPJOIN_212] (rows=460833 width=227)
-                                Conds:RS_209._col0=SEL_211._col2(Inner),HybridGraceHashJoin:true,Output:["_col1","_col3","_col4"]
+                                Conds:RS_209._col0=SEL_211._col2(Inner),Output:["_col1","_col3","_col4"]
                               <-Reducer 15 [BROADCAST_EDGE] vectorized
                                 BROADCAST [RS_209]
                                   PartitionCols:_col0
@@ -170,12 +170,12 @@ Stage-0
                             SHUFFLE [RS_224]
                               PartitionCols:_col5
                               Map Join Operator [MAPJOIN_223] (rows=575379 width=4)
-                                Conds:RS_193._col0=SEL_222._col0(Inner),HybridGraceHashJoin:true,Output:["_col4","_col5"]
+                                Conds:RS_193._col0=SEL_222._col0(Inner),Output:["_col4","_col5"]
                               <-Map 1 [BROADCAST_EDGE] vectorized
                                 BROADCAST [RS_193]
                                   PartitionCols:_col0
                                   Map Join Operator [MAPJOIN_192] (rows=52 width=4)
-                                    Conds:SEL_191._col1=RS_189._col0(Inner),HybridGraceHashJoin:true,Output:["_col0"]
+                                    Conds:SEL_191._col1=RS_189._col0(Inner),Output:["_col0"]
                                   <-Reducer 3 [BROADCAST_EDGE] vectorized
                                     BROADCAST [RS_189]
                                       PartitionCols:_col0
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
index a0a47f8..d6ec53d 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
@@ -958,7 +958,7 @@ Stage-0
         Select Operator [SEL_33] (rows=399/480 width=186)
           Output:["_col0","_col1","_col2"]
           Map Join Operator [MAPJOIN_32] (rows=399/480 width=186)
-            BucketMapJoin:true,Conds:RS_29._col0=SEL_31._col0(Inner),HybridGraceHashJoin:true,Output:["_col0","_col1","_col3"]
+            BucketMapJoin:true,Conds:RS_29._col0=SEL_31._col0(Inner),Output:["_col0","_col1","_col3"]
           <-Map 1 [CUSTOM_EDGE] vectorized
             MULTICAST [RS_29]
               PartitionCols:_col0
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out
index ff90824..c512735 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out
@@ -354,7 +354,7 @@ Stage-0
         <-Reducer 2 [SIMPLE_EDGE]
           SHUFFLE [RS_10]
             Map Join Operator [MAPJOIN_27] (rows=1501/10 width=236)
-              Conds:RS_6.KEY.reducesinkkey0=RS_7.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,HybridGraceHashJoin:true,Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23"]
+              Conds:RS_6.KEY.reducesinkkey0=RS_7.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14","_col15","_col16","_col17","_col18","_col19","_col20","_col21","_col22","_col23"]
             <-Map 4 [CUSTOM_SIMPLE_EDGE]
               PARTITION_ONLY_SHUFFLE [RS_7]
                 PartitionCols:_col2
@@ -453,7 +453,7 @@ Stage-0
         <-Reducer 2 [CUSTOM_SIMPLE_EDGE]
           PARTITION_ONLY_SHUFFLE [RS_10]
             Map Join Operator [MAPJOIN_28] (rows=1501/10 width=236)
-              Conds:RS_6.KEY.reducesinkkey0=RS_7.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,HybridGraceHashJoin:true
+              Conds:RS_6.KEY.reducesinkkey0=RS_7.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true
             <-Map 4 [CUSTOM_SIMPLE_EDGE]
               PARTITION_ONLY_SHUFFLE [RS_7]
                 PartitionCols:_col0
@@ -555,7 +555,7 @@ Stage-0
               SHUFFLE [RS_10]
                 PartitionCols:_col0
                 Map Join Operator [MAPJOIN_30] (rows=1501/10 width=236)
-                  Conds:RS_6.KEY.reducesinkkey0=RS_7.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,HybridGraceHashJoin:true,Output:["_col0"]
+                  Conds:RS_6.KEY.reducesinkkey0=RS_7.KEY.reducesinkkey0(Inner),DynamicPartitionHashJoin:true,Output:["_col0"]
                 <-Map 5 [CUSTOM_SIMPLE_EDGE]
                   PARTITION_ONLY_SHUFFLE [RS_7]
                     PartitionCols:_col0
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
index 7892baf..f9f01fa 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
@@ -792,7 +792,7 @@ Stage-0
         Select Operator [SEL_33] (rows=399 width=186)
           Output:["_col0","_col1","_col2"]
           Map Join Operator [MAPJOIN_32] (rows=399 width=186)
-            BucketMapJoin:true,Conds:RS_29._col0=SEL_31._col0(Inner),HybridGraceHashJoin:true,Output:["_col0","_col1","_col3"]
+            BucketMapJoin:true,Conds:RS_29._col0=SEL_31._col0(Inner),Output:["_col0","_col1","_col3"]
           <-Map 1 [CUSTOM_EDGE] vectorized
             MULTICAST [RS_29]
               PartitionCols:_col0