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/16 05:55:35 UTC

(shardingsphere) branch master updated: Refactor EmbeddedStorageContainer (#36580)

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 5291aabc4e2 Refactor EmbeddedStorageContainer (#36580)
5291aabc4e2 is described below

commit 5291aabc4e2549434ab5d2d4cb153161c7a4333c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Sep 16 13:55:29 2025 +0800

    Refactor EmbeddedStorageContainer (#36580)
---
 .../type/embedded/EmbeddedStorageContainer.java    | 23 ++++++++--------------
 .../type/natived/NativeStorageContainer.java       |  4 ++--
 .../test/e2e/env/runtime/E2ETestEnvironment.java   | 10 +++++-----
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/embedded/EmbeddedStorageContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/embedded/EmbeddedStorageContainer.java
index 11aeef9d126..af0388b450d 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/embedded/EmbeddedStorageContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/embedded/EmbeddedStorageContainer.java
@@ -23,6 +23,7 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.EmbeddedITContain
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
 import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
 
@@ -51,25 +52,17 @@ public abstract class EmbeddedStorageContainer implements EmbeddedITContainer, S
     protected EmbeddedStorageContainer(final DatabaseType databaseType, final String scenario) {
         this.databaseType = databaseType;
         this.scenario = scenario;
-        actualDataSourceMap = createActualDataSourceMap();
-        expectedDataSourceMap = createExpectedDataSourceMap();
+        actualDataSourceMap = createDataSourceMap(Type.ACTUAL);
+        expectedDataSourceMap = createDataSourceMap(Type.EXPECTED);
     }
     
-    private Map<String, DataSource> createActualDataSourceMap() {
-        Collection<String> databaseNames = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.ACTUAL).entrySet().stream()
+    private Map<String, DataSource> createDataSourceMap(final Type type) {
+        E2ETestEnvironment env = E2ETestEnvironment.getInstance();
+        Collection<String> databaseNames = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, type).entrySet().stream()
                 .filter(entry -> entry.getValue().getClass().isAssignableFrom(databaseType.getClass())).map(Entry::getKey).collect(Collectors.toList());
         Map<String, DataSource> result = new LinkedHashMap<>(databaseNames.size(), 1F);
-        databaseNames.forEach(each -> result.put(each, StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType, null, 0, each),
-                "root", "Root@123")));
-        return result;
-    }
-    
-    private Map<String, DataSource> createExpectedDataSourceMap() {
-        Collection<String> databaseNames = DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.EXPECTED).entrySet().stream()
-                .filter(entry -> entry.getValue().getClass().isAssignableFrom(databaseType.getClass())).map(Entry::getKey).collect(Collectors.toList());
-        Map<String, DataSource> result = new LinkedHashMap<>(databaseNames.size(), 1F);
-        databaseNames.forEach(each -> result.put(each, StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType, null, 0, each),
-                "root", "Root@123")));
+        databaseNames.forEach(each -> result.put(each, StorageContainerUtils.generateDataSource(
+                DataSourceEnvironment.getURL(databaseType, env.getNativeStorageHost(), env.getNativeStoragePort(), each), env.getNativeStorageUsername(), env.getNativeStoragePassword())));
         return result;
     }
     
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java
index 5802fb3d025..8d0af4073c3 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/natived/NativeStorageContainer.java
@@ -73,7 +73,7 @@ public final class NativeStorageContainer implements StorageContainer {
     
     private void initDatabase() {
         DataSource dataSource = StorageContainerUtils.generateDataSource(
-                DataSourceEnvironment.getURL(databaseType, E2ETestEnvironment.getInstance().getNativeStorageHost(), Integer.parseInt(E2ETestEnvironment.getInstance().getNativeStoragePort())),
+                DataSourceEnvironment.getURL(databaseType, E2ETestEnvironment.getInstance().getNativeStorageHost(), E2ETestEnvironment.getInstance().getNativeStoragePort()),
                 E2ETestEnvironment.getInstance().getNativeStorageUsername(), E2ETestEnvironment.getInstance().getNativeStoragePassword());
         new MountSQLResourceGenerator(option, databaseType).generate(0, scenario).keySet().forEach(each -> SQLScriptUtils.execute(dataSource, each));
     }
@@ -89,7 +89,7 @@ public final class NativeStorageContainer implements StorageContainer {
         Map<String, DataSource> result = new HashMap<>(databaseNames.size(), 1F);
         for (String each : databaseNames) {
             DataSource dataSource = StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType, E2ETestEnvironment.getInstance().getNativeStorageHost(),
-                    Integer.parseInt(E2ETestEnvironment.getInstance().getNativeStoragePort()), each),
+                    E2ETestEnvironment.getInstance().getNativeStoragePort(), each),
                     E2ETestEnvironment.getInstance().getNativeStorageUsername(), E2ETestEnvironment.getInstance().getNativeStoragePassword());
             result.put(each, dataSource);
         }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index 70c47dca835..b2411b32883 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -50,7 +50,7 @@ public final class E2ETestEnvironment {
     
     private final String nativeStorageHost;
     
-    private final String nativeStoragePort;
+    private final int nativeStoragePort;
     
     private final String nativeStorageUsername;
     
@@ -64,10 +64,10 @@ public final class E2ETestEnvironment {
         scenarios = getScenarios(props);
         smoke = Boolean.parseBoolean(props.getProperty("it.run.smoke"));
         clusterEnvironment = new ClusterEnvironment(props);
-        nativeStorageHost = props.getProperty("it.native.storage.host");
-        nativeStoragePort = props.getProperty("it.native.storage.port");
-        nativeStorageUsername = props.getProperty("it.native.storage.username");
-        nativeStoragePassword = props.getProperty("it.native.storage.password");
+        nativeStorageHost = props.getProperty("it.native.storage.host", "127.0.0.1");
+        nativeStoragePort = Integer.parseInt(props.getProperty("it.native.storage.port", "0"));
+        nativeStorageUsername = props.getProperty("it.native.storage.username", "root");
+        nativeStoragePassword = props.getProperty("it.native.storage.password", "Root@123");
         governanceCenter = props.getProperty("it.env.governance.center");
     }