This is an automated email from the ASF dual-hosted git repository.
azexin 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 bfbf9441217 Rename CheckLatestJobId to LatestCheckJobId (#22532)
bfbf9441217 is described below
commit bfbf9441217ef529fa9e4189d6c1266e9c71cabc
Author: Hongsheng Zhong <[email protected]>
AuthorDate: Wed Nov 30 17:09:22 2022 +0800
Rename CheckLatestJobId to LatestCheckJobId (#22532)
* Rename CheckLatestJobId to LatestCheckJobId
* Rename jobId to parentJobId for repository consistency check methods
parameter
* Rename CheckLatestJobId to LatestCheckJobId
---
.../pipeline/core/api/GovernanceRepositoryAPI.java | 33 +++++++++----------
.../core/api/impl/GovernanceRepositoryAPIImpl.java | 24 +++++++-------
.../core/metadata/node/PipelineMetaDataNode.java | 6 ++--
.../metadata/node/PipelineMetaDataNodeTest.java | 4 +--
.../ConsistencyCheckJobAPIImpl.java | 38 +++++++++++-----------
.../scenario/migration/MigrationJobAPIImpl.java | 4 +--
.../api/impl/ConsistencyCheckJobAPIImplTest.java | 8 ++---
7 files changed, 58 insertions(+), 59 deletions(-)
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/GovernanceRepositoryAPI.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/GovernanceRepositoryAPI.java
index 103213ba6e8..f910062508b 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/GovernanceRepositoryAPI.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/GovernanceRepositoryAPI.java
@@ -58,33 +58,32 @@ public interface GovernanceRepositoryAPI {
String getJobItemProgress(String jobId, int shardingItem);
/**
- * Get check latest job id.
+ * Get latest check job id.
*
- * @param jobId job id
+ * @param parentJobId parent job id
* @return check job id
*/
- // TODO rename method name
- Optional<String> getCheckLatestJobId(String jobId);
+ Optional<String> getLatestCheckJobId(String parentJobId);
/**
- * Persist check latest job id.
+ * Persist latest check job id.
*
- * @param jobId job id
+ * @param parentJobId job id
* @param checkJobId check job id
*/
- void persistCheckLatestJobId(String jobId, String checkJobId);
+ void persistLatestCheckJobId(String parentJobId, String checkJobId);
/**
- * Delete check latest job id.
+ * Delete latest check job id.
*
- * @param jobId job id
+ * @param parentJobId parent job id
*/
- void deleteCheckLatestJobId(String jobId);
+ void deleteLatestCheckJobId(String parentJobId);
/**
* Get check job result.
*
- * @param parentJobId job id
+ * @param parentJobId parent job id
* @param checkJobId check job id
* @return check job result
*/
@@ -93,27 +92,27 @@ public interface GovernanceRepositoryAPI {
/**
* Persist check job result.
*
- * @param jobId job id
+ * @param parentJobId parent job id
* @param checkJobId check job id
* @param checkResultMap check result map
*/
- void persistCheckJobResult(String jobId, String checkJobId, Map<String,
DataConsistencyCheckResult> checkResultMap);
+ void persistCheckJobResult(String parentJobId, String checkJobId,
Map<String, DataConsistencyCheckResult> checkResultMap);
/**
* Delete check job result.
*
- * @param jobId job id
+ * @param parentJobId parent job id
* @param checkJobId check job id
*/
- void deleteCheckJobResult(String jobId, String checkJobId);
+ void deleteCheckJobResult(String parentJobId, String checkJobId);
/**
* List check job ids.
*
- * @param jobId job id
+ * @param parentJobId parent job id
* @return check job ids
*/
- Collection<String> listCheckJobIds(String jobId);
+ Collection<String> listCheckJobIds(String parentJobId);
/**
* Delete job.
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/GovernanceRepositoryAPIImpl.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/GovernanceRepositoryAPIImpl.java
index b30236452d7..d150ccf2811 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/GovernanceRepositoryAPIImpl.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/GovernanceRepositoryAPIImpl.java
@@ -66,18 +66,18 @@ public final class GovernanceRepositoryAPIImpl implements
GovernanceRepositoryAP
}
@Override
- public Optional<String> getCheckLatestJobId(final String jobId) {
- return
Optional.ofNullable(repository.getDirectly(PipelineMetaDataNode.getCheckLatestJobIdPath(jobId)));
+ public Optional<String> getLatestCheckJobId(final String parentJobId) {
+ return
Optional.ofNullable(repository.getDirectly(PipelineMetaDataNode.getLatestCheckJobIdPath(parentJobId)));
}
@Override
- public void persistCheckLatestJobId(final String jobId, final String
checkJobId) {
-
repository.persist(PipelineMetaDataNode.getCheckLatestJobIdPath(jobId),
String.valueOf(checkJobId));
+ public void persistLatestCheckJobId(final String parentJobId, final String
checkJobId) {
+
repository.persist(PipelineMetaDataNode.getLatestCheckJobIdPath(parentJobId),
String.valueOf(checkJobId));
}
@Override
- public void deleteCheckLatestJobId(final String jobId) {
- repository.delete(PipelineMetaDataNode.getCheckLatestJobIdPath(jobId));
+ public void deleteLatestCheckJobId(final String parentJobId) {
+
repository.delete(PipelineMetaDataNode.getLatestCheckJobIdPath(parentJobId));
}
@SuppressWarnings("unchecked")
@@ -97,7 +97,7 @@ public final class GovernanceRepositoryAPIImpl implements
GovernanceRepositoryAP
}
@Override
- public void persistCheckJobResult(final String jobId, final String
checkJobId, final Map<String, DataConsistencyCheckResult> checkResultMap) {
+ public void persistCheckJobResult(final String parentJobId, final String
checkJobId, final Map<String, DataConsistencyCheckResult> checkResultMap) {
if (null == checkResultMap) {
return;
}
@@ -106,17 +106,17 @@ public final class GovernanceRepositoryAPIImpl implements
GovernanceRepositoryAP
YamlDataConsistencyCheckResult yamlCheckResult = new
YamlDataConsistencyCheckResultSwapper().swapToYamlConfiguration(entry.getValue());
yamlCheckResultMap.put(entry.getKey(),
YamlEngine.marshal(yamlCheckResult));
}
- repository.persist(PipelineMetaDataNode.getCheckJobResultPath(jobId,
checkJobId), YamlEngine.marshal(yamlCheckResultMap));
+
repository.persist(PipelineMetaDataNode.getCheckJobResultPath(parentJobId,
checkJobId), YamlEngine.marshal(yamlCheckResultMap));
}
@Override
- public void deleteCheckJobResult(final String jobId, final String
checkJobId) {
- repository.delete(PipelineMetaDataNode.getCheckJobResultPath(jobId,
checkJobId));
+ public void deleteCheckJobResult(final String parentJobId, final String
checkJobId) {
+
repository.delete(PipelineMetaDataNode.getCheckJobResultPath(parentJobId,
checkJobId));
}
@Override
- public Collection<String> listCheckJobIds(final String jobId) {
- return
repository.getChildrenKeys(PipelineMetaDataNode.getCheckJobIdsRootPath(jobId));
+ public Collection<String> listCheckJobIds(final String parentJobId) {
+ return
repository.getChildrenKeys(PipelineMetaDataNode.getCheckJobIdsRootPath(parentJobId));
}
@Override
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
index 92e369f55ab..33e3eb7bcdb 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNode.java
@@ -118,12 +118,12 @@ public final class PipelineMetaDataNode {
}
/**
- * Get check latest job id path.
+ * Get latest check job id path.
*
* @param jobId job id
- * @return check latest job id path
+ * @return latest check job id path
*/
- public static String getCheckLatestJobIdPath(final String jobId) {
+ public static String getLatestCheckJobIdPath(final String jobId) {
return String.join("/", getJobRootPath(jobId), "check",
"latest_job_id");
}
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java
index c718743559c..03c30a92b99 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/metadata/node/PipelineMetaDataNodeTest.java
@@ -71,8 +71,8 @@ public final class PipelineMetaDataNodeTest {
}
@Test
- public void assertGetCheckLatestJobIdPath() {
- assertThat(PipelineMetaDataNode.getCheckLatestJobIdPath(jobId),
is(jobCheckRootPath + "/latest_job_id"));
+ public void assertGetLatestCheckJobIdPath() {
+ assertThat(PipelineMetaDataNode.getLatestCheckJobIdPath(jobId),
is(jobCheckRootPath + "/latest_job_id"));
}
@Test
diff --git
a/kernel/data-pipeline/scenario/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
b/kernel/data-pipeline/scenario/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
index 34851b7940d..3f17b5b8433 100644
---
a/kernel/data-pipeline/scenario/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
+++
b/kernel/data-pipeline/scenario/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
@@ -81,16 +81,16 @@ public final class ConsistencyCheckJobAPIImpl extends
AbstractPipelineJobAPIImpl
public String createJobAndStart(final CreateConsistencyCheckJobParameter
param) {
GovernanceRepositoryAPI repositoryAPI =
PipelineAPIFactory.getGovernanceRepositoryAPI();
String parentJobId = param.getJobId();
- Optional<String> checkLatestJobId =
repositoryAPI.getCheckLatestJobId(parentJobId);
- if (checkLatestJobId.isPresent()) {
- PipelineJobItemProgress progress =
getJobItemProgress(checkLatestJobId.get(), 0);
+ Optional<String> latestCheckJobId =
repositoryAPI.getLatestCheckJobId(parentJobId);
+ if (latestCheckJobId.isPresent()) {
+ PipelineJobItemProgress progress =
getJobItemProgress(latestCheckJobId.get(), 0);
if (null == progress || JobStatus.FINISHED !=
progress.getStatus()) {
log.info("check job already exists and status is not FINISHED,
progress={}", progress);
- throw new
UncompletedConsistencyCheckJobExistsException(checkLatestJobId.get());
+ throw new
UncompletedConsistencyCheckJobExistsException(latestCheckJobId.get());
}
}
- String result = marshalJobId(checkLatestJobId.map(s -> new
ConsistencyCheckJobId(parentJobId, s)).orElseGet(() -> new
ConsistencyCheckJobId(parentJobId)));
- repositoryAPI.persistCheckLatestJobId(parentJobId, result);
+ String result = marshalJobId(latestCheckJobId.map(s -> new
ConsistencyCheckJobId(parentJobId, s)).orElseGet(() -> new
ConsistencyCheckJobId(parentJobId)));
+ repositoryAPI.persistLatestCheckJobId(parentJobId, result);
repositoryAPI.deleteCheckJobResult(parentJobId, result);
dropJob(result);
YamlConsistencyCheckJobConfiguration yamlConfig = new
YamlConsistencyCheckJobConfiguration();
@@ -104,11 +104,11 @@ public final class ConsistencyCheckJobAPIImpl extends
AbstractPipelineJobAPIImpl
@Override
public Map<String, DataConsistencyCheckResult>
getLatestDataConsistencyCheckResult(final String jobId) {
- Optional<String> checkLatestJobId =
PipelineAPIFactory.getGovernanceRepositoryAPI().getCheckLatestJobId(jobId);
- if (!checkLatestJobId.isPresent()) {
+ Optional<String> latestCheckJobId =
PipelineAPIFactory.getGovernanceRepositoryAPI().getLatestCheckJobId(jobId);
+ if (!latestCheckJobId.isPresent()) {
return Collections.emptyMap();
}
- return
PipelineAPIFactory.getGovernanceRepositoryAPI().getCheckJobResult(jobId,
checkLatestJobId.get());
+ return
PipelineAPIFactory.getGovernanceRepositoryAPI().getCheckJobResult(jobId,
latestCheckJobId.get());
}
@Override
@@ -150,23 +150,23 @@ public final class ConsistencyCheckJobAPIImpl extends
AbstractPipelineJobAPIImpl
@Override
public void startByParentJobId(final String parentJobId) {
- startDisabledJob(getCheckLatestJobId(parentJobId));
+ startDisabledJob(getLatestCheckJobId(parentJobId));
}
- private String getCheckLatestJobId(final String parentJobId) {
- Optional<String> result =
PipelineAPIFactory.getGovernanceRepositoryAPI().getCheckLatestJobId(parentJobId);
+ private String getLatestCheckJobId(final String parentJobId) {
+ Optional<String> result =
PipelineAPIFactory.getGovernanceRepositoryAPI().getLatestCheckJobId(parentJobId);
ShardingSpherePreconditions.checkState(result.isPresent(), () -> new
ConsistencyCheckJobNotFoundException(parentJobId));
return result.get();
}
@Override
public void stopByParentJobId(final String parentJobId) {
- stop(getCheckLatestJobId(parentJobId));
+ stop(getLatestCheckJobId(parentJobId));
}
@Override
public void dropByParentJobId(final String parentJobId) {
- String latestCheckJobId = getCheckLatestJobId(parentJobId);
+ String latestCheckJobId = getLatestCheckJobId(parentJobId);
stop(latestCheckJobId);
GovernanceRepositoryAPI repositoryAPI =
PipelineAPIFactory.getGovernanceRepositoryAPI();
Collection<String> checkJobIds =
repositoryAPI.listCheckJobIds(parentJobId);
@@ -174,9 +174,9 @@ public final class ConsistencyCheckJobAPIImpl extends
AbstractPipelineJobAPIImpl
checkJobIds.stream().map(ConsistencyCheckJobId::parseSequence).collect(Collectors.toList()),
ConsistencyCheckJobId.parseSequence(latestCheckJobId));
if (previousSequence.isPresent()) {
String checkJobId = marshalJobId(new
ConsistencyCheckJobId(parentJobId, previousSequence.get()));
- repositoryAPI.persistCheckLatestJobId(parentJobId, checkJobId);
+ repositoryAPI.persistLatestCheckJobId(parentJobId, checkJobId);
} else {
- repositoryAPI.deleteCheckLatestJobId(parentJobId);
+ repositoryAPI.deleteLatestCheckJobId(parentJobId);
}
repositoryAPI.deleteCheckJobResult(parentJobId, latestCheckJobId);
dropJob(latestCheckJobId);
@@ -184,9 +184,9 @@ public final class ConsistencyCheckJobAPIImpl extends
AbstractPipelineJobAPIImpl
@Override
public ConsistencyCheckJobItemInfo getJobItemInfo(final String
parentJobId) {
- Optional<String> checkLatestJobId =
PipelineAPIFactory.getGovernanceRepositoryAPI().getCheckLatestJobId(parentJobId);
- ShardingSpherePreconditions.checkState(checkLatestJobId.isPresent(),
() -> new ConsistencyCheckJobNotFoundException(parentJobId));
- String checkJobId = checkLatestJobId.get();
+ Optional<String> latestCheckJobId =
PipelineAPIFactory.getGovernanceRepositoryAPI().getLatestCheckJobId(parentJobId);
+ ShardingSpherePreconditions.checkState(latestCheckJobId.isPresent(),
() -> new ConsistencyCheckJobNotFoundException(parentJobId));
+ String checkJobId = latestCheckJobId.get();
ConsistencyCheckJobItemProgress jobItemProgress =
getJobItemProgress(checkJobId, 0);
ConsistencyCheckJobItemInfo result = new ConsistencyCheckJobItemInfo();
if (null == jobItemProgress) {
diff --git
a/kernel/data-pipeline/scenario/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
b/kernel/data-pipeline/scenario/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
index b7bd0fdbef4..a9dd585ecc8 100644
---
a/kernel/data-pipeline/scenario/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
+++
b/kernel/data-pipeline/scenario/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
@@ -249,7 +249,7 @@ public final class MigrationJobAPIImpl extends
AbstractInventoryIncrementalJobAP
@Override
public void startDisabledJob(final String jobId) {
super.startDisabledJob(jobId);
-
PipelineAPIFactory.getGovernanceRepositoryAPI().getCheckLatestJobId(jobId).ifPresent(optional
-> {
+
PipelineAPIFactory.getGovernanceRepositoryAPI().getLatestCheckJobId(jobId).ifPresent(optional
-> {
try {
ConsistencyCheckJobAPIFactory.getInstance().startDisabledJob(optional);
// CHECKSTYLE:OFF
@@ -262,7 +262,7 @@ public final class MigrationJobAPIImpl extends
AbstractInventoryIncrementalJobAP
@Override
public void stop(final String jobId) {
-
PipelineAPIFactory.getGovernanceRepositoryAPI().getCheckLatestJobId(jobId).ifPresent(optional
-> {
+
PipelineAPIFactory.getGovernanceRepositoryAPI().getLatestCheckJobId(jobId).ifPresent(optional
-> {
try {
ConsistencyCheckJobAPIFactory.getInstance().stop(optional);
// CHECKSTYLE:OFF
diff --git
a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/ConsistencyCheckJobAPIImplTest.java
b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/ConsistencyCheckJobAPIImplTest.java
index 0199094685f..9d7edd588f4 100644
---
a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/ConsistencyCheckJobAPIImplTest.java
+++
b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/ConsistencyCheckJobAPIImplTest.java
@@ -79,7 +79,7 @@ public final class ConsistencyCheckJobAPIImplTest {
Optional<String> jobId =
migrationJobAPI.start(JobConfigurationBuilder.createJobConfiguration());
assertTrue(jobId.isPresent());
String checkJobId = checkJobAPI.createJobAndStart(new
CreateConsistencyCheckJobParameter(jobId.get(), null, null));
-
PipelineAPIFactory.getGovernanceRepositoryAPI().persistCheckLatestJobId(jobId.get(),
checkJobId);
+
PipelineAPIFactory.getGovernanceRepositoryAPI().persistLatestCheckJobId(jobId.get(),
checkJobId);
Map<String, DataConsistencyCheckResult> expectedCheckResult =
Collections.singletonMap("t_order", new DataConsistencyCheckResult(new
DataConsistencyCountCheckResult(1, 1),
new DataConsistencyContentCheckResult(true)));
PipelineAPIFactory.getGovernanceRepositoryAPI().persistCheckJobResult(jobId.get(),
checkJobId, expectedCheckResult);
@@ -101,19 +101,19 @@ public final class ConsistencyCheckJobAPIImplTest {
Map<String, DataConsistencyCheckResult> dataConsistencyCheckResult
= Collections.singletonMap("t_order",
new DataConsistencyCheckResult(new
DataConsistencyCountCheckResult(0, 0), new
DataConsistencyContentCheckResult(true)));
repositoryAPI.persistCheckJobResult(parentJobId, checkJobId,
dataConsistencyCheckResult);
- Optional<String> latestCheckJobId =
repositoryAPI.getCheckLatestJobId(parentJobId);
+ Optional<String> latestCheckJobId =
repositoryAPI.getLatestCheckJobId(parentJobId);
assertTrue(latestCheckJobId.isPresent());
assertThat(ConsistencyCheckJobId.parseSequence(latestCheckJobId.get()),
is(expectedSequence++));
}
expectedSequence = 2;
for (int i = 0; i < 2; i++) {
checkJobAPI.dropByParentJobId(parentJobId);
- Optional<String> latestCheckJobId =
repositoryAPI.getCheckLatestJobId(parentJobId);
+ Optional<String> latestCheckJobId =
repositoryAPI.getLatestCheckJobId(parentJobId);
assertTrue(latestCheckJobId.isPresent());
assertThat(ConsistencyCheckJobId.parseSequence(latestCheckJobId.get()),
is(expectedSequence--));
}
checkJobAPI.dropByParentJobId(parentJobId);
- Optional<String> latestCheckJobId =
repositoryAPI.getCheckLatestJobId(parentJobId);
+ Optional<String> latestCheckJobId =
repositoryAPI.getLatestCheckJobId(parentJobId);
assertFalse(latestCheckJobId.isPresent());
}
