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 b310ad8d2ae Merge
StorageContainerConfigurationOption.getMountedResources() (#36484)
b310ad8d2ae is described below
commit b310ad8d2ae609b3e57f1c61aeadee3657365c7b
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Sep 6 13:24:52 2025 +0800
Merge StorageContainerConfigurationOption.getMountedResources() (#36484)
---
.../StorageContainerConfigurationFactory.java | 4 +---
.../StorageContainerConfigurationOption.java | 14 -------------
.../H2StorageContainerConfigurationOption.java | 12 +----------
.../HiveStorageContainerConfigurationOption.java | 24 +++++++---------------
...MariaDBStorageContainerConfigurationOption.java | 18 ++++------------
.../MySQLStorageContainerConfigurationOption.java | 11 ----------
...enGaussStorageContainerConfigurationOption.java | 20 +++++-------------
...tgreSQLStorageContainerConfigurationOption.java | 18 ++++------------
8 files changed, 22 insertions(+), 99 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 b49cdefb695..4228fb7846d 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
@@ -40,9 +40,7 @@ public final class StorageContainerConfigurationFactory {
* @return created storage container configuration
*/
public static StorageContainerConfiguration newInstance(final
StorageContainerConfigurationOption option, final int majorVersion) {
- return option.isRecognizeMajorVersion()
- ? new StorageContainerConfiguration(option.getCommand(),
option.getContainerEnvironments(), option.getMountedResources(majorVersion),
Collections.emptyMap(), Collections.emptyMap())
- : new StorageContainerConfiguration(option.getCommand(),
option.getContainerEnvironments(), option.getMountedResources(),
Collections.emptyMap(), Collections.emptyMap());
+ return new StorageContainerConfiguration(option.getCommand(),
option.getContainerEnvironments(), option.getMountedResources(majorVersion),
Collections.emptyMap(), Collections.emptyMap());
}
/**
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 839c5a2c65f..0e6ec34adc2 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
@@ -38,13 +38,6 @@ public interface StorageContainerConfigurationOption {
*/
Map<String, String> getContainerEnvironments();
- /**
- * Get mounted resources.
- *
- * @return mounted resources
- */
- Map<String, String> getMountedResources();
-
/**
* Get mounted resources.
*
@@ -67,11 +60,4 @@ public interface StorageContainerConfigurationOption {
* @return is embedded storage container or not
*/
boolean isEmbeddedStorageContainer();
-
- /**
- * Whether recognize major version.
- *
- * @return recognized major version or not
- */
- boolean isRecognizeMajorVersion();
}
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 420a54b57d5..09985a2b477 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
@@ -44,11 +44,6 @@ public final class H2StorageContainerConfigurationOption
implements StorageConta
return Collections.emptyMap();
}
- @Override
- public Map<String, String> getMountedResources() {
- return Collections.singletonMap("/env/mysql/01-initdb.sql",
"/docker-entrypoint-initdb.d/01-initdb.sql");
- }
-
@Override
public Map<String, String> getMountedResources(final String scenario) {
Map<String, String> result = new HashMap<>(2, 1F);
@@ -59,16 +54,11 @@ public final class H2StorageContainerConfigurationOption
implements StorageConta
@Override
public Map<String, String> getMountedResources(final int majorVersion) {
- return getMountedResources();
+ return Collections.singletonMap("/env/mysql/01-initdb.sql",
"/docker-entrypoint-initdb.d/01-initdb.sql");
}
@Override
public boolean isEmbeddedStorageContainer() {
return true;
}
-
- @Override
- public boolean isRecognizeMajorVersion() {
- 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 834bca79fb4..1e51a3edf6e 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
@@ -49,17 +49,6 @@ public final class HiveStorageContainerConfigurationOption
implements StorageCon
return result;
}
- @Override
- public Map<String, String> getMountedResources() {
- 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 Map<String, String> getMountedResources(final String scenario) {
Map<String, String> result = new HashMap<>(4, 1F);
@@ -71,16 +60,17 @@ public final class HiveStorageContainerConfigurationOption
implements StorageCon
@Override
public Map<String, String> getMountedResources(final int majorVersion) {
- return getMountedResources();
+ 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;
}
-
- @Override
- public boolean isRecognizeMajorVersion() {
- 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 f97f4afb1f7..6a799f038d9 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
@@ -43,14 +43,6 @@ public final class
MariaDBStorageContainerConfigurationOption implements Storage
return result;
}
- @Override
- public Map<String, String> getMountedResources() {
- 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;
- }
-
@Override
public Map<String, String> getMountedResources(final String scenario) {
return Collections.emptyMap();
@@ -58,16 +50,14 @@ public final class
MariaDBStorageContainerConfigurationOption implements Storage
@Override
public Map<String, String> getMountedResources(final int majorVersion) {
- return getMountedResources();
+ 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;
}
@Override
public boolean isEmbeddedStorageContainer() {
return false;
}
-
- @Override
- public boolean isRecognizeMajorVersion() {
- 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 b46446dce18..31018160083 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
@@ -26,7 +26,6 @@ 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.Map;
@@ -50,11 +49,6 @@ public final class MySQLStorageContainerConfigurationOption
implements StorageCo
return result;
}
- @Override
- public Map<String, String> getMountedResources() {
- return Collections.singletonMap("env/mysql/01-initdb.sql",
"/docker-entrypoint-initdb.d/01-initdb.sql");
- }
-
@Override
public Map<String, String> getMountedResources(final String scenario) {
Map<String, String> result = new HashMap<>(3, 1F);
@@ -89,9 +83,4 @@ public final class MySQLStorageContainerConfigurationOption
implements StorageCo
public boolean isEmbeddedStorageContainer() {
return false;
}
-
- @Override
- public boolean isRecognizeMajorVersion() {
- return true;
- }
}
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 65d510ed426..dc3032eb815 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
@@ -46,15 +46,6 @@ public final class
OpenGaussStorageContainerConfigurationOption implements Stora
return Collections.singletonMap("GS_PASSWORD",
StorageContainerConstants.PASSWORD);
}
- @Override
- public Map<String, String> getMountedResources() {
- 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;
- }
-
@Override
public Map<String, String> getMountedResources(final String scenario) {
Map<String, String> result = new HashMap<>(4, 1F);
@@ -67,16 +58,15 @@ public final class
OpenGaussStorageContainerConfigurationOption implements Stora
@Override
public Map<String, String> getMountedResources(final int majorVersion) {
- return getMountedResources();
+ 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;
}
@Override
public boolean isEmbeddedStorageContainer() {
return false;
}
-
- @Override
- public boolean isRecognizeMajorVersion() {
- 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 d92301bf5ba..941da991b24 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
@@ -48,14 +48,6 @@ public final class
PostgreSQLStorageContainerConfigurationOption implements Stor
return result;
}
- @Override
- public Map<String, String> getMountedResources() {
- 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;
- }
-
@Override
public Map<String, String> getMountedResources(final String scenario) {
Map<String, String> result = new HashMap<>(3, 1F);
@@ -67,16 +59,14 @@ public final class
PostgreSQLStorageContainerConfigurationOption implements Stor
@Override
public Map<String, String> getMountedResources(final int majorVersion) {
- return getMountedResources();
+ 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;
}
@Override
public boolean isEmbeddedStorageContainer() {
return false;
}
-
- @Override
- public boolean isRecognizeMajorVersion() {
- return false;
- }
}
