Remove use original database to build new MetaDataContexts (apache#34222

)
chakkk309 · Jan 2, 2025 · a6a09ba · a6a09ba
1 parent 680c0db
commit a6a09ba
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...ava/org/apache/shardingsphere/mode/metadata/manager/DatabaseRuleConfigurationManager.java b/...ava/org/apache/shardingsphere/mode/metadata/manager/DatabaseRuleConfigurationManager.java
@@ -36,6 +36,7 @@
 import java.util.LinkedList;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 /**
  * Database rule configuration manager.
@@ -74,7 +75,7 @@ public synchronized void alterRuleConfiguration(final String databaseName, final
         rules.removeIf(each -> each.getConfiguration().getClass().isAssignableFrom(ruleConfig.getClass()));
         rules.addAll(DatabaseRulesBuilder.build(
                 databaseName, database.getProtocolType(), database.getRuleMetaData().getRules(), ruleConfig, computeNodeInstanceContext, database.getResourceMetaData()));
-        refreshMetadata(databaseName, database, rules);
+        refreshMetadata(databaseName, getRuleConfigurations(rules));
     }
 
     /**
@@ -98,14 +99,16 @@ public synchronized void dropRuleConfiguration(final String databaseName, final
             rules.addAll(DatabaseRulesBuilder.build(
                     databaseName, database.getProtocolType(), database.getRuleMetaData().getRules(), ruleConfig, computeNodeInstanceContext, database.getResourceMetaData()));
         }
-        refreshMetadata(databaseName, database, rules);
+        refreshMetadata(databaseName, getRuleConfigurations(rules));
     }
 
-    private void refreshMetadata(final String databaseName, final ShardingSphereDatabase database, final Collection<ShardingSphereRule> rules) throws SQLException {
-        database.getRuleMetaData().getRules().clear();
-        database.getRuleMetaData().getRules().addAll(rules);
+    private void refreshMetadata(final String databaseName, final Collection<RuleConfiguration> ruleConfigurations) throws SQLException {
         MetaDataContexts reloadMetaDataContexts = MetaDataContextsFactory.createByAlterRule(databaseName, false,
-                database.getRuleMetaData().getConfigurations(), metaDataContexts.get(), metaDataPersistService, computeNodeInstanceContext);
+                ruleConfigurations, metaDataContexts.get(), metaDataPersistService, computeNodeInstanceContext);
         metaDataContexts.set(reloadMetaDataContexts);
     }
+
+    private Collection<RuleConfiguration> getRuleConfigurations(final Collection<ShardingSphereRule> rules) {
+        return rules.stream().map(ShardingSphereRule::getConfiguration).collect(Collectors.toList());
+    }
 }