You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by dw...@apache.org on 2019/03/07 13:50:50 UTC
[flink] branch master updated: [FLINK-11687] Code clean for
streamJobGraphGenerator.
This is an automated email from the ASF dual-hosted git repository.
dwysakowicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 25169cf [FLINK-11687] Code clean for streamJobGraphGenerator.
25169cf is described below
commit 25169cfefacbb34adc921ed3756e9a0069b08984
Author: 时无两丶 <44...@qq.com>
AuthorDate: Thu Mar 7 21:50:29 2019 +0800
[FLINK-11687] Code clean for streamJobGraphGenerator.
---
.../streaming/api/graph/StreamingJobGraphGenerator.java | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
index 8465939..fe228e8 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
@@ -180,13 +180,7 @@ public class StreamingJobGraphGenerator {
for (StreamEdge edge : physicalEdgesInOrder) {
int target = edge.getTargetId();
- List<StreamEdge> inEdges = physicalInEdgesInOrder.get(target);
-
- // create if not set
- if (inEdges == null) {
- inEdges = new ArrayList<>();
- physicalInEdgesInOrder.put(target, inEdges);
- }
+ List<StreamEdge> inEdges = physicalInEdgesInOrder.computeIfAbsent(target, k -> new ArrayList<>());
inEdges.add(edge);
}
@@ -277,12 +271,8 @@ public class StreamingJobGraphGenerator {
config.setTransitiveChainedTaskConfigs(chainedConfigs.get(startNodeId));
} else {
+ chainedConfigs.computeIfAbsent(startNodeId, k -> new HashMap<Integer, StreamConfig>());
- Map<Integer, StreamConfig> chainedConfs = chainedConfigs.get(startNodeId);
-
- if (chainedConfs == null) {
- chainedConfigs.put(startNodeId, new HashMap<Integer, StreamConfig>());
- }
config.setChainIndex(chainIndex);
StreamNode node = streamGraph.getStreamNode(currentNodeId);
config.setOperatorName(node.getOperatorName());
@@ -478,9 +468,6 @@ public class StreamingJobGraphGenerator {
config.setIterationWaitTime(streamGraph.getLoopTimeout(vertexID));
}
- List<StreamEdge> allOutputs = new ArrayList<StreamEdge>(chainableOutputs);
- allOutputs.addAll(nonChainableOutputs);
-
vertexConfigs.put(vertexID, config);
}