You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by vi...@apache.org on 2016/05/18 18:06:41 UTC

hive git commit: HIVE-13343: Need to disable hybrid grace hash join in llap mode except for dynamically partitioned hash join (Vikram Dixit K, reviewed by Gunther Hagleitner)

Repository: hive
Updated Branches:
  refs/heads/master 4959ff5bb -> f3fe47ca5


HIVE-13343: Need to disable hybrid grace hash join in llap mode except for dynamically partitioned hash join (Vikram Dixit K, reviewed by Gunther Hagleitner)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f3fe47ca
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f3fe47ca
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f3fe47ca

Branch: refs/heads/master
Commit: f3fe47ca584e332c3e4bacc0a2e13ecbf7f32fea
Parents: 4959ff5
Author: vikram <vi...@hortonworks.com>
Authored: Wed May 18 10:47:11 2016 -0700
Committer: vikram <vi...@hortonworks.com>
Committed: Wed May 18 10:48:11 2016 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/conf/HiveConf.java   |  2 +
 .../hive/ql/optimizer/physical/LlapDecider.java | 40 ++++++++++++++++----
 .../clientpositive/hybridgrace_hashjoin_1.q     |  2 +
 .../llap/bucket_map_join_tez1.q.out             | 21 ----------
 .../llap/bucket_map_join_tez2.q.out             |  8 ----
 .../llap/dynamic_partition_pruning.q.out        | 18 ---------
 .../llap/dynamic_partition_pruning_2.q.out      |  7 ----
 .../llap/hybridgrace_hashjoin_1.q.out           |  5 +--
 .../llap/hybridgrace_hashjoin_2.q.out           |  6 ---
 .../clientpositive/llap/lvj_mapjoin.q.out       |  2 -
 .../clientpositive/llap/mapjoin_decimal.q.out   |  1 -
 .../test/results/clientpositive/llap/mrr.q.out  |  2 -
 .../llap/tez_bmj_schema_evolution.q.out         |  1 -
 .../llap/tez_join_result_complex.q.out          | 17 ++++++++-
 .../clientpositive/llap/tez_smb_main.q.out      | 11 ------
 .../results/clientpositive/llap/tez_union.q.out | 14 -------
 .../vectorized_dynamic_partition_pruning.q.out  | 17 ---------
 .../tez/hybridgrace_hashjoin_1.q.out            |  2 +
 18 files changed, 56 insertions(+), 120 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
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 cbb3a72..9cc8fbe 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -2852,6 +2852,8 @@ public class HiveConf extends Configuration {
         "protocol or ZK paths), similar to how ssh refuses a key with bad access permissions."),
     LLAP_DAEMON_OUTPUT_SERVICE_PORT("hive.llap.daemon.output.service.port", 15003,
         "LLAP daemon output service port"),
+    LLAP_ENABLE_GRACE_JOIN_IN_LLAP("hive.llap.enable.grace.join.in.llap", false,
+        "Override if grace join should be allowed to run in llap."),
 
     SPARK_CLIENT_FUTURE_TIMEOUT("hive.spark.client.future.timeout",
       "60s", new TimeValidator(TimeUnit.SECONDS),

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java
index e6f8f75..4d50c64 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/LlapDecider.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.hive.ql.exec.FilterOperator;
 import org.apache.hadoop.hive.ql.exec.FunctionInfo;
 import org.apache.hadoop.hive.ql.exec.FunctionRegistry;
 import org.apache.hadoop.hive.ql.exec.GroupByOperator;
+import org.apache.hadoop.hive.ql.exec.MapJoinOperator;
 import org.apache.hadoop.hive.ql.exec.Operator;
 import org.apache.hadoop.hive.ql.exec.ScriptOperator;
 import org.apache.hadoop.hive.ql.exec.SelectOperator;
@@ -105,6 +106,7 @@ public class LlapDecider implements PhysicalPlanResolver {
     private final boolean doSkipUdfCheck;
     private final boolean arePermanentFnsAllowed;
     private final boolean shouldUber;
+    private List<MapJoinOperator> mapJoinOpList;
 
     public LlapDecisionDispatcher(PhysicalContext pctx, LlapMode mode) {
       conf = pctx.getConf();
@@ -112,6 +114,7 @@ public class LlapDecider implements PhysicalPlanResolver {
       arePermanentFnsAllowed = HiveConf.getBoolVar(conf, ConfVars.LLAP_ALLOW_PERMANENT_FNS);
       // Don't user uber in "all" mode - everything can go into LLAP, which is better than uber.
       shouldUber = HiveConf.getBoolVar(conf, ConfVars.LLAP_AUTO_ALLOW_UBER) && (mode != all);
+      mapJoinOpList = new ArrayList<MapJoinOperator>();
     }
 
     @Override
@@ -130,17 +133,21 @@ public class LlapDecider implements PhysicalPlanResolver {
 
     private void handleWork(TezWork tezWork, BaseWork work)
       throws SemanticException {
-      if (evaluateWork(tezWork, work)) {
-        convertWork(tezWork, work);
-      } else {
-        if (mode == all) {
-          throw new SemanticException("Llap mode is set to all but cannot run work in llap mode." +
-              "Set " + HiveConf.ConfVars.LLAP_EXECUTION_MODE + " = auto or set " +
-              HiveConf.ConfVars.HIVE_EXECUTION_MODE + " = container");
+      boolean workCanBeDoneInLlap = evaluateWork(tezWork, work);
+      LOG.debug(
+          "Work " + work + " " + (workCanBeDoneInLlap ? "can" : "cannot") + " be done in LLAP");
+      if (workCanBeDoneInLlap) {
+        for (MapJoinOperator graceMapJoinOp : mapJoinOpList) {
+          LOG.debug(
+              "Disabling hybrid grace hash join in case of LLAP and non-dynamic partition hash join.");
+          graceMapJoinOp.getConf().setHybridHashJoin(false);
         }
+        convertWork(tezWork, work);
       }
+      mapJoinOpList.clear();
     }
 
+
     private void convertWork(TezWork tezWork, BaseWork work)
       throws SemanticException {
 
@@ -183,12 +190,13 @@ public class LlapDecider implements PhysicalPlanResolver {
 
       // if mode is all just run it
       if (mode == all) {
+        LOG.info("LLAP mode set to 'all' so can convert any work.");
         return true;
       }
 
       // if map mode run iff work is map work
       if (mode == map) {
-        return work instanceof MapWork;
+        return (work instanceof MapWork);
       }
 
       // --- From here we evaluate the auto mode
@@ -357,6 +365,22 @@ public class LlapDecider implements PhysicalPlanResolver {
           }
         });
 
+      if (!conf.getBoolVar(HiveConf.ConfVars.LLAP_ENABLE_GRACE_JOIN_IN_LLAP)) {
+        opRules.put(
+            new RuleRegExp("Disable grace hash join if LLAP mode and not dynamic partition hash join",
+                MapJoinOperator.getOperatorName() + "%"), new NodeProcessor() {
+              @Override
+              public Object process(Node n, Stack<Node> s, NodeProcessorCtx c, Object... os) {
+                MapJoinOperator mapJoinOp = (MapJoinOperator) n;
+                if (mapJoinOp.getConf().isHybridHashJoin()
+                    && !(mapJoinOp.getConf().isDynamicPartitionHashJoin())) {
+                  mapJoinOpList.add((MapJoinOperator) n);
+                }
+                return new Boolean(true);
+              }
+            });
+      }
+
       return opRules;
     }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
index dd42bb3..9c19a86 100644
--- a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_1.q
@@ -6,6 +6,7 @@ set hive.explain.user=false;
 -- 2. Partitioned table spilling
 -- 3. Vectorization
 
+
 SELECT 1;
 
 set hive.auto.convert.join=true;
@@ -132,6 +133,7 @@ select count(*) from
  on cd.cint = c.cint) t1
 ;
 
+set hive.llap.enable.grace.join.in.llap=true;
 
 -- Partitioned table
 create table parttbl (key string, value char(20)) partitioned by (dt char(10));

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/bucket_map_join_tez1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez1.q.out b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez1.q.out
index 204da88..455c9a8 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez1.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez1.q.out
@@ -170,7 +170,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
@@ -274,7 +273,6 @@ STAGE PLANS:
                     input vertices:
                       1 Map 4
                     Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-                    HybridGraceHashJoin: true
                     Group By Operator
                       aggregations: count()
                       mode: hash
@@ -393,7 +391,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -403,7 +400,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 4
                           Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Group By Operator
                             aggregations: count()
                             mode: hash
@@ -566,7 +562,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -576,7 +571,6 @@ STAGE PLANS:
                           input vertices:
                             0 Map 1
                           Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Group By Operator
                             aggregations: count()
                             mode: hash
@@ -708,7 +702,6 @@ STAGE PLANS:
                         input vertices:
                           0 Reducer 2
                         Statistics: Num rows: 266 Data size: 2822 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col1 (type: int), _col0 (type: double), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
@@ -793,7 +786,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col1 (type: int), substr(_col2, 5) (type: string)
                           outputColumnNames: _col0, _col1
@@ -875,7 +867,6 @@ STAGE PLANS:
                     input vertices:
                       1 Map 4
                     Statistics: Num rows: 302 Data size: 3213 Basic stats: COMPLETE Column stats: NONE
-                    HybridGraceHashJoin: true
                     Select Operator
                       expressions: _col1 (type: int), _col0 (type: double), _col3 (type: string)
                       outputColumnNames: _col0, _col1, _col2
@@ -939,7 +930,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 266 Data size: 2822 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: int), substr(_col1, 5) (type: string)
                           outputColumnNames: _col0, _col1
@@ -1020,7 +1010,6 @@ STAGE PLANS:
                     input vertices:
                       1 Map 4
                     Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                    HybridGraceHashJoin: true
                     Select Operator
                       expressions: _col1 (type: int), _col0 (type: double), _col3 (type: string)
                       outputColumnNames: _col0, _col1, _col2
@@ -1086,7 +1075,6 @@ STAGE PLANS:
                           1 Map 2
                           2 Map 3
                         Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
@@ -1188,7 +1176,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -1199,7 +1186,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 3
                           Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Select Operator
                             expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                             outputColumnNames: _col0, _col1, _col2
@@ -1332,7 +1318,6 @@ STAGE PLANS:
                         input vertices:
                           0 Reducer 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: double), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
@@ -1433,7 +1418,6 @@ STAGE PLANS:
                         input vertices:
                           0 Reducer 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: double), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
@@ -1533,7 +1517,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
@@ -1634,7 +1617,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
@@ -1693,7 +1675,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -1704,7 +1685,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 3
                           Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Select Operator
                             expressions: _col0 (type: int), _col3 (type: int)
                             outputColumnNames: _col0, _col1
@@ -1841,7 +1821,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: string), _col4 (type: string)
                           outputColumnNames: _col0, _col1, _col2

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
index 86ffb45..f3a1bd9 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
@@ -146,7 +146,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -157,7 +156,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 3
                           Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Select Operator
                             expressions: _col0 (type: int), _col3 (type: int)
                             outputColumnNames: _col0, _col1
@@ -301,7 +299,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                           outputColumnNames: _col0, _col1, _col2
@@ -362,7 +359,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 60 Data size: 642 Basic stats: COMPLETE Column stats: NONE
@@ -438,7 +434,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 2
                         Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
@@ -533,7 +528,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE
@@ -623,7 +617,6 @@ STAGE PLANS:
                   input vertices:
                     1 Map 3
                   Statistics: Num rows: 266 Data size: 2822 Basic stats: COMPLETE Column stats: NONE
-                  HybridGraceHashJoin: true
                   File Output Operator
                     compressed: false
                     Statistics: Num rows: 266 Data size: 2822 Basic stats: COMPLETE Column stats: NONE
@@ -712,7 +705,6 @@ STAGE PLANS:
                   input vertices:
                     1 Map 3
                   Statistics: Num rows: 266 Data size: 2822 Basic stats: COMPLETE Column stats: NONE
-                  HybridGraceHashJoin: true
                   Select Operator
                     expressions: _col0 (type: string), _col2 (type: string)
                     outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
index fe2049f..9f07718 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
@@ -4035,7 +4035,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4174,7 +4173,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4302,7 +4300,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -4312,7 +4309,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 2420 Data size: 25709 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -4487,7 +4483,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4639,7 +4634,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4752,7 +4746,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4876,7 +4869,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -5016,7 +5008,6 @@ STAGE PLANS:
                       input vertices:
                         1 Reducer 4
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -5166,7 +5157,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -5274,7 +5264,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -5381,7 +5370,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -5455,7 +5443,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -5465,7 +5452,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 1210 Data size: 12854 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -5636,7 +5622,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -5646,7 +5631,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 4
                           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                          HybridGraceHashJoin: true
                           Group By Operator
                             aggregations: count()
                             mode: hash
@@ -5749,7 +5733,6 @@ STAGE PLANS:
                       input vertices:
                         1 Union 5
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         keys: _col0 (type: string)
                         mode: hash
@@ -5988,7 +5971,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 206800 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out
index db3b85d..8ed8ab4 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out
@@ -181,7 +181,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 4
                       Statistics: Num rows: 9 Data size: 29 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Select Operator
                         expressions: _col3 (type: string), _col0 (type: decimal(10,0))
                         outputColumnNames: _col3, _col0
@@ -355,7 +354,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 4
                       Statistics: Num rows: 9 Data size: 29 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Select Operator
                         expressions: _col3 (type: string), _col0 (type: decimal(10,0))
                         outputColumnNames: _col3, _col0
@@ -504,7 +502,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 2
                       Statistics: Num rows: 9 Data size: 29 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Select Operator
                         expressions: _col2 (type: string)
                         outputColumnNames: _col0
@@ -730,7 +727,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 4
                       Statistics: Num rows: 9 Data size: 29 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Select Operator
                         expressions: _col3 (type: string), _col0 (type: decimal(10,0))
                         outputColumnNames: _col3, _col0
@@ -895,7 +891,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 9 Data size: 29 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       File Output Operator
                         compressed: false
                         Statistics: Num rows: 18 Data size: 58 Basic stats: COMPLETE Column stats: NONE
@@ -960,7 +955,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 5
                       Statistics: Num rows: 9 Data size: 29 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       File Output Operator
                         compressed: false
                         Statistics: Num rows: 18 Data size: 58 Basic stats: COMPLETE Column stats: NONE
@@ -1088,7 +1082,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out
index f281d44..c750dc2 100644
--- a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_1.q.out
@@ -4,6 +4,7 @@ PREHOOK: query: -- Hybrid Grace Hash Join
 -- 2. Partitioned table spilling
 -- 3. Vectorization
 
+
 SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
@@ -14,6 +15,7 @@ POSTHOOK: query: -- Hybrid Grace Hash Join
 -- 2. Partitioned table spilling
 -- 3. Vectorization
 
+
 SELECT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
@@ -196,7 +198,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 4505 Data size: 968719 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -439,7 +440,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 13516 Data size: 2906160 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -669,7 +669,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 13516 Data size: 2906160 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
index 95da4c5..b8f24c4 100644
--- a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
@@ -211,7 +211,6 @@ STAGE PLANS:
                         0 Map 1
                         2 Map 4
                       Statistics: Num rows: 4400 Data size: 46745 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -512,7 +511,6 @@ STAGE PLANS:
                         2 Map 4
                         3 Map 5
                       Statistics: Num rows: 6600 Data size: 70118 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -948,7 +946,6 @@ STAGE PLANS:
                         0 Map 1
                         2 Map 6
                       Statistics: Num rows: 4400 Data size: 46745 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -1010,7 +1007,6 @@ STAGE PLANS:
                         0 Map 7
                         2 Map 10
                       Statistics: Num rows: 4400 Data size: 46745 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -1392,7 +1388,6 @@ STAGE PLANS:
                         0 Map 1
                         2 Map 4
                       Statistics: Num rows: 1465 Data size: 15565 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -1405,7 +1400,6 @@ STAGE PLANS:
                           1 Map 5
                           2 Map 6
                         Statistics: Num rows: 3223 Data size: 34243 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
index e065464..dd4d024 100644
--- a/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/lvj_mapjoin.q.out
@@ -145,7 +145,6 @@ STAGE PLANS:
                               input vertices:
                                 1 Map 2
                               Statistics: Num rows: 6 Data size: 85 Basic stats: COMPLETE Column stats: NONE
-                              HybridGraceHashJoin: true
                               Filter Operator
                                 predicate: (_col0 = _col2) (type: boolean)
                                 Statistics: Num rows: 3 Data size: 42 Basic stats: COMPLETE Column stats: NONE
@@ -184,7 +183,6 @@ STAGE PLANS:
                                 input vertices:
                                   1 Map 2
                                 Statistics: Num rows: 6 Data size: 85 Basic stats: COMPLETE Column stats: NONE
-                                HybridGraceHashJoin: true
                                 Filter Operator
                                   predicate: (_col0 = _col2) (type: boolean)
                                   Statistics: Num rows: 3 Data size: 42 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
index 6c23503..2d1b818 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out
@@ -117,7 +117,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 1153 Data size: 129236 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Reduce Output Operator
                           key expressions: _col0 (type: decimal(4,2))
                           sort order: +

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/mrr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mrr.q.out b/ql/src/test/results/clientpositive/llap/mrr.q.out
index ac265c0..4f547f5 100644
--- a/ql/src/test/results/clientpositive/llap/mrr.q.out
+++ b/ql/src/test/results/clientpositive/llap/mrr.q.out
@@ -874,7 +874,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: _col1 (type: string), _col2 (type: string)
                           mode: hash
@@ -1767,7 +1766,6 @@ STAGE PLANS:
                   input vertices:
                     1 Map 4
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  HybridGraceHashJoin: true
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out b/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out
index a84e86c..f99b829 100644
--- a/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_bmj_schema_evolution.q.out
@@ -105,7 +105,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 1100 Data size: 57543 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Reduce Output Operator
                           key expressions: _col0 (type: int)
                           sort order: +

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out b/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
index 6ca9ea6..fd18117 100644
--- a/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
@@ -208,6 +208,8 @@ STAGE PLANS:
 #### A masked pattern was here ####
                     name default.ct_events_clean
                     numFiles 1
+                    numRows 0
+                    rawDataSize 0
                     serialization.ddl struct ct_events_clean { string contact_event_id, string ce_create_dt, string ce_end_dt, string contact_type, string cnctevs_cd, string contact_mode, string cntvnst_stts_cd, i32 total_transfers, list<string> ce_notes}
                     serialization.format 	
                     serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -229,6 +231,8 @@ STAGE PLANS:
 #### A masked pattern was here ####
                       name default.ct_events_clean
                       numFiles 1
+                      numRows 0
+                      rawDataSize 0
                       serialization.ddl struct ct_events_clean { string contact_event_id, string ce_create_dt, string ce_end_dt, string contact_type, string cnctevs_cd, string contact_mode, string cntvnst_stts_cd, i32 total_transfers, list<string> ce_notes}
                       serialization.format 	
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -312,6 +316,8 @@ STAGE PLANS:
 #### A masked pattern was here ####
                     name default.service_request_clean
                     numFiles 1
+                    numRows 0
+                    rawDataSize 0
                     serialization.ddl struct service_request_clean { string cnctevn_id, string svcrqst_id, string svcrqst_crt_dts, i32 subject_seq_no, string plan_component, string cust_segment, string cnctyp_cd, string cnctmd_cd, string cnctevs_cd, string svcrtyp_cd, string svrstyp_cd, string cmpltyp_cd, string catsrsn_cd, string apealvl_cd, string cnstnty_cd, string svcrqst_asrqst_ind, string svcrqst_rtnorig_in, string svcrqst_vwasof_dt, string sum_reason_cd, string sum_reason, string crsr_master_claim_index, list<string> svcrqct_cds, string svcrqst_lupdt, timestamp crsr_lupdt, string cntevsds_lupdt, i32 ignore_me, list<string> notes}
                     serialization.format 	
                     serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -333,6 +339,8 @@ STAGE PLANS:
 #### A masked pattern was here ####
                       name default.service_request_clean
                       numFiles 1
+                      numRows 0
+                      rawDataSize 0
                       serialization.ddl struct service_request_clean { string cnctevn_id, string svcrqst_id, string svcrqst_crt_dts, i32 subject_seq_no, string plan_component, string cust_segment, string cnctyp_cd, string cnctmd_cd, string cnctevs_cd, string svcrtyp_cd, string svrstyp_cd, string cmpltyp_cd, string catsrsn_cd, string apealvl_cd, string cnstnty_cd, string svcrqst_asrqst_ind, string svcrqst_rtnorig_in, string svcrqst_vwasof_dt, string sum_reason_cd, string sum_reason, string crsr_master_claim_index, list<string> svcrqct_cds, string svcrqst_lupdt, timestamp crsr_lupdt, string cntevsds_lupdt, i32 ignore_me, list<string> notes}
                       serialization.format 	
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1184,6 +1192,8 @@ STAGE PLANS:
 #### A masked pattern was here ####
                     name default.ct_events_clean
                     numFiles 1
+                    numRows 0
+                    rawDataSize 0
                     serialization.ddl struct ct_events_clean { string contact_event_id, string ce_create_dt, string ce_end_dt, string contact_type, string cnctevs_cd, string contact_mode, string cntvnst_stts_cd, i32 total_transfers, list<string> ce_notes}
                     serialization.format 	
                     serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1205,6 +1215,8 @@ STAGE PLANS:
 #### A masked pattern was here ####
                       name default.ct_events_clean
                       numFiles 1
+                      numRows 0
+                      rawDataSize 0
                       serialization.ddl struct ct_events_clean { string contact_event_id, string ce_create_dt, string ce_end_dt, string contact_type, string cnctevs_cd, string contact_mode, string cntvnst_stts_cd, i32 total_transfers, list<string> ce_notes}
                       serialization.format 	
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1241,7 +1253,6 @@ STAGE PLANS:
                           0 Map 1
                         Position of Big Table: 1
                         Statistics: Num rows: 4 Data size: 19978 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Select Operator
                           expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string), _col4 (type: string), _col5 (type: string), _col6 (type: string), _col7 (type: int), _col8 (type: array<string>), _col10 (type: string), _col15 (type: array<string>), _col12 (type: string), _col13 (type: string), _col14 (type: string), _col11 (type: string), _col16 (type: array<string>)
                           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15
@@ -1289,6 +1300,8 @@ STAGE PLANS:
 #### A masked pattern was here ####
                     name default.service_request_clean
                     numFiles 1
+                    numRows 0
+                    rawDataSize 0
                     serialization.ddl struct service_request_clean { string cnctevn_id, string svcrqst_id, string svcrqst_crt_dts, i32 subject_seq_no, string plan_component, string cust_segment, string cnctyp_cd, string cnctmd_cd, string cnctevs_cd, string svcrtyp_cd, string svrstyp_cd, string cmpltyp_cd, string catsrsn_cd, string apealvl_cd, string cnstnty_cd, string svcrqst_asrqst_ind, string svcrqst_rtnorig_in, string svcrqst_vwasof_dt, string sum_reason_cd, string sum_reason, string crsr_master_claim_index, list<string> svcrqct_cds, string svcrqst_lupdt, timestamp crsr_lupdt, string cntevsds_lupdt, i32 ignore_me, list<string> notes}
                     serialization.format 	
                     serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -1310,6 +1323,8 @@ STAGE PLANS:
 #### A masked pattern was here ####
                       name default.service_request_clean
                       numFiles 1
+                      numRows 0
+                      rawDataSize 0
                       serialization.ddl struct service_request_clean { string cnctevn_id, string svcrqst_id, string svcrqst_crt_dts, i32 subject_seq_no, string plan_component, string cust_segment, string cnctyp_cd, string cnctmd_cd, string cnctevs_cd, string svcrtyp_cd, string svrstyp_cd, string cmpltyp_cd, string catsrsn_cd, string apealvl_cd, string cnstnty_cd, string svcrqst_asrqst_ind, string svcrqst_rtnorig_in, string svcrqst_vwasof_dt, string sum_reason_cd, string sum_reason, string crsr_master_claim_index, list<string> svcrqct_cds, string svcrqst_lupdt, timestamp crsr_lupdt, string cntevsds_lupdt, i32 ignore_me, list<string> notes}
                       serialization.format 	
                       serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out b/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out
index f661eee..a88f413 100644
--- a/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out
@@ -299,7 +299,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -411,7 +410,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -523,7 +521,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -631,7 +628,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 4
                           Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Group By Operator
                             aggregations: count()
                             mode: hash
@@ -1013,7 +1009,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -1121,7 +1116,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -1131,7 +1125,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 4
                           Statistics: Num rows: 605 Data size: 6427 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Group By Operator
                             aggregations: count()
                             mode: hash
@@ -1249,7 +1242,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 266 Data size: 2822 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -1259,7 +1251,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 6
                           Statistics: Num rows: 558 Data size: 5926 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Group By Operator
                             aggregations: count()
                             mode: hash
@@ -1311,7 +1302,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 6
                         Statistics: Num rows: 558 Data size: 5926 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -1467,7 +1457,6 @@ STAGE PLANS:
                   input vertices:
                     0 Reducer 2
                   Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                  HybridGraceHashJoin: true
                   Group By Operator
                     aggregations: count()
                     mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/tez_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_union.q.out b/ql/src/test/results/clientpositive/llap/tez_union.q.out
index 7a6b32b..2a47ab5 100644
--- a/ql/src/test/results/clientpositive/llap/tez_union.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_union.q.out
@@ -43,7 +43,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 1050 Data size: 11155 Basic stats: COMPLETE Column stats: NONE
@@ -402,7 +401,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
@@ -434,7 +432,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
@@ -560,7 +557,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -574,7 +570,6 @@ STAGE PLANS:
                             1 Map 9
                             2 Map 10
                           Statistics: Num rows: 3630 Data size: 38563 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Select Operator
                             expressions: _col1 (type: string), _col0 (type: string), _col2 (type: string)
                             outputColumnNames: _col0, _col1, _col2
@@ -656,7 +651,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 6
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -670,7 +664,6 @@ STAGE PLANS:
                             1 Map 9
                             2 Map 10
                           Statistics: Num rows: 3630 Data size: 38563 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Select Operator
                             expressions: _col1 (type: string), _col0 (type: string), _col2 (type: string)
                             outputColumnNames: _col0, _col1, _col2
@@ -723,7 +716,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 8
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -737,7 +729,6 @@ STAGE PLANS:
                             1 Map 9
                             2 Map 10
                           Statistics: Num rows: 3630 Data size: 38563 Basic stats: COMPLETE Column stats: NONE
-                          HybridGraceHashJoin: true
                           Select Operator
                             expressions: _col1 (type: string), _col0 (type: string), _col2 (type: string)
                             outputColumnNames: _col0, _col1, _col2
@@ -1006,7 +997,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
@@ -1057,7 +1047,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 5
                         Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         File Output Operator
                           compressed: false
                           Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
@@ -1198,7 +1187,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 4
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       File Output Operator
                         compressed: false
                         Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
@@ -1227,7 +1215,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 4
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       File Output Operator
                         compressed: false
                         Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
@@ -1344,7 +1331,6 @@ STAGE PLANS:
                       input vertices:
                         0 Union 2
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       File Output Operator
                         compressed: false
                         Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
index 5f52822..9475487 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out
@@ -3790,7 +3790,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -3931,7 +3930,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -3941,7 +3939,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 2420 Data size: 25709 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -4116,7 +4113,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4268,7 +4264,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4381,7 +4376,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4505,7 +4499,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4645,7 +4638,6 @@ STAGE PLANS:
                       input vertices:
                         1 Reducer 4
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4795,7 +4787,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -4903,7 +4894,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 3
                         Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -5010,7 +5000,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -5084,7 +5073,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -5094,7 +5082,6 @@ STAGE PLANS:
                         input vertices:
                           1 Map 4
                         Statistics: Num rows: 1210 Data size: 12854 Basic stats: COMPLETE Column stats: NONE
-                        HybridGraceHashJoin: true
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -5265,7 +5252,6 @@ STAGE PLANS:
                         input vertices:
                           0 Map 1
                         Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                        HybridGraceHashJoin: true
                         Map Join Operator
                           condition map:
                                Inner Join 0 to 1
@@ -5275,7 +5261,6 @@ STAGE PLANS:
                           input vertices:
                             1 Map 4
                           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-                          HybridGraceHashJoin: true
                           Group By Operator
                             aggregations: count()
                             mode: hash
@@ -5378,7 +5363,6 @@ STAGE PLANS:
                       input vertices:
                         1 Union 5
                       Statistics: Num rows: 2200 Data size: 23372 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         keys: _col0 (type: string)
                         mode: hash
@@ -5617,7 +5601,6 @@ STAGE PLANS:
                       input vertices:
                         1 Map 3
                       Statistics: Num rows: 2200 Data size: 206800 Basic stats: COMPLETE Column stats: NONE
-                      HybridGraceHashJoin: true
                       Group By Operator
                         aggregations: count()
                         mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/f3fe47ca/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
index a8eb0d3..7c22d9a 100644
--- a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
@@ -4,6 +4,7 @@ PREHOOK: query: -- Hybrid Grace Hash Join
 -- 2. Partitioned table spilling
 -- 3. Vectorization
 
+
 SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
@@ -14,6 +15,7 @@ POSTHOOK: query: -- Hybrid Grace Hash Join
 -- 2. Partitioned table spilling
 -- 3. Vectorization
 
+
 SELECT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table