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 ff952b6950..312d8dc057 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 @@ -535,6 +535,7 @@ public void doPhase1QBExpr(ASTNode ast, QBExpr qbexpr, String id, String alias) 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 { @@ -574,15 +575,15 @@ public void doPhase1QBExpr(ASTNode ast, QBExpr qbexpr, String id, String alias, // 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); } } diff --git a/ql/src/test/queries/clientpositive/union38.q b/ql/src/test/queries/clientpositive/union38.q new file mode 100644 index 0000000000..7db0814562 --- /dev/null +++ b/ql/src/test/queries/clientpositive/union38.q @@ -0,0 +1,50 @@ +--create table test1 + +create table test1( name String, id int, address String); +insert into test1 values("Young", 1, "Sydney"), ("Jin", 2, "Mel"); +analyze table test1 compute statistics for columns; + +create view test1_view as select * from test1; +select * from test1_view; + + +--create table test2 + +create table test2( name String, id int, address String); +insert into test2 values("Eun", 3, "Bri"), ("Kim", 4, "Ad"); + +create view test2_view as select * from test2; +select * from test2_view; + +select * from test1 union select * from test2; +select * from test1_view union select * from test2_view; + + +--create view test_view using tables with union + +create view test_view as select * from test1 union select * from test2; +select * from test_view; + + +--create view test_view using tables with union all + +create view test_view1 as select * from test1 union all select * from test2; +select * from test_view1; + + +--create view test_view using temp table with union + +create view test_view2 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union select * from tmp_2; +select * from test_view2; + + +--create view test_view using temp table with union all + +create view test_view3 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union all select * from tmp_2; +select * from test_view3; + + +--create table test_table using temp table with union all + +create table test_table1 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union all select * from tmp_2; +select * from test_table1; diff --git a/ql/src/test/results/clientpositive/explain_logical.q.out b/ql/src/test/results/clientpositive/explain_logical.q.out index 4024f200af..f316ec8d85 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 diff --git a/ql/src/test/results/clientpositive/filter_union.q.out b/ql/src/test/results/clientpositive/filter_union.q.out index 4df6ae618e..d0ac4ae701 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 diff --git a/ql/src/test/results/clientpositive/input_part7.q.out b/ql/src/test/results/clientpositive/input_part7.q.out index f6cbda5132..c4f0b11442 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 diff --git a/ql/src/test/results/clientpositive/join34.q.out b/ql/src/test/results/clientpositive/join34.q.out index ae7459acfd..cdaf718605 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 diff --git a/ql/src/test/results/clientpositive/join35.q.out b/ql/src/test/results/clientpositive/join35.q.out index f8af6a8523..fb6d97f8e5 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 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 23b1d67a18..5030103f92 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 diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out b/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out index ee92f9801c..005bb3360d 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 diff --git a/ql/src/test/results/clientpositive/spark/join34.q.out b/ql/src/test/results/clientpositive/spark/join34.q.out index 679883b8f2..2da0d81b08 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 diff --git a/ql/src/test/results/clientpositive/spark/join35.q.out b/ql/src/test/results/clientpositive/spark/join35.q.out index 496dbb0202..847e9e2155 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 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 f5f856b498..0c1687dd09 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 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 3ff746672e..f5da8d626c 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 diff --git a/ql/src/test/results/clientpositive/spark/union22.q.out b/ql/src/test/results/clientpositive/spark/union22.q.out index 0a99d8640d..33f6cc28ae 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 diff --git a/ql/src/test/results/clientpositive/spark/union24.q.out b/ql/src/test/results/clientpositive/spark/union24.q.out index 015f904197..897d946500 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 name: default.src2 Truncated Path -> Alias: - /src2 [null-subquery1-subquery1-subquery1:$hdt$_2-subquery1-subquery1-subquery1:src2] + /src2 [$hdt$_2-subquery1-subquery1-subquery1:src2] Map 2 Map Operator Tree: TableScan @@ -258,7 +258,7 @@ STAGE PLANS: name: default.src3 name: default.src3 Truncated Path -> Alias: - /src3 [null-subquery1-subquery1-subquery2:$hdt$_2-subquery1-subquery1-subquery2:src3] + /src3 [$hdt$_2-subquery1-subquery1-subquery2:src3] Map 3 Map Operator Tree: TableScan @@ -348,7 +348,7 @@ STAGE PLANS: name: default.src4 name: default.src4 Truncated Path -> Alias: - /src4 [null-subquery1-subquery2:$hdt$_2-subquery1-subquery2:src4] + /src4 [$hdt$_2-subquery1-subquery2:src4] Map 4 Map Operator Tree: TableScan @@ -427,7 +427,7 @@ STAGE PLANS: name: default.src5 name: default.src5 Truncated Path -> Alias: - /src5 [null-subquery2:$hdt$_2-subquery2:src5] + /src5 [$hdt$_2-subquery2:src5] Reducer 5 Execution mode: vectorized Needs Tagging: false @@ -639,7 +639,7 @@ STAGE PLANS: name: default.src2 name: default.src2 Truncated Path -> Alias: - /src2 [null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:src2] + /src2 [$hdt$_1-subquery1-subquery1:src2] Map 2 Map Operator Tree: TableScan @@ -729,7 +729,7 @@ STAGE PLANS: name: default.src3 name: default.src3 Truncated Path -> Alias: - /src3 [null-subquery1-subquery2:$hdt$_1-subquery1-subquery2:src3] + /src3 [$hdt$_1-subquery1-subquery2:src3] Map 3 Map Operator Tree: TableScan @@ -805,7 +805,7 @@ STAGE PLANS: name: default.src4 name: default.src4 Truncated Path -> Alias: - /src4 [null-subquery2:$hdt$_1-subquery2:$hdt$_1:a] + /src4 [$hdt$_1-subquery2:$hdt$_1:a] Map 5 Map Operator Tree: TableScan @@ -882,7 +882,7 @@ STAGE PLANS: name: default.src5 name: default.src5 Truncated Path -> Alias: - /src5 [null-subquery2:$hdt$_1-subquery2:$hdt$_2:b] + /src5 [$hdt$_1-subquery2:$hdt$_2:b] Reducer 4 Needs Tagging: true Reduce Operator Tree: @@ -1087,7 +1087,7 @@ STAGE PLANS: name: default.src2 name: default.src2 Truncated Path -> Alias: - /src2 [null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:src2] + /src2 [$hdt$_1-subquery1-subquery1:src2] Map 2 Map Operator Tree: TableScan @@ -1177,7 +1177,7 @@ STAGE PLANS: name: default.src3 name: default.src3 Truncated Path -> Alias: - /src3 [null-subquery1-subquery2:$hdt$_1-subquery1-subquery2:src3] + /src3 [$hdt$_1-subquery1-subquery2:src3] Map 3 Map Operator Tree: TableScan @@ -1253,7 +1253,7 @@ STAGE PLANS: name: default.src4 name: default.src4 Truncated Path -> Alias: - /src4 [null-subquery2:$hdt$_1-subquery2:$hdt$_1:a] + /src4 [$hdt$_1-subquery2:$hdt$_1:a] Map 6 Map Operator Tree: TableScan @@ -1329,7 +1329,7 @@ STAGE PLANS: name: default.src5 name: default.src5 Truncated Path -> Alias: - /src5 [null-subquery2:$hdt$_1-subquery2:$hdt$_2:b] + /src5 [$hdt$_1-subquery2:$hdt$_2:b] Reducer 4 Needs Tagging: true Reduce Operator Tree: 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 d1b9e3da53..9c9ec6ad59 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 diff --git a/ql/src/test/results/clientpositive/union22.q.out b/ql/src/test/results/clientpositive/union22.q.out index dc53735e05..43c9f857ba 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 diff --git a/ql/src/test/results/clientpositive/union24.q.out b/ql/src/test/results/clientpositive/union24.q.out index 8920506a1b..334affaeca 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 name: default.src5 Truncated Path -> Alias: - /src5 [null-subquery2:$hdt$_2-subquery2:src5] + /src5 [$hdt$_2-subquery2:src5] Needs Tagging: false Reduce Operator Tree: Group By Operator @@ -488,9 +488,9 @@ STAGE PLANS: name: default.src4 name: default.src4 Truncated Path -> Alias: - /src2 [null-subquery1-subquery1-subquery1:$hdt$_2-subquery1-subquery1-subquery1:src2] - /src3 [null-subquery1-subquery1-subquery2:$hdt$_2-subquery1-subquery1-subquery2:src3] - /src4 [null-subquery1-subquery2:$hdt$_2-subquery1-subquery2:src4] + /src2 [$hdt$_2-subquery1-subquery1-subquery1:src2] + /src3 [$hdt$_2-subquery1-subquery1-subquery2:src3] + /src4 [$hdt$_2-subquery1-subquery2:src4] #### A masked pattern was here #### Stage: Stage-0 @@ -721,8 +721,8 @@ STAGE PLANS: name: default.src5 name: default.src5 Truncated Path -> Alias: - /src4 [null-subquery2:$hdt$_1-subquery2:$hdt$_1:a] - /src5 [null-subquery2:$hdt$_1-subquery2:$hdt$_2:b] + /src4 [$hdt$_1-subquery2:$hdt$_1:a] + /src5 [$hdt$_1-subquery2:$hdt$_2:b] Needs Tagging: true Reduce Operator Tree: Join Operator @@ -979,8 +979,8 @@ STAGE PLANS: name: default.src3 name: default.src3 Truncated Path -> Alias: - /src2 [null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:src2] - /src3 [null-subquery1-subquery2:$hdt$_1-subquery1-subquery2:src3] + /src2 [$hdt$_1-subquery1-subquery1:src2] + /src3 [$hdt$_1-subquery1-subquery2:src3] #### A masked pattern was here #### Stage: Stage-0 @@ -1201,8 +1201,8 @@ STAGE PLANS: name: default.src5 name: default.src5 Truncated Path -> Alias: - /src4 [null-subquery2:$hdt$_1-subquery2:$hdt$_1:a] - /src5 [null-subquery2:$hdt$_1-subquery2:$hdt$_2:b] + /src4 [$hdt$_1-subquery2:$hdt$_1:a] + /src5 [$hdt$_1-subquery2:$hdt$_2:b] Needs Tagging: true Reduce Operator Tree: Join Operator @@ -1530,8 +1530,8 @@ STAGE PLANS: name: default.src3 name: default.src3 Truncated Path -> Alias: - /src2 [null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:src2] - /src3 [null-subquery1-subquery2:$hdt$_1-subquery1-subquery2:src3] + /src2 [$hdt$_1-subquery1-subquery1:src2] + /src3 [$hdt$_1-subquery1-subquery2:src3] #### A masked pattern was here #### Stage: Stage-0 diff --git a/ql/src/test/results/clientpositive/union34.q.out b/ql/src/test/results/clientpositive/union34.q.out index 527b85a517..8a65a52d02 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 + $hdt$_1-subquery1-subquery1:$hdt$_0:src10_1 Fetch Operator limit: -1 Alias -> Map Local Operator Tree: - null-subquery1-subquery1:$hdt$_1-subquery1-subquery1:$hdt$_0:src10_1 + $hdt$_1-subquery1-subquery1:$hdt$_0:src10_1 TableScan alias: src10_1 Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE 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 0000000000..7632d3fa5f --- /dev/null +++ b/ql/src/test/results/clientpositive/union38.q.out @@ -0,0 +1,281 @@ +PREHOOK: query: create table test1( name String, id int, address String) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@test1 +POSTHOOK: query: create table test1( name String, id int, address String) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test1 +PREHOOK: query: insert into test1 values("Young", 1, "Sydney"), ("Jin", 2, "Mel") +PREHOOK: type: QUERY +PREHOOK: Input: _dummy_database@_dummy_table +PREHOOK: Output: default@test1 +POSTHOOK: query: insert into test1 values("Young", 1, "Sydney"), ("Jin", 2, "Mel") +POSTHOOK: type: QUERY +POSTHOOK: Input: _dummy_database@_dummy_table +POSTHOOK: Output: default@test1 +POSTHOOK: Lineage: test1.address SCRIPT [] +POSTHOOK: Lineage: test1.id SCRIPT [] +POSTHOOK: Lineage: test1.name SCRIPT [] +PREHOOK: query: analyze table test1 compute statistics for columns +PREHOOK: type: ANALYZE_TABLE +PREHOOK: Input: default@test1 +PREHOOK: Output: default@test1 +#### A masked pattern was here #### +POSTHOOK: query: analyze table test1 compute statistics for columns +POSTHOOK: type: ANALYZE_TABLE +POSTHOOK: Input: default@test1 +POSTHOOK: Output: default@test1 +#### A masked pattern was here #### +PREHOOK: query: create view test1_view as select * from test1 +PREHOOK: type: CREATEVIEW +PREHOOK: Input: default@test1 +PREHOOK: Output: database:default +PREHOOK: Output: default@test1_view +POSTHOOK: query: create view test1_view as select * from test1 +POSTHOOK: type: CREATEVIEW +POSTHOOK: Input: default@test1 +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test1_view +POSTHOOK: Lineage: test1_view.address SIMPLE [(test1)test1.FieldSchema(name:address, type:string, comment:null), ] +POSTHOOK: Lineage: test1_view.id SIMPLE [(test1)test1.FieldSchema(name:id, type:int, comment:null), ] +POSTHOOK: Lineage: test1_view.name SIMPLE [(test1)test1.FieldSchema(name:name, type:string, comment:null), ] +PREHOOK: query: select * from test1_view +PREHOOK: type: QUERY +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test1_view +#### A masked pattern was here #### +POSTHOOK: query: select * from test1_view +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test1_view +#### A masked pattern was here #### +Young 1 Sydney +Jin 2 Mel +PREHOOK: query: create table test2( name String, id int, address String) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@test2 +POSTHOOK: query: create table test2( name String, id int, address String) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test2 +PREHOOK: query: insert into test2 values("Eun", 3, "Bri"), ("Kim", 4, "Ad") +PREHOOK: type: QUERY +PREHOOK: Input: _dummy_database@_dummy_table +PREHOOK: Output: default@test2 +POSTHOOK: query: insert into test2 values("Eun", 3, "Bri"), ("Kim", 4, "Ad") +POSTHOOK: type: QUERY +POSTHOOK: Input: _dummy_database@_dummy_table +POSTHOOK: Output: default@test2 +POSTHOOK: Lineage: test2.address SCRIPT [] +POSTHOOK: Lineage: test2.id SCRIPT [] +POSTHOOK: Lineage: test2.name SCRIPT [] +PREHOOK: query: create view test2_view as select * from test2 +PREHOOK: type: CREATEVIEW +PREHOOK: Input: default@test2 +PREHOOK: Output: database:default +PREHOOK: Output: default@test2_view +POSTHOOK: query: create view test2_view as select * from test2 +POSTHOOK: type: CREATEVIEW +POSTHOOK: Input: default@test2 +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test2_view +POSTHOOK: Lineage: test2_view.address SIMPLE [(test2)test2.FieldSchema(name:address, type:string, comment:null), ] +POSTHOOK: Lineage: test2_view.id SIMPLE [(test2)test2.FieldSchema(name:id, type:int, comment:null), ] +POSTHOOK: Lineage: test2_view.name SIMPLE [(test2)test2.FieldSchema(name:name, type:string, comment:null), ] +PREHOOK: query: select * from test2_view +PREHOOK: type: QUERY +PREHOOK: Input: default@test2 +PREHOOK: Input: default@test2_view +#### A masked pattern was here #### +POSTHOOK: query: select * from test2_view +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test2 +POSTHOOK: Input: default@test2_view +#### A masked pattern was here #### +Eun 3 Bri +Kim 4 Ad +PREHOOK: query: select * from test1 union select * from test2 +PREHOOK: type: QUERY +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +#### A masked pattern was here #### +POSTHOOK: query: select * from test1 union select * from test2 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +#### A masked pattern was here #### +Eun 3 Bri +Jin 2 Mel +Kim 4 Ad +Young 1 Sydney +PREHOOK: query: select * from test1_view union select * from test2_view +PREHOOK: type: QUERY +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test1_view +PREHOOK: Input: default@test2 +PREHOOK: Input: default@test2_view +#### A masked pattern was here #### +POSTHOOK: query: select * from test1_view union select * from test2_view +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test1_view +POSTHOOK: Input: default@test2 +POSTHOOK: Input: default@test2_view +#### A masked pattern was here #### +Eun 3 Bri +Jin 2 Mel +Kim 4 Ad +Young 1 Sydney +PREHOOK: query: create view test_view as select * from test1 union select * from test2 +PREHOOK: type: CREATEVIEW +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Output: database:default +PREHOOK: Output: default@test_view +POSTHOOK: query: create view test_view as select * from test1 union select * from test2 +POSTHOOK: type: CREATEVIEW +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test_view +POSTHOOK: Lineage: test_view.address EXPRESSION [(test1)test1.FieldSchema(name:address, type:string, comment:null), (test2)test2.FieldSchema(name:address, type:string, comment:null), ] +POSTHOOK: Lineage: test_view.id EXPRESSION [(test1)test1.FieldSchema(name:id, type:int, comment:null), (test2)test2.FieldSchema(name:id, type:int, comment:null), ] +POSTHOOK: Lineage: test_view.name EXPRESSION [(test1)test1.FieldSchema(name:name, type:string, comment:null), (test2)test2.FieldSchema(name:name, type:string, comment:null), ] +PREHOOK: query: select * from test_view +PREHOOK: type: QUERY +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Input: default@test_view +#### A masked pattern was here #### +POSTHOOK: query: select * from test_view +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Input: default@test_view +#### A masked pattern was here #### +Eun 3 Bri +Jin 2 Mel +Kim 4 Ad +Young 1 Sydney +PREHOOK: query: create view test_view1 as select * from test1 union all select * from test2 +PREHOOK: type: CREATEVIEW +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Output: database:default +PREHOOK: Output: default@test_view1 +POSTHOOK: query: create view test_view1 as select * from test1 union all select * from test2 +POSTHOOK: type: CREATEVIEW +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test_view1 +POSTHOOK: Lineage: test_view1.address EXPRESSION [(test1)test1.FieldSchema(name:address, type:string, comment:null), (test2)test2.FieldSchema(name:address, type:string, comment:null), ] +POSTHOOK: Lineage: test_view1.id EXPRESSION [(test1)test1.FieldSchema(name:id, type:int, comment:null), (test2)test2.FieldSchema(name:id, type:int, comment:null), ] +POSTHOOK: Lineage: test_view1.name EXPRESSION [(test1)test1.FieldSchema(name:name, type:string, comment:null), (test2)test2.FieldSchema(name:name, type:string, comment:null), ] +PREHOOK: query: select * from test_view1 +PREHOOK: type: QUERY +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Input: default@test_view1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_view1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Input: default@test_view1 +#### A masked pattern was here #### +Young 1 Sydney +Jin 2 Mel +Eun 3 Bri +Kim 4 Ad +PREHOOK: query: create view test_view2 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union select * from tmp_2 +PREHOOK: type: CREATEVIEW +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Output: database:default +PREHOOK: Output: default@test_view2 +POSTHOOK: query: create view test_view2 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union select * from tmp_2 +POSTHOOK: type: CREATEVIEW +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test_view2 +POSTHOOK: Lineage: test_view2.address EXPRESSION [(test1)test1.FieldSchema(name:address, type:string, comment:null), (test2)test2.FieldSchema(name:address, type:string, comment:null), ] +POSTHOOK: Lineage: test_view2.id EXPRESSION [(test1)test1.FieldSchema(name:id, type:int, comment:null), (test2)test2.FieldSchema(name:id, type:int, comment:null), ] +POSTHOOK: Lineage: test_view2.name EXPRESSION [(test1)test1.FieldSchema(name:name, type:string, comment:null), (test2)test2.FieldSchema(name:name, type:string, comment:null), ] +PREHOOK: query: select * from test_view2 +PREHOOK: type: QUERY +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Input: default@test_view2 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_view2 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Input: default@test_view2 +#### A masked pattern was here #### +Eun 3 Bri +Jin 2 Mel +Kim 4 Ad +Young 1 Sydney +PREHOOK: query: create view test_view3 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union all select * from tmp_2 +PREHOOK: type: CREATEVIEW +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Output: database:default +PREHOOK: Output: default@test_view3 +POSTHOOK: query: create view test_view3 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union all select * from tmp_2 +POSTHOOK: type: CREATEVIEW +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test_view3 +POSTHOOK: Lineage: test_view3.address EXPRESSION [(test1)test1.FieldSchema(name:address, type:string, comment:null), (test2)test2.FieldSchema(name:address, type:string, comment:null), ] +POSTHOOK: Lineage: test_view3.id EXPRESSION [(test1)test1.FieldSchema(name:id, type:int, comment:null), (test2)test2.FieldSchema(name:id, type:int, comment:null), ] +POSTHOOK: Lineage: test_view3.name EXPRESSION [(test1)test1.FieldSchema(name:name, type:string, comment:null), (test2)test2.FieldSchema(name:name, type:string, comment:null), ] +PREHOOK: query: select * from test_view3 +PREHOOK: type: QUERY +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Input: default@test_view3 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_view3 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Input: default@test_view3 +#### A masked pattern was here #### +Young 1 Sydney +Jin 2 Mel +Eun 3 Bri +Kim 4 Ad +PREHOOK: query: create table test_table1 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union all select * from tmp_2 +PREHOOK: type: CREATETABLE_AS_SELECT +PREHOOK: Input: default@test1 +PREHOOK: Input: default@test2 +PREHOOK: Output: database:default +PREHOOK: Output: default@test_table1 +POSTHOOK: query: create table test_table1 as with tmp_1 as ( select * from test1 ), tmp_2 as (select * from test2 ) select * from tmp_1 union all select * from tmp_2 +POSTHOOK: type: CREATETABLE_AS_SELECT +POSTHOOK: Input: default@test1 +POSTHOOK: Input: default@test2 +POSTHOOK: Output: database:default +POSTHOOK: Output: default@test_table1 +POSTHOOK: Lineage: test_table1.address EXPRESSION [(test1)test1.FieldSchema(name:address, type:string, comment:null), (test2)test2.FieldSchema(name:address, type:string, comment:null), ] +POSTHOOK: Lineage: test_table1.id EXPRESSION [(test1)test1.FieldSchema(name:id, type:int, comment:null), (test2)test2.FieldSchema(name:id, type:int, comment:null), ] +POSTHOOK: Lineage: test_table1.name EXPRESSION [(test1)test1.FieldSchema(name:name, type:string, comment:null), (test2)test2.FieldSchema(name:name, type:string, comment:null), ] +PREHOOK: query: select * from test_table1 +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table1 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table1 +#### A masked pattern was here #### +Young 1 Sydney +Jin 2 Mel +Eun 3 Bri +Kim 4 Ad diff --git a/ql/src/test/results/clientpositive/union_ppr.q.out b/ql/src/test/results/clientpositive/union_ppr.q.out index 1be1e815ce..a42d619bdf 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 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 35bff6a64d..360e178dbc 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 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 cfc89f90cc..daaebad8c3 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 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 35bff6a64d..360e178dbc 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 diff --git a/ql/src/test/results/clientpositive/union_stats.q.out b/ql/src/test/results/clientpositive/union_stats.q.out index 8bd3f44b6e..73e880b68b 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