Skip to content

Commit 25b7292

Browse files
huyuanfeng1996fanrui
authored andcommitted
[hotfix] Remove DefaultExecutionGraph's jobType
1 parent 77e7ac0 commit 25b7292

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@ public class DefaultExecutionGraph implements ExecutionGraph, InternalExecutionG
223223
/** Current status of the job execution. */
224224
private volatile JobStatus state = JobStatus.CREATED;
225225

226-
/** The job type of the job execution. */
227-
private final JobType jobType;
228-
229226
/** A future that completes once the job has reached a terminal state. */
230227
private final CompletableFuture<JobStatus> terminationFuture = new CompletableFuture<>();
231228

@@ -311,7 +308,6 @@ public class DefaultExecutionGraph implements ExecutionGraph, InternalExecutionG
311308
// --------------------------------------------------------------------------------------------
312309

313310
public DefaultExecutionGraph(
314-
JobType jobType,
315311
JobInformation jobInformation,
316312
ScheduledExecutorService futureExecutor,
317313
Executor ioExecutor,
@@ -334,7 +330,6 @@ public DefaultExecutionGraph(
334330
TaskDeploymentDescriptorFactory taskDeploymentDescriptorFactory,
335331
List<JobStatusChangedListener> jobStatusChangedListeners) {
336332

337-
this.jobType = jobType;
338333
this.executionGraphId = new ExecutionGraphID();
339334

340335
this.jobInformation = checkNotNull(jobInformation);
@@ -645,7 +640,7 @@ public JobStatus getState() {
645640

646641
@Override
647642
public JobType getJobType() {
648-
return jobType;
643+
return jobInformation.getJobType();
649644
}
650645

651646
@Override

flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraphBuilder.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.flink.runtime.executiongraph.failover.partitionrelease.PartitionGroupReleaseStrategyFactoryLoader;
4040
import org.apache.flink.runtime.io.network.partition.JobMasterPartitionTracker;
4141
import org.apache.flink.runtime.jobgraph.JobGraph;
42-
import org.apache.flink.runtime.jobgraph.JobType;
4342
import org.apache.flink.runtime.jobgraph.JobVertex;
4443
import org.apache.flink.runtime.jobgraph.jsonplan.JsonPlanGenerator;
4544
import org.apache.flink.runtime.jobgraph.tasks.CheckpointCoordinatorConfiguration;
@@ -105,12 +104,11 @@ public static DefaultExecutionGraph buildGraph(
105104

106105
final String jobName = jobGraph.getName();
107106
final JobID jobId = jobGraph.getJobID();
108-
final JobType jobType = jobGraph.getJobType();
109107

110108
final JobInformation jobInformation =
111109
new JobInformation(
112110
jobId,
113-
jobType,
111+
jobGraph.getJobType(),
114112
jobName,
115113
jobGraph.getSerializedExecutionConfig(),
116114
jobGraph.getJobConfiguration(),
@@ -149,7 +147,6 @@ public static DefaultExecutionGraph buildGraph(
149147
// create a new execution graph, if none exists so far
150148
final DefaultExecutionGraph executionGraph =
151149
new DefaultExecutionGraph(
152-
jobGraph.getJobType(),
153150
jobInformation,
154151
futureExecutor,
155152
ioExecutor,

0 commit comments

Comments
 (0)