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 0686738bc1a Refactor DatabaseRuleConfigurationManager (#34549)
0686738bc1a is described below
commit 0686738bc1a4e11993659c9c0ba02bae2ebe84b8
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Feb 1 18:01:13 2025 +0800
Refactor DatabaseRuleConfigurationManager (#34549)
* Refactor DatabaseRuleConfigurationManager
* Refactor DatabaseRuleConfigurationManager
---
.../mode/metadata/manager/MetaDataContextManager.java | 8 +++-----
.../metadata/manager/rule/DatabaseRuleConfigurationManager.java | 4 ++--
.../mode/metadata/manager/rule/DatabaseRuleItemManager.java | 4 ++--
.../persist/service/StandaloneMetaDataManagerPersistService.java | 2 +-
.../service/StandaloneMetaDataManagerPersistServiceTest.java | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
index 84638d4b9c9..4cea4cb3b46 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
@@ -18,16 +18,15 @@
package org.apache.shardingsphere.mode.metadata.manager;
import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import
org.apache.shardingsphere.mode.metadata.manager.database.DatabaseMetaDataManager;
-import
org.apache.shardingsphere.mode.metadata.manager.rule.DatabaseRuleConfigurationManager;
-import
org.apache.shardingsphere.mode.metadata.manager.rule.GlobalConfigurationManager;
import
org.apache.shardingsphere.mode.metadata.manager.resource.ResourceSwitchManager;
+import
org.apache.shardingsphere.mode.metadata.manager.resource.StorageUnitManager;
+import
org.apache.shardingsphere.mode.metadata.manager.rule.DatabaseRuleConfigurationManager;
import
org.apache.shardingsphere.mode.metadata.manager.rule.DatabaseRuleItemManager;
+import
org.apache.shardingsphere.mode.metadata.manager.rule.GlobalConfigurationManager;
import
org.apache.shardingsphere.mode.metadata.manager.statistics.StatisticsManager;
-import
org.apache.shardingsphere.mode.metadata.manager.resource.StorageUnitManager;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistFacade;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -35,7 +34,6 @@ import
org.apache.shardingsphere.mode.spi.repository.PersistRepository;
* Meta data context manager.
*/
@Getter
-@Slf4j
public class MetaDataContextManager {
private final MetaDataContexts metaDataContexts;
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 a1847e5884b..43c47a66d6d 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
@@ -57,7 +57,7 @@ public final class DatabaseRuleConfigurationManager {
* @throws SQLException SQL Exception
*/
@SuppressWarnings({"unchecked", "rawtypes"})
- public synchronized void alterRuleConfiguration(final String databaseName,
final RuleConfiguration ruleConfig) throws SQLException {
+ public synchronized void alter(final String databaseName, final
RuleConfiguration ruleConfig) throws SQLException {
ShardingSphereDatabase database =
metaDataContexts.getMetaData().getDatabase(databaseName);
Collection<ShardingSphereRule> rules = new
LinkedList<>(database.getRuleMetaData().getRules());
Optional<ShardingSphereRule> toBeChangedRule =
rules.stream().filter(each ->
each.getConfiguration().getClass().equals(ruleConfig.getClass())).findFirst();
@@ -78,7 +78,7 @@ public final class DatabaseRuleConfigurationManager {
* @throws SQLException SQL Exception
*/
@SuppressWarnings({"unchecked", "rawtypes"})
- public synchronized void dropRuleConfiguration(final String databaseName,
final RuleConfiguration ruleConfig) throws SQLException {
+ public synchronized void drop(final String databaseName, final
RuleConfiguration ruleConfig) throws SQLException {
ShardingSphereDatabase database =
metaDataContexts.getMetaData().getDatabase(databaseName);
Collection<ShardingSphereRule> rules = new
LinkedList<>(database.getRuleMetaData().getRules());
Optional<ShardingSphereRule> toBeChangedRule =
rules.stream().filter(each ->
each.getConfiguration().getClass().equals(ruleConfig.getClass())).findFirst();
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
index b0e5c1f0e2b..10784e66674 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
@@ -57,7 +57,7 @@ public final class DatabaseRuleItemManager {
RuleConfiguration currentRuleConfig =
processor.findRuleConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName));
synchronized (this) {
processor.changeRuleItemConfiguration(alterRuleItem,
currentRuleConfig, processor.swapRuleItemConfiguration(alterRuleItem,
yamlContent));
- databaseRuleConfigManager.alterRuleConfiguration(databaseName,
currentRuleConfig);
+ databaseRuleConfigManager.alter(databaseName, currentRuleConfig);
}
}
@@ -75,7 +75,7 @@ public final class DatabaseRuleItemManager {
RuleConfiguration currentRuleConfig =
processor.findRuleConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName));
synchronized (this) {
processor.dropRuleItemConfiguration(dropRuleItem,
currentRuleConfig);
- databaseRuleConfigManager.dropRuleConfiguration(databaseName,
currentRuleConfig);
+ databaseRuleConfigManager.drop(databaseName, currentRuleConfig);
}
}
}
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 a4e1a77c046..f4956698073 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
@@ -199,7 +199,7 @@ public final class StandaloneMetaDataManagerPersistService
implements MetaDataMa
SingleRuleConfiguration singleRuleConfig =
ruleMetaData.getSingleRule(SingleRule.class).getConfiguration();
Collection<MetaDataVersion> metaDataVersions =
metaDataPersistFacade.getDatabaseRuleService().persist(databaseName,
Collections.singleton(singleRuleConfig));
metaDataPersistFacade.getMetaDataVersionService().switchActiveVersion(metaDataVersions);
-
metaDataContextManager.getDatabaseRuleConfigurationManager().alterRuleConfiguration(databaseName,
singleRuleConfig);
+
metaDataContextManager.getDatabaseRuleConfigurationManager().alter(databaseName,
singleRuleConfig);
clearServiceCache();
}
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
index c7c5d6cbf35..cd94a06b081 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
@@ -154,7 +154,7 @@ class StandaloneMetaDataManagerPersistServiceTest {
when(singleRule.getConfiguration()).thenReturn(singleRuleConfig);
metaDataManagerPersistService.alterSingleRuleConfiguration("foo_db",
new RuleMetaData(Collections.singleton(singleRule)));
verify(metaDataPersistFacade.getMetaDataVersionService()).switchActiveVersion(any());
-
verify(metaDataContextManager.getDatabaseRuleConfigurationManager()).alterRuleConfiguration("foo_db",
singleRuleConfig);
+
verify(metaDataContextManager.getDatabaseRuleConfigurationManager()).alter("foo_db",
singleRuleConfig);
}
@Test
