This is an automated email from the ASF dual-hosted git repository.
panjuan 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 ddc6db98e96 Convert
StorageResourceCreator.getStorageNodeDataSourcePoolProperties() (#28595)
ddc6db98e96 is described below
commit ddc6db98e96707dfe9b6fc37acf2eb4cefed00cf
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 26 22:29:49 2023 +0800
Convert StorageResourceCreator.getStorageNodeDataSourcePoolProperties()
(#28595)
---
.../database/resource/StorageResourceCreator.java | 6 +++---
.../manager/switcher/NewResourceSwitchManager.java | 8 ++++----
.../manager/switcher/ResourceSwitchManager.java | 22 +++++++++++-----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/StorageResourceCreator.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/StorageResourceCreator.java
index fd8c98d429d..70ed45e9df4 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/StorageResourceCreator.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/StorageResourceCreator.java
@@ -113,8 +113,8 @@ public final class StorageResourceCreator {
* @param storageUnitDataSourcePoolProps storage unit grouped data source
pool properties map
* @return storage node grouped data source pool properties map
*/
- public static Map<String, DataSourcePoolProperties>
getStorageNodeDataSourcePoolProperties(final Map<String,
DataSourcePoolProperties> storageUnitDataSourcePoolProps) {
- Map<String, DataSourcePoolProperties> result = new LinkedHashMap<>();
+ public static Map<StorageNode, DataSourcePoolProperties>
getStorageNodeDataSourcePoolProperties(final Map<String,
DataSourcePoolProperties> storageUnitDataSourcePoolProps) {
+ Map<StorageNode, DataSourcePoolProperties> result = new
LinkedHashMap<>();
Collection<StorageNode> storageNodes = new HashSet<>();
for (Entry<String, DataSourcePoolProperties> entry :
storageUnitDataSourcePoolProps.entrySet()) {
Map<String, Object> standardProps =
entry.getValue().getConnectionPropertySynonyms().getStandardProperties();
@@ -122,7 +122,7 @@ public final class StorageResourceCreator {
boolean isInstanceConnectionAvailable = new
DatabaseTypeRegistry(DatabaseTypeFactory.get(url)).getDialectDatabaseMetaData().isInstanceConnectionAvailable();
StorageNode storageNode = new
StorageNode(getStorageNodeName(entry.getKey(), url,
standardProps.get("username").toString(), isInstanceConnectionAvailable));
if (storageNodes.add(storageNode)) {
- result.put(storageNode.getName(), entry.getValue());
+ result.put(storageNode, entry.getValue());
}
}
return result;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java
index 670f6af2caa..709c63526a1 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/switcher/NewResourceSwitchManager.java
@@ -55,11 +55,11 @@ public final class NewResourceSwitchManager {
private StorageResource getRegisterNewStorageResource(final
ResourceMetaData resourceMetaData,
final
StorageResource toBeCreatedStorageResource, final Map<String,
DataSourcePoolProperties> storageUnitDataSourcePoolProps) {
- Map<String, DataSourcePoolProperties> storageNodeDataSourcePoolProps =
StorageResourceCreator.getStorageNodeDataSourcePoolProperties(storageUnitDataSourcePoolProps);
+ Map<StorageNode, DataSourcePoolProperties>
storageNodeDataSourcePoolProps =
StorageResourceCreator.getStorageNodeDataSourcePoolProperties(storageUnitDataSourcePoolProps);
Map<StorageNode, DataSource> storageNodes = new
LinkedHashMap<>(toBeCreatedStorageResource.getDataSourceMap().size(), 1F);
for (StorageNode each :
toBeCreatedStorageResource.getDataSourceMap().keySet()) {
if (!resourceMetaData.getDataSourceMap().containsKey(each)) {
- storageNodes.put(each,
DataSourcePoolCreator.create(storageNodeDataSourcePoolProps.get(each.getName())));
+ storageNodes.put(each,
DataSourcePoolCreator.create(storageNodeDataSourcePoolProps.get(each)));
}
}
return new StorageResource(storageNodes,
toBeCreatedStorageResource.getStorageUnitNodeMappers());
@@ -81,10 +81,10 @@ public final class NewResourceSwitchManager {
}
private StorageResource getAlterNewStorageResource(final StorageResource
toBeAlteredStorageResource, final Map<String, DataSourcePoolProperties>
storageUnitDataSourcePoolProps) {
- Map<String, DataSourcePoolProperties> storageNodeDataSourcePoolProps =
StorageResourceCreator.getStorageNodeDataSourcePoolProperties(storageUnitDataSourcePoolProps);
+ Map<StorageNode, DataSourcePoolProperties>
storageNodeDataSourcePoolProps =
StorageResourceCreator.getStorageNodeDataSourcePoolProperties(storageUnitDataSourcePoolProps);
Map<StorageNode, DataSource> storageNodes = new
LinkedHashMap<>(toBeAlteredStorageResource.getDataSourceMap().size(), 1F);
for (StorageNode each :
toBeAlteredStorageResource.getDataSourceMap().keySet()) {
- storageNodes.put(each,
DataSourcePoolCreator.create(storageNodeDataSourcePoolProps.get(each.getName())));
+ storageNodes.put(each,
DataSourcePoolCreator.create(storageNodeDataSourcePoolProps.get(each)));
}
return new StorageResource(storageNodes,
toBeAlteredStorageResource.getStorageUnitNodeMappers());
}
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 fc731013529..14bd8691222 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
@@ -94,15 +94,15 @@ public final class ResourceSwitchManager {
private StorageResource createNewStorageResource(final ResourceMetaData
resourceMetaData,
final StorageResource
toBeChangedStorageResource, final Map<String, DataSourcePoolProperties>
storageUnitDataSourcePoolProps) {
- Map<String, DataSourcePoolProperties> storageNodeDataSourcePoolProps =
StorageResourceCreator.getStorageNodeDataSourcePoolProperties(storageUnitDataSourcePoolProps);
+ Map<StorageNode, DataSourcePoolProperties>
storageNodeDataSourcePoolProps =
StorageResourceCreator.getStorageNodeDataSourcePoolProperties(storageUnitDataSourcePoolProps);
Map<StorageNode, DataSource> storageNodes =
getNewStorageNodes(resourceMetaData,
toBeChangedStorageResource.getDataSourceMap(), storageNodeDataSourcePoolProps);
Map<String, StorageUnitNodeMapper> storageUnitNodeMappers =
getNewStorageUnitNodeMappers(resourceMetaData,
toBeChangedStorageResource.getStorageUnitNodeMappers());
return new StorageResource(storageNodes, storageUnitNodeMappers);
}
- private Map<StorageNode, DataSource> getNewStorageNodes(final
ResourceMetaData resourceMetaData,
- final
Map<StorageNode, DataSource> toBeChangedStorageNodes, final Map<String,
DataSourcePoolProperties> propsMap) {
+ private Map<StorageNode, DataSource> getNewStorageNodes(final
ResourceMetaData resourceMetaData, final Map<StorageNode, DataSource>
toBeChangedStorageNodes,
+ final
Map<StorageNode, DataSourcePoolProperties> propsMap) {
Map<StorageNode, DataSource> result = new
LinkedHashMap<>(resourceMetaData.getDataSourceMap());
result.keySet().removeAll(getToBeDeletedDataSources(resourceMetaData.getDataSourceMap(),
toBeChangedStorageNodes.keySet()).keySet());
result.putAll(getChangedDataSources(resourceMetaData.getDataSourceMap(),
toBeChangedStorageNodes, propsMap));
@@ -119,12 +119,12 @@ public final class ResourceSwitchManager {
}
private Map<StorageNode, DataSource> getChangedDataSources(final
Map<StorageNode, DataSource> storageNodes,
- final
Map<StorageNode, DataSource> toBeChangedStorageNodes, final Map<String,
DataSourcePoolProperties> propsMap) {
+ final
Map<StorageNode, DataSource> toBeChangedStorageNodes, final Map<StorageNode,
DataSourcePoolProperties> propsMap) {
Collection<StorageNode> toBeChangedDataSourceNames =
toBeChangedStorageNodes.keySet().stream()
- .filter(each -> isModifiedDataSource(storageNodes, each,
propsMap.get(each.getName()))).collect(Collectors.toList());
+ .filter(each -> isModifiedDataSource(storageNodes, each,
propsMap.get(each))).collect(Collectors.toList());
Map<StorageNode, DataSource> result = new
LinkedHashMap<>(toBeChangedStorageNodes.size(), 1F);
for (StorageNode each : toBeChangedDataSourceNames) {
- result.put(each,
DataSourcePoolCreator.create(propsMap.get(each.getName())));
+ result.put(each, DataSourcePoolCreator.create(propsMap.get(each)));
}
return result;
}
@@ -134,11 +134,11 @@ public final class ResourceSwitchManager {
}
private Map<StorageNode, DataSource> getToBeAddedDataSources(final
Map<StorageNode, DataSource> storageNodes, final Map<StorageNode, DataSource>
toBeChangedStorageNodes,
- final
Map<String, DataSourcePoolProperties> propsMap) {
+ final
Map<StorageNode, DataSourcePoolProperties> propsMap) {
Collection<StorageNode> toBeAddedDataSourceNames =
toBeChangedStorageNodes.keySet().stream().filter(each ->
!storageNodes.containsKey(each)).collect(Collectors.toList());
Map<StorageNode, DataSource> result = new LinkedHashMap<>();
for (StorageNode each : toBeAddedDataSourceNames) {
- result.put(each,
DataSourcePoolCreator.create(propsMap.get(each.getName())));
+ result.put(each, DataSourcePoolCreator.create(propsMap.get(each)));
}
return result;
}
@@ -165,10 +165,10 @@ public final class ResourceSwitchManager {
return new StorageResource(storageNodes, storageUnitNodeMappers);
}
- private Map<StorageNode, DataSource> getToBeChangedDataSources(final
Map<StorageNode, DataSource> storageNodes, final Map<String,
DataSourcePoolProperties> propsMap) {
+ private Map<StorageNode, DataSource> getToBeChangedDataSources(final
Map<StorageNode, DataSource> storageNodes, final Map<StorageNode,
DataSourcePoolProperties> propsMap) {
Map<StorageNode, DataSource> result = new
LinkedHashMap<>(storageNodes.size(), 1F);
- for (Entry<String, DataSourcePoolProperties> entry :
propsMap.entrySet()) {
- StorageNode storageNode = new StorageNode(entry.getKey());
+ for (Entry<StorageNode, DataSourcePoolProperties> entry :
propsMap.entrySet()) {
+ StorageNode storageNode = entry.getKey();
if (isModifiedDataSource(storageNodes, storageNode,
entry.getValue())) {
result.put(storageNode, storageNodes.get(storageNode));
}
