diff --git a/common/src/java/org/apache/hadoop/hive/common/jsonexplain/DagJsonParser.java b/common/src/java/org/apache/hadoop/hive/common/jsonexplain/DagJsonParser.java index 1f01685..74620f5 100644 --- a/common/src/java/org/apache/hadoop/hive/common/jsonexplain/DagJsonParser.java +++ b/common/src/java/org/apache/hadoop/hive/common/jsonexplain/DagJsonParser.java @@ -111,7 +111,11 @@ public void print(JSONObject inputObject, PrintStream outputStream) throws Excep // print out the vertex dependency in root stage for (Stage candidate : this.stages.values()) { if (candidate.tezStageDependency != null && candidate.tezStageDependency.size() > 0) { - printer.println("Vertex dependency in root stage"); + if (candidate.parentStages.size() == 0) { + printer.println("Vertex dependency in root stage"); + } else { + printer.println("Vertex dependency in " + candidate.externalName); + } for (Entry> entry : candidate.tezStageDependency.entrySet()) { StringBuilder sb = new StringBuilder(); sb.append(entry.getKey().name); diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out index cb88f0c..31c5959 100644 --- a/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out @@ -12,7 +12,7 @@ on a.key=b.key POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-4 Reducer 3 <- Map 2 (SIMPLE_EDGE), Map 4 (SIMPLE_EDGE) Stage-3 diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out index 1c5be08..c23e985 100644 --- a/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out @@ -51,7 +51,7 @@ on a.key=b.key POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-4 Reducer 3 <- Map 2 (SIMPLE_EDGE), Map 4 (SIMPLE_EDGE) Stage-3 @@ -201,7 +201,7 @@ on a.key=b.key POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-4 Reducer 3 <- Map 2 (SIMPLE_EDGE), Map 4 (SIMPLE_EDGE) Stage-3 diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out index 0c22b72..6fa2615 100644 --- a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out +++ b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out @@ -75,7 +75,7 @@ on a.colnum=b.key POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-4 Reducer 3 <- Map 2 (SIMPLE_EDGE), Map 4 (SIMPLE_EDGE) Stage-3 diff --git a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out index ca0910a..fd29d6a 100644 --- a/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out +++ b/ql/src/test/results/clientpositive/spark/spark_explainuser_1.q.out @@ -228,7 +228,7 @@ select src1.key as k1, src1.value as v1, POSTHOOK: type: QUERY Plan not optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (PARTITION-LEVEL SORT) Reducer 3 <- Reducer 2 (GROUP) @@ -2821,7 +2821,7 @@ FROM (select x.key AS key, count(1) AS cnt POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 3 <- Map 2 (GROUP) Reducer 4 <- Reducer 3 (GROUP) @@ -4178,7 +4178,7 @@ sort by j.p_name) POSTHOOK: type: QUERY Plan not optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (PARTITION-LEVEL SORT) Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT) @@ -4400,7 +4400,7 @@ order by p_name POSTHOOK: type: QUERY Plan not optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (PARTITION-LEVEL SORT) Stage-0 @@ -4725,7 +4725,7 @@ order by p_name POSTHOOK: type: QUERY Plan not optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (PARTITION-LEVEL SORT) Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT) @@ -5484,7 +5484,7 @@ POSTHOOK: query: explain FROM T1 a JOIN src c ON c.key+1=a.key select /*+ STREAM POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 3 <- Map 2 (GROUP) Reducer 4 <- Reducer 3 (GROUP) @@ -5606,7 +5606,7 @@ POSTHOOK: query: explain select /*+ mapjoin(k)*/ sum(hash(k.key)), sum(hash(v.va POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (GROUP) Reducer 3 <- Reducer 2 (GROUP) @@ -5654,7 +5654,7 @@ POSTHOOK: query: explain select sum(hash(k.key)), sum(hash(v.val)) from T1 k joi POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (GROUP) Reducer 3 <- Reducer 2 (GROUP) @@ -5702,7 +5702,7 @@ POSTHOOK: query: explain select count(1) from T1 a join T1 b on a.key = b.key POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (GROUP) Reducer 3 <- Reducer 2 (GROUP) @@ -5748,7 +5748,7 @@ POSTHOOK: query: explain FROM T1 a LEFT OUTER JOIN T2 c ON c.key+1=a.key select POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (GROUP) Reducer 3 <- Reducer 2 (GROUP) @@ -5792,7 +5792,7 @@ POSTHOOK: query: explain FROM T1 a RIGHT OUTER JOIN T2 c ON c.key+1=a.key select POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 3 <- Map 2 (GROUP) Reducer 4 <- Reducer 3 (GROUP) @@ -5881,7 +5881,7 @@ POSTHOOK: query: explain select /*+ mapjoin(v)*/ sum(hash(k.key)), sum(hash(v.va POSTHOOK: type: QUERY Plan optimized by CBO. -Vertex dependency in root stage +Vertex dependency in Stage-1 Reducer 2 <- Map 1 (GROUP) Reducer 3 <- Reducer 2 (GROUP)