You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/13 06:08:18 UTC

(shardingsphere) branch master updated: Refactor StorageContainerConfigurationFactory (#36553)

This is an automated email from the ASF dual-hosted git repository.

zhangliang 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 7f7f382e60d Refactor StorageContainerConfigurationFactory (#36553)
7f7f382e60d is described below

commit 7f7f382e60db2a84605d54b05e017f632f310791
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Sep 13 14:08:12 2025 +0800

    Refactor StorageContainerConfigurationFactory (#36553)
    
    * Fix javadoc on StorageContainerConfigurationOption
    
    * Refactor StorageContainerConfigurationFactory
    
    * Refactor StorageContainerConfigurationFactory
---
 .../e2e/agent/engine/env/AgentE2ETestEnvironment.java |  4 ++--
 .../config/StorageContainerConfigurationFactory.java  | 19 +++++++++----------
 .../cases/createtable/CreateTableSQLGeneratorIT.java  |  2 +-
 .../container/compose/DockerContainerComposer.java    |  6 +++---
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
index 6e1b0ae1f69..69f8f4426e6 100644
--- a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
+++ b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
@@ -118,7 +118,7 @@ public final class AgentE2ETestEnvironment {
         ShardingSphereProxyClusterContainer proxyContainer = new ShardingSphereProxyClusterContainer(databaseType, getAdaptorContainerConfiguration());
         proxyContainer.withLogConsumer(testConfig.isLogEnabled() ? this::collectLogs : null);
         MySQLContainer storageContainer = new MySQLContainer(
-                imageConfig.getMysqlImage(), StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, 5));
+                imageConfig.getMysqlImage(), StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, 5, null));
         proxyContainer.dependsOn(storageContainer);
         containers.registerContainer(storageContainer);
         GovernanceContainer governanceContainer = GovernanceContainerFactory.newInstance("ZooKeeper");
@@ -149,7 +149,7 @@ public final class AgentE2ETestEnvironment {
     private void createJDBCEnvironment(final Optional<DockerITContainer> agentPluginContainer) {
         containers = new ITContainers();
         MySQLContainer storageContainer = new MySQLContainer(imageConfig.getMysqlImage(),
-                StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, 5));
+                StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, 5, null));
         ShardingSphereJdbcAgentContainer jdbcAgentContainer = new ShardingSphereJdbcAgentContainer(
                 imageConfig.getJdbcProjectImage(), testConfig.getPluginType(), testConfig.isLogEnabled() ? this::collectLogs : null);
         jdbcAgentContainer.dependsOn(storageContainer);
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
index 84c64112984..73e08abd2df 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
@@ -53,13 +53,11 @@ public final class StorageContainerConfigurationFactory {
      *
      * @param option storage container configuration option
      * @param databaseType database type
-     * @param majorVersion majorVersion
+     * @param scenario scenario
      * @return created storage container configuration
      */
-    public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final int majorVersion) {
-        Map<String, String> toBeMountedConfigurationFiles = getToBeMountedConfigurationFiles(databaseType, option, majorVersion, "");
-        Map<String, String> toBeMountedSQLFiles = getToBeMountedSQLFiles(databaseType, option, majorVersion, "");
-        return new StorageContainerConfiguration(null, option, toBeMountedConfigurationFiles, toBeMountedSQLFiles, Collections.emptyMap(), Collections.emptyMap());
+    public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final String scenario) {
+        return newInstance(option, databaseType, 0, scenario);
     }
     
     /**
@@ -67,14 +65,15 @@ public final class StorageContainerConfigurationFactory {
      *
      * @param option storage container configuration option
      * @param databaseType database type
-     * @param scenario  scenario
+     * @param majorVersion majorVersion
+     * @param scenario scenario
      * @return created storage container configuration
      */
-    public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final String scenario) {
+    public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final int majorVersion, final String scenario) {
         Map<String, String> toBeMountedConfigurationFiles = getToBeMountedConfigurationFiles(databaseType, option, 0, scenario);
-        Map<String, String> toBeMountedSQLFiles = getToBeMountedSQLFiles(databaseType, option, 0, scenario);
-        Map<String, DatabaseType> actualDatabaseTypes = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.ACTUAL);
-        Map<String, DatabaseType> expectedDatabaseTypes = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.EXPECTED);
+        Map<String, String> toBeMountedSQLFiles = getToBeMountedSQLFiles(databaseType, option, majorVersion, scenario);
+        Map<String, DatabaseType> actualDatabaseTypes = null == scenario ? Collections.emptyMap() : DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.ACTUAL);
+        Map<String, DatabaseType> expectedDatabaseTypes = null == scenario ? Collections.emptyMap() : DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.EXPECTED);
         return new StorageContainerConfiguration(
                 option.isEmbeddedStorageContainer() ? scenario : null, option, toBeMountedConfigurationFiles, toBeMountedSQLFiles, actualDatabaseTypes, expectedDatabaseTypes);
     }
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index e81b5f93f8a..464173c0d15 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -102,7 +102,7 @@ class CreateTableSQLGeneratorIT {
     
     private StorageContainerConfiguration createStorageContainerConfiguration(final DatabaseType databaseType, final String storageContainerImage) {
         int majorVersion = new DockerImageVersion(storageContainerImage).getMajorVersion();
-        return StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, majorVersion);
+        return StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, majorVersion, null);
     }
     
     private void assertSQL(final Collection<String> actualSQL, final Collection<String> expectedSQL) {
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java
index 9a930d715f7..6004cde8cab 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -66,9 +66,9 @@ public final class DockerContainerComposer extends BaseContainerComposer {
         for (int i = 0; i < storageContainerCount; i++) {
             StorageContainerConfiguration storageContainerConfig;
             int majorVersion = databaseType instanceof MySQLDatabaseType ? new DockerImageVersion(storageContainerImage).getMajorVersion() : 0;
-            storageContainerConfig = StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, majorVersion);
-            DockerStorageContainer storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage,
-                    storageContainerConfig));
+            storageContainerConfig = StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, majorVersion, null);
+            DockerStorageContainer storageContainer = getContainers().registerContainer(
+                    (DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage, storageContainerConfig));
             storageContainer.setNetworkAliases(Collections.singletonList(String.join(".", databaseType.getType().toLowerCase() + "_" + i, "host")));
             storageContainers.add(storageContainer);
         }