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/07 02:33:50 UTC

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

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 b44494ce392 Refactor StorageContainerConfigurationFactory (#36497)
b44494ce392 is described below

commit b44494ce392021ae26519581c5164812caa5f038
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Sep 7 10:33:45 2025 +0800

    Refactor StorageContainerConfigurationFactory (#36497)
    
    * Refactor StorageContainerConfigurationFactory
    
    * Refactor StorageContainerConfigurationFactory
    
    * Refactor StorageContainerConfigurationFactory
    
    * Refactor StorageContainerConfigurationFactory
---
 .../StorageContainerConfigurationFactory.java      | 52 ++++++++++++++++++++--
 .../StorageContainerConfigurationOption.java       | 15 +++++++
 .../H2StorageContainerConfigurationOption.java     | 11 +++++
 .../HiveStorageContainerConfigurationOption.java   | 15 ++++++-
 ...MariaDBStorageContainerConfigurationOption.java | 16 +++++--
 .../MySQLStorageContainerConfigurationOption.java  | 30 ++++++-------
 ...enGaussStorageContainerConfigurationOption.java | 24 ++++++----
 ...tgreSQLStorageContainerConfigurationOption.java | 20 ++++++---
 .../test/resources/container/mariadb/cnf/my.cnf    | 34 ++++++++++++++
 .../container/opengauss/cnf/postgresql.conf        | 26 +++++++++++
 .../createtable/CreateTableSQLGeneratorIT.java     |  2 +-
 .../container/compose/DockerContainerComposer.java |  2 +-
 .../resources/env/container/mysql/cnf/5/my.cnf     | 31 +++++++++++++
 .../resources/env/container/mysql/cnf/8/my.cnf     | 34 ++++++++++++++
 14 files changed, 271 insertions(+), 41 deletions(-)

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 4228fb7846d..3a32a2be67b 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
@@ -24,7 +24,10 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.op
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
 
 /**
  * Storage container configuration factory.
@@ -36,11 +39,13 @@ public final class StorageContainerConfigurationFactory {
      * Create new instance of storage container configuration.
      *
      * @param option storage container configuration option
+     * @param databaseType database type
      * @param majorVersion majorVersion
      * @return created storage container configuration
      */
-    public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final int majorVersion) {
-        return new StorageContainerConfiguration(option.getCommand(), option.getContainerEnvironments(), option.getMountedResources(majorVersion), Collections.emptyMap(), Collections.emptyMap());
+    public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final int majorVersion) {
+        Map<String, String> mountedResources = getMountedResources(databaseType, option, majorVersion, "", option.getMountedResources(majorVersion));
+        return new StorageContainerConfiguration(option.getCommand(), option.getContainerEnvironments(), mountedResources, Collections.emptyMap(), Collections.emptyMap());
     }
     
     /**
@@ -54,8 +59,47 @@ public final class StorageContainerConfigurationFactory {
     public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final String scenario) {
         Map<String, DatabaseType> databaseTypes = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType);
         Map<String, DatabaseType> expectedDatabaseTypes = DatabaseEnvironmentManager.getExpectedDatabaseTypes(scenario, databaseType);
+        Map<String, String> mountedResources = getMountedResources(databaseType, option, 0, scenario, option.getMountedResources(scenario));
         return option.isEmbeddedStorageContainer()
-                ? new StorageContainerConfiguration(scenario, option.getCommand(), option.getContainerEnvironments(), option.getMountedResources(scenario), databaseTypes, expectedDatabaseTypes)
-                : new StorageContainerConfiguration(option.getCommand(), option.getContainerEnvironments(), option.getMountedResources(scenario), databaseTypes, expectedDatabaseTypes);
+                ? new StorageContainerConfiguration(scenario, option.getCommand(), option.getContainerEnvironments(), mountedResources, databaseTypes, expectedDatabaseTypes)
+                : new StorageContainerConfiguration(option.getCommand(), option.getContainerEnvironments(), mountedResources, databaseTypes, expectedDatabaseTypes);
+    }
+    
+    private static Map<String, String> getMountedResources(final DatabaseType databaseType, final StorageContainerConfigurationOption option, final int majorVersion, final String scenario,
+                                                           final Map<String, String> mountedResources) {
+        Map<String, String> mountConfigResources = getMountedResources(databaseType, option, majorVersion, scenario);
+        Map<String, String> result = new HashMap<>(mountConfigResources.size() + mountedResources.size(), 1F);
+        result.putAll(mountConfigResources);
+        result.putAll(mountedResources);
+        return result;
+    }
+    
+    private static Map<String, String> getMountedResources(final DatabaseType databaseType, final StorageContainerConfigurationOption option, final int majorVersion, final String scenario) {
+        Map<String, String> mountedConfigurationResources = option.getMountedConfigurationResources();
+        Map<String, String> result = new HashMap<>(mountedConfigurationResources.size(), 1F);
+        for (Entry<String, String> entry : mountedConfigurationResources.entrySet()) {
+            Optional<Integer> foundMajorVersion;
+            if (option.getSupportedMajorVersions().isEmpty()) {
+                foundMajorVersion = Optional.empty();
+            } else {
+                foundMajorVersion = Optional.of(option.getSupportedMajorVersions().stream().filter(optional -> optional == majorVersion).findAny().orElse(option.getSupportedMajorVersions().get(0)));
+            }
+            String configFilePath = foundMajorVersion.map(optional -> String.format("container/%s/cnf/%d/%s", databaseType.getType().toLowerCase(), optional, entry.getKey()))
+                    .orElseGet(() -> String.format("container/%s/cnf/%s", databaseType.getType().toLowerCase(), entry.getKey()));
+            result.put(getToBeMountedConfigurationFile(configFilePath, scenario), entry.getValue());
+        }
+        return result;
+    }
+    
+    private static String getToBeMountedConfigurationFile(final String toBeMountedConfigFile, final String scenario) {
+        String scenarioConfigFilePath = String.format("scenario/%s/%s", scenario, toBeMountedConfigFile);
+        if (null != Thread.currentThread().getContextClassLoader().getResource(scenarioConfigFilePath)) {
+            return "/" + scenarioConfigFilePath;
+        }
+        String envConfigFilePath = String.format("env/%s", toBeMountedConfigFile);
+        if (null != Thread.currentThread().getContextClassLoader().getResource(envConfigFilePath)) {
+            return "/" + envConfigFilePath;
+        }
+        return "/" + toBeMountedConfigFile;
     }
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java
index 0e6ec34adc2..b161252288a 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,6 +39,13 @@ public interface StorageContainerConfigurationOption {
      */
     Map<String, String> getContainerEnvironments();
     
+    /**
+     * Get mounted configuration resources.
+     *
+     * @return mounted configuration resources
+     */
+    Map<String, String> getMountedConfigurationResources();
+    
     /**
      * Get mounted resources.
      *
@@ -60,4 +68,11 @@ public interface StorageContainerConfigurationOption {
      * @return is embedded storage container or not
      */
     boolean isEmbeddedStorageContainer();
+    
+    /**
+     * Get supported major versions.
+     *
+     * @return supported major versions
+     */
+    List<Integer> getSupportedMajorVersions();
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java
index 09985a2b477..fe50139a2fc 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java
@@ -25,6 +25,7 @@ import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioData
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,6 +45,11 @@ public final class H2StorageContainerConfigurationOption implements StorageConta
         return Collections.emptyMap();
     }
     
+    @Override
+    public Map<String, String> getMountedConfigurationResources() {
+        return Collections.emptyMap();
+    }
+    
     @Override
     public Map<String, String> getMountedResources(final String scenario) {
         Map<String, String> result = new HashMap<>(2, 1F);
@@ -61,4 +67,9 @@ public final class H2StorageContainerConfigurationOption implements StorageConta
     public boolean isEmbeddedStorageContainer() {
         return true;
     }
+    
+    @Override
+    public List<Integer> getSupportedMajorVersions() {
+        return Collections.emptyList();
+    }
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java
index 1e51a3edf6e..becd3ee74bb 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java
@@ -25,7 +25,9 @@ import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioData
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
 
 import java.net.URL;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,12 +51,16 @@ public final class HiveStorageContainerConfigurationOption implements StorageCon
         return result;
     }
     
+    @Override
+    public Map<String, String> getMountedConfigurationResources() {
+        return Collections.singletonMap("hive-site.xml", HiveContainer.HIVE_CONF_IN_CONTAINER);
+    }
+    
     @Override
     public Map<String, String> getMountedResources(final String scenario) {
-        Map<String, String> result = new HashMap<>(4, 1F);
+        Map<String, String> result = new HashMap<>(2, 1F);
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, databaseType) + "/01-actual-init.sql", "/docker-entrypoint-initdb.d/01-actual-init.sql");
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, databaseType) + "/01-expected-init.sql", "/docker-entrypoint-initdb.d/01-expected-init.sql");
-        result.put("/container/hive/cnf/hive-site.xml", HiveContainer.HIVE_CONF_IN_CONTAINER);
         return result;
     }
     
@@ -73,4 +79,9 @@ public final class HiveStorageContainerConfigurationOption implements StorageCon
     public boolean isEmbeddedStorageContainer() {
         return false;
     }
+    
+    @Override
+    public List<Integer> getSupportedMajorVersions() {
+        return Collections.emptyList();
+    }
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
index 6a799f038d9..c93ce2a12e8 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
@@ -23,6 +23,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUti
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +44,11 @@ public final class MariaDBStorageContainerConfigurationOption implements Storage
         return result;
     }
     
+    @Override
+    public Map<String, String> getMountedConfigurationResources() {
+        return Collections.singletonMap("my.cnf", MySQLContainer.MYSQL_CONF_IN_CONTAINER);
+    }
+    
     @Override
     public Map<String, String> getMountedResources(final String scenario) {
         return Collections.emptyMap();
@@ -50,14 +56,16 @@ public final class MariaDBStorageContainerConfigurationOption implements Storage
     
     @Override
     public Map<String, String> getMountedResources(final int majorVersion) {
-        Map<String, String> result = new HashMap<>(2, 1F);
-        result.put("/container/mysql/cnf/8/my.cnf", MySQLContainer.MYSQL_CONF_IN_CONTAINER);
-        result.put("/env/mysql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
-        return result;
+        return Collections.singletonMap("/env/mysql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
     }
     
     @Override
     public boolean isEmbeddedStorageContainer() {
         return false;
     }
+    
+    @Override
+    public List<Integer> getSupportedMajorVersions() {
+        return Collections.emptyList();
+    }
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
index f25fff4bbe7..417a82d37c8 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
@@ -25,8 +25,10 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUti
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
 
-import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,29 +51,22 @@ public final class MySQLStorageContainerConfigurationOption implements StorageCo
         return result;
     }
     
+    @Override
+    public Map<String, String> getMountedConfigurationResources() {
+        return Collections.singletonMap("my.cnf", MySQLContainer.MYSQL_CONF_IN_CONTAINER);
+    }
+    
     @Override
     public Map<String, String> getMountedResources(final String scenario) {
-        Map<String, String> result = new HashMap<>(3, 1F);
+        Map<String, String> result = new HashMap<>(2, 1F);
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, databaseType) + "/01-actual-init.sql", "/docker-entrypoint-initdb.d/01-actual-init.sql");
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, databaseType) + "/01-expected-init.sql", "/docker-entrypoint-initdb.d/01-expected-init.sql");
-        URL url = Thread.currentThread().getContextClassLoader().getResource("env/mysql/8/my.cnf");
-        if (null != url) {
-            result.put("/env/mysql/8/my.cnf", MySQLContainer.MYSQL_CONF_IN_CONTAINER);
-        } else {
-            result.put("/container/mysql/cnf/8/my.cnf", MySQLContainer.MYSQL_CONF_IN_CONTAINER);
-        }
         return result;
     }
     
     @Override
     public Map<String, String> getMountedResources(final int majorVersion) {
-        Map<String, String> result = new HashMap<>(3, 1F);
-        URL url = Thread.currentThread().getContextClassLoader().getResource(String.format("env/mysql/%s/my.cnf", majorVersion));
-        if (null != url) {
-            result.put(String.format("/env/mysql/%s/my.cnf", majorVersion), MySQLContainer.MYSQL_CONF_IN_CONTAINER);
-        } else {
-            result.put(String.format("/container/mysql/cnf/%s/my.cnf", majorVersion), MySQLContainer.MYSQL_CONF_IN_CONTAINER);
-        }
+        Map<String, String> result = new HashMap<>(2, 1F);
         result.put("/env/mysql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
         if (majorVersion > 5) {
             result.put("/env/mysql/02-grant-xa-privilege.sql", "/docker-entrypoint-initdb.d/02-grant-xa-privilege.sql");
@@ -83,4 +78,9 @@ public final class MySQLStorageContainerConfigurationOption implements StorageCo
     public boolean isEmbeddedStorageContainer() {
         return false;
     }
+    
+    @Override
+    public List<Integer> getSupportedMajorVersions() {
+        return Arrays.asList(5, 8);
+    }
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
index d2dec9eaf73..549a824788e 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
@@ -27,6 +27,7 @@ import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioData
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -46,27 +47,34 @@ public final class OpenGaussStorageContainerConfigurationOption implements Stora
         return Collections.singletonMap("GS_PASSWORD", StorageContainerConstants.PASSWORD);
     }
     
+    @Override
+    public Map<String, String> getMountedConfigurationResources() {
+        Map<String, String> result = new HashMap<>(2, 1F);
+        result.put("postgresql.conf", OpenGaussContainer.OPENGAUSS_CONF_IN_CONTAINER);
+        result.put("pg_hba.conf", OpenGaussContainer.OPENGAUSS_HBA_IN_CONF_CONTAINER);
+        return result;
+    }
+    
     @Override
     public Map<String, String> getMountedResources(final String scenario) {
-        Map<String, String> result = new HashMap<>(4, 1F);
+        Map<String, String> result = new HashMap<>(2, 1F);
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, databaseType) + "/01-actual-init.sql", "/docker-entrypoint-initdb.d/01-actual-init.sql");
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, databaseType) + "/01-expected-init.sql", "/docker-entrypoint-initdb.d/01-expected-init.sql");
-        result.put("/container/postgresql/cnf/postgresql.conf", OpenGaussContainer.OPENGAUSS_CONF_IN_CONTAINER);
-        result.put("/container/opengauss/cnf/pg_hba.conf", OpenGaussContainer.OPENGAUSS_HBA_IN_CONF_CONTAINER);
         return result;
     }
     
     @Override
     public Map<String, String> getMountedResources(final int majorVersion) {
-        Map<String, String> result = new HashMap<>(3, 1F);
-        result.put("/env/opengauss/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
-        result.put("/container/postgresql/cnf/postgresql.conf", OpenGaussContainer.OPENGAUSS_CONF_IN_CONTAINER);
-        result.put("/container/opengauss/cnf/pg_hba.conf", OpenGaussContainer.OPENGAUSS_HBA_IN_CONF_CONTAINER);
-        return result;
+        return Collections.singletonMap("/env/opengauss/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
     }
     
     @Override
     public boolean isEmbeddedStorageContainer() {
         return false;
     }
+    
+    @Override
+    public List<Integer> getSupportedMajorVersions() {
+        return Collections.emptyList();
+    }
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
index 3404b44f03e..892f8f60be4 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
@@ -25,7 +25,9 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.Post
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -48,25 +50,31 @@ public final class PostgreSQLStorageContainerConfigurationOption implements Stor
         return result;
     }
     
+    @Override
+    public Map<String, String> getMountedConfigurationResources() {
+        return Collections.singletonMap("postgresql.conf", PostgreSQLContainer.POSTGRESQL_CONF_IN_CONTAINER);
+    }
+    
     @Override
     public Map<String, String> getMountedResources(final String scenario) {
-        Map<String, String> result = new HashMap<>(3, 1F);
+        Map<String, String> result = new HashMap<>(2, 1F);
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, databaseType) + "/01-actual-init.sql", "/docker-entrypoint-initdb.d/01-actual-init.sql");
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, databaseType) + "/01-expected-init.sql", "/docker-entrypoint-initdb.d/01-expected-init.sql");
-        result.put("/container/postgresql/cnf/postgresql.conf", PostgreSQLContainer.POSTGRESQL_CONF_IN_CONTAINER);
         return result;
     }
     
     @Override
     public Map<String, String> getMountedResources(final int majorVersion) {
-        Map<String, String> result = new HashMap<>(2, 1F);
-        result.put("/env/postgresql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
-        result.put("/container/postgresql/cnf/postgresql.conf", PostgreSQLContainer.POSTGRESQL_CONF_IN_CONTAINER);
-        return result;
+        return Collections.singletonMap("/env/postgresql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
     }
     
     @Override
     public boolean isEmbeddedStorageContainer() {
         return false;
     }
+    
+    @Override
+    public List<Integer> getSupportedMajorVersions() {
+        return Collections.emptyList();
+    }
 }
diff --git a/test/e2e/env/src/test/resources/container/mariadb/cnf/my.cnf b/test/e2e/env/src/test/resources/container/mariadb/cnf/my.cnf
new file mode 100644
index 00000000000..5afba273014
--- /dev/null
+++ b/test/e2e/env/src/test/resources/container/mariadb/cnf/my.cnf
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[mysql]
+
+[mysqld]
+character-set-server=utf8mb4
+collation-server=utf8mb4_general_ci
+log-bin=mysql-bin
+binlog-format=row
+binlog-row-image=full
+max_connections=600
+lower_case_table_names=1
+innodb_lock_wait_timeout=5
+default-time-zone='+00:00'
+default-authentication-plugin=mysql_native_password
+sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
+
+# For MySQL 8.0
+secure_file_priv=/var/lib/mysql
diff --git a/test/e2e/env/src/test/resources/container/opengauss/cnf/postgresql.conf b/test/e2e/env/src/test/resources/container/opengauss/cnf/postgresql.conf
new file mode 100644
index 00000000000..79974d0516e
--- /dev/null
+++ b/test/e2e/env/src/test/resources/container/opengauss/cnf/postgresql.conf
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+listen_addresses = '*'
+wal_level = logical
+wal_sender_timeout = 0
+max_connections = 600
+max_prepared_transactions = 600
+max_replication_slots = 10
+log_timezone = 'Asia/Shanghai'
+datestyle = 'iso, mdy'
+timezone = 'Asia/Shanghai'
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 dc021e09a3a..550d0c94977 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), majorVersion);
+        return StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, majorVersion);
     }
     
     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 8e19ea0b1b9..65462bec4f4 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,7 +66,7 @@ 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), majorVersion);
+            storageContainerConfig = StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, majorVersion);
             DockerStorageContainer storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage,
                     storageContainerConfig));
             storageContainer.setNetworkAliases(Collections.singletonList(String.join(".", databaseType.getType().toLowerCase() + "_" + i, "host")));
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/container/mysql/cnf/5/my.cnf b/test/e2e/operation/pipeline/src/test/resources/env/container/mysql/cnf/5/my.cnf
new file mode 100644
index 00000000000..5e034f5c393
--- /dev/null
+++ b/test/e2e/operation/pipeline/src/test/resources/env/container/mysql/cnf/5/my.cnf
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[mysql]
+
+[mysqld]
+character-set-server=utf8mb4
+collation-server=utf8mb4_general_ci
+log-bin=mysql-bin
+binlog-format=row
+binlog-row-image=full
+max_connections=600
+lower_case_table_names=1
+innodb_lock_wait_timeout=5
+default-time-zone='+00:00'
+default-authentication-plugin=mysql_native_password
+sql_mode=
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/container/mysql/cnf/8/my.cnf b/test/e2e/operation/pipeline/src/test/resources/env/container/mysql/cnf/8/my.cnf
new file mode 100644
index 00000000000..7bfabebe18a
--- /dev/null
+++ b/test/e2e/operation/pipeline/src/test/resources/env/container/mysql/cnf/8/my.cnf
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+[mysql]
+
+[mysqld]
+character-set-server=utf8mb4
+collation-server=utf8mb4_general_ci
+log-bin=mysql-bin
+binlog-format=row
+binlog-row-image=full
+max_connections=600
+lower_case_table_names=1
+innodb_lock_wait_timeout=5
+default-time-zone='+00:00'
+default-authentication-plugin=caching_sha2_password
+sql_mode=
+
+# For MySQL 8.0
+secure_file_priv=/var/lib/mysql