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 16:00:45 UTC

(shardingsphere) branch master updated: Add MountedConfigurationResourceGenerator (#36557)

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 3fdb0d5270d Add MountedConfigurationResourceGenerator (#36557)
3fdb0d5270d is described below

commit 3fdb0d5270d5f64d7b3a8798b47445b754d1bac0
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Sep 14 00:00:40 2025 +0800

    Add MountedConfigurationResourceGenerator (#36557)
    
    * Add MountedConfigurationResourceGenerator
    
    * Add MountedConfigurationResourceGenerator
---
 .../config/StorageContainerConfiguration.java      |  2 -
 .../StorageContainerConfigurationFactory.java      | 32 +---------
 .../MountedConfigurationResourceGenerator.java     | 70 ++++++++++++++++++++++
 .../StorageContainerConfigurationOption.java       |  7 ---
 .../H2StorageContainerConfigurationOption.java     |  5 --
 .../HiveStorageContainerConfigurationOption.java   |  5 --
 ...MariaDBStorageContainerConfigurationOption.java |  5 --
 .../MySQLStorageContainerConfigurationOption.java  |  5 --
 ...enGaussStorageContainerConfigurationOption.java |  5 --
 ...tgreSQLStorageContainerConfigurationOption.java |  5 --
 .../type/docker/DockerStorageContainer.java        |  3 +-
 11 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java
index 153b5deb218..f9a7bdb275c 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java
@@ -38,8 +38,6 @@ public final class StorageContainerConfiguration {
     
     private final StorageContainerConfigurationOption configurationOption;
     
-    private final Map<String, String> mountedConfigurationResources;
-    
     private final Collection<String> mountedSQLResources;
     
     private final Map<String, DatabaseType> actualDatabaseTypes;
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 c5ed9834d15..9c538ff9e8f 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
@@ -25,11 +25,9 @@ import org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.Database
 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.io.File;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Optional;
@@ -70,38 +68,10 @@ public final class StorageContainerConfigurationFactory {
      * @return created storage container configuration
      */
     public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final int majorVersion, final String scenario) {
-        Map<String, String> toBeMountedConfigurationFiles = getToBeMountedConfigurationFiles(databaseType, option, majorVersion, scenario);
         Collection<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);
-    }
-    
-    private static Map<String, String> getToBeMountedConfigurationFiles(final DatabaseType databaseType,
-                                                                        final StorageContainerConfigurationOption option, final int majorVersion, final String scenario) {
-        Collection<String> mountedConfigResources = option.getMountedConfigurationResources();
-        Map<String, String> result = new HashMap<>(mountedConfigResources.size(), 1F);
-        for (String each : mountedConfigResources) {
-            String fileName = new File(each).getName();
-            String configFile = findMajorVersion(option, majorVersion)
-                    .map(optional -> String.format("container/%s/cnf/%d/%s", databaseType.getType().toLowerCase(), optional, fileName))
-                    .orElseGet(() -> String.format("container/%s/cnf/%s", databaseType.getType().toLowerCase(), fileName));
-            result.put(getToBeMountedConfigurationFile(configFile, scenario), each);
-        }
-        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;
+        return new StorageContainerConfiguration(scenario, option, toBeMountedSQLFiles, actualDatabaseTypes, expectedDatabaseTypes);
     }
     
     private static Collection<String> getToBeMountedSQLFiles(final DatabaseType databaseType, final StorageContainerConfigurationOption option, final int majorVersion, final String scenario) {
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedConfigurationResourceGenerator.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedConfigurationResourceGenerator.java
new file mode 100644
index 00000000000..a905b2af0c7
--- /dev/null
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedConfigurationResourceGenerator.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mounted;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Mounted configuration resource generator.
+ */
+@RequiredArgsConstructor
+public final class MountedConfigurationResourceGenerator {
+    
+    private final StorageContainerConfigurationOption option;
+    
+    private final DatabaseType databaseType;
+    
+    /**
+     * Generate mounted configuration resource map.
+     *
+     * @param majorVersion major version
+     * @param scenario scenario
+     * @return generated resource map
+     */
+    public Map<String, String> generate(final int majorVersion, final String scenario) {
+        Collection<String> mountedConfigResources = option.getMountedConfigurationResources();
+        Map<String, String> result = new HashMap<>(mountedConfigResources.size(), 1F);
+        for (String each : mountedConfigResources) {
+            String fileName = new File(each).getName();
+            String configFile = option.getSupportedMajorVersions().isEmpty()
+                    ? String.format("container/%s/cnf/%s", databaseType.getType().toLowerCase(), fileName)
+                    : String.format("container/%s/cnf/%d/%s", databaseType.getType().toLowerCase(), majorVersion, fileName);
+            result.put(getToBeMountedConfigurationFile(configFile, scenario), each);
+        }
+        return result;
+    }
+    
+    private 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 efcd950623b..707619990f7 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
@@ -63,13 +63,6 @@ public interface StorageContainerConfigurationOption {
      */
     List<Integer> getSupportedMajorVersions();
     
-    /**
-     * Whether embedded storage container.
-     *
-     * @return is embedded storage container or not
-     */
-    boolean isEmbeddedStorageContainer();
-    
     /**
      * Whether with privileged mode.
      *
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 10d12798697..5bcc5776104 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
@@ -55,11 +55,6 @@ public final class H2StorageContainerConfigurationOption implements StorageConta
         return Collections.emptyList();
     }
     
-    @Override
-    public boolean isEmbeddedStorageContainer() {
-        return true;
-    }
-    
     @Override
     public boolean withPrivilegedMode() {
         return false;
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 d2b44f8be76..f3d49557714 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
@@ -60,11 +60,6 @@ public final class HiveStorageContainerConfigurationOption implements StorageCon
         return Collections.emptyList();
     }
     
-    @Override
-    public boolean isEmbeddedStorageContainer() {
-        return false;
-    }
-    
     @Override
     public boolean withPrivilegedMode() {
         return false;
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 689deae94a7..aaf5e0611e2 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
@@ -60,11 +60,6 @@ public final class MariaDBStorageContainerConfigurationOption implements Storage
         return Collections.emptyList();
     }
     
-    @Override
-    public boolean isEmbeddedStorageContainer() {
-        return false;
-    }
-    
     @Override
     public boolean withPrivilegedMode() {
         return false;
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 cfb286c0eea..487e7e497aa 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
@@ -66,11 +66,6 @@ public final class MySQLStorageContainerConfigurationOption implements StorageCo
         return Arrays.asList(8, 5);
     }
     
-    @Override
-    public boolean isEmbeddedStorageContainer() {
-        return false;
-    }
-    
     @Override
     public boolean withPrivilegedMode() {
         return false;
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 f95f455362b..ef6e162305b 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
@@ -57,11 +57,6 @@ public final class OpenGaussStorageContainerConfigurationOption implements Stora
         return Collections.emptyList();
     }
     
-    @Override
-    public boolean isEmbeddedStorageContainer() {
-        return false;
-    }
-    
     @Override
     public boolean withPrivilegedMode() {
         return true;
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 d2889893925..a9d5d50b383 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
@@ -60,11 +60,6 @@ public final class PostgreSQLStorageContainerConfigurationOption implements Stor
         return Collections.emptyList();
     }
     
-    @Override
-    public boolean isEmbeddedStorageContainer() {
-        return false;
-    }
-    
     @Override
     public boolean withPrivilegedMode() {
         return false;
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
index 3b1f2e9b913..797bdaed49d 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
@@ -24,6 +24,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer
 import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mounted.MountedConfigurationResourceGenerator;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.util.DockerImageVersion;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
 import org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
@@ -67,7 +68,7 @@ public abstract class DockerStorageContainer extends DockerITContainer implement
     protected final void configure() {
         setCommands();
         addEnvironments();
-        mapResources(storageContainerConfig.getMountedConfigurationResources());
+        mapResources(new MountedConfigurationResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(majorVersion, storageContainerConfig.getScenario()));
         mapResources(storageContainerConfig.getMountedSQLResourceMap());
         setPrivilegedMode();
         withExposedPorts(getExposedPort());