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 90322c17b4b Refactor MetaDataManagerPersistService.removeRuleConfiguration (#34643) 90322c17b4b is described below commit 90322c17b4bbe845c5594488155d393e164fe4a0 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Wed Feb 12 20:54:10 2025 +0800 Refactor MetaDataManagerPersistService.removeRuleConfiguration (#34643) --- .../mode/persist/service/MetaDataManagerPersistService.java | 4 ++-- .../cluster/persist/service/ClusterMetaDataManagerPersistService.java | 4 ++-- .../persist/service/StandaloneMetaDataManagerPersistService.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java index d75b6b366e9..840c0e0fd97 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/MetaDataManagerPersistService.java @@ -158,9 +158,9 @@ public interface MetaDataManagerPersistService { * Remove rule configuration. * * @param database database - * @param ruleName rule name + * @param ruleTypeName rule type name */ - void removeRuleConfiguration(ShardingSphereDatabase database, String ruleName); + void removeRuleConfiguration(ShardingSphereDatabase database, String ruleTypeName); /** * Alter global rule configuration. 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 eff379c1e28..03e6b11481b 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 @@ -198,9 +198,9 @@ public final class ClusterMetaDataManagerPersistService implements MetaDataManag } @Override - public void removeRuleConfiguration(final ShardingSphereDatabase database, final String ruleName) { + public void removeRuleConfiguration(final ShardingSphereDatabase database, final String ruleTypeName) { MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics()); - metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(), ruleName); + metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(), ruleTypeName); afterRuleConfigurationDropped(database.getName(), originalMetaDataContexts); } 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 2ec6fe94a5b..433da4f929f 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 @@ -231,8 +231,8 @@ public final class StandaloneMetaDataManagerPersistService implements MetaDataMa } @Override - public void removeRuleConfiguration(final ShardingSphereDatabase database, final String ruleName) { - metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(), ruleName); + public void removeRuleConfiguration(final ShardingSphereDatabase database, final String ruleTypeName) { + metaDataPersistFacade.getDatabaseRuleService().delete(database.getName(), ruleTypeName); clearServiceCache(); }