You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2024/04/27 11:13:40 UTC
(shardingsphere) branch master updated: Rename GlobalPersistService.persistConfigurations() (#31033)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 f5b9f2436f1 Rename GlobalPersistService.persistConfigurations() (#31033)
f5b9f2436f1 is described below
commit f5b9f2436f1dd8d7a6c9c71406ee47f162563635
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Apr 27 19:13:34 2024 +0800
Rename GlobalPersistService.persistConfigurations() (#31033)
---
.../metadata/persist/service/config/global/GlobalPersistService.java | 4 ++--
.../persist/service/config/global/GlobalRulePersistService.java | 2 +-
.../persist/service/config/global/PropertiesPersistService.java | 2 +-
.../mode/manager/cluster/ClusterModeContextManager.java | 5 +++--
.../mode/manager/standalone/StandaloneModeContextManager.java | 5 +++--
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java
index 4b2bf0a3200..e12eed6107c 100644
--- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java
+++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalPersistService.java
@@ -39,10 +39,10 @@ public interface GlobalPersistService<T> {
/**
* Persist configurations.
*
- * @param globalRuleConfigs configurations
+ * @param globalRuleConfigs global configurations
* @return meta data versions
*/
- Collection<MetaDataVersion> persistConfig(T globalRuleConfigs);
+ Collection<MetaDataVersion> persistConfigurations(T globalRuleConfigs);
/**
* Load configurations.
diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
index 3f983506023..157af02fb39 100644
--- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
+++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
@@ -62,7 +62,7 @@ public final class GlobalRulePersistService extends AbstractPersistService imple
@SuppressWarnings({"unchecked", "rawtypes"})
@Override
- public Collection<MetaDataVersion> persistConfig(final Collection<RuleConfiguration> globalRuleConfigs) {
+ public Collection<MetaDataVersion> persistConfigurations(final Collection<RuleConfiguration> globalRuleConfigs) {
Collection<MetaDataVersion> result = new LinkedList<>();
Map<RuleConfiguration, YamlDataNodeGlobalRuleConfigurationSwapper> yamlConfigs = new YamlDataNodeGlobalRuleConfigurationSwapperEngine().swapToYamlRuleConfigurations(globalRuleConfigs);
for (Entry<RuleConfiguration, YamlDataNodeGlobalRuleConfigurationSwapper> entry : yamlConfigs.entrySet()) {
diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/PropertiesPersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/PropertiesPersistService.java
index cdad56251d1..3a37ec786f0 100644
--- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/PropertiesPersistService.java
+++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/PropertiesPersistService.java
@@ -52,7 +52,7 @@ public final class PropertiesPersistService implements GlobalPersistService<Prop
}
@Override
- public Collection<MetaDataVersion> persistConfig(final Properties props) {
+ public Collection<MetaDataVersion> persistConfigurations(final Properties props) {
List<String> versions = repository.getChildrenKeys(GlobalNode.getPropsVersionsNode());
String nextActiveVersion = versions.isEmpty() ? DEFAULT_VERSION : String.valueOf(Integer.parseInt(versions.get(0)) + 1);
String persistKey = GlobalNode.getPropsVersionNode(nextActiveVersion);
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
index 05d76eee5a0..0163709741c 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterModeContextManager.java
@@ -149,12 +149,13 @@ public final class ClusterModeContextManager implements ModeContextManager, Cont
@Override
public void alterGlobalRuleConfiguration(final RuleConfiguration toBeAlteredRuleConfig) {
GlobalPersistService<Collection<RuleConfiguration>> globalRuleService = contextManager.getMetaDataContexts().getPersistService().getGlobalRuleService();
- contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(globalRuleService.persistConfig(Collections.singleton(toBeAlteredRuleConfig)));
+ contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService()
+ .switchActiveVersion(globalRuleService.persistConfigurations(Collections.singleton(toBeAlteredRuleConfig)));
}
@Override
public void alterProperties(final Properties props) {
- Collection<MetaDataVersion> versions = contextManager.getMetaDataContexts().getPersistService().getPropsService().persistConfig(props);
+ Collection<MetaDataVersion> versions = contextManager.getMetaDataContexts().getPersistService().getPropsService().persistConfigurations(props);
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(versions);
}
diff --git a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
index 9d43223e5f5..71dd0d792cf 100644
--- a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
+++ b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneModeContextManager.java
@@ -306,7 +306,8 @@ public final class StandaloneModeContextManager implements ModeContextManager, C
public void alterGlobalRuleConfiguration(final RuleConfiguration toBeAlteredRuleConfig) {
contextManager.getConfigurationContextManager().alterGlobalRuleConfiguration(toBeAlteredRuleConfig);
GlobalPersistService<Collection<RuleConfiguration>> globalRuleService = contextManager.getMetaDataContexts().getPersistService().getGlobalRuleService();
- contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(globalRuleService.persistConfig(Collections.singleton(toBeAlteredRuleConfig)));
+ contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService()
+ .switchActiveVersion(globalRuleService.persistConfigurations(Collections.singleton(toBeAlteredRuleConfig)));
clearServiceCache();
}
@@ -314,7 +315,7 @@ public final class StandaloneModeContextManager implements ModeContextManager, C
public void alterProperties(final Properties props) {
contextManager.getConfigurationContextManager().alterProperties(props);
if (null != contextManager.getMetaDataContexts().getPersistService().getPropsService()) {
- Collection<MetaDataVersion> versions = contextManager.getMetaDataContexts().getPersistService().getPropsService().persistConfig(props);
+ Collection<MetaDataVersion> versions = contextManager.getMetaDataContexts().getPersistService().getPropsService().persistConfigurations(props);
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().switchActiveVersion(versions);
}
clearServiceCache();