You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2025/02/24 09:17:23 UTC
(shardingsphere) branch master updated: Close original database rule after database rule removed (#34773)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 a802847a610 Close original database rule after database rule removed (#34773)
a802847a610 is described below
commit a802847a61064af3db6ed06433230b04adbee798
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Mon Feb 24 17:17:17 2025 +0800
Close original database rule after database rule removed (#34773)
---
.../rule/DatabaseRuleConfigurationManager.java | 23 +++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManager.java
index 43c47a66d6d..72a9f4928e4 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManager.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManager.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.mode.metadata.manager.rule;
import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfiguration;
import org.apache.shardingsphere.infra.config.rule.scope.DatabaseRuleConfigurationEmptyChecker;
@@ -65,9 +66,10 @@ public final class DatabaseRuleConfigurationManager {
((PartialRuleUpdateSupported) toBeChangedRule.get()).updateConfiguration(ruleConfig);
return;
}
- rules.removeIf(each -> each.getConfiguration().getClass().isAssignableFrom(ruleConfig.getClass()));
+ Collection<ShardingSphereRule> toBeRemovedRules = rules.stream().filter(each -> each.getConfiguration().getClass().isAssignableFrom(ruleConfig.getClass())).collect(Collectors.toList());
+ rules.removeAll(toBeRemovedRules);
rules.add(DatabaseRulesBuilder.build(databaseName, database.getProtocolType(), database.getRuleMetaData().getRules(), ruleConfig, computeNodeInstanceContext, database.getResourceMetaData()));
- refreshMetadata(databaseName, rules);
+ refreshMetadata(databaseName, rules, toBeRemovedRules);
}
/**
@@ -86,16 +88,27 @@ public final class DatabaseRuleConfigurationManager {
((PartialRuleUpdateSupported) toBeChangedRule.get()).updateConfiguration(ruleConfig);
return;
}
- rules.removeIf(each -> each.getConfiguration().getClass().isAssignableFrom(ruleConfig.getClass()));
+ Collection<ShardingSphereRule> toBeRemovedRules = rules.stream().filter(each -> each.getConfiguration().getClass().isAssignableFrom(ruleConfig.getClass())).collect(Collectors.toList());
+ rules.removeAll(toBeRemovedRules);
if (!TypedSPILoader.getService(DatabaseRuleConfigurationEmptyChecker.class, ruleConfig.getClass()).isEmpty((DatabaseRuleConfiguration) ruleConfig)) {
rules.add(DatabaseRulesBuilder.build(
databaseName, database.getProtocolType(), database.getRuleMetaData().getRules(), ruleConfig, computeNodeInstanceContext, database.getResourceMetaData()));
}
- refreshMetadata(databaseName, rules);
+ refreshMetadata(databaseName, rules, toBeRemovedRules);
}
- private void refreshMetadata(final String databaseName, final Collection<ShardingSphereRule> rules) throws SQLException {
+ private void refreshMetadata(final String databaseName, final Collection<ShardingSphereRule> rules, final Collection<ShardingSphereRule> toBeRemovedRules) throws SQLException {
Collection<RuleConfiguration> ruleConfigs = rules.stream().map(ShardingSphereRule::getConfiguration).collect(Collectors.toList());
metaDataContexts.update(new MetaDataContextsFactory(metaDataPersistFacade, computeNodeInstanceContext).createByAlterRule(databaseName, false, ruleConfigs, metaDataContexts));
+ closeOriginalRules(toBeRemovedRules);
+ }
+
+ @SneakyThrows(Exception.class)
+ private void closeOriginalRules(final Collection<ShardingSphereRule> toBeRemovedRules) {
+ for (ShardingSphereRule each : toBeRemovedRules) {
+ if (each instanceof AutoCloseable) {
+ ((AutoCloseable) each).close();
+ }
+ }
}
}