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 2265733292a Add StorageContainerConfigurationOption (#36473)
2265733292a is described below
commit 2265733292ae26e6e5eb9a2a527e11f4062aa036
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 5 00:04:11 2025 +0800
Add StorageContainerConfigurationOption (#36473)
* Add StorageContainerConfigurationOption
* Add StorageContainerConfigurationOption
---
.../StorageContainerConfigurationFactory.java | 61 ++++++-----------
.../dialect/H2ContainerConfigurationFactory.java | 79 ----------------------
.../StorageContainerConfigurationOption.java | 77 +++++++++++++++++++++
...StorageContainerConfigurationOptionFactory.java | 58 ++++++++++++++++
.../H2StorageContainerConfigurationOption.java | 74 ++++++++++++++++++++
...ariaDBStorageContainerConfigurationOption.java} | 49 ++++++++------
.../MySQLStorageContainerConfigurationOption.java} | 74 ++++++++------------
...nGaussStorageContainerConfigurationOption.java} | 65 ++++++++----------
...greSQLStorageContainerConfigurationOption.java} | 66 ++++++++----------
.../storage/impl/NativeStorageContainer.java | 3 +-
.../createtable/CreateTableSQLGeneratorIT.java | 3 +-
.../container/compose/DockerContainerComposer.java | 3 +-
.../ClusterShowProcessListContainerComposer.java | 6 +-
.../container/compose/DockerContainerComposer.java | 3 +-
.../compose/mode/ClusterContainerComposer.java | 4 +-
.../compose/mode/StandaloneContainerComposer.java | 4 +-
16 files changed, 366 insertions(+), 263 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 4e151f62f8b..b49cdefb695 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
@@ -20,11 +20,11 @@ package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect.H2ContainerConfigurationFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect.MariaDBContainerConfigurationFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect.MySQLContainerConfigurationFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect.OpenGaussContainerConfigurationFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect.PostgreSQLContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
+
+import java.util.Collections;
+import java.util.Map;
/**
* Storage container configuration factory.
@@ -35,48 +35,29 @@ public final class StorageContainerConfigurationFactory {
/**
* Create new instance of storage container configuration.
*
- * @param databaseType database type
- * @param scenario scenario
- * @return created instance
- * @throws RuntimeException runtime exception
+ * @param option storage container configuration option
+ * @param majorVersion majorVersion
+ * @return created storage container configuration
*/
- public static StorageContainerConfiguration newInstance(final DatabaseType
databaseType, final String scenario) {
- switch (databaseType.getType()) {
- case "MySQL":
- return
MySQLContainerConfigurationFactory.newInstance(scenario);
- case "PostgreSQL":
- return
PostgreSQLContainerConfigurationFactory.newInstance(scenario);
- case "openGauss":
- return
OpenGaussContainerConfigurationFactory.newInstance(scenario);
- case "H2":
- return H2ContainerConfigurationFactory.newInstance(scenario);
- default:
- throw new RuntimeException(String.format("Database `%s` is
unknown.", databaseType.getType()));
- }
+ 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());
}
/**
* Create new instance of storage container configuration.
*
+ * @param option storage container configuration option
* @param databaseType database type
- * @param majorVersion majorVersion
- * @return created instance
- * @throws RuntimeException runtime exception
+ * @param scenario scenario
+ * @return created storage container configuration
*/
- public static StorageContainerConfiguration newInstance(final DatabaseType
databaseType, final int majorVersion) {
- switch (databaseType.getType()) {
- case "MySQL":
- return
MySQLContainerConfigurationFactory.newInstance(majorVersion);
- case "PostgreSQL":
- return PostgreSQLContainerConfigurationFactory.newInstance();
- case "openGauss":
- return OpenGaussContainerConfigurationFactory.newInstance();
- case "H2":
- return H2ContainerConfigurationFactory.newInstance();
- case "MariaDB":
- return MariaDBContainerConfigurationFactory.newInstance();
- default:
- throw new RuntimeException(String.format("Database `%s` is
unknown.", databaseType.getType()));
- }
+ public static StorageContainerConfiguration newInstance(final
StorageContainerConfigurationOption option, final DatabaseType databaseType,
final String scenario) {
+ Map<String, DatabaseType> databaseTypes =
DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType);
+ Map<String, DatabaseType> expectedDatabaseTypes =
DatabaseEnvironmentManager.getExpectedDatabaseTypes(scenario, databaseType);
+ return option.isEmbeddedStorageContainer()
+ ? new StorageContainerConfiguration(scenario,
option.getCommand(), option.getContainerEnvironments(),
option.getMountedResources(scenario), databaseTypes, expectedDatabaseTypes)
+ : new StorageContainerConfiguration(option.getCommand(),
option.getContainerEnvironments(), option.getMountedResources(scenario),
databaseTypes, expectedDatabaseTypes);
}
}
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
deleted file mode 100644
index 3d9fc0b6fc5..00000000000
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/H2ContainerConfigurationFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.dialect;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-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.StorageContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
-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.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * H2 container configuration factory.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class H2ContainerConfigurationFactory {
-
- private static final DatabaseType DATABASE_TYPE =
TypedSPILoader.getService(DatabaseType.class, "H2");
-
- /**
- * Create new instance of h2 container configuration.
- *
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance() {
- return new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(), Collections.emptyMap(),
Collections.emptyMap());
- }
-
- /**
- * Create new instance of h2 container configuration.
- *
- * @param scenario scenario
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance(final String
scenario) {
- return new StorageContainerConfiguration(scenario, getCommand(),
getContainerEnvironments(), getMountedResources(scenario),
- DatabaseEnvironmentManager.getDatabaseTypes(scenario,
DATABASE_TYPE), DatabaseEnvironmentManager.getExpectedDatabaseTypes(scenario,
DATABASE_TYPE));
- }
-
- private static String getCommand() {
- return "";
- }
-
- private static Map<String, String> getContainerEnvironments() {
- return Collections.emptyMap();
- }
-
- 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/option/StorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java
new file mode 100644
index 00000000000..839c5a2c65f
--- /dev/null
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java
@@ -0,0 +1,77 @@
+/*
+ * 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.option;
+
+import java.util.Map;
+
+/**
+ * Storage container configuration option.
+ */
+public interface StorageContainerConfigurationOption {
+
+ /**
+ * Get command.
+ *
+ * @return command
+ */
+ String getCommand();
+
+ /**
+ * Get container environments.
+ *
+ * @return container environments
+ */
+ Map<String, String> getContainerEnvironments();
+
+ /**
+ * Get mounted resources.
+ *
+ * @return mounted resources
+ */
+ Map<String, String> getMountedResources();
+
+ /**
+ * 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.
+ *
+ * @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/StorageContainerConfigurationOptionFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOptionFactory.java
new file mode 100644
index 00000000000..e50ef5e4eb0
--- /dev/null
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOptionFactory.java
@@ -0,0 +1,58 @@
+/*
+ * 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.option;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect.H2StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect.MariaDBStorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect.MySQLStorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect.OpenGaussStorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect.PostgreSQLStorageContainerConfigurationOption;
+
+/**
+ * Storage container configuration option factory.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class StorageContainerConfigurationOptionFactory {
+
+ /**
+ * Create new instance of storage container configuration option.
+ *
+ * @param databaseType database type
+ * @return created storage container configuration option
+ * @throws RuntimeException runtime exception
+ */
+ public static StorageContainerConfigurationOption newInstance(final
DatabaseType databaseType) {
+ switch (databaseType.getType()) {
+ case "MySQL":
+ return new MySQLStorageContainerConfigurationOption();
+ case "MariaDB":
+ return new MariaDBStorageContainerConfigurationOption();
+ case "PostgreSQL":
+ return new PostgreSQLStorageContainerConfigurationOption();
+ case "openGauss":
+ return new OpenGaussStorageContainerConfigurationOption();
+ case "H2":
+ return new H2StorageContainerConfigurationOption();
+ default:
+ throw new RuntimeException(String.format("Database `%s` is
unknown.", databaseType.getType()));
+ }
+ }
+}
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
new file mode 100644
index 00000000000..420a54b57d5
--- /dev/null
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java
@@ -0,0 +1,74 @@
+/*
+ * 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.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.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Storage container configuration option for H2.
+ */
+public final class H2StorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
+
+ private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "H2");
+
+ @Override
+ public String getCommand() {
+ return "";
+ }
+
+ @Override
+ public Map<String, String> getContainerEnvironments() {
+ 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);
+ 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 getMountedResources();
+ }
+
+ @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/dialect/MariaDBContainerConfigurationFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
similarity index 66%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/MariaDBContainerConfigurationFactory.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
index 78b5dad5083..cbc7be49f55 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/MariaDBContainerConfigurationFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java
@@ -15,11 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MariaDBContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtils;
@@ -28,35 +26,48 @@ import java.util.HashMap;
import java.util.Map;
/**
- * MariaDB container configuration factory.
+ * Storage container configuration option for MariaDB.
*/
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class MariaDBContainerConfigurationFactory {
+public final class MariaDBStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
- /**
- * Create new instance of MariaDB container configuration.
- *
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance() {
- return new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(), Collections.emptyMap(),
Collections.emptyMap());
- }
-
- private static String getCommand() {
+ @Override
+ public String getCommand() {
return "--server-id=" + ContainerUtils.generateMySQLServerId();
}
- private static Map<String, String> getContainerEnvironments() {
+ @Override
+ public Map<String, String> getContainerEnvironments() {
Map<String, String> result = new HashMap<>(2, 1F);
result.put("LANG", "C.UTF-8");
result.put("MYSQL_RANDOM_ROOT_PASSWORD", "yes");
return result;
}
- private static Map<String, String> getMountedResources() {
+ @Override
+ public Map<String, String> getMountedResources() {
Map<String, String> result = new HashMap<>(2, 1F);
result.put("/env/mysql/mysql8/my.cnf",
MariaDBContainer.MARIADB_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();
+ }
+
+ @Override
+ public Map<String, String> getMountedResources(final int majorVersion) {
+ return getMountedResources();
+ }
+
+ @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/dialect/MySQLContainerConfigurationFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
similarity index 54%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/MySQLContainerConfigurationFactory.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java
index c7ca0f86e7f..6a686c37936 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/option/dialect/MySQLStorageContainerConfigurationOption.java
@@ -15,74 +15,42 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
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.StorageContainerConfiguration;
+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.database.DatabaseEnvironmentManager;
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.Collections;
import java.util.HashMap;
import java.util.Map;
/**
- * MySQL container configuration factory.
+ * Storage container configuration option for MySQL.
*/
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class MySQLContainerConfigurationFactory {
+public final class MySQLStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
- private static final DatabaseType DATABASE_TYPE =
TypedSPILoader.getService(DatabaseType.class, "MySQL");
+ private final DatabaseType databaseType =
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.
- *
- * @param scenario scenario
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance(final String
scenario) {
- return new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(scenario),
- DatabaseEnvironmentManager.getDatabaseTypes(scenario,
DATABASE_TYPE), DatabaseEnvironmentManager.getExpectedDatabaseTypes(scenario,
DATABASE_TYPE));
- }
-
- /**
- * Create new instance of MySQL container configuration with major version.
- *
- * @param majorVersion major version
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance(final int
majorVersion) {
- return new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(majorVersion),
Collections.emptyMap(), Collections.emptyMap());
- }
-
- private static String getCommand() {
+ @Override
+ public String getCommand() {
return "--server-id=" + ContainerUtils.generateMySQLServerId();
}
- private static Map<String, String> getContainerEnvironments() {
+ @Override
+ public Map<String, String> getContainerEnvironments() {
Map<String, String> result = new HashMap<>(2, 1F);
result.put("LANG", "C.UTF-8");
result.put("MYSQL_RANDOM_ROOT_PASSWORD", "yes");
return result;
}
- private static Map<String, String> getMountedResources() {
+ @Override
+ public 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);
@@ -92,15 +60,17 @@ public final class MySQLContainerConfigurationFactory {
return result;
}
- private static Map<String, String> getMountedResources(final String
scenario) {
+ @Override
+ public 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");
- result.put(new
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, DATABASE_TYPE)
+ "/01-expected-init.sql", "/docker-entrypoint-initdb.d/01-expected-init.sql");
+ 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");
result.put("/env/mysql/my.cnf",
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
return result;
}
- private static Map<String, String> getMountedResources(final int
majorVersion) {
+ @Override
+ public Map<String, String> getMountedResources(final int majorVersion) {
Map<String, String> result = new HashMap<>(3, 1F);
result.put(String.format("/env/mysql/mysql%s/my.cnf", majorVersion),
MySQLContainer.MYSQL_CONF_IN_CONTAINER);
result.put("/env/mysql/01-initdb.sql",
"/docker-entrypoint-initdb.d/01-initdb.sql");
@@ -109,4 +79,14 @@ public final class MySQLContainerConfigurationFactory {
}
return result;
}
+
+ @Override
+ 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/dialect/OpenGaussContainerConfigurationFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
similarity index 58%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/OpenGaussContainerConfigurationFactory.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
index 2b600783603..73b987e3586 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/OpenGaussContainerConfigurationFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java
@@ -15,16 +15,13 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
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.StorageContainerConfiguration;
+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.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
@@ -33,42 +30,24 @@ import java.util.HashMap;
import java.util.Map;
/**
- * OpenGauss container configuration factory.
+ * Storage container configuration option for openGauss.
*/
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class OpenGaussContainerConfigurationFactory {
+public final class OpenGaussStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
- private static final DatabaseType DATABASE_TYPE =
TypedSPILoader.getService(DatabaseType.class, "openGauss");
+ private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "openGauss");
- /**
- * Create new instance of openGauss container configuration.
- *
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance() {
- return new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(), Collections.emptyMap(),
Collections.emptyMap());
- }
-
- /**
- * Create new instance of openGauss container configuration.
- *
- * @param scenario scenario
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance(final String
scenario) {
- return new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(scenario),
- DatabaseEnvironmentManager.getDatabaseTypes(scenario,
DATABASE_TYPE), DatabaseEnvironmentManager.getExpectedDatabaseTypes(scenario,
DATABASE_TYPE));
- }
-
- private static String getCommand() {
+ @Override
+ public String getCommand() {
return "--max_connections=600 --max_prepared_transactions=600";
}
- private static Map<String, String> getContainerEnvironments() {
+ @Override
+ public Map<String, String> getContainerEnvironments() {
return Collections.singletonMap("GS_PASSWORD",
StorageContainerConstants.PASSWORD);
}
- private static Map<String, String> getMountedResources() {
+ @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("/env/postgresql/postgresql.conf",
OpenGaussContainer.OPENGAUSS_CONF_IN_CONTAINER);
@@ -76,12 +55,28 @@ public final class OpenGaussContainerConfigurationFactory {
return result;
}
- private static Map<String, String> getMountedResources(final String
scenario) {
+ @Override
+ public Map<String, String> getMountedResources(final String scenario) {
Map<String, String> result = new HashMap<>(4, 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");
+ 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");
result.put("/env/postgresql/postgresql.conf",
OpenGaussContainer.OPENGAUSS_CONF_IN_CONTAINER);
result.put("/env/opengauss/pg_hba.conf",
OpenGaussContainer.OPENGAUSS_HBA_IN_CONF_CONTAINER);
return result;
}
+
+ @Override
+ public Map<String, String> getMountedResources(final int majorVersion) {
+ return getMountedResources();
+ }
+
+ @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/dialect/PostgreSQLContainerConfigurationFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
similarity index 57%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/PostgreSQLContainerConfigurationFactory.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
index 8773c2551b4..08a95ec96e8 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/dialect/PostgreSQLContainerConfigurationFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
@@ -15,74 +15,68 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.dialect;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
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.StorageContainerConfiguration;
+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.database.DatabaseEnvironmentManager;
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.Collections;
import java.util.HashMap;
import java.util.Map;
/**
- * PostgreSQL container configuration factory.
+ * Storage container configuration option for PostgreSQL.
*/
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class PostgreSQLContainerConfigurationFactory {
+public final class PostgreSQLStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
- private static final DatabaseType DATABASE_TYPE =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
+ private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
- /**
- * Create new instance of PostgreSQL container configuration.
- *
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance() {
- return new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(), Collections.emptyMap(),
Collections.emptyMap());
- }
-
- /**
- * Create new instance of PostgreSQL container configuration.
- *
- * @param scenario scenario
- * @return created instance
- */
- public static StorageContainerConfiguration newInstance(final String
scenario) {
- return new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(scenario),
- DatabaseEnvironmentManager.getDatabaseTypes(scenario,
DATABASE_TYPE), DatabaseEnvironmentManager.getExpectedDatabaseTypes(scenario,
DATABASE_TYPE));
- }
-
- private static String getCommand() {
+ @Override
+ public String getCommand() {
return "-c config_file=" +
PostgreSQLContainer.POSTGRESQL_CONF_IN_CONTAINER + " --max_connections=600
--max_prepared_transactions=600 --wal_level=logical";
}
- private static Map<String, String> getContainerEnvironments() {
+ @Override
+ public Map<String, String> getContainerEnvironments() {
Map<String, String> result = new HashMap<>(2, 1F);
result.put("POSTGRES_HOST", StorageContainerConstants.USERNAME);
result.put("POSTGRES_PASSWORD", StorageContainerConstants.PASSWORD);
return result;
}
- private static Map<String, String> getMountedResources() {
+ @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("/env/postgresql/postgresql.conf",
PostgreSQLContainer.POSTGRESQL_CONF_IN_CONTAINER);
return result;
}
- private static Map<String, String> getMountedResources(final String
scenario) {
+ @Override
+ public 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");
- result.put(new
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, DATABASE_TYPE)
+ "/01-expected-init.sql", "/docker-entrypoint-initdb.d/01-expected-init.sql");
+ 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");
result.put("/env/postgresql/postgresql.conf",
PostgreSQLContainer.POSTGRESQL_CONF_IN_CONTAINER);
return result;
}
+
+ @Override
+ public Map<String, String> getMountedResources(final int majorVersion) {
+ return getMountedResources();
+ }
+
+ @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/impl/NativeStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/NativeStorageContainer.java
index a895f0e62ff..77e049e8d7f 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/NativeStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/NativeStorageContainer.java
@@ -24,6 +24,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.Storage
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.StorageContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.SQLScriptUtils;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
@@ -59,7 +60,7 @@ public final class NativeStorageContainer implements
StorageContainer {
public NativeStorageContainer(final DatabaseType databaseType, final
String scenario) {
this.databaseType = databaseType;
this.scenario = scenario;
- storageContainerConfiguration =
StorageContainerConfigurationFactory.newInstance(this.databaseType,
this.scenario);
+ storageContainerConfiguration =
StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(this.databaseType),
this.databaseType, this.scenario);
initDatabase();
actualDataSourceMap = createActualDataSourceMap();
expectedDataSourceMap = createExpectedDataSourceMap();
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index 8a36c2bed85..a534fe352d0 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -25,6 +25,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerSto
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.entity.CreateTableSQLGeneratorAssertionEntity;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.entity.CreateTableSQLGeneratorAssertionsRootEntity;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.entity.CreateTableSQLGeneratorOutputEntity;
@@ -101,7 +102,7 @@ class CreateTableSQLGeneratorIT {
private StorageContainerConfiguration
createStorageContainerConfiguration(final DatabaseType databaseType, final
String storageContainerImage) {
int majorVersion = new
DockerImageVersion(storageContainerImage).getMajorVersion();
- return StorageContainerConfigurationFactory.newInstance(databaseType,
majorVersion);
+ return
StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType),
majorVersion);
}
private void assertSQL(final Collection<String> actualSQL, final
Collection<String> expectedSQL) {
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java
index 5535c512c5a..468059988b4 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -30,6 +30,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerSto
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.PipelineE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.enums.PipelineProxyTypeEnum;
@@ -65,7 +66,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
for (int i = 0; i < storageContainerCount; i++) {
StorageContainerConfiguration storageContainerConfig;
int majorVersion = databaseType instanceof MySQLDatabaseType ? new
DockerImageVersion(storageContainerImage).getMajorVersion() : 0;
- storageContainerConfig =
StorageContainerConfigurationFactory.newInstance(databaseType, majorVersion);
+ storageContainerConfig =
StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType),
majorVersion);
DockerStorageContainer storageContainer =
getContainers().registerContainer((DockerStorageContainer)
StorageContainerFactory.newInstance(databaseType, storageContainerImage,
storageContainerConfig));
storageContainer.setNetworkAliases(Collections.singletonList(String.join(".",
databaseType.getType().toLowerCase() + "_" + i, "host")));
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index f53cc08e03c..c54901c4aed 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -31,6 +31,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.Govern
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.env.ShowProcessListEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.parameter.ShowProcessListTestParameter;
@@ -56,8 +58,10 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
public ClusterShowProcessListContainerComposer(final
ShowProcessListTestParameter testParam) {
containers = new ITContainers(testParam.getScenario());
governanceContainer = isClusterMode(testParam.getRunMode()) ?
containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"))
: null;
+ StorageContainerConfigurationOption option =
StorageContainerConfigurationOptionFactory.newInstance(testParam.getDatabaseType());
StorageContainer storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(testParam.getDatabaseType(),
"",
-
StorageContainerConfigurationFactory.newInstance(testParam.getDatabaseType(),
testParam.getScenario())));
+ StorageContainerConfigurationFactory.newInstance(option,
testParam.getDatabaseType(), testParam.getScenario())));
+
AdaptorContainerConfiguration containerConfig = new
AdaptorContainerConfiguration(testParam.getScenario(), new LinkedList<>(),
getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode(),
testParam.getGovernanceCenter()),
AdapterContainerUtils.getAdapterContainerImage(),
"");
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/DockerContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/DockerContainerComposer.java
index c1968ae2246..1d2a9460295 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/DockerContainerComposer.java
@@ -35,6 +35,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerSto
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.TransactionE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionE2EEnvTypeEnum;
@@ -68,7 +69,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
TransactionE2EEnvTypeEnum envType =
TransactionE2EEnvironment.getInstance().getItEnvType();
if (TransactionE2EEnvTypeEnum.DOCKER == envType) {
storageContainer =
getContainers().registerContainer((DockerStorageContainer)
StorageContainerFactory.newInstance(databaseType,
testParam.getStorageContainerImage(),
-
StorageContainerConfigurationFactory.newInstance(databaseType,
testParam.getScenario())));
+
StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType),
databaseType, testParam.getScenario())));
} else {
storageContainer = getContainers().registerContainer(new
NativeStorageContainer(databaseType, testParam.getScenario()));
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
index 365c5285b5f..f2ab6ed44d6 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
@@ -31,6 +31,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.Govern
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
@@ -59,7 +60,8 @@ public final class ClusterContainerComposer implements
ContainerComposer {
governanceContainer =
containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"));
Type envType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
- ? StorageContainerFactory.newInstance(databaseType,
StorageContainerConfigurationFactory.newInstance(databaseType, scenario))
+ ? StorageContainerFactory.newInstance(databaseType,
+
StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType),
databaseType, scenario))
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "cluster",
databaseType);
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType,
scenario, containerConfig, storageContainer, envType.name());
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
index b7051521b10..e4a5bd51c93 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
@@ -28,6 +28,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
@@ -52,7 +53,8 @@ public final class StandaloneContainerComposer implements
ContainerComposer {
containers = new ITContainers(scenario);
Type envType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
- ? StorageContainerFactory.newInstance(databaseType,
StorageContainerConfigurationFactory.newInstance(databaseType, scenario))
+ ? StorageContainerFactory.newInstance(databaseType,
+
StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType),
databaseType, scenario))
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "standalone",
databaseType);
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType,
scenario, containerConfig, storageContainer, envType.name());
