This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 a4be169da79 Refactor PipelineJobOption (#37122)
a4be169da79 is described below
commit a4be169da798cdb269fcd8fe1896808886358c5f
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Nov 16 02:07:47 2025 +0800
Refactor PipelineJobOption (#37122)
---
.../shardingsphere/data/pipeline/core/job/type/PipelineJobOption.java | 4 ++--
.../data/pipeline/core/job/type/PipelineJobOptionTest.java | 4 ++--
.../java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java | 2 +-
.../pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java | 2 +-
.../data/pipeline/scenario/migration/MigrationJobType.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobOption.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobOption.java
index 05032330787..f7948505252 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobOption.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobOption.java
@@ -34,12 +34,12 @@ public final class PipelineJobOption {
private final String code;
+ private final Class<? extends PipelineJob> jobClass;
+
private final boolean isTransmissionJob;
private final YamlPipelineJobConfigurationSwapper<?, ?>
yamlJobConfigurationSwapper;
- private final Class<? extends PipelineJob> jobClass;
-
private final boolean
isIgnoreToStartDisabledJobWhenJobItemProgressIsFinished;
private final String toBeStartDisabledNextJobType;
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobOptionTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobOptionTest.java
index 270beac6c0a..a504314afe6 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobOptionTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobOptionTest.java
@@ -28,11 +28,11 @@ class PipelineJobOptionTest {
@Test
void assertGetYamlJobItemProgressSwapperWithTransmissionJob() {
- assertThat(new PipelineJobOption("00", true, null, null, false, null,
null, false).getYamlJobItemProgressSwapper(),
isA(YamlTransmissionJobItemProgressSwapper.class));
+ assertThat(new PipelineJobOption("00", null, true, null, false, null,
null, false).getYamlJobItemProgressSwapper(),
isA(YamlTransmissionJobItemProgressSwapper.class));
}
@Test
void assertGetYamlJobItemProgressSwapperWithNotTransmissionJob() {
- assertThat(new PipelineJobOption("00", false, null, null, false, null,
null, false).getYamlJobItemProgressSwapper(),
isA(YamlConsistencyCheckJobItemProgressSwapper.class));
+ assertThat(new PipelineJobOption("00", null, false, null, false, null,
null, false).getYamlJobItemProgressSwapper(),
isA(YamlConsistencyCheckJobItemProgressSwapper.class));
}
}
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java
index 1d5d317901d..f1df5cc3761 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java
@@ -30,7 +30,7 @@ public final class CDCJobType implements
PipelineJobType<CDCJobConfiguration> {
@Override
public PipelineJobOption getOption() {
- return new PipelineJobOption("03", true, new
YamlCDCJobConfigurationSwapper(), CDCJob.class, false, null, null, true);
+ return new PipelineJobOption("03", CDCJob.class, true, new
YamlCDCJobConfigurationSwapper(), false, null, null, true);
}
@Override
diff --git
a/kernel/data-pipeline/scenario/consistency-check/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java
b/kernel/data-pipeline/scenario/consistency-check/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java
index 5d70c101335..a0e6d8a6a91 100644
---
a/kernel/data-pipeline/scenario/consistency-check/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java
+++
b/kernel/data-pipeline/scenario/consistency-check/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java
@@ -30,7 +30,7 @@ public final class ConsistencyCheckJobType implements
PipelineJobType<PipelineJo
@Override
public PipelineJobOption getOption() {
- return new PipelineJobOption("02", false, new
YamlConsistencyCheckJobConfigurationSwapper(), ConsistencyCheckJob.class, true,
null, null, false);
+ return new PipelineJobOption("02", ConsistencyCheckJob.class, false,
new YamlConsistencyCheckJobConfigurationSwapper(), true, null, null, false);
}
@Override
diff --git
a/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobType.java
b/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobType.java
index dede99e5221..c87554cd284 100644
---
a/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobType.java
+++
b/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobType.java
@@ -37,7 +37,7 @@ public final class MigrationJobType implements
PipelineJobType<MigrationJobConfi
@Override
public PipelineJobOption getOption() {
- return new PipelineJobOption("01", true, new
YamlMigrationJobConfigurationSwapper(), MigrationJob.class, false,
"CONSISTENCY_CHECK", "CONSISTENCY_CHECK", false);
+ return new PipelineJobOption("01", MigrationJob.class, true, new
YamlMigrationJobConfigurationSwapper(), false, "CONSISTENCY_CHECK",
"CONSISTENCY_CHECK", false);
}
@Override
