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/08 06:50:22 UTC
(shardingsphere) branch master updated: Remove StorageContainerConfigurationOption.getMountedResources() (#36500)
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 06fd40b6454 Remove StorageContainerConfigurationOption.getMountedResources() (#36500)
06fd40b6454 is described below
commit 06fd40b64540ec2d55873ad5b0e938bbd52da420
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Sep 8 14:50:16 2025 +0800
Remove StorageContainerConfigurationOption.getMountedResources() (#36500)
---
.../StorageContainerConfigurationOption.java | 16 -------------
.../H2StorageContainerConfigurationOption.java | 20 -----------------
.../HiveStorageContainerConfigurationOption.java | 26 ----------------------
...MariaDBStorageContainerConfigurationOption.java | 10 ---------
.../MySQLStorageContainerConfigurationOption.java | 24 --------------------
...enGaussStorageContainerConfigurationOption.java | 19 ----------------
...tgreSQLStorageContainerConfigurationOption.java | 19 ----------------
7 files changed, 134 deletions(-)
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 e8522b368da..dd96b267eb8 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
@@ -65,22 +65,6 @@ public interface StorageContainerConfigurationOption {
return Collections.emptyList();
}
- /**
- * Get mounted resources.
- *
- * @param scenario scenario
- * @return mounted resources
- */
- Map<String, String> getMountedResources(String scenario);
-
- /**
- * Get mounted resources.
- *
- * @param majorVersion major version
- * @return mounted resources
- */
- Map<String, String> getMountedResources(int majorVersion);
-
/**
* Whether embedded storage container.
*
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 342f748721a..d6cc2db3ae0 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
@@ -17,16 +17,11 @@
package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
-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.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,8 +30,6 @@ import java.util.Map;
*/
public final class H2StorageContainerConfigurationOption implements StorageContainerConfigurationOption {
- private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "H2");
-
@Override
public String getCommand() {
return "";
@@ -57,19 +50,6 @@ public final class H2StorageContainerConfigurationOption implements StorageConta
return Arrays.asList("01-actual-init.sql", "01-expected-init.sql", "01-initdb.sql");
}
- @Override
- public Map<String, String> getMountedResources(final String scenario) {
- 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");
- return result;
- }
-
- @Override
- public Map<String, String> getMountedResources(final int majorVersion) {
- return Collections.singletonMap("/env/mysql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
- }
-
@Override
public boolean isEmbeddedStorageContainer() {
return true;
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 c4e245d1119..4a75631abea 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
@@ -17,14 +17,9 @@
package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.HiveContainer;
-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.Collection;
import java.util.Collections;
@@ -37,8 +32,6 @@ import java.util.Map;
*/
public final class HiveStorageContainerConfigurationOption implements StorageContainerConfigurationOption {
- private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "Hive");
-
@Override
public String getCommand() {
return "bash -c 'start-hive.sh && tail -f /dev/null'";
@@ -63,25 +56,6 @@ public final class HiveStorageContainerConfigurationOption implements StorageCon
return Arrays.asList("01-actual-init.sql", "01-expected-init.sql", "01-initdb.sql");
}
- @Override
- public Map<String, String> getMountedResources(final String scenario) {
- 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");
- return result;
- }
-
- @Override
- public Map<String, String> getMountedResources(final int majorVersion) {
- Map<String, String> result = new HashMap<>(1, 1F);
- String path = "env/hive/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;
- }
-
@Override
public boolean isEmbeddedStorageContainer() {
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 00d2aebdce9..8aedb76d7b0 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
@@ -55,16 +55,6 @@ public final class MariaDBStorageContainerConfigurationOption implements Storage
return Collections.singleton("01-initdb.sql");
}
- @Override
- public Map<String, String> getMountedResources(final String scenario) {
- return Collections.emptyMap();
- }
-
- @Override
- public Map<String, String> getMountedResources(final int majorVersion) {
- return Collections.singletonMap("/env/mysql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
- }
-
@Override
public boolean isEmbeddedStorageContainer() {
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 75f3eea9760..2eadaf6bee0 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
@@ -17,13 +17,9 @@
package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtils;
-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.Arrays;
import java.util.Collection;
@@ -37,8 +33,6 @@ import java.util.Map;
*/
public final class MySQLStorageContainerConfigurationOption implements StorageContainerConfigurationOption {
- private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "MySQL");
-
@Override
public String getCommand() {
return "--server-id=" + ContainerUtils.generateMySQLServerId();
@@ -67,24 +61,6 @@ public final class MySQLStorageContainerConfigurationOption implements StorageCo
return majorVersion > 5 ? Collections.singleton("02-grant-xa-privilege.sql") : Collections.emptyList();
}
- @Override
- public Map<String, String> getMountedResources(final String scenario) {
- 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");
- return result;
- }
-
- @Override
- public Map<String, String> getMountedResources(final int majorVersion) {
- 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");
- }
- return result;
- }
-
@Override
public boolean isEmbeddedStorageContainer() {
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 76660b25c31..b9bb288e843 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
@@ -17,13 +17,9 @@
package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.OpenGaussContainer;
-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.Arrays;
import java.util.Collection;
@@ -37,8 +33,6 @@ import java.util.Map;
*/
public final class OpenGaussStorageContainerConfigurationOption implements StorageContainerConfigurationOption {
- private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "openGauss");
-
@Override
public String getCommand() {
return "";
@@ -62,19 +56,6 @@ public final class OpenGaussStorageContainerConfigurationOption implements Stora
return Arrays.asList("01-actual-init.sql", "01-expected-init.sql", "01-initdb.sql");
}
- @Override
- public Map<String, String> getMountedResources(final String scenario) {
- 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");
- return result;
- }
-
- @Override
- public Map<String, String> getMountedResources(final int majorVersion) {
- return Collections.singletonMap("/env/opengauss/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
- }
-
@Override
public boolean isEmbeddedStorageContainer() {
return false;
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 949fc4af00c..527829e7dad 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
@@ -17,13 +17,9 @@
package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.PostgreSQLContainer;
-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.Arrays;
import java.util.Collection;
@@ -37,8 +33,6 @@ import java.util.Map;
*/
public final class PostgreSQLStorageContainerConfigurationOption implements StorageContainerConfigurationOption {
- private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
-
@Override
public String getCommand() {
return "-c config_file=" + PostgreSQLContainer.POSTGRESQL_CONF_IN_CONTAINER;
@@ -62,19 +56,6 @@ public final class PostgreSQLStorageContainerConfigurationOption implements Stor
return Arrays.asList("01-actual-init.sql", "01-expected-init.sql", "01-initdb.sql");
}
- @Override
- public Map<String, String> getMountedResources(final String scenario) {
- 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");
- return result;
- }
-
- @Override
- public Map<String, String> getMountedResources(final int majorVersion) {
- return Collections.singletonMap("/env/postgresql/01-initdb.sql", "/docker-entrypoint-initdb.d/01-initdb.sql");
- }
-
@Override
public boolean isEmbeddedStorageContainer() {
return false;