Refactor StorageUnitManager (#34552)

apache · Feb 1, 2025 · 2993864 · 2993864
1 parent fba994e
commit 2993864
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...ain/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManager.java b/...ain/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManager.java
@@ -60,7 +60,8 @@ public synchronized void register(final String databaseName, final Map<String, D
         ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
         try {
             closeStaleRules(database);
-            buildNewMetaDataContext(databaseName, resourceSwitchManager.switchByRegisterStorageUnit(database.getResourceMetaData(), propsMap));
+            SwitchingResource switchingResource = resourceSwitchManager.switchByRegisterStorageUnit(database.getResourceMetaData(), propsMap);
+            buildNewMetaDataContext(databaseName, switchingResource);
         } catch (final SQLException ex) {
             log.error("Alter database: {} register storage unit failed.", databaseName, ex);
         }
@@ -76,7 +77,8 @@ public synchronized void alter(final String databaseName, final Map<String, Data
         ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
         try {
             closeStaleRules(database);
-            buildNewMetaDataContext(databaseName, resourceSwitchManager.switchByAlterStorageUnit(database.getResourceMetaData(), propsMap));
+            SwitchingResource switchingResource = resourceSwitchManager.switchByAlterStorageUnit(database.getResourceMetaData(), propsMap);
+            buildNewMetaDataContext(databaseName, switchingResource);
         } catch (final SQLException ex) {
             log.error("Alter database: {} alter storage unit failed.", databaseName, ex);
         }
@@ -92,7 +94,8 @@ public synchronized void unregister(final String databaseName, final String stor
         ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
         try {
             closeStaleRules(database);
-            buildNewMetaDataContext(databaseName, resourceSwitchManager.switchByUnregisterStorageUnit(database.getResourceMetaData(), Collections.singleton(storageUnitName)));
+            SwitchingResource switchingResource = resourceSwitchManager.switchByUnregisterStorageUnit(database.getResourceMetaData(), Collections.singleton(storageUnitName));
+            buildNewMetaDataContext(databaseName, switchingResource);
         } catch (final SQLException ex) {
             log.error("Alter database: {} register storage unit failed.", databaseName, ex);
         }