Repository: flink Updated Branches: refs/heads/release-1.0 014a686ec -> 4a34f6f73
[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/4a34f6f7 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4a34f6f7 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4a34f6f7 Branch: refs/heads/release-1.0 Commit: 4a34f6f7342c3f40991a4d9e56f17811bad15d62 Parents: 014a686 Author: Fabian Hueske <fhue...@apache.org> Authored: Wed Apr 27 14:44:56 2016 +0200 Committer: Fabian Hueske <fhue...@apache.org> Committed: Wed Apr 27 16:01:29 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/4a34f6f7/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 e6e30be..51d2e62 100644 --- a/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out +++ b/flink-libraries/flink-table/src/test/scala/resources/testJoin0.out @@ -28,7 +28,7 @@ Stage 5 : Data Source content : Join at 'b === 'd ship_strategy : Hash Partition on [1] exchange_mode : PIPELINED - driver_strategy : Hybrid Hash (build: Map at select('count as 'count,'word as 'word)) + driver_strategy : Hybrid Hash (build: Map at select('count as 'count,'word as 'word) (id: 2)) Partitioning : RANDOM_PARTITIONED Stage 0 : Data Sink http://git-wip-us.apache.org/repos/asf/flink/blob/4a34f6f7/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 a8f05dd..59acca1 100644 --- a/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out +++ b/flink-libraries/flink-table/src/test/scala/resources/testJoin1.out @@ -96,7 +96,7 @@ Stage 5 : Data Source content : Join at 'b === 'd ship_strategy : Hash Partition on [1] exchange_mode : PIPELINED - driver_strategy : Hybrid Hash (build: Map at select('count as 'count,'word as 'word)) + driver_strategy : Hybrid Hash (build: Map at select('count as 'count,'word as 'word) (id: 2)) Partitioning : RANDOM_PARTITIONED Partitioning Order : (none) Uniqueness : not unique http://git-wip-us.apache.org/repos/asf/flink/blob/4a34f6f7/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
