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 StorageUnitManager #34550

Merged
merged 1 commit into from
Feb 1, 2025
Merged

Refactor StorageUnitManager #34550

Show file tree
Hide file tree
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
14 changes: 7 additions & 7 deletions ...ain/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ public final class StorageUnitManager {
* @param databaseName database name
* @param propsMap data source pool properties map
*/
public synchronized void registerStorageUnit(final String databaseName, final Map<String, DataSourcePoolProperties> propsMap) {
public synchronized void register(final String databaseName, final Map<String, DataSourcePoolProperties> propsMap) {
try {
closeStaleRules(databaseName);
SwitchingResource switchingResource = resourceSwitchManager.switchByRegisterStorageUnit(metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), propsMap);
buildNewMetaDataContext(databaseName, switchingResource);
} catch (final SQLException ex) {
log.error("Alter database: {} register storage unit failed", databaseName, ex);
log.error("Alter database: {} register storage unit failed.", databaseName, ex);
}
}

Expand All @@ -72,13 +72,13 @@ public synchronized void registerStorageUnit(final String databaseName, final Ma
* @param databaseName database name
* @param propsMap data source pool properties map
*/
public synchronized void alterStorageUnit(final String databaseName, final Map<String, DataSourcePoolProperties> propsMap) {
public synchronized void alter(final String databaseName, final Map<String, DataSourcePoolProperties> propsMap) {
try {
closeStaleRules(databaseName);
SwitchingResource switchingResource = resourceSwitchManager.switchByAlterStorageUnit(metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), propsMap);
buildNewMetaDataContext(databaseName, switchingResource);
} catch (final SQLException ex) {
log.error("Alter database: {} register storage unit failed", databaseName, ex);
log.error("Alter database: {} alter storage unit failed.", databaseName, ex);
}
}

Expand All @@ -88,14 +88,14 @@ public synchronized void alterStorageUnit(final String databaseName, final Map<S
* @param databaseName database name
* @param storageUnitName storage unit name
*/
public synchronized void unregisterStorageUnit(final String databaseName, final String storageUnitName) {
public synchronized void unregister(final String databaseName, final String storageUnitName) {
try {
closeStaleRules(databaseName);
SwitchingResource switchingResource = resourceSwitchManager.switchByUnregisterStorageUnit(
metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), Collections.singletonList(storageUnitName));
metaDataContexts.getMetaData().getDatabase(databaseName).getResourceMetaData(), Collections.singleton(storageUnitName));
buildNewMetaDataContext(databaseName, switchingResource);
} catch (final SQLException ex) {
log.error("Alter database: {} register storage unit failed", databaseName, ex);
log.error("Alter database: {} register storage unit failed.", databaseName, ex);
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...de/manager/cluster/dispatch/handler/database/metadata/type/StorageUnitChangedHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public final class StorageUnitChangedHandler {
public void handleRegistered(final String databaseName, final String dataSourceUnitName, final DataChangedEvent event) {
ActiveVersionChecker.checkActiveVersion(contextManager, event);
DataSourcePoolProperties dataSourcePoolProps = contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getDataSourceUnitService().load(databaseName, dataSourceUnitName);
contextManager.getMetaDataContextManager().getStorageUnitManager().registerStorageUnit(databaseName, Collections.singletonMap(dataSourceUnitName, dataSourcePoolProps));
contextManager.getMetaDataContextManager().getStorageUnitManager().register(databaseName, Collections.singletonMap(dataSourceUnitName, dataSourcePoolProps));
}

/**
Expand All @@ -57,7 +57,7 @@ public void handleRegistered(final String databaseName, final String dataSourceU
public void handleAltered(final String databaseName, final String dataSourceUnitName, final DataChangedEvent event) {
ActiveVersionChecker.checkActiveVersion(contextManager, event);
DataSourcePoolProperties dataSourcePoolProps = contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getDataSourceUnitService().load(databaseName, dataSourceUnitName);
contextManager.getMetaDataContextManager().getStorageUnitManager().alterStorageUnit(databaseName, Collections.singletonMap(dataSourceUnitName, dataSourcePoolProps));
contextManager.getMetaDataContextManager().getStorageUnitManager().alter(databaseName, Collections.singletonMap(dataSourceUnitName, dataSourcePoolProps));
}

/**
Expand All @@ -68,6 +68,6 @@ public void handleAltered(final String databaseName, final String dataSourceUnit
*/
public void handleUnregistered(final String databaseName, final String dataSourceUnitName) {
Preconditions.checkState(contextManager.getMetaDataContexts().getMetaData().containsDatabase(databaseName), "No database '%s' exists.", databaseName);
contextManager.getMetaDataContextManager().getStorageUnitManager().unregisterStorageUnit(databaseName, dataSourceUnitName);
contextManager.getMetaDataContextManager().getStorageUnitManager().unregister(databaseName, dataSourceUnitName);
}
}
6 changes: 3 additions & 3 deletions ...e/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,21 +128,21 @@ void assertHandleStorageUnitRegistered() {
when(contextManager.getPersistServiceFacade().getRepository().query("key")).thenReturn("value");
when(contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getDataSourceUnitService().load("foo_db", "foo_unit")).thenReturn(mock(DataSourcePoolProperties.class));
handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/data_sources/units/foo_unit/active_version/0", "0", Type.ADDED));
verify(contextManager.getMetaDataContextManager().getStorageUnitManager()).registerStorageUnit(eq("foo_db"), any());
verify(contextManager.getMetaDataContextManager().getStorageUnitManager()).register(eq("foo_db"), any());
}

@Test
void assertHandleStorageUnitAltered() {
when(contextManager.getPersistServiceFacade().getRepository().query("key")).thenReturn("value");
when(contextManager.getPersistServiceFacade().getMetaDataPersistFacade().getDataSourceUnitService().load("foo_db", "foo_unit")).thenReturn(mock(DataSourcePoolProperties.class));
handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/data_sources/units/foo_unit/active_version/0", "0", Type.UPDATED));
verify(contextManager.getMetaDataContextManager().getStorageUnitManager()).alterStorageUnit(eq("foo_db"), any());
verify(contextManager.getMetaDataContextManager().getStorageUnitManager()).alter(eq("foo_db"), any());
}

@Test
void assertHandleStorageUnitUnregistered() {
when(contextManager.getMetaDataContexts().getMetaData().containsDatabase("foo_db")).thenReturn(true);
handler.handle("foo_db", new DataChangedEvent("/metadata/foo_db/data_sources/units/foo_unit", "", Type.DELETED));
verify(contextManager.getMetaDataContextManager().getStorageUnitManager()).unregisterStorageUnit("foo_db", "foo_unit");
verify(contextManager.getMetaDataContextManager().getStorageUnitManager()).unregister("foo_db", "foo_unit");
}
}