This is an automated email from the ASF dual-hosted git repository. gaoyunhaii 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 fa94fb5a027 [FLINK-31721][core] Move JobStatusHook to flink-core module fa94fb5a027 is described below commit fa94fb5a0271590c89edf6f3c0d4f274cf995e7d Author: Tartarus0zm <zhangma...@163.com> AuthorDate: Fri Jun 16 10:43:57 2023 +0800 [FLINK-31721][core] Move JobStatusHook to flink-core module This closes #22344. --- .../src/main/java/org/apache/flink/core/execution}/JobStatusHook.java | 2 +- .../org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java | 1 + .../src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java | 2 +- .../org/apache/flink/runtime/executiongraph/TestingJobStatusHook.java | 1 + .../java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java | 2 +- .../src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobStatusHook.java b/flink-core/src/main/java/org/apache/flink/core/execution/JobStatusHook.java similarity index 97% rename from flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobStatusHook.java rename to flink-core/src/main/java/org/apache/flink/core/execution/JobStatusHook.java index 231cbab87cd..5a6467a66d0 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/JobStatusHook.java +++ b/flink-core/src/main/java/org/apache/flink/core/execution/JobStatusHook.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.executiongraph; +package org.apache.flink.core.execution; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.JobID; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java index 6d7f325a590..8c64183915d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultExecutionGraph.java @@ -27,6 +27,7 @@ import org.apache.flink.api.common.accumulators.Accumulator; import org.apache.flink.api.common.accumulators.AccumulatorHelper; import org.apache.flink.api.common.time.Time; import org.apache.flink.configuration.Configuration; +import org.apache.flink.core.execution.JobStatusHook; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.SimpleCounter; import org.apache.flink.runtime.JobException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java index 14e49c89228..a8a1b9cafe6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/JobGraph.java @@ -24,9 +24,9 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.StateChangelogOptionsInternal; +import org.apache.flink.core.execution.JobStatusHook; import org.apache.flink.core.fs.Path; import org.apache.flink.runtime.blob.PermanentBlobKey; -import org.apache.flink.runtime.executiongraph.JobStatusHook; import org.apache.flink.runtime.jobgraph.tasks.JobCheckpointingSettings; import org.apache.flink.runtime.jobmanager.scheduler.CoLocationGroup; import org.apache.flink.runtime.jobmanager.scheduler.SlotSharingGroup; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingJobStatusHook.java b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingJobStatusHook.java index bad1af69002..4720ee62372 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingJobStatusHook.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/executiongraph/TestingJobStatusHook.java @@ -19,6 +19,7 @@ package org.apache.flink.runtime.executiongraph; import org.apache.flink.api.common.JobID; +import org.apache.flink.core.execution.JobStatusHook; import java.util.function.BiConsumer; import java.util.function.Consumer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java index 5e60f34cdd8..1635cb41d79 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/DefaultSchedulerTest.java @@ -25,6 +25,7 @@ import org.apache.flink.api.common.time.Time; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.MetricOptions; import org.apache.flink.configuration.WebOptions; +import org.apache.flink.core.execution.JobStatusHook; import org.apache.flink.core.failure.FailureEnricher; import org.apache.flink.core.failure.TestingFailureEnricher; import org.apache.flink.core.testutils.OneShotLatch; @@ -51,7 +52,6 @@ import org.apache.flink.runtime.executiongraph.ArchivedExecutionVertex; import org.apache.flink.runtime.executiongraph.ErrorInfo; import org.apache.flink.runtime.executiongraph.ExecutionAttemptID; import org.apache.flink.runtime.executiongraph.ExecutionVertex; -import org.apache.flink.runtime.executiongraph.JobStatusHook; import org.apache.flink.runtime.executiongraph.TestingJobStatusHook; import org.apache.flink.runtime.executiongraph.failover.flip1.FailoverStrategy; import org.apache.flink.runtime.executiongraph.failover.flip1.RestartAllFailoverStrategy; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java index 15617ece87c..3add906c578 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java @@ -33,10 +33,10 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.typeutils.MissingTypeInfo; import org.apache.flink.configuration.PipelineOptions; +import org.apache.flink.core.execution.JobStatusHook; import org.apache.flink.core.fs.Path; import org.apache.flink.core.memory.ManagedMemoryUseCase; import org.apache.flink.runtime.clusterframework.types.ResourceProfile; -import org.apache.flink.runtime.executiongraph.JobStatusHook; import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.JobType;