You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/13 17:41:49 UTC
(shardingsphere) branch master updated: Refactor StorageContainerConfigurationFactory (#36559)
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 13f0dd952df Refactor StorageContainerConfigurationFactory (#36559)
13f0dd952df is described below
commit 13f0dd952df2f43f76c1834ddbdb5dd7f1251fc1
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Sep 14 01:41:43 2025 +0800
Refactor StorageContainerConfigurationFactory (#36559)
---
.../agent/engine/env/AgentE2ETestEnvironment.java | 4 ++--
.../StorageContainerConfigurationFactory.java | 21 ---------------------
.../config/mounted/MountedSQLResourceGenerator.java | 12 ++++++------
.../createtable/CreateTableSQLGeneratorIT.java | 11 +++--------
.../container/compose/DockerContainerComposer.java | 7 ++-----
5 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
index 69f8f4426e6..317db57842d 100644
--- a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
+++ b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
@@ -118,7 +118,7 @@ public final class AgentE2ETestEnvironment {
ShardingSphereProxyClusterContainer proxyContainer = new ShardingSphereProxyClusterContainer(databaseType, getAdaptorContainerConfiguration());
proxyContainer.withLogConsumer(testConfig.isLogEnabled() ? this::collectLogs : null);
MySQLContainer storageContainer = new MySQLContainer(
- imageConfig.getMysqlImage(), StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, 5, null));
+ imageConfig.getMysqlImage(), StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, null));
proxyContainer.dependsOn(storageContainer);
containers.registerContainer(storageContainer);
GovernanceContainer governanceContainer = GovernanceContainerFactory.newInstance("ZooKeeper");
@@ -149,7 +149,7 @@ public final class AgentE2ETestEnvironment {
private void createJDBCEnvironment(final Optional<DockerITContainer> agentPluginContainer) {
containers = new ITContainers();
MySQLContainer storageContainer = new MySQLContainer(imageConfig.getMysqlImage(),
- StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, 5, null));
+ StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, null));
ShardingSphereJdbcAgentContainer jdbcAgentContainer = new ShardingSphereJdbcAgentContainer(
imageConfig.getJdbcProjectImage(), testConfig.getPluginType(), testConfig.isLogEnabled() ? this::collectLogs : null);
jdbcAgentContainer.dependsOn(storageContainer);
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 a0e0c13a11f..1ec7133d95e 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
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioData
import java.util.Collections;
import java.util.Map;
-import java.util.Optional;
/**
* Storage container configuration factory.
@@ -43,28 +42,8 @@ public final class StorageContainerConfigurationFactory {
* @return created storage container configuration
*/
public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final String scenario) {
- return newInstance(option, databaseType, findMajorVersion(option, 0).orElse(0), scenario);
- }
-
- /**
- * Create new instance of storage container configuration.
- *
- * @param option storage container configuration option
- * @param databaseType database type
- * @param majorVersion majorVersion
- * @param scenario scenario
- * @return created storage container configuration
- */
- public static StorageContainerConfiguration newInstance(final StorageContainerConfigurationOption option, final DatabaseType databaseType, final int majorVersion, final String scenario) {
Map<String, DatabaseType> actualDatabaseTypes = null == scenario ? Collections.emptyMap() : DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.ACTUAL);
Map<String, DatabaseType> expectedDatabaseTypes = null == scenario ? Collections.emptyMap() : DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType, Type.EXPECTED);
return new StorageContainerConfiguration(scenario, option, actualDatabaseTypes, expectedDatabaseTypes);
}
-
- private static Optional<Integer> findMajorVersion(final StorageContainerConfigurationOption option, final int majorVersion) {
- if (option.getSupportedMajorVersions().isEmpty()) {
- return Optional.empty();
- }
- return Optional.of(option.getSupportedMajorVersions().stream().filter(optional -> optional == majorVersion).findAny().orElse(option.getSupportedMajorVersions().get(0)));
- }
}
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedSQLResourceGenerator.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedSQLResourceGenerator.java
index f814023061e..48d8fc9f346 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedSQLResourceGenerator.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/mounted/MountedSQLResourceGenerator.java
@@ -57,21 +57,21 @@ public final class MountedSQLResourceGenerator {
* @return generated resource map
*/
public Map<String, String> generate(final int majorVersion, final String scenario) {
- Collection<String> result = new LinkedList<>();
+ Collection<String> toBeMountedSQLFiles = new LinkedList<>();
for (String each : TO_BE_MOUNTED_COMMON_SQL_FILES) {
- findToBeMountedCommonSQLFile(databaseType, each).ifPresent(optional -> result.add("/" + optional));
+ findToBeMountedCommonSQLFile(databaseType, each).ifPresent(optional -> toBeMountedSQLFiles.add("/" + optional));
}
String toBeMountedStandardEnvSQLFilePath = String.format("env/container/%s/init-sql/%s", databaseType.getType().toLowerCase(), TO_BE_MOUNTED_STANDARD_ENV_SQL_FILE);
if (null != Thread.currentThread().getContextClassLoader().getResource(toBeMountedStandardEnvSQLFilePath)) {
- result.add("/" + toBeMountedStandardEnvSQLFilePath);
+ toBeMountedSQLFiles.add("/" + toBeMountedStandardEnvSQLFilePath);
}
for (String each : option.getAdditionalEnvMountedSQLResources(majorVersion)) {
- getToBeMountedAdditionalEnvSQLFile(databaseType, each).ifPresent(optional -> result.add("/" + optional));
+ getToBeMountedAdditionalEnvSQLFile(databaseType, each).ifPresent(optional -> toBeMountedSQLFiles.add("/" + optional));
}
for (String each : getToBeMountedScenarioSQLFiles(databaseType, scenario)) {
- result.add("/" + each);
+ toBeMountedSQLFiles.add("/" + each);
}
- return result.stream().collect(Collectors.toMap(each -> each, each -> "/docker-entrypoint-initdb.d/" + new File(each).getName()));
+ return toBeMountedSQLFiles.stream().collect(Collectors.toMap(each -> each, each -> "/docker-entrypoint-initdb.d/" + new File(each).getName()));
}
private Optional<String> findToBeMountedCommonSQLFile(final DatabaseType databaseType, final String toBeMountedSQLFile) {
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 464173c0d15..7649f287717 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
@@ -21,11 +21,11 @@ import org.apache.shardingsphere.data.pipeline.core.sqlbuilder.dialect.DialectPi
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
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.type.docker.DockerStorageContainer;
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.container.atomic.storage.type.docker.DockerStorageContainer;
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;
@@ -34,7 +34,6 @@ import org.apache.shardingsphere.test.e2e.operation.pipeline.framework.param.Pip
import org.apache.shardingsphere.test.e2e.operation.pipeline.framework.param.PipelineE2ESettings.PipelineE2EDatabaseSettings;
import org.apache.shardingsphere.test.e2e.operation.pipeline.framework.param.PipelineE2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.operation.pipeline.framework.param.PipelineTestParameter;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.util.DockerImageVersion;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
@@ -95,16 +94,12 @@ class CreateTableSQLGeneratorIT {
}
private void startStorageContainer(final DatabaseType databaseType, final String storageContainerImage) {
- StorageContainerConfiguration storageContainerConfig = createStorageContainerConfiguration(databaseType, storageContainerImage);
+ StorageContainerConfiguration storageContainerConfig = StorageContainerConfigurationFactory.newInstance(
+ StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, null);
storageContainer = (DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage, storageContainerConfig);
storageContainer.start();
}
- private StorageContainerConfiguration createStorageContainerConfiguration(final DatabaseType databaseType, final String storageContainerImage) {
- int majorVersion = new DockerImageVersion(storageContainerImage).getMajorVersion();
- return StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, majorVersion, null);
- }
-
private void assertSQL(final Collection<String> actualSQL, final Collection<String> expectedSQL) {
Iterator<String> expected = expectedSQL.iterator();
for (String each : actualSQL) {
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 6004cde8cab..92d282a5497 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
@@ -19,23 +19,21 @@ package org.apache.shardingsphere.test.e2e.operation.pipeline.framework.containe
import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.database.connector.mysql.type.MySQLDatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyEmbeddedContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
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.container.atomic.storage.type.docker.DockerStorageContainer;
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;
import org.apache.shardingsphere.test.e2e.operation.pipeline.framework.container.config.proxy.PipelineProxyContainerConfigurationFactory;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.util.DockerImageVersion;
import java.security.InvalidParameterException;
import java.util.Collections;
@@ -65,8 +63,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(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, majorVersion, null);
+ storageContainerConfig = StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, null);
DockerStorageContainer storageContainer = getContainers().registerContainer(
(DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage, storageContainerConfig));
storageContainer.setNetworkAliases(Collections.singletonList(String.join(".", databaseType.getType().toLowerCase() + "_" + i, "host")));