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/05 11:25:41 UTC
[shardingsphere] branch master updated: Optimize hasUncompletedJobOfSameDatabaseName method. (#17339)
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 9e8c02809de Optimize hasUncompletedJobOfSameDatabaseName method. (#17339)
9e8c02809de is described below
commit 9e8c02809de5c9fe1d69b6294805403e4ca1b4cb
Author: azexcy <10...@users.noreply.github.com>
AuthorDate: Thu May 5 19:25:22 2022 +0800
Optimize hasUncompletedJobOfSameDatabaseName method. (#17339)
---
.../data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
index 89ea2b67447..3f2b908dd05 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobWorker.java
@@ -165,7 +165,7 @@ public final class RuleAlteredJobWorker {
@Subscribe
public void start(final StartScalingEvent event) {
log.info("Start scaling job by {}", event);
- if (!hasUncompletedJobOfSameDatabaseName(event.getDatabaseName())) {
+ if (hasUncompletedJobOfSameDatabaseName(event.getDatabaseName())) {
log.warn("There is uncompleted job with the same database name, please handle it first, current job will be ignored");
return;
}
@@ -289,15 +289,15 @@ public final class RuleAlteredJobWorker {
continue;
}
RuleAlteredJobConfiguration jobConfig = YamlEngine.unmarshal(each.getJobParameter(), RuleAlteredJobConfiguration.class, true);
- if (hasUncompletedJobOfSameDatabaseName(jobConfig, each.getJobId(), databaseName)) {
+ if (hasUncompletedJobOfSameDatabaseName(jobConfig, databaseName)) {
result = true;
break;
}
}
- return !result;
+ return result;
}
- private boolean hasUncompletedJobOfSameDatabaseName(final RuleAlteredJobConfiguration jobConfig, final String jobId, final String currentDatabaseName) {
+ private boolean hasUncompletedJobOfSameDatabaseName(final RuleAlteredJobConfiguration jobConfig, final String currentDatabaseName) {
return currentDatabaseName.equals(jobConfig.getDatabaseName());
}