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/04 13:48:49 UTC

(shardingsphere) branch master updated: Refactor MySQLContainerConfigurationFactory (#36471)

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 692145b71eb Refactor MySQLContainerConfigurationFactory (#36471)
692145b71eb is described below

commit 692145b71ebb56d245622e0bc5baf425019be88e
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Sep 4 21:48:42 2025 +0800

    Refactor MySQLContainerConfigurationFactory (#36471)
---
 .../dialect/H2ContainerConfigurationFactory.java   | 19 +++++++----
 .../MySQLContainerConfigurationFactory.java        | 38 +++++++++++-----------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/H2ContainerConfigurationFactory.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/H2ContainerConfigurationFactory.java
index e5ecd627303..58259d3ef0d 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/H2ContainerConfigurationFactory.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/H2ContainerConfigurationFactory.java
@@ -44,8 +44,7 @@ public final class H2ContainerConfigurationFactory {
      * @return created instance
      */
     public static StorageContainerConfiguration newInstance() {
-        Map<String, String> mountedResources = new HashMap<>(1, 1F);
-        mountedResources.put("/env/mysql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
+        Map<String, String> mountedResources = getMountedResources();
         return new StorageContainerConfiguration("", Collections.emptyMap(), mountedResources, Collections.emptyMap(), Collections.emptyMap());
     }
     
@@ -56,10 +55,18 @@ public final class H2ContainerConfigurationFactory {
      * @return created instance
      */
     public static StorageContainerConfiguration newInstance(final String scenario) {
-        Map<String, String> mountedResources = new HashMap<>(2, 1F);
-        mountedResources.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, DATABASE_TYPE) + "/01-actual-init.sql", "/docker-entrypoint-initdb.d/01-actual-init.sql");
-        mountedResources.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, DATABASE_TYPE) + "/01-expected-init.sql", "/docker-entrypoint-initdb.d/01-expected-init.sql");
-        return new StorageContainerConfiguration(scenario, "", Collections.emptyMap(), mountedResources,
+        return new StorageContainerConfiguration(scenario, "", Collections.emptyMap(), getMountedResources(scenario),
                 DatabaseEnvironmentManager.getDatabaseTypes(scenario, DATABASE_TYPE), DatabaseEnvironmentManager.getExpectedDatabaseTypes(scenario, DATABASE_TYPE));
     }
+    
+    private static Map<String, String> getMountedResources() {
+        return Collections.singletonMap("/env/mysql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
+    }
+    
+    private static Map<String, String> getMountedResources(final String scenario) {
+        Map<String, String> result = new HashMap<>(2, 1F);
+        result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, DATABASE_TYPE) + "/01-actual-init.sql", "/docker-entrypoint-initdb.d/01-actual-init.sql");
+        result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, DATABASE_TYPE) + "/01-expected-init.sql", "/docker-entrypoint-initdb.d/01-expected-init.sql");
+        return result;
+    }
 }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/MySQLContainerConfigurationFactory.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/MySQLContainerConfigurationFactory.java
index a757d7727f1..c7ca0f86e7f 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/MySQLContainerConfigurationFactory.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/MySQLContainerConfigurationFactory.java
@@ -41,6 +41,15 @@ public final class MySQLContainerConfigurationFactory {
     
     private static final DatabaseType DATABASE_TYPE = TypedSPILoader.getService(DatabaseType.class, "MySQL");
     
+    /**
+     * Create new instance of MySQL container configuration.
+     *
+     * @return created instance
+     */
+    public static StorageContainerConfiguration newInstance() {
+        return new StorageContainerConfiguration(getCommand(), getContainerEnvironments(), getMountedResources(), Collections.emptyMap(), Collections.emptyMap());
+    }
+    
     /**
      * Create new instance of MySQL container configuration.
      *
@@ -62,15 +71,6 @@ public final class MySQLContainerConfigurationFactory {
         return new StorageContainerConfiguration(getCommand(), getContainerEnvironments(), getMountedResources(majorVersion), Collections.emptyMap(), Collections.emptyMap());
     }
     
-    /**
-     * Create new instance of MySQL container configuration.
-     *
-     * @return created instance
-     */
-    public static StorageContainerConfiguration newInstance() {
-        return new StorageContainerConfiguration(getCommand(), getContainerEnvironments(), getMountedResources(), Collections.emptyMap(), Collections.emptyMap());
-    }
-    
     private static String getCommand() {
         return "--server-id=" + ContainerUtils.generateMySQLServerId();
     }
@@ -82,6 +82,16 @@ public final class MySQLContainerConfigurationFactory {
         return result;
     }
     
+    private static Map<String, String> getMountedResources() {
+        Map<String, String> result = new HashMap<>(1, 1F);
+        String path = "env/mysql/01-initdb.sql";
+        URL url = Thread.currentThread().getContextClassLoader().getResource(path);
+        if (null != url) {
+            result.put(path, "/docker-entrypoint-initdb.d/01-initdb.sql");
+        }
+        return result;
+    }
+    
     private static Map<String, String> getMountedResources(final String scenario) {
         Map<String, String> result = new HashMap<>(3, 1F);
         result.put(new ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, DATABASE_TYPE) + "/01-actual-init.sql", "/docker-entrypoint-initdb.d/01-actual-init.sql");
@@ -99,14 +109,4 @@ public final class MySQLContainerConfigurationFactory {
         }
         return result;
     }
-    
-    private static Map<String, String> getMountedResources() {
-        Map<String, String> result = new HashMap<>(1, 1F);
-        String path = "env/mysql/01-initdb.sql";
-        URL url = Thread.currentThread().getContextClassLoader().getResource(path);
-        if (null != url) {
-            result.put(path, "/docker-entrypoint-initdb.d/01-initdb.sql");
-        }
-        return result;
-    }
 }