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

[2/2] hive git commit: HIVE-19259: Create view on tables having union all fail with 'Table not found' (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)

HIVE-19259: Create view on tables having union all fail with 'Table not found' (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)


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

Branch: refs/heads/master
Commit: 2d166ab00939251d272f9b6d48d5f649079fa98e
Parents: cdbe123
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Sat May 26 07:55:22 2018 -0700
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Sat May 26 07:55:22 2018 -0700

----------------------------------------------------------------------
 .../hadoop/hive/ql/parse/SemanticAnalyzer.java  |   9 +-
 ql/src/test/queries/clientpositive/union38.q    |  50 ++++
 .../clientpositive/explain_logical.q.out        |   4 +-
 .../results/clientpositive/filter_union.q.out   |   4 +-
 .../clientpositive/groupby_sort_1_23.q.out      |   6 +-
 .../clientpositive/groupby_sort_skew_1_23.q.out |   6 +-
 .../results/clientpositive/input_part7.q.out    |   4 +-
 ql/src/test/results/clientpositive/join34.q.out |   2 +-
 ql/src/test/results/clientpositive/join35.q.out |   4 +-
 .../clientpositive/multi_join_union.q.out       |   8 +-
 .../clientpositive/skewjoin_mapjoin7.q.out      |   8 +-
 .../spark/groupby_sort_1_23.q.out               |   8 +-
 .../spark/groupby_sort_skew_1_23.q.out          |   8 +-
 .../results/clientpositive/spark/join34.q.out   |   4 +-
 .../results/clientpositive/spark/join35.q.out   |   4 +-
 .../spark/optimize_nullscan.q.out               |  18 +-
 .../spark/spark_union_merge.q.out               |   8 +-
 .../results/clientpositive/spark/union22.q.out  |   6 +-
 .../results/clientpositive/spark/union24.q.out  |  24 +-
 .../clientpositive/spark/union_ppr.q.out        |   8 +-
 .../test/results/clientpositive/union22.q.out   |  12 +-
 .../test/results/clientpositive/union24.q.out   |  24 +-
 .../test/results/clientpositive/union34.q.out   |   4 +-
 .../test/results/clientpositive/union38.q.out   | 281 +++++++++++++++++++
 .../test/results/clientpositive/union_ppr.q.out |   4 +-
 .../clientpositive/union_remove_12.q.out        |   4 +-
 .../clientpositive/union_remove_13.q.out        |   4 +-
 .../clientpositive/union_remove_14.q.out        |   4 +-
 .../results/clientpositive/union_stats.q.out    |   2 +-
 29 files changed, 432 insertions(+), 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
index 7ff7e18..55e4df3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
@@ -536,6 +536,7 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
       throws SemanticException {
     doPhase1QBExpr(ast, qbexpr, id, alias, false);
   }
+
   @SuppressWarnings("nls")
   public void doPhase1QBExpr(ASTNode ast, QBExpr qbexpr, String id, String alias, boolean insideView)
       throws SemanticException {
@@ -575,15 +576,15 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
       // query 1
       assert (ast.getChild(0) != null);
       QBExpr qbexpr1 = new QBExpr(alias + SUBQUERY_TAG_1);
-      doPhase1QBExpr((ASTNode) ast.getChild(0), qbexpr1, id + SUBQUERY_TAG_1, alias
-          + SUBQUERY_TAG_1, insideView);
+      doPhase1QBExpr((ASTNode) ast.getChild(0), qbexpr1, id,
+          alias + SUBQUERY_TAG_1, insideView);
       qbexpr.setQBExpr1(qbexpr1);
 
       // query 2
       assert (ast.getChild(1) != null);
       QBExpr qbexpr2 = new QBExpr(alias + SUBQUERY_TAG_2);
-      doPhase1QBExpr((ASTNode) ast.getChild(1), qbexpr2, id + SUBQUERY_TAG_2, alias
-          + SUBQUERY_TAG_2, insideView);
+      doPhase1QBExpr((ASTNode) ast.getChild(1), qbexpr2, id,
+          alias + SUBQUERY_TAG_2, insideView);
       qbexpr.setQBExpr2(qbexpr2);
     }
   }

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/queries/clientpositive/union38.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union38.q b/ql/src/test/queries/clientpositive/union38.q
new file mode 100644
index 0000000..2ea02bf
--- /dev/null
+++ b/ql/src/test/queries/clientpositive/union38.q
@@ -0,0 +1,50 @@
+--create table union38_test1 
+
+create table union38_test1( name String, id int, address String); 
+insert into union38_test1 values("Young", 1, "Sydney"), ("Jin", 2, "Mel"); 
+analyze table union38_test1 compute statistics for columns; 
+
+create view union38_test1_view as select * from union38_test1; 
+select * from union38_test1_view; 
+
+
+--create table union38_test2 
+
+create table union38_test2( name String, id int, address String); 
+insert into union38_test2 values("Eun", 3, "Bri"), ("Kim", 4, "Ad"); 
+
+create view union38_test2_view as select * from union38_test2; 
+select * from union38_test2_view; 
+
+select * from union38_test1 union select * from union38_test2; 
+select * from union38_test1_view union select * from union38_test2_view; 
+
+
+--create view union38_test_view using tables with union 
+
+create view union38_test_view as select * from union38_test1 union select * from union38_test2; 
+select * from union38_test_view; 
+
+
+--create view union38_test_view using tables with union all 
+
+create view union38_test_view1 as select * from union38_test1 union all select * from union38_test2; 
+select * from union38_test_view1; 
+
+
+--create view union38_test_view using temp table with union 
+
+create view union38_test_view2 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union select * from union38_tmp_2; 
+select * from union38_test_view2; 
+
+
+--create view union38_test_view using temp table with union all 
+
+create view union38_test_view3 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union all select * from union38_tmp_2; 
+select * from union38_test_view3; 
+
+
+--create table test_table using temp table with union all 
+
+create table union38_test_table1 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union all select * from union38_tmp_2; 
+select * from union38_test_table1; 

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/explain_logical.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/explain_logical.q.out b/ql/src/test/results/clientpositive/explain_logical.q.out
index 740a377..6b7e986 100644
--- a/ql/src/test/results/clientpositive/explain_logical.q.out
+++ b/ql/src/test/results/clientpositive/explain_logical.q.out
@@ -159,7 +159,7 @@ POSTHOOK: query: EXPLAIN LOGICAL
   ) S1
 POSTHOOK: type: QUERY
 LOGICAL PLAN:
-null-subquery1:$hdt$_0-subquery1:src 
+$hdt$_0-subquery1:src 
   TableScan (TS_0)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -176,7 +176,7 @@ null-subquery1:$hdt$_0-subquery1:src
               input format: org.apache.hadoop.mapred.SequenceFileInputFormat
               output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-null-subquery2:$hdt$_0-subquery2:srcpart 
+$hdt$_0-subquery2:srcpart 
   TableScan (TS_2)
     alias: srcpart
     Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/filter_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_union.q.out b/ql/src/test/results/clientpositive/filter_union.q.out
index 4df6ae6..d0ac4ae 100644
--- a/ql/src/test/results/clientpositive/filter_union.q.out
+++ b/ql/src/test/results/clientpositive/filter_union.q.out
@@ -110,7 +110,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [null-subquery1:$hdt$_0-subquery1:src]
+        /src [$hdt$_0-subquery1:src]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -326,7 +326,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [null-subquery2:$hdt$_0-subquery2:src]
+        /src [$hdt$_0-subquery2:src]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
index 0fbbcd2..e0f7f5d 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
@@ -3271,7 +3271,7 @@ STAGE PLANS:
               name: default.t1_n80
             name: default.t1_n80
       Truncated Path -> Alias:
-        /t1_n80 [null-subquery1:$hdt$_0-subquery1:t1_n80, null-subquery2:$hdt$_0-subquery2:t1_n80]
+        /t1_n80 [$hdt$_0-subquery1:t1_n80, $hdt$_0-subquery2:t1_n80]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -3685,7 +3685,7 @@ STAGE PLANS:
               name: default.t1_n80
             name: default.t1_n80
       Truncated Path -> Alias:
-        /t1_n80 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:t1_n80]
+        /t1_n80 [$hdt$_0-subquery2:$hdt$_0:t1_n80]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -3924,7 +3924,7 @@ STAGE PLANS:
               name: default.t1_n80
             name: default.t1_n80
       Truncated Path -> Alias:
-        /t1_n80 [null-subquery1:$hdt$_0-subquery1:t1_n80]
+        /t1_n80 [$hdt$_0-subquery1:t1_n80]
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
index 9f2b370..335ee16 100644
--- a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
@@ -3551,7 +3551,7 @@ STAGE PLANS:
               name: default.t1_n56
             name: default.t1_n56
       Truncated Path -> Alias:
-        /t1_n56 [null-subquery1:$hdt$_0-subquery1:t1_n56, null-subquery2:$hdt$_0-subquery2:t1_n56]
+        /t1_n56 [$hdt$_0-subquery1:t1_n56, $hdt$_0-subquery2:t1_n56]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -3966,7 +3966,7 @@ STAGE PLANS:
               name: default.t1_n56
             name: default.t1_n56
       Truncated Path -> Alias:
-        /t1_n56 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:t1_n56]
+        /t1_n56 [$hdt$_0-subquery2:$hdt$_0:t1_n56]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -4274,7 +4274,7 @@ STAGE PLANS:
               name: default.t1_n56
             name: default.t1_n56
       Truncated Path -> Alias:
-        /t1_n56 [null-subquery1:$hdt$_0-subquery1:t1_n56]
+        /t1_n56 [$hdt$_0-subquery1:t1_n56]
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/input_part7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part7.q.out b/ql/src/test/results/clientpositive/input_part7.q.out
index f6cbda5..c4f0b11 100644
--- a/ql/src/test/results/clientpositive/input_part7.q.out
+++ b/ql/src/test/results/clientpositive/input_part7.q.out
@@ -174,8 +174,8 @@ STAGE PLANS:
               name: default.srcpart
             name: default.srcpart
       Truncated Path -> Alias:
-        /srcpart/ds=2008-04-08/hr=11 [a-subquery1:_u1-subquery1:x, a-subquery2:_u1-subquery2:y]
-        /srcpart/ds=2008-04-08/hr=12 [a-subquery1:_u1-subquery1:x, a-subquery2:_u1-subquery2:y]
+        /srcpart/ds=2008-04-08/hr=11 [a:_u1-subquery1:x, a:_u1-subquery2:y]
+        /srcpart/ds=2008-04-08/hr=12 [a:_u1-subquery1:x, a:_u1-subquery2:y]
       Needs Tagging: false
       Reduce Operator Tree:
         Select Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/join34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join34.q.out b/ql/src/test/results/clientpositive/join34.q.out
index bb226cb..161097f 100644
--- a/ql/src/test/results/clientpositive/join34.q.out
+++ b/ql/src/test/results/clientpositive/join34.q.out
@@ -339,7 +339,7 @@ STAGE PLANS:
               name: default.src1
             name: default.src1
       Truncated Path -> Alias:
-        /src [$hdt$_0-subquery1:$hdt$_0-subquery1:x, $hdt$_0-subquery2:$hdt$_0-subquery2:x1]
+        /src [$hdt$_0:$hdt$_0-subquery1:x, $hdt$_0:$hdt$_0-subquery2:x1]
 
   Stage: Stage-0
     Move Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/join35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join35.q.out b/ql/src/test/results/clientpositive/join35.q.out
index 9bd3bff..873a307 100644
--- a/ql/src/test/results/clientpositive/join35.q.out
+++ b/ql/src/test/results/clientpositive/join35.q.out
@@ -115,7 +115,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_0-subquery1:$hdt$_0-subquery1:x]
+        /src [$hdt$_0:$hdt$_0-subquery1:x]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -614,7 +614,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [$hdt$_0-subquery2:$hdt$_0-subquery2:x1]
+        /src [$hdt$_0:$hdt$_0-subquery2:x1]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/multi_join_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/multi_join_union.q.out b/ql/src/test/results/clientpositive/multi_join_union.q.out
index 23b1d67..5030103 100644
--- a/ql/src/test/results/clientpositive/multi_join_union.q.out
+++ b/ql/src/test/results/clientpositive/multi_join_union.q.out
@@ -68,10 +68,10 @@ STAGE PLANS:
         $hdt$_0:a 
           Fetch Operator
             limit: -1
-        $hdt$_2-subquery1:$hdt$_2-subquery1:src13 
+        $hdt$_2:$hdt$_2-subquery1:src13 
           Fetch Operator
             limit: -1
-        $hdt$_2-subquery2:$hdt$_2-subquery2:src14 
+        $hdt$_2:$hdt$_2-subquery2:src14 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
@@ -90,7 +90,7 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
-        $hdt$_2-subquery1:$hdt$_2-subquery1:src13 
+        $hdt$_2:$hdt$_2-subquery1:src13 
           TableScan
             alias: src13
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
@@ -107,7 +107,7 @@ STAGE PLANS:
                     keys:
                       0 _col3 (type: string)
                       1 _col1 (type: string)
-        $hdt$_2-subquery2:$hdt$_2-subquery2:src14 
+        $hdt$_2:$hdt$_2-subquery2:src14 
           TableScan
             alias: src14
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out
index baee33f..a246aa3 100644
--- a/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out
@@ -60,14 +60,14 @@ STAGE PLANS:
   Stage: Stage-16
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery1:$hdt$_0-subquery1:$hdt$_0:a 
+        $hdt$_0-subquery1:$hdt$_0:a 
           Fetch Operator
             limit: -1
         subquery1:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery1:$hdt$_0-subquery1:$hdt$_0:a 
+        $hdt$_0-subquery1:$hdt$_0:a 
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE
@@ -191,14 +191,14 @@ STAGE PLANS:
   Stage: Stage-17
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:a 
+        $hdt$_0-subquery2:$hdt$_0:a 
           Fetch Operator
             limit: -1
         subquery2:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:a 
+        $hdt$_0-subquery2:$hdt$_0:a 
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
index 3e93ce5..110b8ba 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
@@ -1815,7 +1815,7 @@ STAGE PLANS:
                     name: default.t1_n80
                   name: default.t1_n80
             Truncated Path -> Alias:
-              /t1_n80 [null-subquery1:$hdt$_0-subquery1:t1_n80]
+              /t1_n80 [$hdt$_0-subquery1:t1_n80]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -1926,7 +1926,7 @@ STAGE PLANS:
                     name: default.t1_n80
                   name: default.t1_n80
             Truncated Path -> Alias:
-              /t1_n80 [null-subquery2:$hdt$_0-subquery2:t1_n80]
+              /t1_n80 [$hdt$_0-subquery2:t1_n80]
 
   Stage: Stage-0
     Move Operator
@@ -2138,7 +2138,7 @@ STAGE PLANS:
                     name: default.t1_n80
                   name: default.t1_n80
             Truncated Path -> Alias:
-              /t1_n80 [null-subquery1:$hdt$_0-subquery1:t1_n80]
+              /t1_n80 [$hdt$_0-subquery1:t1_n80]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -2221,7 +2221,7 @@ STAGE PLANS:
                     name: default.t1_n80
                   name: default.t1_n80
             Truncated Path -> Alias:
-              /t1_n80 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:t1_n80]
+              /t1_n80 [$hdt$_0-subquery2:$hdt$_0:t1_n80]
         Reducer 3 
             Execution mode: vectorized
             Needs Tagging: false

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
index a72b27a..23a7ca7 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
@@ -1895,7 +1895,7 @@ STAGE PLANS:
                     name: default.t1_n56
                   name: default.t1_n56
             Truncated Path -> Alias:
-              /t1_n56 [null-subquery1:$hdt$_0-subquery1:t1_n56]
+              /t1_n56 [$hdt$_0-subquery1:t1_n56]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -2006,7 +2006,7 @@ STAGE PLANS:
                     name: default.t1_n56
                   name: default.t1_n56
             Truncated Path -> Alias:
-              /t1_n56 [null-subquery2:$hdt$_0-subquery2:t1_n56]
+              /t1_n56 [$hdt$_0-subquery2:t1_n56]
 
   Stage: Stage-0
     Move Operator
@@ -2219,7 +2219,7 @@ STAGE PLANS:
                     name: default.t1_n56
                   name: default.t1_n56
             Truncated Path -> Alias:
-              /t1_n56 [null-subquery1:$hdt$_0-subquery1:t1_n56]
+              /t1_n56 [$hdt$_0-subquery1:t1_n56]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -2302,7 +2302,7 @@ STAGE PLANS:
                     name: default.t1_n56
                   name: default.t1_n56
             Truncated Path -> Alias:
-              /t1_n56 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:t1_n56]
+              /t1_n56 [$hdt$_0-subquery2:$hdt$_0:t1_n56]
         Reducer 3 
             Execution mode: vectorized
             Needs Tagging: false

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/join34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join34.q.out b/ql/src/test/results/clientpositive/spark/join34.q.out
index 8000ae1..45161d9 100644
--- a/ql/src/test/results/clientpositive/spark/join34.q.out
+++ b/ql/src/test/results/clientpositive/spark/join34.q.out
@@ -114,7 +114,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [$hdt$_0-subquery1:$hdt$_0-subquery1:x]
+              /src [$hdt$_0:$hdt$_0-subquery1:x]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -191,7 +191,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [$hdt$_0-subquery2:$hdt$_0-subquery2:x1]
+              /src [$hdt$_0:$hdt$_0-subquery2:x1]
         Map 4 
             Map Operator Tree:
                 TableScan

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/join35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join35.q.out b/ql/src/test/results/clientpositive/spark/join35.q.out
index d85e91d..57403a3 100644
--- a/ql/src/test/results/clientpositive/spark/join35.q.out
+++ b/ql/src/test/results/clientpositive/spark/join35.q.out
@@ -118,7 +118,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [$hdt$_0-subquery1:$hdt$_0-subquery1:x]
+              /src [$hdt$_0:$hdt$_0-subquery1:x]
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -197,7 +197,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [$hdt$_0-subquery2:$hdt$_0-subquery2:x1]
+              /src [$hdt$_0:$hdt$_0-subquery2:x1]
         Map 6 
             Map Operator Tree:
                 TableScan

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
index f5f856b..0c1687d 100644
--- a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
@@ -561,7 +561,7 @@ STAGE PLANS:
                         auto parallelism: false
             Execution mode: vectorized
             Path -> Alias:
-              nullscan://null/default.src/part_ [null-subquery1:_u1-subquery1:src]
+              nullscan://null/default.src/part_ [_u1-subquery1:src]
             Path -> Partition:
               nullscan://null/default.src/part_ 
                 Partition
@@ -611,7 +611,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              nullscan://null/default.src/part_ [null-subquery1:_u1-subquery1:src]
+              nullscan://null/default.src/part_ [_u1-subquery1:src]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -835,10 +835,10 @@ STAGE PLANS:
                     name: default.srcpart
                   name: default.srcpart
             Truncated Path -> Alias:
-              /srcpart/ds=2008-04-08/hr=11 [null-subquery2:_u1-subquery2:srcpart]
-              /srcpart/ds=2008-04-08/hr=12 [null-subquery2:_u1-subquery2:srcpart]
-              /srcpart/ds=2008-04-09/hr=11 [null-subquery2:_u1-subquery2:srcpart]
-              /srcpart/ds=2008-04-09/hr=12 [null-subquery2:_u1-subquery2:srcpart]
+              /srcpart/ds=2008-04-08/hr=11 [_u1-subquery2:srcpart]
+              /srcpart/ds=2008-04-08/hr=12 [_u1-subquery2:srcpart]
+              /srcpart/ds=2008-04-09/hr=11 [_u1-subquery2:srcpart]
+              /srcpart/ds=2008-04-09/hr=12 [_u1-subquery2:srcpart]
         Reducer 2 
             Execution mode: vectorized
             Needs Tagging: false
@@ -1428,7 +1428,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [a-subquery1:_u1-subquery1:src]
+              /src [a:_u1-subquery1:src]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -1449,7 +1449,7 @@ STAGE PLANS:
                       auto parallelism: false
             Execution mode: vectorized
             Path -> Alias:
-              nullscan://null/default.src/part_ [a-subquery2:_u1-subquery2:src]
+              nullscan://null/default.src/part_ [a:_u1-subquery2:src]
             Path -> Partition:
               nullscan://null/default.src/part_ 
                 Partition
@@ -1499,7 +1499,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              nullscan://null/default.src/part_ [a-subquery2:_u1-subquery2:src]
+              nullscan://null/default.src/part_ [a:_u1-subquery2:src]
         Map 4 
             Map Operator Tree:
                 TableScan

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out b/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out
index 3ff7466..f5da8d6 100644
--- a/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out
+++ b/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out
@@ -109,7 +109,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [null-subquery1:$hdt$_0-subquery1:src]
+              /src [$hdt$_0-subquery1:src]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -196,7 +196,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [null-subquery2:$hdt$_0-subquery2:src]
+              /src [$hdt$_0-subquery2:src]
 
   Stage: Stage-0
     Move Operator
@@ -341,7 +341,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [null-subquery1:$hdt$_0-subquery1:src]
+              /src [$hdt$_0-subquery1:src]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -428,7 +428,7 @@ STAGE PLANS:
                     name: default.src
                   name: default.src
             Truncated Path -> Alias:
-              /src [null-subquery2:$hdt$_0-subquery2:src]
+              /src [$hdt$_0-subquery2:src]
 
   Stage: Stage-6
     Conditional Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/union22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union22.q.out b/ql/src/test/results/clientpositive/spark/union22.q.out
index 0a99d86..33f6cc2 100644
--- a/ql/src/test/results/clientpositive/spark/union22.q.out
+++ b/ql/src/test/results/clientpositive/spark/union22.q.out
@@ -160,7 +160,7 @@ STAGE PLANS:
                     name: default.dst_union22_delta
                   name: default.dst_union22_delta
             Truncated Path -> Alias:
-              /dst_union22_delta/ds=1 [null-subquery2:$hdt$_0-subquery2:$hdt$_1:dst_union22_delta]
+              /dst_union22_delta/ds=1 [$hdt$_0-subquery2:$hdt$_1:dst_union22_delta]
 
   Stage: Stage-1
     Spark
@@ -264,7 +264,7 @@ STAGE PLANS:
                     name: default.dst_union22_delta
                   name: default.dst_union22_delta
             Truncated Path -> Alias:
-              /dst_union22_delta/ds=1 [null-subquery1:$hdt$_0-subquery1:dst_union22_delta]
+              /dst_union22_delta/ds=1 [$hdt$_0-subquery1:dst_union22_delta]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -385,7 +385,7 @@ STAGE PLANS:
                     name: default.dst_union22
                   name: default.dst_union22
             Truncated Path -> Alias:
-              /dst_union22/ds=1 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:a]
+              /dst_union22/ds=1 [$hdt$_0-subquery2:$hdt$_0:a]
 
   Stage: Stage-0
     Move Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/union24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union24.q.out b/ql/src/test/results/clientpositive/spark/union24.q.out
index e425bda..668a944 100644
--- a/ql/src/test/results/clientpositive/spark/union24.q.out
+++ b/ql/src/test/results/clientpositive/spark/union24.q.out
@@ -168,7 +168,7 @@ STAGE PLANS:
                     name: default.src2_n6
                   name: default.src2_n6
             Truncated Path -> Alias:
-              /src2_n6 [null-subquery1-subquery1-subquery1:$hdt$_2-subquery1-subquery1-subquery1:src2_n6]
+              /src2_n6 [$hdt$_2-subquery1-subquery1-subquery1:src2_n6]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -258,7 +258,7 @@ STAGE PLANS:
                     name: default.src3_n2
                   name: default.src3_n2
             Truncated Path -> Alias:
-              /src3_n2 [null-subquery1-subquery1-subquery2:$hdt$_2-subquery1-subquery1-subquery2:src3_n2]
+              /src3_n2 [$hdt$_2-subquery1-subquery1-subquery2:src3_n2]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -348,7 +348,7 @@ STAGE PLANS:
                     name: default.src4_n0
                   name: default.src4_n0
             Truncated Path -> Alias:
-              /src4_n0 [null-subquery1-subquery2:$hdt$_2-subquery1-subquery2:src4_n0]
+              /src4_n0 [$hdt$_2-subquery1-subquery2:src4_n0]
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -427,7 +427,7 @@ STAGE PLANS:
                     name: default.src5_n3
                   name: default.src5_n3
             Truncated Path -> Alias:
-              /src5_n3 [null-subquery2:$hdt$_2-subquery2:src5_n3]
+              /src5_n3 [$hdt$_2-subquery2:src5_n3]
         Reducer 5 
             Execution mode: vectorized
             Needs Tagging: false
@@ -639,7 +639,7 @@ STAGE PLANS:
                     name: default.src2_n6
                   name: default.src2_n6
             Truncated Path -> Alias:
-              /src2_n6 [null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:src2_n6]
+              /src2_n6 [$hdt$_1-subquery1-subquery1:src2_n6]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -729,7 +729,7 @@ STAGE PLANS:
                     name: default.src3_n2
                   name: default.src3_n2
             Truncated Path -> Alias:
-              /src3_n2 [null-subquery1-subquery2:$hdt$_1-subquery1-subquery2:src3_n2]
+              /src3_n2 [$hdt$_1-subquery1-subquery2:src3_n2]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -805,7 +805,7 @@ STAGE PLANS:
                     name: default.src4_n0
                   name: default.src4_n0
             Truncated Path -> Alias:
-              /src4_n0 [null-subquery2:$hdt$_1-subquery2:$hdt$_1:a]
+              /src4_n0 [$hdt$_1-subquery2:$hdt$_1:a]
         Map 5 
             Map Operator Tree:
                 TableScan
@@ -882,7 +882,7 @@ STAGE PLANS:
                     name: default.src5_n3
                   name: default.src5_n3
             Truncated Path -> Alias:
-              /src5_n3 [null-subquery2:$hdt$_1-subquery2:$hdt$_2:b]
+              /src5_n3 [$hdt$_1-subquery2:$hdt$_2:b]
         Reducer 4 
             Needs Tagging: true
             Reduce Operator Tree:
@@ -1087,7 +1087,7 @@ STAGE PLANS:
                     name: default.src2_n6
                   name: default.src2_n6
             Truncated Path -> Alias:
-              /src2_n6 [null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:src2_n6]
+              /src2_n6 [$hdt$_1-subquery1-subquery1:src2_n6]
         Map 2 
             Map Operator Tree:
                 TableScan
@@ -1177,7 +1177,7 @@ STAGE PLANS:
                     name: default.src3_n2
                   name: default.src3_n2
             Truncated Path -> Alias:
-              /src3_n2 [null-subquery1-subquery2:$hdt$_1-subquery1-subquery2:src3_n2]
+              /src3_n2 [$hdt$_1-subquery1-subquery2:src3_n2]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -1253,7 +1253,7 @@ STAGE PLANS:
                     name: default.src4_n0
                   name: default.src4_n0
             Truncated Path -> Alias:
-              /src4_n0 [null-subquery2:$hdt$_1-subquery2:$hdt$_1:a]
+              /src4_n0 [$hdt$_1-subquery2:$hdt$_1:a]
         Map 6 
             Map Operator Tree:
                 TableScan
@@ -1329,7 +1329,7 @@ STAGE PLANS:
                     name: default.src5_n3
                   name: default.src5_n3
             Truncated Path -> Alias:
-              /src5_n3 [null-subquery2:$hdt$_1-subquery2:$hdt$_2:b]
+              /src5_n3 [$hdt$_1-subquery2:$hdt$_2:b]
         Reducer 4 
             Needs Tagging: true
             Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/spark/union_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_ppr.q.out b/ql/src/test/results/clientpositive/spark/union_ppr.q.out
index d1b9e3d..9c9ec6a 100644
--- a/ql/src/test/results/clientpositive/spark/union_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_ppr.q.out
@@ -155,8 +155,8 @@ STAGE PLANS:
                     name: default.srcpart
                   name: default.srcpart
             Truncated Path -> Alias:
-              /srcpart/ds=2008-04-08/hr=11 [a-subquery1:_u1-subquery1:x]
-              /srcpart/ds=2008-04-08/hr=12 [a-subquery1:_u1-subquery1:x]
+              /srcpart/ds=2008-04-08/hr=11 [a:_u1-subquery1:x]
+              /srcpart/ds=2008-04-08/hr=12 [a:_u1-subquery1:x]
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -285,8 +285,8 @@ STAGE PLANS:
                     name: default.srcpart
                   name: default.srcpart
             Truncated Path -> Alias:
-              /srcpart/ds=2008-04-08/hr=11 [a-subquery2:_u1-subquery2:y]
-              /srcpart/ds=2008-04-08/hr=12 [a-subquery2:_u1-subquery2:y]
+              /srcpart/ds=2008-04-08/hr=11 [a:_u1-subquery2:y]
+              /srcpart/ds=2008-04-08/hr=12 [a:_u1-subquery2:y]
         Reducer 2 
             Execution mode: vectorized
             Needs Tagging: false

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union22.q.out b/ql/src/test/results/clientpositive/union22.q.out
index dc53735..43c9f85 100644
--- a/ql/src/test/results/clientpositive/union22.q.out
+++ b/ql/src/test/results/clientpositive/union22.q.out
@@ -86,7 +86,7 @@ STAGE PLANS:
   Stage: Stage-8
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_1:dst_union22_delta 
+        $hdt$_0-subquery2:$hdt$_1:dst_union22_delta 
           Fetch Operator
             limit: -1
             Partition Description:
@@ -138,7 +138,7 @@ STAGE PLANS:
                     name: default.dst_union22_delta
                   name: default.dst_union22_delta
       Alias -> Map Local Operator Tree:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_1:dst_union22_delta 
+        $hdt$_0-subquery2:$hdt$_1:dst_union22_delta 
           TableScan
             alias: dst_union22_delta
             Statistics: Num rows: 500 Data size: 16936 Basic stats: COMPLETE Column stats: NONE
@@ -316,7 +316,7 @@ STAGE PLANS:
               name: default.dst_union22_delta
             name: default.dst_union22_delta
       Truncated Path -> Alias:
-        /dst_union22/ds=1 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:a]
+        /dst_union22/ds=1 [$hdt$_0-subquery2:$hdt$_0:a]
 
   Stage: Stage-2
     Map Reduce
@@ -513,7 +513,7 @@ STAGE PLANS:
               name: default.dst_union22_delta
             name: default.dst_union22_delta
       Truncated Path -> Alias:
-        /dst_union22_delta/ds=1 [null-subquery1:$hdt$_0-subquery1:dst_union22_delta]
+        /dst_union22_delta/ds=1 [$hdt$_0-subquery1:dst_union22_delta]
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
@@ -733,8 +733,8 @@ STAGE PLANS:
               name: default.dst_union22_delta
             name: default.dst_union22_delta
       Truncated Path -> Alias:
-        /dst_union22/ds=1 [null-subquery2:$hdt$_0-subquery2:$hdt$_0:a]
-        /dst_union22_delta/ds=1 [null-subquery2:$hdt$_0-subquery2:$hdt$_1:dst_union22_delta]
+        /dst_union22/ds=1 [$hdt$_0-subquery2:$hdt$_0:a]
+        /dst_union22_delta/ds=1 [$hdt$_0-subquery2:$hdt$_1:dst_union22_delta]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union24.q.out b/ql/src/test/results/clientpositive/union24.q.out
index cc3ef4d..e65de4b 100644
--- a/ql/src/test/results/clientpositive/union24.q.out
+++ b/ql/src/test/results/clientpositive/union24.q.out
@@ -153,7 +153,7 @@ STAGE PLANS:
               name: default.src5_n3
             name: default.src5_n3
       Truncated Path -> Alias:
-        /src5_n3 [null-subquery2:$hdt$_2-subquery2:src5_n3]
+        /src5_n3 [$hdt$_2-subquery2:src5_n3]
       Needs Tagging: false
       Reduce Operator Tree:
         Group By Operator
@@ -488,9 +488,9 @@ STAGE PLANS:
               name: default.src4_n0
             name: default.src4_n0
       Truncated Path -> Alias:
-        /src2_n6 [null-subquery1-subquery1-subquery1:$hdt$_2-subquery1-subquery1-subquery1:src2_n6]
-        /src3_n2 [null-subquery1-subquery1-subquery2:$hdt$_2-subquery1-subquery1-subquery2:src3_n2]
-        /src4_n0 [null-subquery1-subquery2:$hdt$_2-subquery1-subquery2:src4_n0]
+        /src2_n6 [$hdt$_2-subquery1-subquery1-subquery1:src2_n6]
+        /src3_n2 [$hdt$_2-subquery1-subquery1-subquery2:src3_n2]
+        /src4_n0 [$hdt$_2-subquery1-subquery2:src4_n0]
 #### A masked pattern was here ####
 
   Stage: Stage-0
@@ -721,8 +721,8 @@ STAGE PLANS:
               name: default.src5_n3
             name: default.src5_n3
       Truncated Path -> Alias:
-        /src4_n0 [null-subquery2:$hdt$_1-subquery2:$hdt$_1:a]
-        /src5_n3 [null-subquery2:$hdt$_1-subquery2:$hdt$_2:b]
+        /src4_n0 [$hdt$_1-subquery2:$hdt$_1:a]
+        /src5_n3 [$hdt$_1-subquery2:$hdt$_2:b]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator
@@ -979,8 +979,8 @@ STAGE PLANS:
               name: default.src3_n2
             name: default.src3_n2
       Truncated Path -> Alias:
-        /src2_n6 [null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:src2_n6]
-        /src3_n2 [null-subquery1-subquery2:$hdt$_1-subquery1-subquery2:src3_n2]
+        /src2_n6 [$hdt$_1-subquery1-subquery1:src2_n6]
+        /src3_n2 [$hdt$_1-subquery1-subquery2:src3_n2]
 #### A masked pattern was here ####
 
   Stage: Stage-0
@@ -1201,8 +1201,8 @@ STAGE PLANS:
               name: default.src5_n3
             name: default.src5_n3
       Truncated Path -> Alias:
-        /src4_n0 [null-subquery2:$hdt$_1-subquery2:$hdt$_1:a]
-        /src5_n3 [null-subquery2:$hdt$_1-subquery2:$hdt$_2:b]
+        /src4_n0 [$hdt$_1-subquery2:$hdt$_1:a]
+        /src5_n3 [$hdt$_1-subquery2:$hdt$_2:b]
       Needs Tagging: true
       Reduce Operator Tree:
         Join Operator
@@ -1530,8 +1530,8 @@ STAGE PLANS:
               name: default.src3_n2
             name: default.src3_n2
       Truncated Path -> Alias:
-        /src2_n6 [null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:src2_n6]
-        /src3_n2 [null-subquery1-subquery2:$hdt$_1-subquery1-subquery2:src3_n2]
+        /src2_n6 [$hdt$_1-subquery1-subquery1:src2_n6]
+        /src3_n2 [$hdt$_1-subquery1-subquery2:src3_n2]
 #### A masked pattern was here ####
 
   Stage: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union34.q.out b/ql/src/test/results/clientpositive/union34.q.out
index 141c247..2c2df79 100644
--- a/ql/src/test/results/clientpositive/union34.q.out
+++ b/ql/src/test/results/clientpositive/union34.q.out
@@ -83,11 +83,11 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:$hdt$_0:src10_1_n0 
+        $hdt$_1-subquery1-subquery1:$hdt$_0:src10_1_n0 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:$hdt$_0:src10_1_n0 
+        $hdt$_1-subquery1-subquery1:$hdt$_0:src10_1_n0 
           TableScan
             alias: src10_1_n0
             Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union38.q.out b/ql/src/test/results/clientpositive/union38.q.out
new file mode 100644
index 0000000..285d4a4
--- /dev/null
+++ b/ql/src/test/results/clientpositive/union38.q.out
@@ -0,0 +1,281 @@
+PREHOOK: query: create table union38_test1( name String, id int, address String)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test1
+POSTHOOK: query: create table union38_test1( name String, id int, address String)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test1
+PREHOOK: query: insert into union38_test1 values("Young", 1, "Sydney"), ("Jin", 2, "Mel")
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@union38_test1
+POSTHOOK: query: insert into union38_test1 values("Young", 1, "Sydney"), ("Jin", 2, "Mel")
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@union38_test1
+POSTHOOK: Lineage: union38_test1.address SCRIPT []
+POSTHOOK: Lineage: union38_test1.id SCRIPT []
+POSTHOOK: Lineage: union38_test1.name SCRIPT []
+PREHOOK: query: analyze table union38_test1 compute statistics for columns
+PREHOOK: type: ANALYZE_TABLE
+PREHOOK: Input: default@union38_test1
+PREHOOK: Output: default@union38_test1
+#### A masked pattern was here ####
+POSTHOOK: query: analyze table union38_test1 compute statistics for columns
+POSTHOOK: type: ANALYZE_TABLE
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Output: default@union38_test1
+#### A masked pattern was here ####
+PREHOOK: query: create view union38_test1_view as select * from union38_test1
+PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@union38_test1
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test1_view
+POSTHOOK: query: create view union38_test1_view as select * from union38_test1
+POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test1_view
+POSTHOOK: Lineage: union38_test1_view.address SIMPLE [(union38_test1)union38_test1.FieldSchema(name:address, type:string, comment:null), ]
+POSTHOOK: Lineage: union38_test1_view.id SIMPLE [(union38_test1)union38_test1.FieldSchema(name:id, type:int, comment:null), ]
+POSTHOOK: Lineage: union38_test1_view.name SIMPLE [(union38_test1)union38_test1.FieldSchema(name:name, type:string, comment:null), ]
+PREHOOK: query: select * from union38_test1_view
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test1_view
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test1_view
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test1_view
+#### A masked pattern was here ####
+Young	1	Sydney
+Jin	2	Mel
+PREHOOK: query: create table union38_test2( name String, id int, address String)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test2
+POSTHOOK: query: create table union38_test2( name String, id int, address String)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test2
+PREHOOK: query: insert into union38_test2 values("Eun", 3, "Bri"), ("Kim", 4, "Ad")
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@union38_test2
+POSTHOOK: query: insert into union38_test2 values("Eun", 3, "Bri"), ("Kim", 4, "Ad")
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@union38_test2
+POSTHOOK: Lineage: union38_test2.address SCRIPT []
+POSTHOOK: Lineage: union38_test2.id SCRIPT []
+POSTHOOK: Lineage: union38_test2.name SCRIPT []
+PREHOOK: query: create view union38_test2_view as select * from union38_test2
+PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@union38_test2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test2_view
+POSTHOOK: query: create view union38_test2_view as select * from union38_test2
+POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test2_view
+POSTHOOK: Lineage: union38_test2_view.address SIMPLE [(union38_test2)union38_test2.FieldSchema(name:address, type:string, comment:null), ]
+POSTHOOK: Lineage: union38_test2_view.id SIMPLE [(union38_test2)union38_test2.FieldSchema(name:id, type:int, comment:null), ]
+POSTHOOK: Lineage: union38_test2_view.name SIMPLE [(union38_test2)union38_test2.FieldSchema(name:name, type:string, comment:null), ]
+PREHOOK: query: select * from union38_test2_view
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test2
+PREHOOK: Input: default@union38_test2_view
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test2_view
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Input: default@union38_test2_view
+#### A masked pattern was here ####
+Eun	3	Bri
+Kim	4	Ad
+PREHOOK: query: select * from union38_test1 union select * from union38_test2
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test1 union select * from union38_test2
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+#### A masked pattern was here ####
+Eun	3	Bri
+Jin	2	Mel
+Kim	4	Ad
+Young	1	Sydney
+PREHOOK: query: select * from union38_test1_view union select * from union38_test2_view
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test1_view
+PREHOOK: Input: default@union38_test2
+PREHOOK: Input: default@union38_test2_view
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test1_view union select * from union38_test2_view
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test1_view
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Input: default@union38_test2_view
+#### A masked pattern was here ####
+Eun	3	Bri
+Jin	2	Mel
+Kim	4	Ad
+Young	1	Sydney
+PREHOOK: query: create view union38_test_view as select * from union38_test1 union select * from union38_test2
+PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test_view
+POSTHOOK: query: create view union38_test_view as select * from union38_test1 union select * from union38_test2
+POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test_view
+POSTHOOK: Lineage: union38_test_view.address EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:address, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:address, type:string, comment:null), ]
+POSTHOOK: Lineage: union38_test_view.id EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:id, type:int, comment:null), (union38_test2)union38_test2.FieldSchema(name:id, type:int, comment:null), ]
+POSTHOOK: Lineage: union38_test_view.name EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:name, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:name, type:string, comment:null), ]
+PREHOOK: query: select * from union38_test_view
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Input: default@union38_test_view
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test_view
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Input: default@union38_test_view
+#### A masked pattern was here ####
+Eun	3	Bri
+Jin	2	Mel
+Kim	4	Ad
+Young	1	Sydney
+PREHOOK: query: create view union38_test_view1 as select * from union38_test1 union all select * from union38_test2
+PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test_view1
+POSTHOOK: query: create view union38_test_view1 as select * from union38_test1 union all select * from union38_test2
+POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test_view1
+POSTHOOK: Lineage: union38_test_view1.address EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:address, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:address, type:string, comment:null), ]
+POSTHOOK: Lineage: union38_test_view1.id EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:id, type:int, comment:null), (union38_test2)union38_test2.FieldSchema(name:id, type:int, comment:null), ]
+POSTHOOK: Lineage: union38_test_view1.name EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:name, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:name, type:string, comment:null), ]
+PREHOOK: query: select * from union38_test_view1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Input: default@union38_test_view1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test_view1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Input: default@union38_test_view1
+#### A masked pattern was here ####
+Young	1	Sydney
+Jin	2	Mel
+Eun	3	Bri
+Kim	4	Ad
+PREHOOK: query: create view union38_test_view2 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union select * from union38_tmp_2
+PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test_view2
+POSTHOOK: query: create view union38_test_view2 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union select * from union38_tmp_2
+POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test_view2
+POSTHOOK: Lineage: union38_test_view2.address EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:address, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:address, type:string, comment:null), ]
+POSTHOOK: Lineage: union38_test_view2.id EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:id, type:int, comment:null), (union38_test2)union38_test2.FieldSchema(name:id, type:int, comment:null), ]
+POSTHOOK: Lineage: union38_test_view2.name EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:name, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:name, type:string, comment:null), ]
+PREHOOK: query: select * from union38_test_view2
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Input: default@union38_test_view2
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test_view2
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Input: default@union38_test_view2
+#### A masked pattern was here ####
+Eun	3	Bri
+Jin	2	Mel
+Kim	4	Ad
+Young	1	Sydney
+PREHOOK: query: create view union38_test_view3 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union all select * from union38_tmp_2
+PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test_view3
+POSTHOOK: query: create view union38_test_view3 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union all select * from union38_tmp_2
+POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test_view3
+POSTHOOK: Lineage: union38_test_view3.address EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:address, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:address, type:string, comment:null), ]
+POSTHOOK: Lineage: union38_test_view3.id EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:id, type:int, comment:null), (union38_test2)union38_test2.FieldSchema(name:id, type:int, comment:null), ]
+POSTHOOK: Lineage: union38_test_view3.name EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:name, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:name, type:string, comment:null), ]
+PREHOOK: query: select * from union38_test_view3
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Input: default@union38_test_view3
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test_view3
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Input: default@union38_test_view3
+#### A masked pattern was here ####
+Young	1	Sydney
+Jin	2	Mel
+Eun	3	Bri
+Kim	4	Ad
+PREHOOK: query: create table union38_test_table1 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union all select * from union38_tmp_2
+PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@union38_test1
+PREHOOK: Input: default@union38_test2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@union38_test_table1
+POSTHOOK: query: create table union38_test_table1 as with union38_tmp_1 as ( select * from union38_test1 ), union38_tmp_2 as (select * from union38_test2 ) select * from union38_tmp_1 union all select * from union38_tmp_2
+POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@union38_test1
+POSTHOOK: Input: default@union38_test2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@union38_test_table1
+POSTHOOK: Lineage: union38_test_table1.address EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:address, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:address, type:string, comment:null), ]
+POSTHOOK: Lineage: union38_test_table1.id EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:id, type:int, comment:null), (union38_test2)union38_test2.FieldSchema(name:id, type:int, comment:null), ]
+POSTHOOK: Lineage: union38_test_table1.name EXPRESSION [(union38_test1)union38_test1.FieldSchema(name:name, type:string, comment:null), (union38_test2)union38_test2.FieldSchema(name:name, type:string, comment:null), ]
+PREHOOK: query: select * from union38_test_table1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@union38_test_table1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from union38_test_table1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@union38_test_table1
+#### A masked pattern was here ####
+Young	1	Sydney
+Jin	2	Mel
+Eun	3	Bri
+Kim	4	Ad

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_ppr.q.out b/ql/src/test/results/clientpositive/union_ppr.q.out
index 1be1e81..a42d619 100644
--- a/ql/src/test/results/clientpositive/union_ppr.q.out
+++ b/ql/src/test/results/clientpositive/union_ppr.q.out
@@ -176,8 +176,8 @@ STAGE PLANS:
               name: default.srcpart
             name: default.srcpart
       Truncated Path -> Alias:
-        /srcpart/ds=2008-04-08/hr=11 [a-subquery1:_u1-subquery1:x, a-subquery2:_u1-subquery2:y]
-        /srcpart/ds=2008-04-08/hr=12 [a-subquery1:_u1-subquery1:x, a-subquery2:_u1-subquery2:y]
+        /srcpart/ds=2008-04-08/hr=11 [a:_u1-subquery1:x, a:_u1-subquery2:y]
+        /srcpart/ds=2008-04-08/hr=12 [a:_u1-subquery1:x, a:_u1-subquery2:y]
       Needs Tagging: false
       Reduce Operator Tree:
         Select Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union_remove_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_12.q.out b/ql/src/test/results/clientpositive/union_remove_12.q.out
index 465150b..4f93c40 100644
--- a/ql/src/test/results/clientpositive/union_remove_12.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_12.q.out
@@ -116,11 +116,11 @@ STAGE PLANS:
   Stage: Stage-10
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:a 
+        $hdt$_0-subquery2:$hdt$_0:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:a 
+        $hdt$_0-subquery2:$hdt$_0:a 
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union_remove_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_13.q.out b/ql/src/test/results/clientpositive/union_remove_13.q.out
index b6e2d3f..7b17ed3 100644
--- a/ql/src/test/results/clientpositive/union_remove_13.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_13.q.out
@@ -135,11 +135,11 @@ STAGE PLANS:
   Stage: Stage-10
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:a 
+        $hdt$_0-subquery2:$hdt$_0:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:a 
+        $hdt$_0-subquery2:$hdt$_0:a 
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union_remove_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_14.q.out b/ql/src/test/results/clientpositive/union_remove_14.q.out
index b4b8a8e..e037f13 100644
--- a/ql/src/test/results/clientpositive/union_remove_14.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_14.q.out
@@ -116,11 +116,11 @@ STAGE PLANS:
   Stage: Stage-10
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:a 
+        $hdt$_0-subquery2:$hdt$_0:a 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        null-subquery2:$hdt$_0-subquery2:$hdt$_0:a 
+        $hdt$_0-subquery2:$hdt$_0:a 
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/2d166ab0/ql/src/test/results/clientpositive/union_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_stats.q.out b/ql/src/test/results/clientpositive/union_stats.q.out
index 8bd3f44..73e880b 100644
--- a/ql/src/test/results/clientpositive/union_stats.q.out
+++ b/ql/src/test/results/clientpositive/union_stats.q.out
@@ -131,7 +131,7 @@ STAGE PLANS:
               name: default.src
             name: default.src
       Truncated Path -> Alias:
-        /src [null-subquery1:$hdt$_0-subquery1:src, null-subquery2:$hdt$_0-subquery2:src]
+        /src [$hdt$_0-subquery1:src, $hdt$_0-subquery2:src]
 
   Stage: Stage-7
     Conditional Operator