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 2025/02/08 11:46:30 UTC
(shardingsphere) branch master updated: Refactor GlobalRulePersistService (#34613)
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 98cebb20750 Refactor GlobalRulePersistService (#34613)
98cebb20750 is described below
commit 98cebb207509ecb546627d3c8674fdcec49ee205
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Feb 8 19:46:23 2025 +0800
Refactor GlobalRulePersistService (#34613)
* Refactor GlobalRulePersistService
* Refactor GlobalRulePersistService
---
.../config/global/GlobalRulePersistService.java | 31 ++++++----------------
.../global/GlobalRulePersistServiceTest.java | 4 ---
2 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
index 5b2200335a7..d78323f3f96 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
@@ -17,20 +17,18 @@
package org.apache.shardingsphere.mode.metadata.persist.config.global;
-import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapperEngine;
import org.apache.shardingsphere.mode.metadata.persist.config.RepositoryTuplePersistService;
import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.node.path.config.GlobalRuleNodePath;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
import org.apache.shardingsphere.mode.node.tuple.RepositoryTuple;
import org.apache.shardingsphere.mode.node.tuple.YamlRepositoryTupleSwapperEngine;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.Optional;
/**
@@ -81,30 +79,17 @@ public final class GlobalRulePersistService {
* @param globalRuleConfigs global rule configurations
*/
public void persist(final Collection<RuleConfiguration> globalRuleConfigs) {
- Collection<MetaDataVersion> metaDataVersions = new LinkedList<>();
for (YamlRuleConfiguration each : yamlRuleConfigurationSwapperEngine.swapToYamlRuleConfigurations(globalRuleConfigs)) {
- metaDataVersions.addAll(persistTuples(yamlRepositoryTupleSwapperEngine.swapToRepositoryTuples(each)));
+ persistTuples(yamlRepositoryTupleSwapperEngine.swapToRepositoryTuples(each));
}
- metaDataVersionPersistService.switchActiveVersion(metaDataVersions);
}
- private Collection<MetaDataVersion> persistTuples(final Collection<RepositoryTuple> repositoryTuples) {
- Collection<MetaDataVersion> result = new LinkedList<>();
- for (RepositoryTuple each : repositoryTuples) {
- int nextActiveVersion = metaDataVersionPersistService.getNextVersion(GlobalRuleNodePath.getVersionNodePathGenerator(each.getKey()).getVersionsPath());
- repository.persist(GlobalRuleNodePath.getVersionNodePathGenerator(each.getKey()).getVersionPath(nextActiveVersion), each.getValue());
- String ruleActiveVersionPath = GlobalRuleNodePath.getVersionNodePathGenerator(each.getKey()).getActiveVersionPath();
- if (null == getRuleActiveVersion(ruleActiveVersionPath)) {
- repository.persist(ruleActiveVersionPath, String.valueOf(MetaDataVersion.INIT_VERSION));
- }
- Integer ruleActiveVersion = getRuleActiveVersion(ruleActiveVersionPath);
- result.add(new MetaDataVersion(GlobalRuleNodePath.getRulePath(each.getKey()), null == ruleActiveVersion ? MetaDataVersion.INIT_VERSION : ruleActiveVersion, nextActiveVersion));
+ private void persistTuples(final Collection<RepositoryTuple> tuples) {
+ for (RepositoryTuple each : tuples) {
+ VersionNodePathGenerator versionNodePathGenerator = GlobalRuleNodePath.getVersionNodePathGenerator(each.getKey());
+ int nextVersion = metaDataVersionPersistService.getNextVersion(versionNodePathGenerator.getVersionsPath());
+ repository.persist(versionNodePathGenerator.getVersionPath(nextVersion), each.getValue());
+ metaDataVersionPersistService.switchActiveVersion(GlobalRuleNodePath.getRulePath(each.getKey()), nextVersion);
}
- return result;
- }
-
- private Integer getRuleActiveVersion(final String ruleActiveVersionPath) {
- String value = repository.query(ruleActiveVersionPath);
- return Strings.isNullOrEmpty(value) ? null : Integer.parseInt(value);
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
index e7dc71b9fc1..3f87377f7a6 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistServiceTest.java
@@ -84,12 +84,10 @@ class GlobalRulePersistServiceTest {
when(OrderedSPILoader.getServices(YamlRuleConfigurationSwapper.class, Collections.singleton(ruleConfig))).thenReturn(Collections.singletonMap(ruleConfig, swapper));
YamlRuleConfiguration yamlRuleConfig = new MetaDataYamlRuleConfigurationFixture();
when(swapper.swapToYamlConfiguration(ruleConfig)).thenReturn(yamlRuleConfig);
- when(repository.query("/rules/fixture/active_version")).thenReturn("10");
when(repository.getChildrenKeys("/rules/fixture/versions")).thenReturn(Collections.singletonList("10"));
globalRulePersistService.persist(Collections.singleton(ruleConfig));
verify(repository).persist("/rules/fixture/versions/11", "{}" + System.lineSeparator());
verify(repository, times(0)).persist("/rules/fixture/active_version", "0");
- verify(repository, times(2)).query("/rules/fixture/active_version");
}
@SuppressWarnings({"rawtypes", "unchecked"})
@@ -101,10 +99,8 @@ class GlobalRulePersistServiceTest {
YamlRuleConfiguration yamlRuleConfig = new MetaDataYamlRuleConfigurationFixture();
when(swapper.swapToYamlConfiguration(ruleConfig)).thenReturn(yamlRuleConfig);
when(repository.getChildrenKeys("/rules/fixture/versions")).thenReturn(Collections.emptyList());
- when(repository.query("/rules/fixture/active_version")).thenReturn("", "0");
globalRulePersistService.persist(Collections.singleton(ruleConfig));
verify(repository).persist("/rules/fixture/versions/0", "{}" + System.lineSeparator());
verify(repository).persist("/rules/fixture/active_version", "0");
- verify(repository, times(2)).query("/rules/fixture/active_version");
}
}