You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/05/01 12:48:02 UTC
[shardingsphere] branch master updated: Rename RowBasedJobLock and RuleBasedJobLock (#17257)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 c13aff9dce3 Rename RowBasedJobLock and RuleBasedJobLock (#17257)
c13aff9dce3 is described below
commit c13aff9dce3fb190ff2fd3c101d81063726fedf4
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun May 1 20:47:43 2022 +0800
Rename RowBasedJobLock and RuleBasedJobLock (#17257)
* Rename RowBasedJobLock
* Rename RuleBasedJobLock
* Rename related variable names
---
...dJobLockAlgorithm.java => RowBasedJobLock.java} | 4 ++--
...JobLockAlgorithm.java => RuleBasedJobLock.java} | 4 ++--
.../data/pipeline/core/job/FinishedCheckJob.java | 28 +++++++++++-----------
.../scenario/rulealtered/RuleAlteredContext.java | 24 +++++++++----------
.../rulealtered/RuleAlteredJobPreparer.java | 2 +-
...rithm.java => DefaultMetadataCheckoutLock.java} | 10 ++++----
...ithm.java => DefaultSourceWritingStopLock.java} | 6 ++---
...gsphere.data.pipeline.spi.lock.RowBasedJobLock} | 2 +-
...sphere.data.pipeline.spi.lock.RuleBasedJobLock} | 2 +-
....java => DefaultSourceWritingStopLockTest.java} | 22 ++++++++---------
10 files changed, 51 insertions(+), 53 deletions(-)
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RowBasedJobLockAlgorithm.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RowBasedJobLock.java
similarity index 89%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RowBasedJobLockAlgorithm.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RowBasedJobLock.java
index 2c45698877c..a1b0b8ad6cc 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RowBasedJobLockAlgorithm.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RowBasedJobLock.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.spi.lock;
import org.apache.shardingsphere.spi.type.required.RequiredSPI;
/**
- * Row based job lock algorithm, SPI.
+ * Row based job lock.
*/
-public interface RowBasedJobLockAlgorithm extends JobLock, RequiredSPI {
+public interface RowBasedJobLock extends JobLock, RequiredSPI {
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RuleBasedJobLockAlgorithm.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RuleBasedJobLock.java
similarity index 89%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RuleBasedJobLockAlgorithm.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RuleBasedJobLock.java
index 670bbb08c52..d07779b5e9f 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RuleBasedJobLockAlgorithm.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/lock/RuleBasedJobLock.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.spi.lock;
import org.apache.shardingsphere.spi.type.required.RequiredSPI;
/**
- * Rule based job lock algorithm, SPI.
+ * Rule based job lock.
*/
-public interface RuleBasedJobLockAlgorithm extends JobLock, RequiredSPI {
+public interface RuleBasedJobLock extends JobLock, RequiredSPI {
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/FinishedCheckJob.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/FinishedCheckJob.java
index b755976eec2..2106150a548 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/FinishedCheckJob.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/FinishedCheckJob.java
@@ -27,8 +27,8 @@ import org.apache.shardingsphere.data.pipeline.api.job.progress.JobProgress;
import org.apache.shardingsphere.data.pipeline.api.pojo.JobInfo;
import org.apache.shardingsphere.data.pipeline.scenario.rulealtered.RuleAlteredContext;
import org.apache.shardingsphere.data.pipeline.scenario.rulealtered.RuleAlteredJobWorker;
-import org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLockAlgorithm;
-import org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLockAlgorithm;
+import org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLock;
+import org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLock;
import org.apache.shardingsphere.elasticjob.api.ShardingContext;
import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
@@ -66,11 +66,11 @@ public final class FinishedCheckJob implements SimpleJob {
continue;
}
log.info("scaling job {} almost finished.", jobId);
- RowBasedJobLockAlgorithm sourceWritingStopAlgorithm = ruleAlteredContext.getSourceWritingStopAlgorithm();
+ RowBasedJobLock rowBasedJobLock = ruleAlteredContext.getRowBasedJobLock();
String databaseName = jobConfig.getDatabaseName();
try {
- if (null != sourceWritingStopAlgorithm) {
- sourceWritingStopAlgorithm.lock(databaseName, jobId + "");
+ if (null != rowBasedJobLock) {
+ rowBasedJobLock.lock(databaseName, jobId + "");
}
if (!ruleAlteredJobAPI.isDataConsistencyCheckNeeded(jobConfig)) {
log.info("DataConsistencyCalculatorAlgorithm is not configured, data consistency check is ignored.");
@@ -81,11 +81,11 @@ public final class FinishedCheckJob implements SimpleJob {
log.error("data consistency check failed, job {}", jobId);
continue;
}
- RuleBasedJobLockAlgorithm checkoutLockAlgorithm = ruleAlteredContext.getCheckoutLockAlgorithm();
- switchClusterConfiguration(databaseName, jobConfig, checkoutLockAlgorithm);
+ RuleBasedJobLock ruleBasedJobLock = ruleAlteredContext.getRuleBasedJobLock();
+ switchClusterConfiguration(databaseName, jobConfig, ruleBasedJobLock);
} finally {
- if (null != sourceWritingStopAlgorithm) {
- sourceWritingStopAlgorithm.releaseLock(databaseName, jobId + "");
+ if (null != rowBasedJobLock) {
+ rowBasedJobLock.releaseLock(databaseName, jobId + "");
}
}
log.info("job {} finished", jobId);
@@ -115,16 +115,16 @@ public final class FinishedCheckJob implements SimpleJob {
return ruleAlteredJobAPI.aggregateDataConsistencyCheckResults(jobId, ruleAlteredJobAPI.dataConsistencyCheck(jobConfig));
}
- private void switchClusterConfiguration(final String databaseName, final RuleAlteredJobConfiguration jobConfig, final RuleBasedJobLockAlgorithm checkoutLockAlgorithm) {
+ private void switchClusterConfiguration(final String databaseName, final RuleAlteredJobConfiguration jobConfig, final RuleBasedJobLock ruleBasedJobLock) {
String jobId = jobConfig.getJobId();
try {
- if (null != checkoutLockAlgorithm) {
- checkoutLockAlgorithm.lock(databaseName, jobId + "");
+ if (null != ruleBasedJobLock) {
+ ruleBasedJobLock.lock(databaseName, jobId + "");
}
ruleAlteredJobAPI.switchClusterConfiguration(jobConfig);
} finally {
- if (null != checkoutLockAlgorithm) {
- checkoutLockAlgorithm.releaseLock(databaseName, jobId + "");
+ if (null != ruleBasedJobLock) {
+ ruleBasedJobLock.releaseLock(databaseName, jobId + "");
}
}
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredContext.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredContext.java
index 0de892522d1..a6240b4d81d 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredContext.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredContext.java
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.data.pipeline.spi.detect.JobCompletionDetectAlg
import org.apache.shardingsphere.data.pipeline.spi.detect.JobCompletionDetectAlgorithmFactory;
import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChannelCreator;
import org.apache.shardingsphere.data.pipeline.spi.ingest.channel.PipelineChannelCreatorFactory;
-import org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLockAlgorithm;
-import org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLockAlgorithm;
+import org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLock;
+import org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLock;
import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithmFactory;
import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
@@ -57,8 +57,8 @@ public final class RuleAlteredContext {
private static final OnRuleAlteredActionConfigurationYamlSwapper ACTION_CONFIG_YAML_SWAPPER = new OnRuleAlteredActionConfigurationYamlSwapper();
static {
- ShardingSphereServiceLoader.register(RowBasedJobLockAlgorithm.class);
- ShardingSphereServiceLoader.register(RuleBasedJobLockAlgorithm.class);
+ ShardingSphereServiceLoader.register(RowBasedJobLock.class);
+ ShardingSphereServiceLoader.register(RuleBasedJobLock.class);
}
private final OnRuleAlteredActionConfiguration onRuleAlteredActionConfig;
@@ -71,11 +71,11 @@ public final class RuleAlteredContext {
private final JobCompletionDetectAlgorithm<RuleAlteredJobAlmostCompletedParameter> completionDetectAlgorithm;
- private final RowBasedJobLockAlgorithm sourceWritingStopAlgorithm;
-
private final DataConsistencyCalculateAlgorithm dataConsistencyCalculateAlgorithm;
- private final RuleBasedJobLockAlgorithm checkoutLockAlgorithm;
+ private final RowBasedJobLock rowBasedJobLock;
+
+ private final RuleBasedJobLock ruleBasedJobLock;
private final ExecuteEngine inventoryDumperExecuteEngine;
@@ -97,12 +97,12 @@ public final class RuleAlteredContext {
pipelineChannelCreator = PipelineChannelCreatorFactory.newInstance(streamChannel);
ShardingSphereAlgorithmConfiguration completionDetector = onRuleAlteredActionConfig.getCompletionDetector();
completionDetectAlgorithm = null != completionDetector ? JobCompletionDetectAlgorithmFactory.newInstance(completionDetector) : null;
- sourceWritingStopAlgorithm = RequiredSPIRegistry.getRegisteredService(RowBasedJobLockAlgorithm.class);
- ShardingSphereAlgorithmConfiguration dataConsistencyChecker = onRuleAlteredActionConfig.getDataConsistencyCalculator();
- dataConsistencyCalculateAlgorithm = null != dataConsistencyChecker
- ? DataConsistencyCalculateAlgorithmFactory.newInstance(dataConsistencyChecker.getType(), dataConsistencyChecker.getProps())
+ ShardingSphereAlgorithmConfiguration dataConsistencyCheckerConfig = onRuleAlteredActionConfig.getDataConsistencyCalculator();
+ dataConsistencyCalculateAlgorithm = null != dataConsistencyCheckerConfig
+ ? DataConsistencyCalculateAlgorithmFactory.newInstance(dataConsistencyCheckerConfig.getType(), dataConsistencyCheckerConfig.getProps())
: null;
- checkoutLockAlgorithm = RequiredSPIRegistry.getRegisteredService(RuleBasedJobLockAlgorithm.class);
+ rowBasedJobLock = RequiredSPIRegistry.getRegisteredService(RowBasedJobLock.class);
+ ruleBasedJobLock = RequiredSPIRegistry.getRegisteredService(RuleBasedJobLock.class);
inventoryDumperExecuteEngine = ExecuteEngine.newFixedThreadInstance(inputConfig.getWorkerThread());
incrementalDumperExecuteEngine = ExecuteEngine.newCachedThreadInstance();
importerExecuteEngine = ExecuteEngine.newFixedThreadInstance(outputConfig.getWorkerThread());
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
index ce7a2084caf..8b54ec70bc2 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobPreparer.java
@@ -161,7 +161,7 @@ public final class RuleAlteredJobPreparer {
PipelineDataSourceManager dataSourceManager = jobContext.getDataSourceManager();
taskConfig.getDumperConfig().setPosition(getIncrementalPosition(jobContext, taskConfig, dataSourceManager));
PipelineTableMetaDataLoader sourceMetaDataLoader = jobContext.getSourceMetaDataLoader();
- IncrementalTask incrementalTask = new IncrementalTask(taskConfig.getJobConfig().getConcurrency(),
+ IncrementalTask incrementalTask = new IncrementalTask(taskConfig.getJobConfig().getConcurrency(),
taskConfig.getDumperConfig(), taskConfig.getImporterConfig(), pipelineChannelCreator, dataSourceManager, sourceMetaDataLoader, incrementalDumperExecuteEngine);
jobContext.getIncrementalTasks().add(incrementalTask);
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultMetadataCheckoutLockAlgorithm.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultMetadataCheckoutLock.java
similarity index 82%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultMetadataCheckoutLockAlgorithm.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultMetadataCheckoutLock.java
index 5e32cc72623..4d1ac534dd4 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultMetadataCheckoutLockAlgorithm.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultMetadataCheckoutLock.java
@@ -17,16 +17,14 @@
package org.apache.shardingsphere.data.pipeline.scenario.rulealtered.spi;
-import lombok.ToString;
-import org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLockAlgorithm;
+import org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLock;
/**
- * Default metadata checkout lock algorithm.
+ * Default metadata checkout lock.
*/
-@ToString
-public final class DefaultMetadataCheckoutLockAlgorithm implements RuleBasedJobLockAlgorithm {
+public final class DefaultMetadataCheckoutLock implements RuleBasedJobLock {
- // TODO impl default checkoutLockAlgorithm
+ // TODO to be finished
@Override
public void lock(final String databaseName, final String jobId) {
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopAlgorithm.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopLock.java
similarity index 91%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopAlgorithm.java
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopLock.java
index 2b64790dca9..2d63882d8d2 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopAlgorithm.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopLock.java
@@ -20,13 +20,13 @@ package org.apache.shardingsphere.data.pipeline.scenario.rulealtered.spi;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.data.pipeline.api.PipelineJobAPIFactory;
import org.apache.shardingsphere.data.pipeline.api.RuleAlteredJobAPI;
-import org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLockAlgorithm;
+import org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLock;
/**
- * Default source writing stop algorithm.
+ * Default source writing stop lock.
*/
@Slf4j
-public final class DefaultSourceWritingStopAlgorithm implements RowBasedJobLockAlgorithm {
+public final class DefaultSourceWritingStopLock implements RowBasedJobLock {
private final RuleAlteredJobAPI ruleAlteredJobAPI = PipelineJobAPIFactory.newInstance();
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLockAlgorithm b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLock
similarity index 96%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLockAlgorithm
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLock
index 725247f5865..3e108a101e3 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLockAlgorithm
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RowBasedJobLock
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.data.pipeline.scenario.rulealtered.spi.DefaultSourceWritingStopAlgorithm
+org.apache.shardingsphere.data.pipeline.scenario.rulealtered.spi.DefaultSourceWritingStopLock
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLockAlgorithm b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLock
similarity index 95%
rename from shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLockAlgorithm
rename to shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLock
index 3850001b340..358c51c22b8 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLockAlgorithm
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.lock.RuleBasedJobLock
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.data.pipeline.scenario.rulealtered.spi.DefaultMetadataCheckoutLockAlgorithm
+org.apache.shardingsphere.data.pipeline.scenario.rulealtered.spi.DefaultMetadataCheckoutLock
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopAlgorithmTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopLockTest.java
similarity index 65%
rename from shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopAlgorithmTest.java
rename to shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopLockTest.java
index 2eabc06a7e7..2de0b5aa5ca 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopAlgorithmTest.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/spi/DefaultSourceWritingStopLockTest.java
@@ -21,9 +21,9 @@ import org.apache.shardingsphere.data.pipeline.core.util.PipelineContextUtil;
import org.junit.Before;
import org.junit.Test;
-public final class DefaultSourceWritingStopAlgorithmTest {
+public final class DefaultSourceWritingStopLockTest {
- private final DefaultSourceWritingStopAlgorithm defaultSourceWritingStopAlgorithm = new DefaultSourceWritingStopAlgorithm();
+ private final DefaultSourceWritingStopLock defaultSourceWritingStopLock = new DefaultSourceWritingStopLock();
private final String lockName = "lock1";
@@ -36,26 +36,26 @@ public final class DefaultSourceWritingStopAlgorithmTest {
@Test
public void assertSuccessLockReleaseLock() {
- defaultSourceWritingStopAlgorithm.lock(lockName, jobId);
- defaultSourceWritingStopAlgorithm.releaseLock(lockName, jobId);
+ defaultSourceWritingStopLock.lock(lockName, jobId);
+ defaultSourceWritingStopLock.releaseLock(lockName, jobId);
}
@Test
public void assertSuccessLockTwiceReleaseLock() {
- defaultSourceWritingStopAlgorithm.lock(lockName, jobId);
- defaultSourceWritingStopAlgorithm.lock(lockName, jobId);
- defaultSourceWritingStopAlgorithm.releaseLock(lockName, jobId);
+ defaultSourceWritingStopLock.lock(lockName, jobId);
+ defaultSourceWritingStopLock.lock(lockName, jobId);
+ defaultSourceWritingStopLock.releaseLock(lockName, jobId);
}
@Test
public void assertSuccessLockReleaseLockTwice() {
- defaultSourceWritingStopAlgorithm.lock(lockName, jobId);
- defaultSourceWritingStopAlgorithm.releaseLock(lockName, jobId);
- defaultSourceWritingStopAlgorithm.releaseLock(lockName, jobId);
+ defaultSourceWritingStopLock.lock(lockName, jobId);
+ defaultSourceWritingStopLock.releaseLock(lockName, jobId);
+ defaultSourceWritingStopLock.releaseLock(lockName, jobId);
}
@Test
public void assertSuccessReleaseNullLock() {
- defaultSourceWritingStopAlgorithm.releaseLock(lockName, jobId);
+ defaultSourceWritingStopLock.releaseLock(lockName, jobId);
}
}