You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/04/27 15:55:00 UTC
flink git commit: [FLINK-3835] [optimizer] Add input id to JSON plan
to resolve ambiguous input names.
Repository: flink
Updated Branches:
refs/heads/master 130a22d6c -> 80b09eaef
[FLINK-3835] [optimizer] Add input id to JSON plan to resolve ambiguous input names.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/80b09eae
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/80b09eae
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/80b09eae
Branch: refs/heads/master
Commit: 80b09eaefe8f000f79f017ba822a631b8c29b5be
Parents: 130a22d
Author: Fabian Hueske <fh...@apache.org>
Authored: Wed Apr 27 14:44:56 2016 +0200
Committer: Fabian Hueske <fh...@apache.org>
Committed: Wed Apr 27 15:52:05 2016 +0200
----------------------------------------------------------------------
.../flink-table/src/test/scala/resources/testJoin0.out | 2 +-
.../flink-table/src/test/scala/resources/testJoin1.out | 2 +-
.../flink/optimizer/plandump/PlanJSONDumpGenerator.java | 10 ++++++----
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/80b09eae/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out b/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out
index 5a60862..f71ea9f 100644
--- a/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out
+++ b/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out
@@ -32,7 +32,7 @@ Stage 6 : Data Source
content : where: (=(b, d)), join: (a, b, c, d)
ship_strategy : Hash Partition on [1]
exchange_mode : PIPELINED
- driver_strategy : Hybrid Hash (build: from: (a, b))
+ driver_strategy : Hybrid Hash (build: from: (a, b) (id: 3))
Partitioning : RANDOM_PARTITIONED
Stage 1 : FlatMap
http://git-wip-us.apache.org/repos/asf/flink/blob/80b09eae/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out b/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out
index 1ca23c7..f117cd9 100644
--- a/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out
+++ b/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out
@@ -100,7 +100,7 @@ Stage 6 : Data Source
content : where: (=(b, d)), join: (a, b, c, d)
ship_strategy : Hash Partition on [1]
exchange_mode : PIPELINED
- driver_strategy : Hybrid Hash (build: from: (a, b))
+ driver_strategy : Hybrid Hash (build: from: (a, b) (id: 3))
Partitioning : RANDOM_PARTITIONED
Partitioning Order : (none)
Uniqueness : not unique
http://git-wip-us.apache.org/repos/asf/flink/blob/80b09eae/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java
----------------------------------------------------------------------
diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java
index fc5eb21..536e425 100644
--- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java
+++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/plandump/PlanJSONDumpGenerator.java
@@ -290,11 +290,13 @@ public class PlanJSONDumpGenerator {
final DumpableNode<?> source = inConn.getSource();
writer.print(inputNum == 0 ? "\n" : ",\n");
if (inputNum == 0) {
- child1name += child1name.length() > 0 ? ", " : "";
- child1name += source.getOptimizerNode().getOperator().getName();
+ child1name += child1name.length() > 0 ? ", " : "";
+ child1name += source.getOptimizerNode().getOperator().getName() +
+ " (id: " + this.nodeIds.get(source) + ")";
} else if (inputNum == 1) {
- child2name += child2name.length() > 0 ? ", " : "";
- child2name = source.getOptimizerNode().getOperator().getName();
+ child2name += child2name.length() > 0 ? ", " : "";
+ child2name += source.getOptimizerNode().getOperator().getName() +
+ " (id: " + this.nodeIds.get(source) + ")";
}
// output predecessor id