Skip to content

Refactor StorageContainerFactory #36573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 15, 2025
Merged

Refactor StorageContainerFactory #36573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54a83a1
Refactor StorageContainerFactory
terrymanu Sep 15, 2025
d2b143b
Refactor StorageContainerFactory
terrymanu Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .../apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
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.StorageContainerConfiguration;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl.HiveContainer;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.embedded.impl.H2Container;
Expand All @@ -36,34 +36,36 @@ public final class StorageContainerFactory {
* Create new instance of storage container.
*
* @param databaseType database type
* @param storageContainerConfig storage container configuration
* @param option storage container configuration option
* @param scenario scenario
* @return created instance
* @throws RuntimeException runtime exception
*/
public static StorageContainer newInstance(final DatabaseType databaseType, final StorageContainerConfiguration storageContainerConfig) {
return newInstance(databaseType, E2ETestEnvironment.getInstance().getClusterEnvironment().getDatabaseImages().get(databaseType), storageContainerConfig);
public static StorageContainer newInstance(final DatabaseType databaseType, final StorageContainerConfigurationOption option, final String scenario) {
return newInstance(databaseType, E2ETestEnvironment.getInstance().getClusterEnvironment().getDatabaseImages().get(databaseType), option, scenario);
}

/**
* Create new instance of storage container.
*
* @param databaseType database type
* @param storageContainerImage storage container image
* @param storageContainerConfig storage container configuration
* @param option storage container configuration option
* @param scenario scenario
* @return created instance
* @throws RuntimeException runtime exception
*/
public static StorageContainer newInstance(final DatabaseType databaseType, final String storageContainerImage, final StorageContainerConfiguration storageContainerConfig) {
public static StorageContainer newInstance(final DatabaseType databaseType, final String storageContainerImage, final StorageContainerConfigurationOption option, final String scenario) {
switch (databaseType.getType()) {
case "MySQL":
case "PostgreSQL":
case "openGauss":
case "MariaDB":
return new DockerStorageContainer(databaseType, storageContainerImage, storageContainerConfig.getConfigurationOption(), storageContainerConfig.getScenario());
return new DockerStorageContainer(databaseType, storageContainerImage, option, scenario);
case "Hive":
return new HiveContainer(storageContainerImage, storageContainerConfig.getConfigurationOption(), storageContainerConfig.getScenario());
return new HiveContainer(storageContainerImage, option, scenario);
case "H2":
return new H2Container(storageContainerConfig.getScenario());
return new H2Container(scenario);
default:
throw new RuntimeException(String.format("Database `%s` is unknown.", databaseType.getType()));
}
Expand Down
34 changes: 0 additions & 34 deletions ...ingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ...ardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
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.StorageContainerFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
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;
Expand Down Expand Up @@ -93,8 +92,8 @@ void assertGenerateCreateTableSQL(final PipelineTestParameter testParam) throws
}

private void startStorageContainer(final DatabaseType databaseType, final String storageContainerImage) {
StorageContainerConfiguration storageContainerConfig = new StorageContainerConfiguration(null, StorageContainerConfigurationOptionFactory.newInstance(databaseType));
storageContainer = (DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage, storageContainerConfig);
storageContainer = (DockerStorageContainer) StorageContainerFactory.newInstance(
databaseType, storageContainerImage, StorageContainerConfigurationOptionFactory.newInstance(databaseType), null);
storageContainer.start();
}

Expand Down
5 changes: 1 addition & 4 deletions ...here/test/e2e/operation/pipeline/framework/container/compose/DockerContainerComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
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.StorageContainerFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
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;
Expand Down Expand Up @@ -61,10 +60,8 @@ public DockerContainerComposer(final DatabaseType databaseType, final String sto
throw new InvalidParameterException("storageContainerCount must >= 1");
}
for (int i = 0; i < storageContainerCount; i++) {
StorageContainerConfiguration storageContainerConfig;
storageContainerConfig = new StorageContainerConfiguration(null, StorageContainerConfigurationOptionFactory.newInstance(databaseType));
DockerStorageContainer storageContainer = getContainers().registerContainer(
(DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage, storageContainerConfig));
(DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage, StorageContainerConfigurationOptionFactory.newInstance(databaseType), null));
storageContainer.setNetworkAliases(Collections.singletonList(String.join(".", databaseType.getType().toLowerCase() + "_" + i, "host")));
storageContainers.add(storageContainer);
}
Expand Down
4 changes: 1 addition & 3 deletions ...operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
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.StorageContainerConfiguration;
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;
Expand Down Expand Up @@ -59,8 +58,7 @@ public ClusterShowProcessListContainerComposer(final ShowProcessListTestParamete
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(), "", new StorageContainerConfiguration(testParam.getScenario(), option)));
StorageContainer storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(testParam.getDatabaseType(), "", option, testParam.getScenario()));
AdaptorContainerConfiguration containerConfig = new AdaptorContainerConfiguration(testParam.getScenario(), new LinkedList<>(),
getMountedResources(testParam.getScenario(), testParam.getDatabaseType(), testParam.getRunMode(), testParam.getGovernanceCenter()), AdapterContainerUtils.getAdapterContainerImage(),
"");
Expand Down
5 changes: 2 additions & 3 deletions ...e/test/e2e/operation/transaction/framework/container/compose/DockerContainerComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
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.StorageContainerConfiguration;
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.container.atomic.storage.type.natived.NativeStorageContainer;
Expand Down Expand Up @@ -68,8 +67,8 @@ public DockerContainerComposer(final TransactionTestParameter testParam) {
governanceContainer = getContainers().registerContainer(new ZookeeperContainer());
TransactionE2EEnvTypeEnum envType = TransactionE2EEnvironment.getInstance().getItEnvType();
if (TransactionE2EEnvTypeEnum.DOCKER == envType) {
storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, testParam.getStorageContainerImage(),
new StorageContainerConfiguration(testParam.getScenario(), StorageContainerConfigurationOptionFactory.newInstance(databaseType))));
storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(
databaseType, testParam.getStorageContainerImage(), StorageContainerConfigurationOptionFactory.newInstance(databaseType), testParam.getScenario()));
} else {
storageContainer = getContainers().registerContainer(new NativeStorageContainer(databaseType, testParam.getScenario()));
}
Expand Down
3 changes: 1 addition & 2 deletions ...ache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
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.StorageContainerConfiguration;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.natived.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
Expand Down Expand Up @@ -60,7 +59,7 @@ public ClusterContainerComposer(final String scenario, final DatabaseType databa
governanceContainer = containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"));
Type envType = E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
? StorageContainerFactory.newInstance(databaseType, new StorageContainerConfiguration(scenario, StorageContainerConfigurationOptionFactory.newInstance(databaseType)))
? StorageContainerFactory.newInstance(databaseType, StorageContainerConfigurationOptionFactory.newInstance(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());
Expand Down
3 changes: 1 addition & 2 deletions ...e/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
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.StorageContainerConfiguration;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.natived.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
Expand All @@ -53,7 +52,7 @@ public StandaloneContainerComposer(final String scenario, final DatabaseType dat
containers = new ITContainers(scenario);
Type envType = E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
? StorageContainerFactory.newInstance(databaseType, new StorageContainerConfiguration(scenario, StorageContainerConfigurationOptionFactory.newInstance(databaseType)))
? StorageContainerFactory.newInstance(databaseType, StorageContainerConfigurationOptionFactory.newInstance(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());
Expand Down