(shardingsphere) branch master updated: Refactor import metadata & remove deprecated api (#30859)

[zhaojinchao]

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao 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 5da379b0061 Refactor import metadata & remove deprecated api (#30859)
5da379b0061 is described below

commit 5da379b006123c2003be558af3ff9b3ce344d1a7
Author: ChenJiaHao <chenjia...@apache.org>
AuthorDate: Fri Apr 12 17:19:39 2024 +0800

    Refactor import metadata & remove deprecated api (#30859)
---
 .../shardingsphere/infra/instance/mode/ModeContextManager.java     | 7 -------
 .../mode/manager/cluster/ClusterModeContextManager.java            | 5 -----
 .../mode/manager/standalone/StandaloneModeContextManager.java      | 7 -------
 .../handler/distsql/ral/updatable/ImportMetaDataExecutor.java      | 2 +-
 4 files changed, 1 insertion(+), 20 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/mode/ModeContextManager.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/mode/ModeContextManager.java
index 04cb09fc13a..642c54cb0f9 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/mode/ModeContextManager.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/mode/ModeContextManager.java
@@ -136,13 +136,6 @@ public interface ModeContextManager {
      */
     void removeRuleConfiguration(String databaseName, String ruleName);
     
-    /**
-     * Alter global rule configuration.
-     *
-     * @param globalRuleConfigs global rule configs
-     */
-    void alterGlobalRuleConfiguration(Collection<RuleConfiguration> 
globalRuleConfigs);
-    
     /**
      * Alter global rule configuration.
      *
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 3bb312c5f7f..930e89c4cec 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
@@ -148,11 +148,6 @@ public final class ClusterModeContextManager implements 
ModeContextManager, Cont
         
contextManager.getMetaDataContexts().getPersistService().getDatabaseRulePersistService().delete(databaseName,
 ruleName);
     }
     
-    @Override
-    public void alterGlobalRuleConfiguration(final 
Collection<RuleConfiguration> globalRuleConfigs) {
-        
contextManager.getMetaDataContexts().getPersistService().getGlobalRuleService().persist(globalRuleConfigs);
-    }
-    
     @Override
     public void alterGlobalRuleConfiguration(final RuleConfiguration 
toBeAlteredRuleConfig) {
         GlobalPersistService<Collection<RuleConfiguration>> globalRuleService 
= 
contextManager.getMetaDataContexts().getPersistService().getGlobalRuleService();
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 5167e3621bf..8dbddf51cb6 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
@@ -301,13 +301,6 @@ public final class StandaloneModeContextManager implements 
ModeContextManager, C
         clearServiceCache();
     }
     
-    @Override
-    public void alterGlobalRuleConfiguration(final 
Collection<RuleConfiguration> globalRuleConfigs) {
-        
contextManager.getConfigurationContextManager().alterGlobalRuleConfiguration(globalRuleConfigs);
-        
contextManager.getMetaDataContexts().getPersistService().getGlobalRuleService().persist(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations());
-        clearServiceCache();
-    }
-    
     @Override
     public void alterGlobalRuleConfiguration(final RuleConfiguration 
toBeAlteredRuleConfig) {
         
contextManager.getConfigurationContextManager().alterGlobalRuleConfiguration(toBeAlteredRuleConfig);
diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutor.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutor.java
index 1506f209de1..f6e1f8826ac 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutor.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutor.java
@@ -73,7 +73,7 @@ public final class ImportMetaDataExecutor implements 
DistSQLUpdateExecutor<Impor
             return;
         }
         Collection<RuleConfiguration> rules = 
ruleConfigSwapperEngine.swapToRuleConfigurations(yamlServerConfig.getRules());
-        
contextManager.getInstanceContext().getModeContextManager().alterGlobalRuleConfiguration(rules);
+        rules.forEach(each -> 
contextManager.getInstanceContext().getModeContextManager().alterGlobalRuleConfiguration(each));
         
contextManager.getInstanceContext().getModeContextManager().alterProperties(yamlServerConfig.getProps());
     }