[FLINK-16960][runtime] Rename LogicalPipelinedRegion to DefaultLogica…

…lPipelinedRegion
derekm · Apr 14, 2020 · 1f28494 · 1f28494
1 parent 3933b04
commit 1f28494
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...raph/topology/LogicalPipelinedRegion.java → ...pology/DefaultLogicalPipelinedRegion.java b/...raph/topology/LogicalPipelinedRegion.java → ...pology/DefaultLogicalPipelinedRegion.java
@@ -29,11 +29,11 @@
 /**
  * Set of {@link LogicalVertex} that are connected through pipelined {@link LogicalResult}.
  */
-public class LogicalPipelinedRegion {
+public class DefaultLogicalPipelinedRegion {
 
  private final Set<JobVertexID> vertexIDs;
 
- public LogicalPipelinedRegion(final Set<? extends LogicalVertex<?, ?>> logicalVertices) {
+ public DefaultLogicalPipelinedRegion(final Set<? extends LogicalVertex<?, ?>> logicalVertices) {
  checkNotNull(logicalVertices);
 
  this.vertexIDs = logicalVertices.stream()
@@ -47,7 +47,7 @@ public Set<JobVertexID> getVertexIDs() {
 
  @Override
  public String toString() {
- return "LogicalPipelinedRegion{" +
+ return "DefaultLogicalPipelinedRegion{" +
  "vertexIDs=" + vertexIDs +
  '}';
  }

diff --git a/...time/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopology.java b/...time/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopology.java
@@ -102,12 +102,12 @@ private DefaultLogicalResult getResult(final IntermediateDataSetID resultId) {
  .orElseThrow(() -> new IllegalArgumentException("can not find result: " + resultId));
  }
 
- public Set<LogicalPipelinedRegion> getLogicalPipelinedRegions() {
+ public Set<DefaultLogicalPipelinedRegion> getLogicalPipelinedRegions() {
  final Set<Set<DefaultLogicalVertex>> regionsRaw = PipelinedRegionComputeUtil.computePipelinedRegions(this);
 
- final Set<LogicalPipelinedRegion> regions = new HashSet<>();
+ final Set<DefaultLogicalPipelinedRegion> regions = new HashSet<>();
  for (Set<DefaultLogicalVertex> regionVertices : regionsRaw) {
- regions.add(new LogicalPipelinedRegion(regionVertices));
+ regions.add(new DefaultLogicalPipelinedRegion(regionVertices));
  }
  return regions;
  }

diff --git a/.../src/test/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopologyTest.java b/.../src/test/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopologyTest.java
@@ -89,7 +89,7 @@ public void testWithoutCoLocationConstraints() {
 
  @Test
  public void testGetLogicalPipelinedRegions() {
- final Set<LogicalPipelinedRegion> regions = logicalTopology.getLogicalPipelinedRegions();
+ final Set<DefaultLogicalPipelinedRegion> regions = logicalTopology.getLogicalPipelinedRegions();
  assertEquals(2, regions.size());
  }
 

diff --git a/...g-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java b/...g-java/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java
@@ -40,8 +40,8 @@
 import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable;
 import org.apache.flink.runtime.jobgraph.tasks.CheckpointCoordinatorConfiguration;
 import org.apache.flink.runtime.jobgraph.tasks.JobCheckpointingSettings;
+import org.apache.flink.runtime.jobgraph.topology.DefaultLogicalPipelinedRegion;
 import org.apache.flink.runtime.jobgraph.topology.DefaultLogicalTopology;
-import org.apache.flink.runtime.jobgraph.topology.LogicalPipelinedRegion;
 import org.apache.flink.runtime.jobmanager.scheduler.CoLocationGroup;
 import org.apache.flink.runtime.jobmanager.scheduler.SlotSharingGroup;
 import org.apache.flink.runtime.operators.util.TaskConfig;
@@ -690,8 +690,8 @@ private Map<JobVertexID, SlotSharingGroup> buildVertexRegionSlotSharingGroups()
 
  final boolean allRegionsInSameSlotSharingGroup = streamGraph.isAllVerticesInSameSlotSharingGroupByDefault();
 
- final Set<LogicalPipelinedRegion> regions = new DefaultLogicalTopology(jobGraph).getLogicalPipelinedRegions();
- for (LogicalPipelinedRegion region : regions) {
+ final Set<DefaultLogicalPipelinedRegion> regions = new DefaultLogicalTopology(jobGraph).getLogicalPipelinedRegions();
+ for (DefaultLogicalPipelinedRegion region : regions) {
  final SlotSharingGroup regionSlotSharingGroup;
  if (allRegionsInSameSlotSharingGroup) {
  regionSlotSharingGroup = defaultSlotSharingGroup;