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 158f9afa3d8 Refactor StorageUnitManager (#34550)
158f9afa3d8 is described below
commit 158f9afa3d848d91845b1628f4e0d8b452c1ca8c
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Feb 1 18:10:31 2025 +0800
Refactor StorageUnitManager (#34550)
---
.../mode/metadata/manager/resource/StorageUnitManager.java | 14 +++++++-------
.../database/metadata/type/StorageUnitChangedHandler.java | 6 +++---
.../database/metadata/MetaDataChangedHandlerTest.java | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManager.java
index 1619076cf14..259e60a1a98 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManager.java
@@ -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);
}
}
@@ -72,13 +72,13 @@ public final class StorageUnitManager {
* @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);
}
}
@@ -88,14 +88,14 @@ public final class StorageUnitManager {
* @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);
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageUnitChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageUnitChangedHandler.java
index bed4cc9c39f..656b3591876 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageUnitChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/type/StorageUnitChangedHandler.java
@@ -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));
}
/**
@@ -57,7 +57,7 @@ public final class StorageUnitChangedHandler {
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));
}
/**
@@ -68,6 +68,6 @@ public final class StorageUnitChangedHandler {
*/
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);
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
index 95cd004db07..3057d6e0cbe 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/database/metadata/MetaDataChangedHandlerTest.java
@@ -128,7 +128,7 @@ class MetaDataChangedHandlerTest {
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
@@ -136,13 +136,13 @@ class MetaDataChangedHandlerTest {
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");
}
}
