Refactor ShardingSphereDatabaseFactory (#34392)

* Refactor ShardingSphereDatabaseFactory * Refactor ShardingSphereDatabaseFactory
apache · Jan 18, 2025 · 670436a · 670436a
1 parent d3882cc
commit 670436a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 57 deletions.
diff --git a/...java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactory.java b/...java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactory.java
@@ -41,38 +41,6 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ShardingSphereDatabaseFactory {
 
-    /**
-     * Create database.
-     *
-     * @param databaseName database name
-     * @param databaseConfig database configuration
-     * @param props configuration properties
-     * @param computeNodeInstanceContext compute node instance context
-     * @return created database
-     * @throws SQLException SQL exception
-     */
-    public static ShardingSphereDatabase create(final String databaseName, final DatabaseConfiguration databaseConfig,
-                                                final ConfigurationProperties props, final ComputeNodeInstanceContext computeNodeInstanceContext) throws SQLException {
-        DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(databaseConfig, props);
-        return ShardingSphereDatabase.create(databaseName, protocolType, databaseConfig, props, computeNodeInstanceContext);
-    }
-
-    /**
-     * Create database.
-     *
-     * @param databaseName database name
-     * @param databaseConfig database configuration
-     * @param schemas schemas
-     * @param props configuration properties
-     * @param computeNodeInstanceContext compute node instance context
-     * @return created database
-     */
-    public static ShardingSphereDatabase create(final String databaseName, final DatabaseConfiguration databaseConfig, final Collection<ShardingSphereSchema> schemas,
-                                                final ConfigurationProperties props, final ComputeNodeInstanceContext computeNodeInstanceContext) {
-        DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(databaseConfig, props);
-        return ShardingSphereDatabase.create(databaseName, protocolType, databaseConfig, computeNodeInstanceContext, schemas);
-    }
-
     /**
      * Create databases.
      *
@@ -97,7 +65,7 @@ private static ShardingSphereDatabase create(final String databaseName, final Da
                                                  final ComputeNodeInstanceContext computeNodeInstanceContext) {
         return databaseConfig.getStorageUnits().isEmpty()
                 ? ShardingSphereDatabase.create(databaseName, protocolType, props)
-                : create(databaseName, databaseConfig, schemas, props, computeNodeInstanceContext);
+                : ShardingSphereDatabase.create(databaseName, DatabaseTypeEngine.getProtocolType(databaseConfig, props), databaseConfig, computeNodeInstanceContext, schemas);
     }
 
     /**

diff --git a/.../org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactoryTest.java b/.../org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactoryTest.java
@@ -20,41 +20,19 @@
 import org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
 import org.apache.shardingsphere.infra.config.database.impl.DataSourceProvidedDatabaseConfiguration;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
 class ShardingSphereDatabaseFactoryTest {
 
-    @Test
-    void assertCreateDatabase() throws SQLException {
-        DatabaseConfiguration databaseConfig = new DataSourceProvidedDatabaseConfiguration(Collections.emptyMap(), Collections.emptyList());
-        ShardingSphereDatabase actual = ShardingSphereDatabaseFactory.create("foo_db", databaseConfig, new ConfigurationProperties(new Properties()), mock(ComputeNodeInstanceContext.class));
-        assertThat(actual.getName(), is("foo_db"));
-        assertTrue(actual.getResourceMetaData().getStorageUnits().isEmpty());
-    }
-
-    @Test
-    void assertCreateDatabaseWithSchemas() {
-        ShardingSphereDatabase database = ShardingSphereDatabaseFactory.create(
-                "foo_db", mock(DatabaseConfiguration.class), Collections.emptyList(), new ConfigurationProperties(new Properties()), mock(ComputeNodeInstanceContext.class));
-        assertThat(database.getName(), is("foo_db"));
-        assertThat(database.getProtocolType(), is(TypedSPILoader.getService(DatabaseType.class, "MySQL")));
-        assertThat(database.getRuleMetaData().getRules().size(), is(1));
-        assertTrue(database.getAllSchemas().isEmpty());
-    }
-
     @Test
     void assertCreateDatabases() throws SQLException {
         DatabaseConfiguration databaseConfig = new DataSourceProvidedDatabaseConfiguration(Collections.emptyMap(), Collections.emptyList());

diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -24,6 +24,7 @@
 import org.apache.shardingsphere.infra.config.database.impl.DataSourceProvidedDatabaseConfiguration;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
 import org.apache.shardingsphere.infra.datasource.pool.config.DataSourceConfiguration;
 import org.apache.shardingsphere.infra.datasource.pool.destroyer.DataSourcePoolDestroyer;
 import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
@@ -253,8 +254,9 @@ private static ShardingSphereDatabase createChangedDatabase(final String databas
                                                                 final DatabaseConfiguration databaseConfig, final ConfigurationProperties props,
                                                                 final ComputeNodeInstanceContext instanceContext) throws SQLException {
         return internalLoadMetaData
-                ? ShardingSphereDatabaseFactory.create(databaseName, databaseConfig, persistService.getDatabaseMetaDataFacade().getSchema().load(databaseName), props, instanceContext)
-                : ShardingSphereDatabaseFactory.create(databaseName, databaseConfig, props, instanceContext);
+                ? ShardingSphereDatabase.create(databaseName, DatabaseTypeEngine.getProtocolType(databaseConfig, props),
+                        databaseConfig, instanceContext, persistService.getDatabaseMetaDataFacade().getSchema().load(databaseName))
+                : ShardingSphereDatabase.create(databaseName, DatabaseTypeEngine.getProtocolType(databaseConfig, props), databaseConfig, props, instanceContext);
     }
 
     private static ResourceMetaData getEffectiveResourceMetaData(final ShardingSphereDatabase database, final SwitchingResource resource) {