Refactor StorageUnit to use CatalogSwitchableDataSource only necessary (

#31737)
apache · Jun 17, 2024 · faf3f24 · faf3f24
1 parent 9485f48
commit faf3f24
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/...ain/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java b/...ain/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnit.java
@@ -57,8 +57,8 @@ public StorageUnit(final StorageNode storageNode, final DataSourcePoolProperties
         storageType = DatabaseTypeFactory.get(url);
         boolean isInstanceConnectionAvailable = new DatabaseTypeRegistry(DatabaseTypeFactory.get(url)).getDialectDatabaseMetaData().isInstanceConnectionAvailable();
         catalog = isInstanceConnectionAvailable ? new StandardJdbcUrlParser().parse(url).getDatabase() : null;
-        this.dataSource = new CatalogSwitchableDataSource(dataSource, catalog, url);
-        this.dataSourcePoolProperties = dataSourcePoolProps;
+        this.dataSource = isInstanceConnectionAvailable ? new CatalogSwitchableDataSource(dataSource, catalog, url) : dataSource;
+        dataSourcePoolProperties = dataSourcePoolProps;
         connectionProperties = createConnectionProperties(standardProps);
     }
 

diff --git a/...ardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java b/...ardingsphere/infra/config/database/impl/DataSourceGeneratedDatabaseConfigurationTest.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.infra.config.database.impl;
 
 import com.zaxxer.hikari.HikariDataSource;
-import org.apache.shardingsphere.infra.datasource.pool.CatalogSwitchableDataSource;
 import org.apache.shardingsphere.infra.datasource.pool.config.ConnectionConfiguration;
 import org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
 import org.apache.shardingsphere.infra.datasource.pool.config.PoolConfiguration;
@@ -43,8 +42,7 @@ class DataSourceGeneratedDatabaseConfigurationTest {
     void assertGetDataSources() {
         DataSourceGeneratedDatabaseConfiguration databaseConfig = createDataSourceGeneratedDatabaseConfiguration();
         DataSource dataSource = databaseConfig.getStorageUnits().get("normal_db").getDataSource();
-        assertTrue(dataSource instanceof CatalogSwitchableDataSource);
-        assertTrue(((CatalogSwitchableDataSource) dataSource).getDataSource() instanceof HikariDataSource);
+        assertTrue(dataSource instanceof HikariDataSource);
     }
 
     @Test
@@ -60,8 +58,7 @@ void assertGetStorageNodes() {
     void assertGetStorageUnits() {
         DataSourceGeneratedDatabaseConfiguration databaseConfig = createDataSourceGeneratedDatabaseConfiguration();
         DataSource dataSource = databaseConfig.getStorageUnits().get("normal_db").getDataSource();
-        assertTrue(dataSource instanceof CatalogSwitchableDataSource);
-        assertTrue(((CatalogSwitchableDataSource) dataSource).getDataSource() instanceof HikariDataSource);
+        assertTrue(dataSource instanceof HikariDataSource);
     }
 
     @Test

diff --git a/...hardingsphere/infra/config/database/impl/DataSourceProvidedDatabaseConfigurationTest.java b/...hardingsphere/infra/config/database/impl/DataSourceProvidedDatabaseConfigurationTest.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.infra.config.database.impl;
 
-import org.apache.shardingsphere.infra.datasource.pool.CatalogSwitchableDataSource;
 import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
 import org.apache.shardingsphere.infra.fixture.FixtureRuleConfiguration;
 import org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
@@ -38,8 +37,7 @@ class DataSourceProvidedDatabaseConfigurationTest {
     void assertGetDataSources() {
         DataSourceProvidedDatabaseConfiguration databaseConfig = createDataSourceProvidedDatabaseConfiguration();
         DataSource dataSource = databaseConfig.getStorageUnits().get("foo_ds").getDataSource();
-        assertTrue(dataSource instanceof CatalogSwitchableDataSource);
-        assertTrue(((CatalogSwitchableDataSource) dataSource).getDataSource() instanceof MockedDataSource);
+        assertTrue(dataSource instanceof MockedDataSource);
     }
 
     @Test
@@ -55,8 +53,7 @@ void assertGetStorageNodes() {
     void assertGetStorageUnits() {
         DataSourceProvidedDatabaseConfiguration databaseConfig = createDataSourceProvidedDatabaseConfiguration();
         DataSource dataSource = databaseConfig.getStorageUnits().get("foo_ds").getDataSource();
-        assertTrue(dataSource instanceof CatalogSwitchableDataSource);
-        assertTrue(((CatalogSwitchableDataSource) dataSource).getDataSource() instanceof MockedDataSource);
+        assertTrue(dataSource instanceof MockedDataSource);
     }
 
     @Test