You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wa...@apache.org on 2023/10/05 09:10:38 UTC
[shardingsphere] branch master updated: Remove twice CatalogSwitchableDataSource wrap on ResourceMetaData (#28643)
This is an automated email from the ASF dual-hosted git repository.
wangguangyuan 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 b5e7f6d3cec Remove twice CatalogSwitchableDataSource wrap on ResourceMetaData (#28643)
b5e7f6d3cec is described below
commit b5e7f6d3cec5dac1c848ffa9233a54609f38fdb8
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Oct 5 17:10:31 2023 +0800
Remove twice CatalogSwitchableDataSource wrap on ResourceMetaData (#28643)
---
.../infra/metadata/database/resource/ResourceMetaData.java | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
index f63d95511ad..f2b2139c113 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ResourceMetaData.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.infra.metadata.database.resource;
import lombok.Getter;
-import org.apache.shardingsphere.infra.datasource.pool.CatalogSwitchableDataSource;
import org.apache.shardingsphere.infra.datasource.pool.props.creator.DataSourcePoolPropertiesCreator;
import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
import org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
@@ -52,11 +51,7 @@ public final class ResourceMetaData {
Collectors.toMap(Entry::getKey, entry -> DataSourcePoolPropertiesCreator.create(entry.getValue()), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
storageUnits = new LinkedHashMap<>();
for (Entry<String, StorageNode> entry : storageNodes.entrySet()) {
- DataSource dataSource = dataSources.get(entry.getValue().getName().getName());
- if (!(dataSource instanceof CatalogSwitchableDataSource)) {
- dataSource = new CatalogSwitchableDataSource(dataSource, entry.getValue().getCatalog(), entry.getValue().getUrl());
- }
- storageUnits.put(entry.getKey(), new StorageUnit(null, entry.getValue(), dataSourcePoolPropsMap.get(entry.getKey()), dataSource));
+ storageUnits.put(entry.getKey(), new StorageUnit(null, entry.getValue(), dataSourcePoolPropsMap.get(entry.getKey()), dataSources.get(entry.getValue().getName().getName())));
}
}
@@ -65,11 +60,7 @@ public final class ResourceMetaData {
this.dataSources = dataSources;
storageUnits = new LinkedHashMap<>();
for (Entry<String, StorageNode> entry : storageNodes.entrySet()) {
- DataSource dataSource = dataSources.get(entry.getValue().getName());
- if (!(dataSource instanceof CatalogSwitchableDataSource)) {
- dataSource = new CatalogSwitchableDataSource(dataSource, entry.getValue().getCatalog(), entry.getValue().getUrl());
- }
- storageUnits.put(entry.getKey(), new StorageUnit(databaseName, entry.getValue(), dataSourcePoolPropsMap.get(entry.getKey()), dataSource));
+ storageUnits.put(entry.getKey(), new StorageUnit(databaseName, entry.getValue(), dataSourcePoolPropsMap.get(entry.getKey()), dataSources.get(entry.getValue().getName())));
}
}