Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor DatabaseRuleConfigurationManager #34549

Merged
merged 2 commits into from
Feb 1, 2025
Merged

Refactor DatabaseRuleConfigurationManager #34549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed80921
Refactor DatabaseRuleConfigurationManager
terrymanu Feb 1, 2025
b4ef564
Refactor DatabaseRuleConfigurationManager
terrymanu Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ...src/main/java/org/apache/shardingsphere/mode/metadata/manager/MetaDataContextManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,22 @@
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;

/**
* Meta data context manager.
*/
@Getter
@Slf4j
public class MetaDataContextManager {

private final MetaDataContexts metaDataContexts;
Expand Down
4 changes: 2 additions & 2 deletions ...rg/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleConfigurationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -78,7 +78,7 @@ public synchronized void alterRuleConfiguration(final String databaseName, final
* @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();
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void alter(final AlterRuleItem alterRuleItem) throws SQLException {
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);
}
}

Expand All @@ -75,7 +75,7 @@ public void drop(final DropRuleItem dropRuleItem) throws SQLException {
RuleConfiguration currentRuleConfig = processor.findRuleConfiguration(metaDataContexts.getMetaData().getDatabase(databaseName));
synchronized (this) {
processor.dropRuleItemConfiguration(dropRuleItem, currentRuleConfig);
databaseRuleConfigManager.dropRuleConfiguration(databaseName, currentRuleConfig);
databaseRuleConfigManager.drop(databaseName, currentRuleConfig);
}
}
}
2 changes: 1 addition & 1 deletion ...here/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void alterSingleRuleConfiguration(final String databaseName, final RuleMe
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();
}

Expand Down
2 changes: 1 addition & 1 deletion .../mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ void assertAlterSingleRuleConfiguration() throws SQLException {
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
Expand Down