From 5cd660d1da9c8601ac41ed6f597706e1a28f29bf Mon Sep 17 00:00:00 2001
From: zhangliang <zhangliang@apache.org>
Date: Sat, 1 Feb 2025 18:26:10 +0800
Subject: [PATCH] Refactor StorageUnitManager

---
 .../metadata/manager/resource/StorageUnitManager.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 845304e07eced..176ffac152468 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
@@ -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);
         }