You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/05/24 23:51:41 UTC

[07/54] [abbrv] hive git commit: HIVE-16696: Fix JoinCondDesc explain string (Chao Sun, reviewed by Xuefu Zhang)

HIVE-16696: Fix JoinCondDesc explain string (Chao Sun, reviewed by Xuefu Zhang)


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

Branch: refs/heads/hive-14535
Commit: 92983158abc1fe55f36240a8e1a5eadda5ff08e8
Parents: 89699ef
Author: Chao Sun <su...@apache.org>
Authored: Wed May 17 09:18:13 2017 -0700
Committer: Chao Sun <su...@apache.org>
Committed: Wed May 17 22:38:21 2017 -0700

----------------------------------------------------------------------
 .../hadoop/hive/ql/plan/JoinCondDesc.java       | 10 +--
 .../clientpositive/annotate_stats_join.q.out    |  4 +-
 .../results/clientpositive/auto_join20.q.out    |  4 +-
 .../results/clientpositive/auto_join21.q.out    |  4 +-
 .../results/clientpositive/auto_join28.q.out    | 16 ++--
 .../results/clientpositive/auto_join29.q.out    | 24 ++---
 .../results/clientpositive/auto_join31.q.out    |  6 +-
 .../results/clientpositive/auto_join4.q.out     |  2 +-
 .../results/clientpositive/auto_join5.q.out     |  2 +-
 .../results/clientpositive/auto_join7.q.out     |  2 +-
 .../results/clientpositive/auto_join8.q.out     |  2 +-
 .../clientpositive/auto_sortmerge_join_14.q.out |  8 +-
 .../clientpositive/auto_sortmerge_join_15.q.out |  8 +-
 .../clientpositive/beeline/smb_mapjoin_1.q.out  |  8 +-
 .../clientpositive/beeline/smb_mapjoin_2.q.out  |  8 +-
 .../clientpositive/beeline/smb_mapjoin_3.q.out  |  8 +-
 .../cbo_SortUnionTransposeRule.q.out            |  8 +-
 .../results/clientpositive/cbo_rp_join0.q.out   |  6 +-
 .../clientpositive/constant_prop_3.q.out        |  2 +-
 .../clientpositive/correlationoptimizer8.q.out  |  8 +-
 .../clientpositive/cross_join_merge.q.out       |  4 +-
 .../clientpositive/dynamic_rdd_cache.q.out      |  2 +-
 .../results/clientpositive/empty_join.q.out     |  2 +-
 .../clientpositive/filter_cond_pushdown2.q.out  |  2 +-
 .../clientpositive/infer_join_preds.q.out       |  6 +-
 .../test/results/clientpositive/innerjoin.q.out |  2 +-
 ql/src/test/results/clientpositive/join20.q.out |  4 +-
 ql/src/test/results/clientpositive/join21.q.out |  4 +-
 ql/src/test/results/clientpositive/join39.q.out |  2 +-
 ql/src/test/results/clientpositive/join4.q.out  |  2 +-
 ql/src/test/results/clientpositive/join40.q.out |  8 +-
 ql/src/test/results/clientpositive/join41.q.out |  4 +-
 ql/src/test/results/clientpositive/join45.q.out | 10 +--
 ql/src/test/results/clientpositive/join46.q.out | 32 +++----
 ql/src/test/results/clientpositive/join5.q.out  |  2 +-
 ql/src/test/results/clientpositive/join7.q.out  |  2 +-
 ql/src/test/results/clientpositive/join8.q.out  |  2 +-
 .../join_cond_pushdown_unqual5.q.out            |  4 +-
 .../clientpositive/join_emit_interval.q.out     |  4 +-
 .../clientpositive/join_filters_overlap.q.out   | 22 ++---
 .../results/clientpositive/join_merging.q.out   |  6 +-
 .../results/clientpositive/join_reorder.q.out   | 20 ++---
 .../test/results/clientpositive/join_star.q.out | 18 ++--
 .../test/results/clientpositive/lineage1.q.out  |  4 +-
 .../clientpositive/llap/auto_join21.q.out       |  4 +-
 .../clientpositive/llap/auto_join29.q.out       | 24 ++---
 .../clientpositive/llap/auto_join30.q.out       | 18 ++--
 .../llap/auto_sortmerge_join_14.q.out           |  4 +-
 .../llap/auto_sortmerge_join_15.q.out           |  4 +-
 .../llap/bucket_map_join_tez2.q.out             |  4 +-
 .../llap/correlationoptimizer1.q.out            | 20 ++---
 .../llap/correlationoptimizer2.q.out            |  8 +-
 .../llap/correlationoptimizer4.q.out            | 24 ++---
 .../llap/dynamic_partition_pruning.q.out        |  8 +-
 .../llap/dynamic_semijoin_reduction_3.q.out     |  6 +-
 .../llap/hybridgrace_hashjoin_1.q.out           |  4 +-
 .../clientpositive/llap/join32_lessSize.q.out   |  2 +-
 .../results/clientpositive/llap/join46.q.out    | 32 +++----
 .../llap/join_emit_interval.q.out               |  4 +-
 .../llap/limit_join_transpose.q.out             | 36 ++++----
 .../clientpositive/llap/llap_nullscan.q.out     |  2 +-
 .../results/clientpositive/llap/mapjoin3.q.out  |  2 +-
 .../results/clientpositive/llap/mapjoin46.q.out | 30 +++----
 .../llap/mapjoin_emit_interval.q.out            |  4 +-
 .../results/clientpositive/llap/mergejoin.q.out |  4 +-
 .../clientpositive/llap/optimize_nullscan.q.out |  6 +-
 .../results/clientpositive/llap/semijoin.q.out  | 10 +--
 .../results/clientpositive/llap/skewjoin.q.out  |  2 +-
 .../clientpositive/llap/skewjoinopt15.q.out     |  4 +-
 .../clientpositive/llap/smb_mapjoin_17.q.out    | 64 ++++++-------
 .../clientpositive/llap/smb_mapjoin_4.q.out     | 28 +++---
 .../clientpositive/llap/smb_mapjoin_5.q.out     | 28 +++---
 .../results/clientpositive/llap/sqlmerge.q.out  |  4 +-
 .../clientpositive/llap/subquery_in.q.out       | 14 +--
 .../clientpositive/llap/subquery_multi.q.out    | 30 +++----
 .../clientpositive/llap/subquery_notin.q.out    | 92 +++++++++----------
 .../clientpositive/llap/subquery_null_agg.q.out |  2 +-
 .../clientpositive/llap/subquery_scalar.q.out   | 44 ++++-----
 .../clientpositive/llap/subquery_select.q.out   | 94 ++++++++++----------
 .../clientpositive/llap/subquery_views.q.out    |  8 +-
 .../llap/table_nonprintable.q.out               |  2 +-
 .../llap/tez_dynpart_hashjoin_3.q.out           |  4 +-
 .../clientpositive/llap/tez_join_tests.q.out    |  4 +-
 .../clientpositive/llap/tez_joins_explain.q.out |  4 +-
 .../clientpositive/llap/tez_nway_join.q.out     |  8 +-
 .../clientpositive/llap/tez_smb_empty.q.out     |  6 +-
 .../results/clientpositive/llap/tez_union.q.out |  6 +-
 .../llap/tez_union_group_by.q.out               |  2 +-
 .../clientpositive/llap/unionDistinct_1.q.out   |  2 +-
 .../clientpositive/llap/vector_coalesce_3.q.out |  2 +-
 .../llap/vector_groupby_mapjoin.q.out           |  2 +-
 .../clientpositive/llap/vector_join30.q.out     | 18 ++--
 .../llap/vector_left_outer_join.q.out           |  4 +-
 .../llap/vector_left_outer_join2.q.out          | 12 +--
 .../llap/vector_leftsemi_mapjoin.q.out          | 32 +++----
 .../llap/vector_outer_join0.q.out               |  4 +-
 .../llap/vector_outer_join1.q.out               |  8 +-
 .../llap/vector_outer_join2.q.out               |  4 +-
 .../vectorized_dynamic_partition_pruning.q.out  |  8 +-
 .../clientpositive/llap/vectorized_join46.q.out | 26 +++---
 .../test/results/clientpositive/mapjoin1.q.out  | 12 +--
 .../test/results/clientpositive/mapjoin3.q.out  |  2 +-
 .../test/results/clientpositive/mapjoin46.q.out | 30 +++----
 .../mapjoin_filter_on_outerjoin.q.out           |  4 +-
 .../clientpositive/mapjoin_test_outer.q.out     |  4 +-
 .../results/clientpositive/masking_10.q.out     |  4 +-
 .../test/results/clientpositive/mergejoin.q.out |  4 +-
 .../results/clientpositive/mergejoins.q.out     |  2 +-
 .../clientpositive/mergejoins_mixed.q.out       | 40 ++++-----
 .../multi_insert_with_join2.q.out               |  4 +-
 .../results/clientpositive/optional_outer.q.out |  8 +-
 .../clientpositive/position_alias_test_1.q.out  |  4 +-
 .../clientpositive/ppd_outer_join5.q.out        |  6 +-
 .../clientpositive/rcfile_null_value.q.out      |  2 +-
 .../test/results/clientpositive/skewjoin.q.out  |  2 +-
 .../clientpositive/skewjoin_mapjoin1.q.out      |  8 +-
 .../clientpositive/skewjoin_mapjoin10.q.out     |  8 +-
 .../skewjoin_union_remove_1.q.out               |  8 +-
 .../results/clientpositive/skewjoinopt1.q.out   |  8 +-
 .../results/clientpositive/skewjoinopt2.q.out   |  8 +-
 .../results/clientpositive/smb_mapjoin_1.q.out  |  8 +-
 .../results/clientpositive/smb_mapjoin_2.q.out  |  8 +-
 .../results/clientpositive/smb_mapjoin_3.q.out  |  8 +-
 .../results/clientpositive/smb_mapjoin_46.q.out | 26 +++---
 .../spark/annotate_stats_join.q.out             |  4 +-
 .../clientpositive/spark/auto_join20.q.out      |  4 +-
 .../clientpositive/spark/auto_join21.q.out      |  4 +-
 .../clientpositive/spark/auto_join28.q.out      | 16 ++--
 .../clientpositive/spark/auto_join29.q.out      | 24 ++---
 .../clientpositive/spark/auto_join30.q.out      | 18 ++--
 .../clientpositive/spark/auto_join31.q.out      |  2 +-
 .../clientpositive/spark/auto_join4.q.out       |  2 +-
 .../clientpositive/spark/auto_join5.q.out       |  2 +-
 .../clientpositive/spark/auto_join7.q.out       |  2 +-
 .../clientpositive/spark/auto_join8.q.out       |  2 +-
 .../spark/auto_sortmerge_join_14.q.out          |  4 +-
 .../spark/auto_sortmerge_join_15.q.out          |  4 +-
 .../spark/bucket_map_join_tez2.q.out            |  4 +-
 .../spark/dynamic_rdd_cache.q.out               |  2 +-
 .../clientpositive/spark/innerjoin.q.out        |  2 +-
 .../results/clientpositive/spark/join20.q.out   |  4 +-
 .../results/clientpositive/spark/join21.q.out   |  4 +-
 .../clientpositive/spark/join32_lessSize.q.out  |  2 +-
 .../results/clientpositive/spark/join39.q.out   |  2 +-
 .../results/clientpositive/spark/join4.q.out    |  2 +-
 .../results/clientpositive/spark/join41.q.out   |  4 +-
 .../results/clientpositive/spark/join5.q.out    |  2 +-
 .../results/clientpositive/spark/join7.q.out    |  2 +-
 .../results/clientpositive/spark/join8.q.out    |  2 +-
 .../spark/join_filters_overlap.q.out            | 22 ++---
 .../clientpositive/spark/join_merging.q.out     |  6 +-
 .../clientpositive/spark/join_reorder.q.out     | 20 ++---
 .../clientpositive/spark/join_star.q.out        | 18 ++--
 .../results/clientpositive/spark/mapjoin1.q.out | 12 +--
 .../spark/mapjoin_filter_on_outerjoin.q.out     |  4 +-
 .../spark/mapjoin_test_outer.q.out              |  4 +-
 .../clientpositive/spark/mergejoins.q.out       |  2 +-
 .../clientpositive/spark/mergejoins_mixed.q.out | 40 ++++-----
 .../spark/optimize_nullscan.q.out               |  6 +-
 .../clientpositive/spark/ppd_outer_join5.q.out  |  6 +-
 .../results/clientpositive/spark/semijoin.q.out | 10 +--
 .../results/clientpositive/spark/skewjoin.q.out |  2 +-
 .../spark/skewjoin_union_remove_1.q.out         |  8 +-
 .../clientpositive/spark/skewjoinopt1.q.out     |  8 +-
 .../clientpositive/spark/skewjoinopt15.q.out    |  8 +-
 .../clientpositive/spark/skewjoinopt2.q.out     |  8 +-
 .../clientpositive/spark/smb_mapjoin_1.q.out    |  8 +-
 .../clientpositive/spark/smb_mapjoin_17.q.out   | 64 ++++++-------
 .../clientpositive/spark/smb_mapjoin_2.q.out    |  8 +-
 .../clientpositive/spark/smb_mapjoin_3.q.out    |  8 +-
 .../clientpositive/spark/smb_mapjoin_4.q.out    | 28 +++---
 .../clientpositive/spark/smb_mapjoin_5.q.out    | 28 +++---
 .../clientpositive/spark/subquery_in.q.out      | 14 +--
 .../spark/subquery_multiinsert.q.out            |  4 +-
 .../clientpositive/spark/tez_join_tests.q.out   |  4 +-
 .../spark/tez_joins_explain.q.out               |  4 +-
 .../results/clientpositive/spark/union22.q.out  |  2 +-
 .../spark/union_lateralview.q.out               |  2 +-
 .../spark/vector_left_outer_join.q.out          |  4 +-
 .../spark/vector_outer_join0.q.out              |  4 +-
 .../spark/vector_outer_join1.q.out              |  8 +-
 .../spark/vector_outer_join2.q.out              |  4 +-
 .../clientpositive/subquery_in_having.q.out     | 20 ++---
 .../clientpositive/subquery_multiinsert.q.out   |  4 +-
 .../clientpositive/subquery_notexists.q.out     | 12 +--
 .../subquery_notexists_having.q.out             |  4 +-
 .../clientpositive/subquery_notin_having.q.out  | 14 +--
 .../subquery_unqual_corr_expr.q.out             |  2 +-
 .../subquery_unqualcolumnrefs.q.out             |  4 +-
 .../tez/hybridgrace_hashjoin_1.q.out            |  4 +-
 .../test/results/clientpositive/union22.q.out   |  4 +-
 .../clientpositive/union_lateralview.q.out      |  2 +-
 .../results/clientpositive/union_offcbo.q.out   |  8 +-
 .../clientpositive/vector_coalesce_3.q.out      |  2 +-
 .../clientpositive/vector_groupby_mapjoin.q.out |  4 +-
 .../clientpositive/vector_left_outer_join.q.out |  4 +-
 .../vector_left_outer_join2.q.out               | 12 +--
 .../clientpositive/vector_outer_join0.q.out     |  4 +-
 .../clientpositive/vector_outer_join1.q.out     |  8 +-
 .../clientpositive/vector_outer_join2.q.out     |  4 +-
 .../clientpositive/vector_outer_join3.q.out     |  6 +-
 .../clientpositive/vector_outer_join4.q.out     |  6 +-
 .../clientpositive/vector_outer_join6.q.out     |  4 +-
 203 files changed, 994 insertions(+), 994 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinCondDesc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinCondDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinCondDesc.java
index 660ee50..4fa14fa 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinCondDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinCondDesc.java
@@ -128,19 +128,19 @@ public class JoinCondDesc implements Serializable {
       sb.append("Outer Join ");
       break;
     case JoinDesc.LEFT_OUTER_JOIN:
-      sb.append("Left Outer Join");
+      sb.append("Left Outer Join ");
       break;
     case JoinDesc.RIGHT_OUTER_JOIN:
-      sb.append("Right Outer Join");
+      sb.append("Right Outer Join ");
       break;
     case JoinDesc.UNIQUE_JOIN:
-      sb.append("Unique Join");
+      sb.append("Unique Join ");
       break;
     case JoinDesc.LEFT_SEMI_JOIN:
       sb.append("Left Semi Join ");
       break;
     default:
-      sb.append("Unknow Join ");
+      sb.append("Unknown Join ");
       break;
     }
 
@@ -175,7 +175,7 @@ public class JoinCondDesc implements Serializable {
         join.put("type", "Left Semi");
         break;
       default:
-        join.put("type", "Unknow Join");
+        join.put("type", "Unknown Join");
         break;
       }
       join.put("left", left);

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/annotate_stats_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_join.q.out b/ql/src/test/results/clientpositive/annotate_stats_join.q.out
index 5d4fe6c..48ba40e 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_join.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_join.q.out
@@ -677,7 +677,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string), _col1 (type: int)
             1 _col1 (type: string), _col0 (type: int)
@@ -808,7 +808,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string), _col1 (type: int)
             1 _col1 (type: string), _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join20.q.out b/ql/src/test/results/clientpositive/auto_join20.q.out
index 6a602f7..9d97fe5 100644
--- a/ql/src/test/results/clientpositive/auto_join20.q.out
+++ b/ql/src/test/results/clientpositive/auto_join20.q.out
@@ -73,7 +73,7 @@ STAGE PLANS:
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
-                   Right Outer Join0 to 2
+                   Right Outer Join 0 to 2
               filter predicates:
                 0 
                 1 
@@ -233,7 +233,7 @@ STAGE PLANS:
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
-                   Right Outer Join0 to 2
+                   Right Outer Join 0 to 2
               filter predicates:
                 0 
                 1 

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join21.q.out b/ql/src/test/results/clientpositive/auto_join21.q.out
index 9c26055..a1ec028 100644
--- a/ql/src/test/results/clientpositive/auto_join21.q.out
+++ b/ql/src/test/results/clientpositive/auto_join21.q.out
@@ -58,8 +58,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
-                   Right Outer Join1 to 2
+                   Left Outer Join 0 to 1
+                   Right Outer Join 1 to 2
               filter predicates:
                 0 {(key < 10)}
                 1 

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join28.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join28.q.out b/ql/src/test/results/clientpositive/auto_join28.q.out
index d13a356..e1543b3 100644
--- a/ql/src/test/results/clientpositive/auto_join28.q.out
+++ b/ql/src/test/results/clientpositive/auto_join28.q.out
@@ -58,8 +58,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
-                   Right Outer Join1 to 2
+                   Left Outer Join 0 to 1
+                   Right Outer Join 1 to 2
               filter predicates:
                 0 {(key < 10)}
                 1 
@@ -162,8 +162,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
-                   Left Outer Join1 to 2
+                   Left Outer Join 0 to 1
+                   Left Outer Join 1 to 2
               filter predicates:
                 0 {(key < 10)}
                 1 
@@ -266,8 +266,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
-                   Left Outer Join1 to 2
+                   Right Outer Join 0 to 1
+                   Left Outer Join 1 to 2
               filter predicates:
                 0 
                 1 {(key > 10)}
@@ -367,8 +367,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
-                   Right Outer Join1 to 2
+                   Right Outer Join 0 to 1
+                   Right Outer Join 1 to 2
               filter predicates:
                 0 
                 1 {(key > 10)}

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join29.q.out b/ql/src/test/results/clientpositive/auto_join29.q.out
index 147da9f..a799b04 100644
--- a/ql/src/test/results/clientpositive/auto_join29.q.out
+++ b/ql/src/test/results/clientpositive/auto_join29.q.out
@@ -58,8 +58,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
-                   Right Outer Join1 to 2
+                   Left Outer Join 0 to 1
+                   Right Outer Join 1 to 2
               filter predicates:
                 0 {(key < 10)}
                 1 
@@ -670,8 +670,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
-                   Left Outer Join1 to 2
+                   Left Outer Join 0 to 1
+                   Left Outer Join 1 to 2
               filter predicates:
                 0 {(key < 10)}
                 1 
@@ -1282,8 +1282,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
-                   Left Outer Join1 to 2
+                   Right Outer Join 0 to 1
+                   Left Outer Join 1 to 2
               filter predicates:
                 0 
                 1 {(key > 10)}
@@ -1903,8 +1903,8 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
-                   Right Outer Join1 to 2
+                   Right Outer Join 0 to 1
+                   Right Outer Join 1 to 2
               filter predicates:
                 0 
                 1 {(key > 10)}
@@ -2523,7 +2523,7 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                     Left Outer Join1 to 2
+                     Left Outer Join 1 to 2
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -2631,7 +2631,7 @@ STAGE PLANS:
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
-                   Right Outer Join1 to 2
+                   Right Outer Join 1 to 2
               filter predicates:
                 0 
                 1 
@@ -3242,7 +3242,7 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
+                   Left Outer Join 0 to 1
                    Inner Join 1 to 2
               filter predicates:
                 0 {(key < 10)}
@@ -3357,7 +3357,7 @@ STAGE PLANS:
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Right Outer Join0 to 1
+                     Right Outer Join 0 to 1
                      Inner Join 1 to 2
                 filter predicates:
                   0 

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join31.q.out b/ql/src/test/results/clientpositive/auto_join31.q.out
index 04a3c02..1cf86cf 100644
--- a/ql/src/test/results/clientpositive/auto_join31.q.out
+++ b/ql/src/test/results/clientpositive/auto_join31.q.out
@@ -94,7 +94,7 @@ STAGE PLANS:
           TableScan
             Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
+                   Right Outer Join 0 to 1
                    Inner Join 0 to 2
               keys:
                 0 _col0 (type: string)
@@ -169,7 +169,7 @@ STAGE PLANS:
           TableScan
             Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
+                   Right Outer Join 0 to 1
                    Inner Join 0 to 2
               keys:
                 0 _col0 (type: string)
@@ -216,7 +216,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
                Inner Join 0 to 2
           keys:
             0 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join4.q.out b/ql/src/test/results/clientpositive/auto_join4.q.out
index eacf056..d4fb977 100644
--- a/ql/src/test/results/clientpositive/auto_join4.q.out
+++ b/ql/src/test/results/clientpositive/auto_join4.q.out
@@ -81,7 +81,7 @@ STAGE PLANS:
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
-                       Left Outer Join0 to 1
+                       Left Outer Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join5.q.out b/ql/src/test/results/clientpositive/auto_join5.q.out
index d526595..c3b562d 100644
--- a/ql/src/test/results/clientpositive/auto_join5.q.out
+++ b/ql/src/test/results/clientpositive/auto_join5.q.out
@@ -81,7 +81,7 @@ STAGE PLANS:
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
-                       Right Outer Join0 to 1
+                       Right Outer Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join7.q.out b/ql/src/test/results/clientpositive/auto_join7.q.out
index aec4e82..a657c30 100644
--- a/ql/src/test/results/clientpositive/auto_join7.q.out
+++ b/ql/src/test/results/clientpositive/auto_join7.q.out
@@ -107,7 +107,7 @@ STAGE PLANS:
         Join Operator
           condition map:
                Outer Join 0 to 1
-               Left Outer Join0 to 2
+               Left Outer Join 0 to 2
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join8.q.out b/ql/src/test/results/clientpositive/auto_join8.q.out
index ccbafba..5ca6798 100644
--- a/ql/src/test/results/clientpositive/auto_join8.q.out
+++ b/ql/src/test/results/clientpositive/auto_join8.q.out
@@ -81,7 +81,7 @@ STAGE PLANS:
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
-                       Left Outer Join0 to 1
+                       Left Outer Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out
index cc4cbfb..f12bf98 100644
--- a/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out
+++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out
@@ -83,7 +83,7 @@ STAGE PLANS:
               Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -120,7 +120,7 @@ STAGE PLANS:
               Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -219,7 +219,7 @@ STAGE PLANS:
               Statistics: Num rows: 189 Data size: 1891 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Right Outer Join0 to 1
+                     Right Outer Join 0 to 1
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -256,7 +256,7 @@ STAGE PLANS:
               Statistics: Num rows: 189 Data size: 1891 Basic stats: COMPLETE Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
-                     Right Outer Join0 to 1
+                     Right Outer Join 0 to 1
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out
index edf0e30..827708c 100644
--- a/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out
+++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out
@@ -83,7 +83,7 @@ STAGE PLANS:
               Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -120,7 +120,7 @@ STAGE PLANS:
               Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -198,7 +198,7 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Right Outer Join0 to 1
+                     Right Outer Join 0 to 1
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
@@ -235,7 +235,7 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
-                     Right Outer Join0 to 1
+                     Right Outer Join 0 to 1
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
index 40df1c3..52314d9 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
@@ -118,7 +118,7 @@ STAGE PLANS:
             Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
+                   Left Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -173,7 +173,7 @@ STAGE PLANS:
             Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
+                   Right Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -339,7 +339,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
+                   Left Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -394,7 +394,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
+                   Right Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
index 7840905..56a38a2 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_2.q.out
@@ -120,7 +120,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 222 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
+                   Left Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -175,7 +175,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 222 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
+                   Right Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -345,7 +345,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
+                   Left Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -400,7 +400,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
+                   Right Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out
index cda600b..f33b8bb 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_3.q.out
@@ -120,7 +120,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 222 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
+                   Left Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -174,7 +174,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 222 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
+                   Right Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -343,7 +343,7 @@ STAGE PLANS:
             Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Left Outer Join0 to 1
+                   Left Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)
@@ -397,7 +397,7 @@ STAGE PLANS:
             Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE Column stats: NONE
             Sorted Merge Bucket Map Join Operator
               condition map:
-                   Right Outer Join0 to 1
+                   Right Outer Join 0 to 1
               keys:
                 0 key (type: int)
                 1 key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out b/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
index 43132d9..1c6c9ff 100644
--- a/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
+++ b/ql/src/test/results/clientpositive/cbo_SortUnionTransposeRule.q.out
@@ -302,7 +302,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -407,7 +407,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -884,7 +884,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -1016,7 +1016,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_join0.q.out b/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
index 785cf86..ba96de2 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_join0.q.out
@@ -62,7 +62,7 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-               Right Outer Join0 to 2
+               Right Outer Join 0 to 2
           keys:
             0 key (type: string)
             1 key (type: string)
@@ -722,8 +722,8 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-               Right Outer Join0 to 2
-               Left Outer Join0 to 3
+               Right Outer Join 0 to 2
+               Left Outer Join 0 to 3
           keys:
             0 key (type: string)
             1 key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/constant_prop_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constant_prop_3.q.out b/ql/src/test/results/clientpositive/constant_prop_3.q.out
index 7296131..8119ccf 100644
--- a/ql/src/test/results/clientpositive/constant_prop_3.q.out
+++ b/ql/src/test/results/clientpositive/constant_prop_3.q.out
@@ -262,7 +262,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col1 (type: int)
             1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/correlationoptimizer8.q.out b/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
index 785fa98..1d930f8 100644
--- a/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
+++ b/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
@@ -511,7 +511,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -723,7 +723,7 @@ STAGE PLANS:
                 Statistics: Num rows: 397 Data size: 4019 Basic stats: COMPLETE Column stats: NONE
                 Join Operator
                   condition map:
-                       Left Outer Join0 to 1
+                       Left Outer Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -748,7 +748,7 @@ STAGE PLANS:
                 Statistics: Num rows: 397 Data size: 4019 Basic stats: COMPLETE Column stats: NONE
                 Join Operator
                   condition map:
-                       Left Outer Join0 to 1
+                       Left Outer Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -765,7 +765,7 @@ STAGE PLANS:
             Statistics: Num rows: 397 Data size: 4019 Basic stats: COMPLETE Column stats: NONE
             Join Operator
               condition map:
-                   Left Outer Join0 to 1
+                   Left Outer Join 0 to 1
               keys:
                 0 _col0 (type: string)
                 1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/cross_join_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cross_join_merge.q.out b/ql/src/test/results/clientpositive/cross_join_merge.q.out
index a442971..f4956de 100644
--- a/ql/src/test/results/clientpositive/cross_join_merge.q.out
+++ b/ql/src/test/results/clientpositive/cross_join_merge.q.out
@@ -376,7 +376,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 
             1 
@@ -490,7 +490,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
                Inner Join 0 to 2
           keys:
             0 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out b/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out
index 2abb819..fc00309 100644
--- a/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out
+++ b/ql/src/test/results/clientpositive/dynamic_rdd_cache.q.out
@@ -80,7 +80,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
                Inner Join 0 to 2
           keys:
             0 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/empty_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/empty_join.q.out b/ql/src/test/results/clientpositive/empty_join.q.out
index 9a47c1f..a4a9976 100644
--- a/ql/src/test/results/clientpositive/empty_join.q.out
+++ b/ql/src/test/results/clientpositive/empty_join.q.out
@@ -116,7 +116,7 @@ STAGE PLANS:
                 Statistics: Num rows: 1 Data size: 1 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
-                       Left Outer Join0 to 1
+                       Left Outer Join 0 to 1
                        Inner Join 0 to 2
                   keys:
                     0 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out b/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
index 78406f6..8860513 100644
--- a/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
+++ b/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
@@ -157,7 +157,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: int), _col1 (type: string)
             1 _col0 (type: int), _col1 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/infer_join_preds.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_join_preds.q.out b/ql/src/test/results/clientpositive/infer_join_preds.q.out
index 07f9082..6a4fa34 100644
--- a/ql/src/test/results/clientpositive/infer_join_preds.q.out
+++ b/ql/src/test/results/clientpositive/infer_join_preds.q.out
@@ -257,7 +257,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -345,7 +345,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -571,7 +571,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/innerjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/innerjoin.q.out b/ql/src/test/results/clientpositive/innerjoin.q.out
index 4a7649d..99b3d85 100644
--- a/ql/src/test/results/clientpositive/innerjoin.q.out
+++ b/ql/src/test/results/clientpositive/innerjoin.q.out
@@ -1212,7 +1212,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join20.q.out b/ql/src/test/results/clientpositive/join20.q.out
index 583436d..13a2329 100644
--- a/ql/src/test/results/clientpositive/join20.q.out
+++ b/ql/src/test/results/clientpositive/join20.q.out
@@ -52,7 +52,7 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-               Right Outer Join0 to 2
+               Right Outer Join 0 to 2
           filter predicates:
             0 
             1 
@@ -713,7 +713,7 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-               Right Outer Join0 to 2
+               Right Outer Join 0 to 2
           filter predicates:
             0 
             1 

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join21.q.out b/ql/src/test/results/clientpositive/join21.q.out
index 29f449e..6e9ba0a 100644
--- a/ql/src/test/results/clientpositive/join21.q.out
+++ b/ql/src/test/results/clientpositive/join21.q.out
@@ -46,8 +46,8 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
-               Right Outer Join1 to 2
+               Left Outer Join 0 to 1
+               Right Outer Join 1 to 2
           filter predicates:
             0 {(KEY.reducesinkkey0 < 10)}
             1 

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join39.q.out b/ql/src/test/results/clientpositive/join39.q.out
index 628a44a..c656762 100644
--- a/ql/src/test/results/clientpositive/join39.q.out
+++ b/ql/src/test/results/clientpositive/join39.q.out
@@ -58,7 +58,7 @@ STAGE PLANS:
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join4.q.out b/ql/src/test/results/clientpositive/join4.q.out
index d9510f5..0bd1edd 100644
--- a/ql/src/test/results/clientpositive/join4.q.out
+++ b/ql/src/test/results/clientpositive/join4.q.out
@@ -80,7 +80,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join40.q.out b/ql/src/test/results/clientpositive/join40.q.out
index c9ace8d..52b31d3 100644
--- a/ql/src/test/results/clientpositive/join40.q.out
+++ b/ql/src/test/results/clientpositive/join40.q.out
@@ -44,7 +44,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -1804,7 +1804,7 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-               Right Outer Join0 to 2
+               Right Outer Join 0 to 2
           filter predicates:
             0 
             1 
@@ -2465,7 +2465,7 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-               Right Outer Join0 to 2
+               Right Outer Join 0 to 2
           filter predicates:
             0 
             1 
@@ -3121,7 +3121,7 @@ STAGE PLANS:
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join41.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join41.q.out b/ql/src/test/results/clientpositive/join41.q.out
index c2eedd0..2ea4912 100644
--- a/ql/src/test/results/clientpositive/join41.q.out
+++ b/ql/src/test/results/clientpositive/join41.q.out
@@ -56,7 +56,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -133,7 +133,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join45.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join45.q.out b/ql/src/test/results/clientpositive/join45.q.out
index 66f8893..3c373e6 100644
--- a/ql/src/test/results/clientpositive/join45.q.out
+++ b/ql/src/test/results/clientpositive/join45.q.out
@@ -755,7 +755,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -902,7 +902,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -1083,7 +1083,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -1188,7 +1188,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -1611,7 +1611,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join46.q.out b/ql/src/test/results/clientpositive/join46.q.out
index 123e3c5..e24d7b4 100644
--- a/ql/src/test/results/clientpositive/join46.q.out
+++ b/ql/src/test/results/clientpositive/join46.q.out
@@ -83,7 +83,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col1 (type: int)
             1 _col1 (type: int)
@@ -179,7 +179,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           filter predicates:
             0 {VALUE._col0 BETWEEN 100 AND 102}
             1 
@@ -275,7 +275,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           filter predicates:
             0 {VALUE._col0 BETWEEN 100 AND 102}
             1 
@@ -368,7 +368,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col1 (type: int)
             1 _col1 (type: int)
@@ -452,7 +452,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           filter predicates:
             0 {VALUE._col0 BETWEEN 100 AND 102}
             1 
@@ -550,7 +550,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 
             1 
@@ -649,7 +649,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 
             1 
@@ -746,7 +746,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 
             1 
@@ -843,7 +843,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col1 (type: int)
             1 _col1 (type: int)
@@ -935,7 +935,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 
             1 
@@ -1033,7 +1033,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 
             1 
@@ -1132,7 +1132,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 
             1 
@@ -1226,7 +1226,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 
             1 
@@ -1325,7 +1325,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col1 (type: int)
             1 _col1 (type: int)
@@ -1840,7 +1840,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col1 (type: int)
             1 _col1 (type: int)
@@ -1917,7 +1917,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col1 (type: int)
             1 _col1 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join5.q.out b/ql/src/test/results/clientpositive/join5.q.out
index bf1cde3..d981c74 100644
--- a/ql/src/test/results/clientpositive/join5.q.out
+++ b/ql/src/test/results/clientpositive/join5.q.out
@@ -80,7 +80,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join7.q.out b/ql/src/test/results/clientpositive/join7.q.out
index f0f437c..fec67b2 100644
--- a/ql/src/test/results/clientpositive/join7.q.out
+++ b/ql/src/test/results/clientpositive/join7.q.out
@@ -107,7 +107,7 @@ STAGE PLANS:
         Join Operator
           condition map:
                Outer Join 0 to 1
-               Left Outer Join0 to 2
+               Left Outer Join 0 to 2
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join8.q.out b/ql/src/test/results/clientpositive/join8.q.out
index c1035b4..124b47e 100644
--- a/ql/src/test/results/clientpositive/join8.q.out
+++ b/ql/src/test/results/clientpositive/join8.q.out
@@ -80,7 +80,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out b/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out
index b72220d..203010f 100644
--- a/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out
+++ b/ql/src/test/results/clientpositive/join_cond_pushdown_unqual5.q.out
@@ -74,7 +74,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 _col2 (type: string), _col3 (type: string)
             1 _col1 (type: string), _col2 (type: string)
@@ -150,7 +150,7 @@ STAGE PLANS:
               Statistics: Num rows: 2 Data size: 52 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col2 (type: string), _col3 (type: string)
                   1 _col1 (type: string), _col2 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join_emit_interval.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_emit_interval.q.out b/ql/src/test/results/clientpositive/join_emit_interval.q.out
index 1a94e6c..ce7c792 100644
--- a/ql/src/test/results/clientpositive/join_emit_interval.q.out
+++ b/ql/src/test/results/clientpositive/join_emit_interval.q.out
@@ -83,7 +83,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           filter predicates:
             0 {VALUE._col0 BETWEEN 100 AND 102}
             1 
@@ -171,7 +171,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           filter predicates:
             0 {VALUE._col0 BETWEEN 100 AND 102}
             1 

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join_filters_overlap.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_filters_overlap.q.out b/ql/src/test/results/clientpositive/join_filters_overlap.q.out
index eb8aecb..8ef37a4 100644
--- a/ql/src/test/results/clientpositive/join_filters_overlap.q.out
+++ b/ql/src/test/results/clientpositive/join_filters_overlap.q.out
@@ -136,8 +136,8 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
-               Left Outer Join0 to 2
+               Left Outer Join 0 to 1
+               Left Outer Join 0 to 2
           filter mappings:
             0 [1, 1, 2, 1]
           filter predicates:
@@ -327,8 +327,8 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
-               Left Outer Join1 to 2
+               Right Outer Join 0 to 1
+               Left Outer Join 1 to 2
           filter mappings:
             1 [0, 1, 2, 1]
           filter predicates:
@@ -518,8 +518,8 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
-               Left Outer Join1 to 2
+               Right Outer Join 0 to 1
+               Left Outer Join 1 to 2
           filter mappings:
             1 [0, 2, 2, 2]
           filter predicates:
@@ -727,8 +727,8 @@ STAGE PLANS:
         Join Operator
           condition map:
                Outer Join 0 to 1
-               Left Outer Join1 to 2
-               Left Outer Join0 to 3
+               Left Outer Join 1 to 2
+               Left Outer Join 0 to 3
           filter mappings:
             0 [1, 1, 3, 1]
             1 [0, 1, 2, 1]
@@ -933,9 +933,9 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
-               Left Outer Join0 to 2
-               Left Outer Join0 to 3
+               Left Outer Join 0 to 1
+               Left Outer Join 0 to 2
+               Left Outer Join 0 to 3
           filter mappings:
             0 [1, 1, 2, 1, 3, 1]
           filter predicates:

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join_merging.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_merging.q.out b/ql/src/test/results/clientpositive/join_merging.q.out
index 7cc04f5..609cc83 100644
--- a/ql/src/test/results/clientpositive/join_merging.q.out
+++ b/ql/src/test/results/clientpositive/join_merging.q.out
@@ -60,8 +60,8 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
-               Right Outer Join1 to 2
+               Left Outer Join 0 to 1
+               Right Outer Join 1 to 2
           keys:
             0 _col0 (type: int)
             1 _col0 (type: int)
@@ -152,7 +152,7 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-               Right Outer Join1 to 2
+               Right Outer Join 1 to 2
           keys:
             0 _col0 (type: int)
             1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join_reorder.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_reorder.q.out b/ql/src/test/results/clientpositive/join_reorder.q.out
index b103f97..91584ce 100644
--- a/ql/src/test/results/clientpositive/join_reorder.q.out
+++ b/ql/src/test/results/clientpositive/join_reorder.q.out
@@ -247,7 +247,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 key (type: string)
             1 key (type: string)
@@ -281,7 +281,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col1 (type: string)
             1 val (type: string)
@@ -344,7 +344,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join0 to 1
+               Left Outer Join 0 to 1
           keys:
             0 key (type: string)
             1 key (type: string)
@@ -378,7 +378,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col1 (type: string)
             1 val (type: string)
@@ -493,9 +493,9 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Unique Join0 to 0
-               Unique Join0 to 0
-               Unique Join0 to 0
+               Unique Join 0 to 0
+               Unique Join 0 to 0
+               Unique Join 0 to 0
           keys:
             0 key (type: string), val (type: string)
             1 key (type: string), val (type: string)
@@ -567,9 +567,9 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Unique Join0 to 0
-               Unique Join0 to 0
-               Unique Join0 to 0
+               Unique Join 0 to 0
+               Unique Join 0 to 0
+               Unique Join 0 to 0
           keys:
             0 key (type: string), val (type: string)
             1 key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/join_star.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_star.q.out b/ql/src/test/results/clientpositive/join_star.q.out
index b202a4f..261fb53 100644
--- a/ql/src/test/results/clientpositive/join_star.q.out
+++ b/ql/src/test/results/clientpositive/join_star.q.out
@@ -521,7 +521,7 @@ STAGE PLANS:
               Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col2 (type: int)
                   1 _col0 (type: int)
@@ -529,7 +529,7 @@ STAGE PLANS:
                 Statistics: Num rows: 8 Data size: 107 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
-                       Left Outer Join0 to 1
+                       Left Outer Join 0 to 1
                   keys:
                     0 _col4 (type: int)
                     1 _col0 (type: int)
@@ -727,7 +727,7 @@ STAGE PLANS:
               Statistics: Num rows: 6 Data size: 98 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
-                     Left Outer Join0 to 1
+                     Left Outer Join 0 to 1
                 keys:
                   0 _col2 (type: int)
                   1 _col0 (type: int)
@@ -735,7 +735,7 @@ STAGE PLANS:
                 Statistics: Num rows: 6 Data size: 107 Basic stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
-                       Left Outer Join0 to 1
+                       Left Outer Join 0 to 1
                   keys:
                     0 _col5 (type: int)
                     1 _col0 (type: int)
@@ -743,7 +743,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 117 Basic stats: COMPLETE Column stats: NONE
                   Map Join Operator
                     condition map:
-                         Left Outer Join0 to 1
+                         Left Outer Join 0 to 1
                     keys:
                       0 _col3 (type: int)
                       1 _col0 (type: int)
@@ -751,8 +751,8 @@ STAGE PLANS:
                     Statistics: Num rows: 6 Data size: 128 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
-                           Left Outer Join0 to 1
-                           Left Outer Join0 to 2
+                           Left Outer Join 0 to 1
+                           Left Outer Join 0 to 2
                       keys:
                         0 _col9 (type: int)
                         1 _col0 (type: int)
@@ -761,7 +761,7 @@ STAGE PLANS:
                       Statistics: Num rows: 13 Data size: 281 Basic stats: COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
-                             Left Outer Join0 to 1
+                             Left Outer Join 0 to 1
                         keys:
                           0 _col11 (type: int)
                           1 _col0 (type: int)
@@ -769,7 +769,7 @@ STAGE PLANS:
                         Statistics: Num rows: 14 Data size: 309 Basic stats: COMPLETE Column stats: NONE
                         Map Join Operator
                           condition map:
-                               Left Outer Join0 to 1
+                               Left Outer Join 0 to 1
                           keys:
                             0 _col13 (type: int)
                             1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/lineage1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/lineage1.q.out b/ql/src/test/results/clientpositive/lineage1.q.out
index cc905d6..6c8a22f 100644
--- a/ql/src/test/results/clientpositive/lineage1.q.out
+++ b/ql/src/test/results/clientpositive/lineage1.q.out
@@ -76,7 +76,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)
@@ -210,7 +210,7 @@ STAGE PLANS:
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Right Outer Join0 to 1
+               Right Outer Join 0 to 1
           keys:
             0 _col0 (type: string)
             1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/llap/auto_join21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_join21.q.out b/ql/src/test/results/clientpositive/llap/auto_join21.q.out
index 97b36f7..25cd67e 100644
--- a/ql/src/test/results/clientpositive/llap/auto_join21.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_join21.q.out
@@ -64,8 +64,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Left Outer Join0 to 1
-                     Right Outer Join1 to 2
+                     Left Outer Join 0 to 1
+                     Right Outer Join 1 to 2
                 filter predicates:
                   0 {(KEY.reducesinkkey0 < 10)}
                   1 

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/llap/auto_join29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_join29.q.out b/ql/src/test/results/clientpositive/llap/auto_join29.q.out
index a3cc39d..f693ce4 100644
--- a/ql/src/test/results/clientpositive/llap/auto_join29.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_join29.q.out
@@ -64,8 +64,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Left Outer Join0 to 1
-                     Right Outer Join1 to 2
+                     Left Outer Join 0 to 1
+                     Right Outer Join 1 to 2
                 filter predicates:
                   0 {(KEY.reducesinkkey0 < 10)}
                   1 
@@ -682,8 +682,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Left Outer Join0 to 1
-                     Left Outer Join1 to 2
+                     Left Outer Join 0 to 1
+                     Left Outer Join 1 to 2
                 filter predicates:
                   0 {(KEY.reducesinkkey0 < 10)}
                   1 
@@ -1300,8 +1300,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Right Outer Join0 to 1
-                     Left Outer Join1 to 2
+                     Right Outer Join 0 to 1
+                     Left Outer Join 1 to 2
                 filter predicates:
                   0 
                   1 {(KEY.reducesinkkey0 > 10)}
@@ -1927,8 +1927,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Right Outer Join0 to 1
-                     Right Outer Join1 to 2
+                     Right Outer Join 0 to 1
+                     Right Outer Join 1 to 2
                 filter predicates:
                   0 
                   1 {(KEY.reducesinkkey0 > 10)}
@@ -2561,7 +2561,7 @@ STAGE PLANS:
               Merge Join Operator
                 condition map:
                      Inner Join 0 to 1
-                     Left Outer Join1 to 2
+                     Left Outer Join 1 to 2
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -2675,7 +2675,7 @@ STAGE PLANS:
               Merge Join Operator
                 condition map:
                      Inner Join 0 to 1
-                     Right Outer Join1 to 2
+                     Right Outer Join 1 to 2
                 filter predicates:
                   0 
                   1 
@@ -3249,7 +3249,7 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
                   Map Join Operator
                     condition map:
-                         Left Outer Join0 to 1
+                         Left Outer Join 0 to 1
                          Inner Join 1 to 2
                     filter predicates:
                       0 {(key < 10)}
@@ -3380,7 +3380,7 @@ STAGE PLANS:
                     Statistics: Num rows: 166 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE
                     Map Join Operator
                       condition map:
-                           Right Outer Join0 to 1
+                           Right Outer Join 0 to 1
                            Inner Join 1 to 2
                       filter predicates:
                         0 

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/llap/auto_join30.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_join30.q.out b/ql/src/test/results/clientpositive/llap/auto_join30.q.out
index cc59c5c..90c4241 100644
--- a/ql/src/test/results/clientpositive/llap/auto_join30.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_join30.q.out
@@ -214,7 +214,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE
                 Map Join Operator
                   condition map:
-                       Left Outer Join0 to 1
+                       Left Outer Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -367,7 +367,7 @@ STAGE PLANS:
                 Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
                 Map Join Operator
                   condition map:
-                       Right Outer Join0 to 1
+                       Right Outer Join 0 to 1
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -707,7 +707,7 @@ STAGE PLANS:
               Merge Join Operator
                 condition map:
                      Inner Join 0 to 1
-                     Left Outer Join0 to 2
+                     Left Outer Join 0 to 2
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
@@ -890,8 +890,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Left Outer Join0 to 1
-                     Left Outer Join0 to 2
+                     Left Outer Join 0 to 1
+                     Left Outer Join 0 to 2
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
@@ -1074,8 +1074,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Left Outer Join0 to 1
-                     Right Outer Join0 to 2
+                     Left Outer Join 0 to 1
+                     Right Outer Join 0 to 2
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
@@ -1258,8 +1258,8 @@ STAGE PLANS:
             Reduce Operator Tree:
               Merge Join Operator
                 condition map:
-                     Right Outer Join0 to 1
-                     Right Outer Join0 to 2
+                     Right Outer Join 0 to 1
+                     Right Outer Join 0 to 2
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_14.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_14.q.out
index c618531..21f1b3f 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_14.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_14.q.out
@@ -64,7 +64,7 @@ STAGE PLANS:
                     Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
-                           Left Outer Join0 to 1
+                           Left Outer Join 0 to 1
                       keys:
                         0 _col0 (type: int)
                         1 _col0 (type: int)
@@ -187,7 +187,7 @@ STAGE PLANS:
                     Statistics: Num rows: 189 Data size: 1891 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
-                           Right Outer Join0 to 1
+                           Right Outer Join 0 to 1
                       keys:
                         0 _col0 (type: int)
                         1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_15.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_15.q.out
index 286939b..03ff5a6 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_15.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_15.q.out
@@ -64,7 +64,7 @@ STAGE PLANS:
                     Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
-                           Left Outer Join0 to 1
+                           Left Outer Join 0 to 1
                       keys:
                         0 _col0 (type: int)
                         1 _col0 (type: int)
@@ -166,7 +166,7 @@ STAGE PLANS:
                     Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
-                           Right Outer Join0 to 1
+                           Right Outer Join 0 to 1
                       keys:
                         0 _col0 (type: int)
                         1 _col0 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/92983158/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 f6500eb..1232767 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
@@ -426,7 +426,7 @@ STAGE PLANS:
                       Statistics: Num rows: 166 Data size: 3091 Basic stats: COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
-                             Left Outer Join0 to 1
+                             Left Outer Join 0 to 1
                         keys:
                           0 _col0 (type: int)
                           1 _col0 (type: int)
@@ -520,7 +520,7 @@ STAGE PLANS:
                       Statistics: Num rows: 166 Data size: 3091 Basic stats: COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
-                             Right Outer Join0 to 1
+                             Right Outer Join 0 to 1
                         keys:
                           0 _col0 (type: int)
                           1 _col0 (type: int)