[shardingsphere] branch master updated: Add back CatalogSwitchableDataSource.url (#28010)

[panjuan]

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 9ef8ba950d7 Add back CatalogSwitchableDataSource.url (#28010)
9ef8ba950d7 is described below

commit 9ef8ba950d7b53b26283f6718d2ab67eeedf8795
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Aug 10 14:36:45 2023 +0800

    Add back CatalogSwitchableDataSource.url (#28010)
---
 .../infra/metadata/database/resource/StorageUnitMetaData.java          | 2 +-
 .../shardingsphere/infra/datasource/CatalogSwitchableDataSource.java   | 3 +++
 .../shardingsphere/infra/datasource/storage/StorageResource.java       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/StorageUnitMetaData.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/StorageUnitMetaData.java
index 954dab82104..f7196b8488b 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/StorageUnitMetaData.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/StorageUnitMetaData.java
@@ -68,7 +68,7 @@ public final class StorageUnitMetaData {
         Map<String, DataSource> result = new 
LinkedHashMap<>(storageUnits.size(), 1F);
         for (Entry<String, StorageUnitNodeMapper> entry : 
storageUnits.entrySet()) {
             DataSource dataSource = 
storageNodes.get(entry.getValue().getNodeName());
-            result.put(entry.getKey(), new 
CatalogSwitchableDataSource(dataSource, entry.getValue().getCatalog()));
+            result.put(entry.getKey(), new 
CatalogSwitchableDataSource(dataSource, entry.getValue().getCatalog(), 
entry.getValue().getUrl()));
         }
         return result;
     }
diff --git 
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/CatalogSwitchableDataSource.java
 
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/CatalogSwitchableDataSource.java
index 2b21307ad8d..527855b0d2f 100644
--- 
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/CatalogSwitchableDataSource.java
+++ 
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/CatalogSwitchableDataSource.java
@@ -38,6 +38,9 @@ public final class CatalogSwitchableDataSource implements 
DataSource, AutoClosea
     
     private final String catalog;
     
+    @Getter
+    private final String url;
+    
     @Override
     public Connection getConnection() throws SQLException {
         Connection result = dataSource.getConnection();
diff --git 
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/storage/StorageResource.java
 
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/storage/StorageResource.java
index a4ba58bbbf9..5d708acac26 100644
--- 
a/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/storage/StorageResource.java
+++ 
b/infra/datasource/core/src/main/java/org/apache/shardingsphere/infra/datasource/storage/StorageResource.java
@@ -48,7 +48,7 @@ public class StorageResource {
         for (Entry<String, StorageUnitNodeMapper> entry : 
storageUnitNodeMappers.entrySet()) {
             DataSource dataSource = 
storageNodes.get(entry.getValue().getNodeName());
             if (null != dataSource) {
-                result.put(entry.getKey(), new 
CatalogSwitchableDataSource(dataSource, entry.getValue().getCatalog()));
+                result.put(entry.getKey(), new 
CatalogSwitchableDataSource(dataSource, entry.getValue().getCatalog(), 
entry.getValue().getUrl()));
             }
         }
         return result;