This is an automated email from the ASF dual-hosted git repository. sunnianjun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push: new 0ab344066bc Refactor AbstractSeparablePipelineJob (#29351) 0ab344066bc is described below commit 0ab344066bc7ff66a879b701aae8106f00f1c08f Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sun Dec 10 21:41:59 2023 +0800 Refactor AbstractSeparablePipelineJob (#29351) --- .../data/pipeline/core/job/AbstractSeparablePipelineJob.java | 4 ++++ .../data/pipeline/scenario/consistencycheck/ConsistencyCheckJob.java | 5 ----- .../data/pipeline/scenario/migration/MigrationJob.java | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractSeparablePipelineJob.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractSeparablePipelineJob.java index ff1d04515da..9a866cd852f 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractSeparablePipelineJob.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractSeparablePipelineJob.java @@ -44,6 +44,10 @@ public abstract class AbstractSeparablePipelineJob<T extends PipelineJobItemCont private final PipelineJobRunnerManager jobRunnerManager; + public AbstractSeparablePipelineJob() { + this(new PipelineJobRunnerManager()); + } + @Override public final void execute(final ShardingContext shardingContext) { String jobId = shardingContext.getJobName(); diff --git a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJob.java b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJob.java index 7cf1a25af59..9e6fa5563d7 100644 --- a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJob.java +++ b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJob.java @@ -19,7 +19,6 @@ package org.apache.shardingsphere.data.pipeline.scenario.consistencycheck; import org.apache.shardingsphere.data.pipeline.core.job.AbstractSeparablePipelineJob; import org.apache.shardingsphere.data.pipeline.core.job.JobStatus; -import org.apache.shardingsphere.data.pipeline.core.job.engine.PipelineJobRunnerManager; import org.apache.shardingsphere.data.pipeline.core.job.progress.ConsistencyCheckJobItemProgress; import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineJobItemManager; import org.apache.shardingsphere.data.pipeline.core.task.runner.PipelineTasksRunner; @@ -36,10 +35,6 @@ import java.util.Optional; */ public final class ConsistencyCheckJob extends AbstractSeparablePipelineJob<ConsistencyCheckJobItemContext> { - public ConsistencyCheckJob() { - super(new PipelineJobRunnerManager()); - } - @Override public ConsistencyCheckJobItemContext buildJobItemContext(final ShardingContext shardingContext) { ConsistencyCheckJobConfiguration jobConfig = new YamlConsistencyCheckJobConfigurationSwapper().swapToObject(shardingContext.getJobParameter()); diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java index 2f97a967a12..b592e8d2992 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java @@ -26,7 +26,6 @@ import org.apache.shardingsphere.data.pipeline.core.importer.ImporterConfigurati import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; import org.apache.shardingsphere.data.pipeline.core.job.AbstractSeparablePipelineJob; -import org.apache.shardingsphere.data.pipeline.core.job.engine.PipelineJobRunnerManager; import org.apache.shardingsphere.data.pipeline.core.job.id.PipelineJobIdUtils; import org.apache.shardingsphere.data.pipeline.core.job.progress.TransmissionJobItemProgress; import org.apache.shardingsphere.data.pipeline.core.job.progress.config.PipelineProcessConfiguration; @@ -72,7 +71,6 @@ public final class MigrationJob extends AbstractSeparablePipelineJob<MigrationJo private final MigrationJobPreparer jobPreparer; public MigrationJob() { - super(new PipelineJobRunnerManager()); jobItemManager = new PipelineJobItemManager<>(new MigrationJobType().getYamlJobItemProgressSwapper()); processConfigPersistService = new PipelineProcessConfigurationPersistService(); jobPreparer = new MigrationJobPreparer();