(shardingsphere) branch master updated: Unify MetaDataManagerPersistService.alterSingleRuleConfiguration (#34528)

[zhangliang]

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 55030806e5b Unify 
MetaDataManagerPersistService.alterSingleRuleConfiguration (#34528)
55030806e5b is described below

commit 55030806e5bebadc30d64672fa68cbaa1dfcb070
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Jan 29 12:00:39 2025 +0800

    Unify MetaDataManagerPersistService.alterSingleRuleConfiguration (#34528)
---
 .../cluster/persist/service/ClusterMetaDataManagerPersistService.java | 4 ++--
 .../persist/service/StandaloneMetaDataManagerPersistService.java      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index aaa27205e5b..8e4608356db 100644
--- 
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++ 
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -216,8 +216,8 @@ public final class ClusterMetaDataManagerPersistService 
implements MetaDataManag
     @Override
     public void alterSingleRuleConfiguration(final String databaseName, final 
RuleMetaData ruleMetaData) {
         SingleRuleConfiguration singleRuleConfig = 
ruleMetaData.getSingleRule(SingleRule.class).getConfiguration();
-        metaDataPersistService.getMetaDataVersionPersistService()
-                
.switchActiveVersion(metaDataPersistService.getDatabaseRulePersistService().persist(databaseName,
 Collections.singleton(singleRuleConfig)));
+        Collection<MetaDataVersion> metaDataVersions = 
metaDataPersistService.getDatabaseRulePersistService().persist(databaseName, 
Collections.singleton(singleRuleConfig));
+        
metaDataPersistService.getMetaDataVersionPersistService().switchActiveVersion(metaDataVersions);
     }
     
     @Override
diff --git 
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
 
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
index fcb825cc6e6..e46af30c4e8 100644
--- 
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
+++ 
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
@@ -196,8 +196,7 @@ public final class StandaloneMetaDataManagerPersistService 
implements MetaDataMa
     @Override
     public void alterSingleRuleConfiguration(final String databaseName, final 
RuleMetaData ruleMetaData) throws SQLException {
         SingleRuleConfiguration singleRuleConfig = 
ruleMetaData.getSingleRule(SingleRule.class).getConfiguration();
-        Collection<MetaDataVersion> metaDataVersions = 
metaDataPersistService.getDatabaseRulePersistService()
-                
.persist(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName(),
 Collections.singleton(singleRuleConfig));
+        Collection<MetaDataVersion> metaDataVersions = 
metaDataPersistService.getDatabaseRulePersistService().persist(databaseName, 
Collections.singleton(singleRuleConfig));
         
metaDataPersistService.getMetaDataVersionPersistService().switchActiveVersion(metaDataVersions);
         
metaDataContextManager.getDatabaseRuleConfigurationManager().alterRuleConfiguration(databaseName,
 singleRuleConfig);
         clearServiceCache();