You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by zh...@apache.org on 2021/03/18 08:45:48 UTC
[flink] 03/04: [hotfix] Remove generic from LogicalTopology and its
components
This is an automated email from the ASF dual-hosted git repository.
zhuzh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5b20a7bb143b4d3dee2e64928f5c826e5e7c1632
Author: Thesharing <cy...@outlook.com>
AuthorDate: Thu Mar 4 18:04:28 2021 +0800
[hotfix] Remove generic from LogicalTopology and its components
---
.../runtime/jobgraph/topology/DefaultLogicalPipelinedRegion.java | 2 +-
.../flink/runtime/jobgraph/topology/DefaultLogicalResult.java | 3 +--
.../flink/runtime/jobgraph/topology/DefaultLogicalTopology.java | 7 +++----
.../flink/runtime/jobgraph/topology/DefaultLogicalVertex.java | 3 +--
.../flink/runtime/jobgraph/topology/LogicalPipelinedRegion.java | 5 ++---
.../apache/flink/runtime/jobgraph/topology/LogicalResult.java | 4 ++--
.../apache/flink/runtime/jobgraph/topology/LogicalTopology.java | 9 +++++++--
.../apache/flink/runtime/jobgraph/topology/LogicalVertex.java | 4 ++--
8 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalPipelinedRegion.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalPipelinedRegion.java
index 639f4b1..146900c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalPipelinedRegion.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalPipelinedRegion.java
@@ -31,7 +31,7 @@ public class DefaultLogicalPipelinedRegion {
private final Set<JobVertexID> vertexIDs;
- public DefaultLogicalPipelinedRegion(final Set<? extends LogicalVertex<?, ?>> logicalVertices) {
+ public DefaultLogicalPipelinedRegion(final Set<? extends LogicalVertex> logicalVertices) {
checkNotNull(logicalVertices);
this.vertexIDs =
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalResult.java
index 184e92b..09df2bb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalResult.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalResult.java
@@ -33,8 +33,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
/**
* Default implementation of {@link LogicalResult}. It is an adapter of {@link IntermediateDataSet}.
*/
-public class DefaultLogicalResult
- implements LogicalResult<DefaultLogicalVertex, DefaultLogicalResult> {
+public class DefaultLogicalResult implements LogicalResult {
private final IntermediateDataSet intermediateDataSet;
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopology.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopology.java
index c937338..c999114 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopology.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalTopology.java
@@ -37,8 +37,7 @@ import java.util.function.Function;
import static org.apache.flink.util.Preconditions.checkNotNull;
/** Default implementation of {@link LogicalTopology}. It is an adapter of {@link JobGraph}. */
-public class DefaultLogicalTopology
- implements LogicalTopology<DefaultLogicalVertex, DefaultLogicalResult> {
+public class DefaultLogicalTopology implements LogicalTopology {
private final List<DefaultLogicalVertex> verticesSorted;
@@ -93,11 +92,11 @@ public class DefaultLogicalTopology
}
public Set<DefaultLogicalPipelinedRegion> getLogicalPipelinedRegions() {
- final Set<Set<DefaultLogicalVertex>> regionsRaw =
+ final Set<Set<LogicalVertex>> regionsRaw =
PipelinedRegionComputeUtil.computePipelinedRegions(verticesSorted);
final Set<DefaultLogicalPipelinedRegion> regions = new HashSet<>();
- for (Set<DefaultLogicalVertex> regionVertices : regionsRaw) {
+ for (Set<LogicalVertex> regionVertices : regionsRaw) {
regions.add(new DefaultLogicalPipelinedRegion(regionVertices));
}
return regions;
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalVertex.java
index 7215607..60ff44a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalVertex.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/DefaultLogicalVertex.java
@@ -30,8 +30,7 @@ import java.util.stream.Collectors;
import static org.apache.flink.util.Preconditions.checkNotNull;
/** Default implementation of {@link LogicalVertex}. It is an adapter of {@link JobVertex}. */
-public class DefaultLogicalVertex
- implements LogicalVertex<DefaultLogicalVertex, DefaultLogicalResult> {
+public class DefaultLogicalVertex implements LogicalVertex {
private final JobVertex jobVertex;
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalPipelinedRegion.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalPipelinedRegion.java
index 2a38c0e..42f46d9 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalPipelinedRegion.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalPipelinedRegion.java
@@ -25,6 +25,5 @@ import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.runtime.topology.PipelinedRegion;
/** Pipelined region on logical level, i.e., {@link JobVertex} level. */
-public interface LogicalPipelinedRegion<
- V extends LogicalVertex<V, R>, R extends LogicalResult<V, R>>
- extends PipelinedRegion<JobVertexID, IntermediateDataSetID, V, R> {}
+public interface LogicalPipelinedRegion
+ extends PipelinedRegion<JobVertexID, IntermediateDataSetID, LogicalVertex, LogicalResult> {}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalResult.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalResult.java
index 2ceda3d..068e4d6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalResult.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalResult.java
@@ -23,5 +23,5 @@ import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.runtime.topology.Result;
/** Represents a data set produced by a {@link LogicalVertex}, i.e. {@link IntermediateDataSet}. */
-public interface LogicalResult<V extends LogicalVertex<V, R>, R extends LogicalResult<V, R>>
- extends Result<JobVertexID, IntermediateDataSetID, V, R> {}
+public interface LogicalResult
+ extends Result<JobVertexID, IntermediateDataSetID, LogicalVertex, LogicalResult> {}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalTopology.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalTopology.java
index bbb5d13..3c58f18 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalTopology.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalTopology.java
@@ -23,5 +23,10 @@ import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.runtime.topology.Topology;
/** Represents a logical topology, i.e. {@link JobGraph}. */
-public interface LogicalTopology<V extends LogicalVertex<V, R>, R extends LogicalResult<V, R>>
- extends Topology<JobVertexID, IntermediateDataSetID, V, R, LogicalPipelinedRegion<V, R>> {}
+public interface LogicalTopology
+ extends Topology<
+ JobVertexID,
+ IntermediateDataSetID,
+ LogicalVertex,
+ LogicalResult,
+ LogicalPipelinedRegion> {}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalVertex.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalVertex.java
index 8e839f8..44703e2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalVertex.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/topology/LogicalVertex.java
@@ -23,5 +23,5 @@ import org.apache.flink.runtime.jobgraph.JobVertexID;
import org.apache.flink.runtime.topology.Vertex;
/** Represents a vertex in {@link LogicalTopology}, i.e. {@link JobVertex}. */
-public interface LogicalVertex<V extends LogicalVertex<V, R>, R extends LogicalResult<V, R>>
- extends Vertex<JobVertexID, IntermediateDataSetID, V, R> {}
+public interface LogicalVertex
+ extends Vertex<JobVertexID, IntermediateDataSetID, LogicalVertex, LogicalResult> {}