Refactor ConsistencyCheckJobId (#29284)

apache · Dec 4, 2023 · c825887 · c825887
1 parent 0b73645
commit c825887
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/.../core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/PipelineJobId.java b/.../core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/PipelineJobId.java
@@ -20,6 +20,8 @@
 import org.apache.shardingsphere.data.pipeline.common.context.PipelineContextKey;
 import org.apache.shardingsphere.data.pipeline.common.job.type.PipelineJobType;
 
+import java.util.Optional;
+
 /**
  * Pipeline job id.
  */
@@ -40,4 +42,13 @@ public interface PipelineJobId {
      * @return pipeline context key
      */
     PipelineContextKey getContextKey();
+
+    /**
+     * Get sequence.
+     *
+     * @return sequence
+     */
+    default Optional<Integer> getSequence() {
+        return Optional.empty();
+    }
 }
diff --git a/...re/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java b/...re/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/PipelineJobIdUtils.java
@@ -52,7 +52,7 @@ public final class PipelineJobIdUtils {
      * @return job id
      */
     public static String marshal(final PipelineJobId jobId) {
-        return marshalPrefix(jobId.getJobType(), jobId.getContextKey()) + marshalSuffix(jobId);
+        return marshalPrefix(jobId.getJobType(), jobId.getContextKey()) + marshalSuffix(jobId) + jobId.getSequence().map(String::valueOf).orElse("");
     }
 
     private static String marshalPrefix(final PipelineJobType jobType, final PipelineContextKey contextKey) {

diff --git a/.../apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobId.java b/.../apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobId.java
@@ -23,6 +23,8 @@
 import org.apache.shardingsphere.data.pipeline.common.job.type.PipelineJobType;
 import org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.util.ConsistencyCheckSequence;
 
+import java.util.Optional;
+
 /**
  * Consistency check job id.
  */
@@ -60,4 +62,9 @@ public ConsistencyCheckJobId(final PipelineContextKey contextKey, final String p
     public static int parseSequence(final String checkJobId) {
         return Integer.parseInt(checkJobId.substring(checkJobId.length() - 1));
     }
+
+    @Override
+    public Optional<Integer> getSequence() {
+        return Optional.of(sequence);
+    }
 }