[shardingsphere] branch master updated: Merge alter rule configuration method (#13689)

[pa...@apache.org]

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

panjuan 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 ed3211d  Merge alter rule configuration method (#13689)
ed3211d is described below

commit ed3211d0e59ce661fc76e3ae2cba6963bc74bcbb
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Thu Nov 18 19:42:15 2021 +0800

    Merge alter rule configuration method (#13689)
    
    Co-authored-by: shardingsphere <de...@shardingsphere.apache.org>
---
 .../mode/manager/ContextManager.java               | 23 ----------------------
 .../rdl/rule/RuleDefinitionBackendHandler.java     |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 9b84396..e71d3c4 100644
--- a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++ b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -167,29 +167,6 @@ public final class ContextManager implements AutoCloseable {
     }
     
     /**
-     * Alter rule.
-     * 
-     * @param schemaName schema name
-     */
-    public void alterRule(final String schemaName) {
-        try {
-            Map<String, Map<String, DataSource>> dataSourcesMap = Collections.singletonMap(schemaName, metaDataContexts.getMetaData(schemaName).getResource().getDataSources());
-            Map<String, Collection<RuleConfiguration>> schemaRuleConfigs = Collections.singletonMap(schemaName, metaDataContexts.getMetaData(schemaName).getRuleMetaData().getConfigurations());
-            Properties props = metaDataContexts.getProps().getProps();
-            Map<String, Collection<ShardingSphereRule>> rules = SchemaRulesBuilder.buildRules(dataSourcesMap, schemaRuleConfigs, props);
-            Map<String, ShardingSphereSchema> schemas = new SchemaLoader(dataSourcesMap, schemaRuleConfigs, rules, props).load();
-            MetaDataContexts changedMetaDataContext = new MetaDataContextsBuilder(dataSourcesMap, schemaRuleConfigs, metaDataContexts.getGlobalRuleMetaData().getConfigurations(), 
-                    schemas, rules, props)
-                    .build(metaDataContexts.getMetaDataPersistService().orElse(null));
-            metaDataContexts.getOptimizerContext().getMetaData().getSchemas().put(schemaName,
-                    changedMetaDataContext.getOptimizerContext().getMetaData().getSchemas().get(schemaName));
-            metaDataContexts.getMetaDataMap().put(schemaName, changedMetaDataContext.getMetaData(schemaName));
-        } catch (final SQLException ex) {
-            log.error("Alter schema:{} rule failed", schemaName, ex);
-        }
-    }
-    
-    /**
      * Alter rule configuration.
      * 
      * @param schemaName schema name
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
index 0dfa324..9d0b50f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/rule/RuleDefinitionBackendHandler.java
@@ -94,7 +94,7 @@ public final class RuleDefinitionBackendHandler<T extends RuleDefinitionStatemen
         } else {
             throw new UnsupportedOperationException(String.format("Cannot support RDL updater type `%s`", updater.getClass().getCanonicalName()));
         }
-        ProxyContext.getInstance().getContextManager().alterRule(shardingSphereMetaData.getName());
+        ProxyContext.getInstance().getContextManager().alterRuleConfiguration(shardingSphereMetaData.getName(), shardingSphereMetaData.getRuleMetaData().getConfigurations());
     }
     
     @SuppressWarnings({"rawtypes", "unchecked"})