You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2023/10/07 12:43:26 UTC
[shardingsphere] branch master updated: Refactor ResourceSwitchManager (#28664)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 c2a5ec1da8a Refactor ResourceSwitchManager (#28664)
c2a5ec1da8a is described below
commit c2a5ec1da8a04fcb7dcd69d5e912cb6e03336f85
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Oct 7 20:43:19 2023 +0800
Refactor ResourceSwitchManager (#28664)
---
.../shardingsphere/mode/manager/switcher/ResourceSwitchManager.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
index 5a89e457c2a..73d33b7355e 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/ResourceSwitchManager.java
@@ -53,8 +53,9 @@ public final class ResourceSwitchManager {
mergedPropsMap.putAll(toBeChangedPropsMap);
Map<String, StorageNode> toBeChangedStorageUnitNodeMap = StorageUnitNodeMapCreator.create(toBeChangedPropsMap);
Map<StorageNode, DataSourcePoolProperties> dataSourcePoolPropsMap = StorageNodeAggregator.aggregateDataSourcePoolProperties(toBeChangedPropsMap);
- return new SwitchingResource(createNewDataSources(resourceMetaData, toBeChangedStorageUnitNodeMap, dataSourcePoolPropsMap),
- getStaleDataSources(resourceMetaData, mergedPropsMap), getStaleStorageUnitNames(resourceMetaData, toBeChangedStorageUnitNodeMap), mergedPropsMap);
+ Map<StorageNode, DataSource> newDataSources = createNewDataSources(resourceMetaData, toBeChangedStorageUnitNodeMap, dataSourcePoolPropsMap);
+ Map<StorageNode, DataSource> staleDataSources = getStaleDataSources(resourceMetaData, mergedPropsMap);
+ return new SwitchingResource(newDataSources, staleDataSources, getStaleStorageUnitNames(resourceMetaData, toBeChangedStorageUnitNodeMap), mergedPropsMap);
}
/**