Skip to content

Refactor ClusterMetaDataManagerPersistService #34531

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

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Refactor ClusterMetaDataManagerPersistService #34531

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 5 additions & 13 deletions ...dingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.destroyer.DataSourcePoolDestroyer;
import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerCoordinatorType;
import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
Expand Down Expand Up @@ -131,7 +129,7 @@ public void dropTable(final String databaseName, final String schemaName, final

@Override
public void registerStorageUnits(final String databaseName, final Map<String, DataSourcePoolProperties> toBeRegisteredProps) throws SQLException {
MetaDataContexts originalMetaDataContexts = buildOriginalMetaDataContexts();
MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics());
Map<StorageNode, DataSource> newDataSources = new HashMap<>(toBeRegisteredProps.size());
try {
SwitchingResource switchingResource = metaDataContextManager.getResourceSwitchManager()
Expand All @@ -149,7 +147,7 @@ public void registerStorageUnits(final String databaseName, final Map<String, Da

@Override
public void alterStorageUnits(final String databaseName, final Map<String, DataSourcePoolProperties> toBeUpdatedProps) throws SQLException {
MetaDataContexts originalMetaDataContexts = buildOriginalMetaDataContexts();
MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics());
Map<StorageNode, DataSource> newDataSources = new HashMap<>(toBeUpdatedProps.size());
try {
SwitchingResource switchingResource = metaDataContextManager.getResourceSwitchManager()
Expand All @@ -170,7 +168,7 @@ public void alterStorageUnits(final String databaseName, final Map<String, DataS
@Override
public void unregisterStorageUnits(final String databaseName, final Collection<String> toBeDroppedStorageUnitNames) throws SQLException {
for (String each : getToBeDroppedResourceNames(databaseName, toBeDroppedStorageUnitNames)) {
MetaDataContexts originalMetaDataContexts = buildOriginalMetaDataContexts();
MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics());
SwitchingResource switchingResource = metaDataContextManager.getResourceSwitchManager()
.createByUnregisterStorageUnit(originalMetaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), Collections.singletonList(each));
MetaDataContexts reloadMetaDataContexts = new MetaDataContextsFactory(metaDataPersistService, metaDataContextManager.getComputeNodeInstanceContext()).createBySwitchResource(
Expand Down Expand Up @@ -224,7 +222,7 @@ public void alterRuleConfiguration(final String databaseName, final RuleConfigur
if (null == toBeAlteredRuleConfig) {
return;
}
MetaDataContexts originalMetaDataContexts = buildOriginalMetaDataContexts();
MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics());
Collection<MetaDataVersion> metaDataVersions = metaDataPersistService.getDatabaseRulePersistService().persist(databaseName, Collections.singleton(toBeAlteredRuleConfig));
metaDataPersistService.getMetaDataVersionPersistService().switchActiveVersion(metaDataVersions);
afterRuleConfigurationAltered(databaseName, originalMetaDataContexts);
Expand All @@ -247,7 +245,7 @@ public void removeRuleConfigurationItem(final String databaseName, final RuleCon

@Override
public void removeRuleConfiguration(final String databaseName, final String ruleName) {
MetaDataContexts originalMetaDataContexts = buildOriginalMetaDataContexts();
MetaDataContexts originalMetaDataContexts = new MetaDataContexts(metaDataContextManager.getMetaDataContexts().getMetaData(), metaDataContextManager.getMetaDataContexts().getStatistics());
metaDataPersistService.getDatabaseRulePersistService().delete(databaseName, ruleName);
afterRuleConfigurationDropped(databaseName, originalMetaDataContexts);
}
Expand All @@ -269,10 +267,4 @@ public void alterGlobalRuleConfiguration(final RuleConfiguration toBeAlteredRule
public void alterProperties(final Properties props) {
metaDataPersistService.getPropsService().persist(props);
}

private MetaDataContexts buildOriginalMetaDataContexts() {
ShardingSphereMetaData originalMetaData = metaDataContextManager.getMetaDataContexts().getMetaData();
ShardingSphereStatistics originalStatistics = metaDataContextManager.getMetaDataContexts().getStatistics();
return new MetaDataContexts(originalMetaData, originalStatistics);
}
}