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 2022/09/15 03:21:25 UTC
[shardingsphere] branch master updated: Refactor : refactor a variable for container quantity (#20970)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 dbd0880c243 Refactor : refactor a variable for container quantity (#20970)
dbd0880c243 is described below
commit dbd0880c243f366040543a5403ae727eecdb71f0
Author: 孙念君 Nianjun Sun <su...@sphere-ex.com>
AuthorDate: Thu Sep 15 11:21:13 2022 +0800
Refactor : refactor a variable for container quantity (#20970)
* Refactor : refactor the variables
* Refactor : rename storage container image variables
---
.github/PULL_REQUEST_TEMPLATE | 1 -
.../integration/env/container/atomic/DockerITContainer.java | 4 ++--
.../env/container/atomic/constants/EnvironmentConstants.java | 2 +-
.../env/container/atomic/governance/GovernanceContainer.java | 4 ++--
.../env/container/atomic/storage/DockerStorageContainer.java | 4 ++--
.../container/atomic/storage/StorageContainerFactory.java | 12 ++++++------
.../env/container/atomic/storage/impl/MySQLContainer.java | 4 ++--
.../container/atomic/storage/impl/OpenGaussContainer.java | 4 ++--
.../container/atomic/storage/impl/PostgreSQLContainer.java | 4 ++--
.../env/container/atomic/util/DatabaseTypeUtil.java | 10 +++++-----
.../test/integration/ha/cases/base/BaseITCase.java | 2 +-
.../test/integration/ha/cases/mysql/MySQLHAGeneralIT.java | 4 ++--
.../test/integration/ha/env/IntegrationTestEnvironment.java | 8 ++++----
.../framework/container/compose/DockerContainerComposer.java | 4 ++--
.../integration/ha/framework/parameter/HAParameterized.java | 2 +-
.../integration/data/pipeline/cases/base/BaseITCase.java | 2 +-
.../cases/createtable/CreateTableSQLGeneratorIT.java | 2 +-
.../cases/migration/general/MySQLMigrationGeneralIT.java | 4 ++--
.../migration/general/PostgreSQLMigrationGeneralIT.java | 8 ++++----
.../migration/primarykey/TextPrimaryKeyMigrationIT.java | 6 +++---
.../data/pipeline/env/IntegrationTestEnvironment.java | 6 +++---
.../framework/container/compose/DockerContainerComposer.java | 6 +++---
.../ScalingProxyClusterContainerConfigurationFactory.java | 10 +++++-----
.../data/pipeline/framework/param/ScalingParameterized.java | 2 +-
.../container/compose/ContainerComposerRegistry.java | 2 +-
.../integration/transaction/engine/base/BaseITCase.java | 4 ++--
.../framework/container/compose/DockerContainerComposer.java | 2 +-
.../framework/param/TransactionParameterized.java | 4 ++--
28 files changed, 63 insertions(+), 64 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index dd845dfa2a5..18f83de83d6 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -13,4 +13,3 @@ Before committing this PR, I'm sure that I have checked the following options:
- [x] I have triggered maven check: `mvn clean install -B -T2C -DskipTests -Dmaven.javadoc.skip=true -e`.
- [x] I have made corresponding changes to the documentation.
- [x] I have added corresponding unit tests for my changes.
-
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/DockerITContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/DockerITContainer.java
index 9cb7ff22709..40373853be7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/DockerITContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/DockerITContainer.java
@@ -38,8 +38,8 @@ public abstract class DockerITContainer extends GenericContainer<DockerITContain
private final String name;
- public DockerITContainer(final String name, final String dockerImageName) {
- super(new RemoteDockerImage(DockerImageName.parse(dockerImageName)));
+ public DockerITContainer(final String name, final String containerImage) {
+ super(new RemoteDockerImage(DockerImageName.parse(containerImage)));
this.name = name;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/constants/EnvironmentConstants.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/constants/EnvironmentConstants.java
index 630b8fb9831..08358123785 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/constants/EnvironmentConstants.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/constants/EnvironmentConstants.java
@@ -30,5 +30,5 @@ public final class EnvironmentConstants {
public static final String STANDALONE_MODE = "Standalone";
- public static final int DEFAULT_FULL_CONTAINER_QUANTITY = 8;
+ public static final int MAX_CONTAINER_QUANTITY = 7;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainer.java
index 1a7da291c0e..cc288c922ca 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/governance/GovernanceContainer.java
@@ -24,8 +24,8 @@ import org.apache.shardingsphere.test.integration.env.container.atomic.DockerITC
*/
public abstract class GovernanceContainer extends DockerITContainer {
- public GovernanceContainer(final String name, final String dockerImageName) {
- super(name, dockerImageName);
+ public GovernanceContainer(final String name, final String containerImage) {
+ super(name, containerImage);
}
/**
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/DockerStorageContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/DockerStorageContainer.java
index 587477fe52c..2ec8bcdfc65 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/DockerStorageContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/DockerStorageContainer.java
@@ -59,8 +59,8 @@ public abstract class DockerStorageContainer extends DockerITContainer implement
private final Map<String, DataSource> expectedDataSourceMap;
- public DockerStorageContainer(final DatabaseType databaseType, final String dockerImageName, final String scenario) {
- super(databaseType.getType().toLowerCase(), dockerImageName);
+ public DockerStorageContainer(final DatabaseType databaseType, final String containerImage, final String scenario) {
+ super(databaseType.getType().toLowerCase(), containerImage);
this.databaseType = databaseType;
this.scenario = scenario;
actualDataSourceMap = new LinkedHashMap<>();
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainerFactory.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainerFactory.java
index f855d2cfc56..5f454c9662c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainerFactory.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainerFactory.java
@@ -36,20 +36,20 @@ public final class StorageContainerFactory {
* Create new instance of storage container.
*
* @param databaseType database type
- * @param dockerImageName docker image name
+ * @param storageContainerImage storage container image
* @param scenario scenario
- * @param storageContainerConfiguration storageContainerConfiguration
+ * @param storageContainerConfiguration storage container configuration
* @return created instance
*/
- public static StorageContainer newInstance(final DatabaseType databaseType, final String dockerImageName, final String scenario,
+ public static StorageContainer newInstance(final DatabaseType databaseType, final String storageContainerImage, final String scenario,
final StorageContainerConfiguration storageContainerConfiguration) {
switch (databaseType.getType()) {
case "MySQL":
- return new MySQLContainer(dockerImageName, scenario, storageContainerConfiguration);
+ return new MySQLContainer(storageContainerImage, scenario, storageContainerConfiguration);
case "PostgreSQL":
- return new PostgreSQLContainer(dockerImageName, scenario, storageContainerConfiguration);
+ return new PostgreSQLContainer(storageContainerImage, scenario, storageContainerConfiguration);
case "openGauss":
- return new OpenGaussContainer(dockerImageName, scenario, storageContainerConfiguration);
+ return new OpenGaussContainer(storageContainerImage, scenario, storageContainerConfiguration);
case "H2":
return new H2Container(scenario);
default:
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/MySQLContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/MySQLContainer.java
index f5bdc16b32f..60dd7fccf3d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/MySQLContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/MySQLContainer.java
@@ -32,8 +32,8 @@ public final class MySQLContainer extends DockerStorageContainer {
private final StorageContainerConfiguration storageContainerConfiguration;
- public MySQLContainer(final String dockerImageName, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
- super(DatabaseTypeFactory.getInstance("MySQL"), Strings.isNullOrEmpty(dockerImageName) ? "mysql/mysql-server:5.7" : dockerImageName, scenario);
+ public MySQLContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
+ super(DatabaseTypeFactory.getInstance("MySQL"), Strings.isNullOrEmpty(containerImage) ? "mysql/mysql-server:5.7" : containerImage, scenario);
this.storageContainerConfiguration = storageContainerConfiguration;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/OpenGaussContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/OpenGaussContainer.java
index 2dd0b4e1038..743ed014c9e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/OpenGaussContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/OpenGaussContainer.java
@@ -36,8 +36,8 @@ public final class OpenGaussContainer extends DockerStorageContainer {
private final StorageContainerConfiguration storageContainerConfiguration;
- public OpenGaussContainer(final String dockerImageName, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
- super(DatabaseTypeFactory.getInstance("openGauss"), Strings.isNullOrEmpty(dockerImageName) ? "enmotech/opengauss:3.0.0" : dockerImageName, scenario);
+ public OpenGaussContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
+ super(DatabaseTypeFactory.getInstance("openGauss"), Strings.isNullOrEmpty(containerImage) ? "enmotech/opengauss:3.0.0" : containerImage, scenario);
this.storageContainerConfiguration = storageContainerConfiguration;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/PostgreSQLContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/PostgreSQLContainer.java
index 2ee23cdd4f1..7308807df04 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/PostgreSQLContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/PostgreSQLContainer.java
@@ -32,8 +32,8 @@ public final class PostgreSQLContainer extends DockerStorageContainer {
private final StorageContainerConfiguration storageContainerConfiguration;
- public PostgreSQLContainer(final String dockerImageName, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
- super(DatabaseTypeFactory.getInstance("PostgreSQL"), Strings.isNullOrEmpty(dockerImageName) ? "postgres:12-alpine" : dockerImageName, scenario);
+ public PostgreSQLContainer(final String containerImage, final String scenario, final StorageContainerConfiguration storageContainerConfiguration) {
+ super(DatabaseTypeFactory.getInstance("PostgreSQL"), Strings.isNullOrEmpty(containerImage) ? "postgres:12-alpine" : containerImage, scenario);
this.storageContainerConfiguration = storageContainerConfiguration;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/DatabaseTypeUtil.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/DatabaseTypeUtil.java
index 682a13f3ac5..9c00833058d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/DatabaseTypeUtil.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/DatabaseTypeUtil.java
@@ -59,16 +59,16 @@ public final class DatabaseTypeUtil {
}
/**
- * Get docker image major version.
+ * Get storage container image major version.
*
- * @param dockerImageName dockerImageName
+ * @param storageContainerImage storage container image
* @return major version
*/
- public static String parseMajorVersion(final String dockerImageName) {
- if (StringUtils.isBlank(dockerImageName)) {
+ public static String parseMajorVersion(final String storageContainerImage) {
+ if (StringUtils.isBlank(storageContainerImage)) {
return "";
}
- String version = dockerImageName.split(":")[1];
+ String version = storageContainerImage.split(":")[1];
return version.split("\\.")[0];
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/base/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/base/BaseITCase.java
index 19fd9df018a..28f83600013 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/base/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/base/BaseITCase.java
@@ -56,7 +56,7 @@ public abstract class BaseITCase {
public BaseITCase(final HAParameterized haParameterized) {
databaseType = haParameterized.getDatabaseType();
- containerComposer = new DockerContainerComposer(haParameterized.getScenario(), haParameterized.getDatabaseType(), haParameterized.getDockerImageName());
+ containerComposer = new DockerContainerComposer(haParameterized.getScenario(), haParameterized.getDatabaseType(), haParameterized.getStorageContainerImage());
containerComposer.start();
databaseName = (DatabaseTypeUtil.isPostgreSQL(databaseType) || DatabaseTypeUtil.isOpenGauss(databaseType)) ? "postgres" : "";
initStorageDataSources();
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/mysql/MySQLHAGeneralIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/mysql/MySQLHAGeneralIT.java
index 1438f3780b5..9b90880ec29 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/mysql/MySQLHAGeneralIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/mysql/MySQLHAGeneralIT.java
@@ -49,8 +49,8 @@ public final class MySQLHAGeneralIT extends BaseITCase {
public static Collection<HAParameterized> getParameters() {
Collection<HAParameterized> result = new LinkedList<>();
MySQLDatabaseType databaseType = new MySQLDatabaseType();
- for (String version : ENV.listDatabaseDockerImageNames(databaseType)) {
- result.add(new HAParameterized(databaseType, version, "mysql_ha"));
+ for (String each : ENV.listStorageContainerImages(databaseType)) {
+ result.add(new HAParameterized(databaseType, each, "mysql_ha"));
}
return result;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/env/IntegrationTestEnvironment.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/env/IntegrationTestEnvironment.java
index 30a143d7ce1..60fec4a19d0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/env/IntegrationTestEnvironment.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/env/IntegrationTestEnvironment.java
@@ -77,12 +77,12 @@ public final class IntegrationTestEnvironment {
}
/**
- * List database docker image names.
+ * List storage container images.
*
- * @param databaseType database type.
- * @return database docker image names
+ * @param databaseType database type
+ * @return storage container images
*/
- public List<String> listDatabaseDockerImageNames(final DatabaseType databaseType) {
+ public List<String> listStorageContainerImages(final DatabaseType databaseType) {
switch (databaseType.getType()) {
case "MySQL":
return mysqlVersions;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerContainerComposer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerContainerComposer.java
index 360936ab7db..6704fc5149b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerContainerComposer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerContainerComposer.java
@@ -60,14 +60,14 @@ public final class DockerContainerComposer extends BaseContainerComposer {
@Getter
private final GovernanceContainer governanceContainer;
- public DockerContainerComposer(final String scenario, final DatabaseType databaseType, final String dockerImageName) {
+ public DockerContainerComposer(final String scenario, final DatabaseType databaseType, final String storageContainerImage) {
super("");
this.databaseType = databaseType;
this.storageContainers = new LinkedList<>();
governanceContainer = getContainers().registerContainer(new ZookeeperContainer());
List<StorageContainerConfiguration> containerConfigs = StorageContainerConfigurationFactory.newInstance(scenario, databaseType);
containerConfigs.forEach(each -> {
- DockerStorageContainer storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, dockerImageName, null, each));
+ DockerStorageContainer storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage, null, each));
storageContainer.setNetworkAliases(Collections.singletonList(databaseType.getType().toLowerCase() + "_" + ContainerUtil.generateStorageContainerId()));
storageContainers.add(storageContainer);
});
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/parameter/HAParameterized.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/parameter/HAParameterized.java
index ba062913fd8..f5e078d7908 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/parameter/HAParameterized.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/parameter/HAParameterized.java
@@ -29,7 +29,7 @@ public final class HAParameterized {
private final DatabaseType databaseType;
- private final String dockerImageName;
+ private final String storageContainerImage;
private final String scenario;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
index 4deb6fdffcf..75cb988b2e7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
@@ -114,7 +114,7 @@ public abstract class BaseITCase {
public BaseITCase(final ScalingParameterized parameterized) {
databaseType = parameterized.getDatabaseType();
if (ENV.getItEnvType() == ITEnvTypeEnum.DOCKER) {
- containerComposer = new DockerContainerComposer(parameterized.getDatabaseType(), parameterized.getDockerImageName());
+ containerComposer = new DockerContainerComposer(parameterized.getDatabaseType(), parameterized.getStorageContainerImage());
} else {
containerComposer = new NativeContainerComposer(parameterized.getDatabaseType());
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index 738d642963f..86831e60cd6 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -79,7 +79,7 @@ public final class CreateTableSQLGeneratorIT {
this.parameterized = parameterized;
rootEntity = JAXB.unmarshal(
Objects.requireNonNull(CreateTableSQLGeneratorIT.class.getClassLoader().getResource(parameterized.getScenario())), CreateTableSQLGeneratorAssertionsRootEntity.class);
- storageContainer = (DockerStorageContainer) StorageContainerFactory.newInstance(parameterized.getDatabaseType(), parameterized.getDockerImageName(), "",
+ storageContainer = (DockerStorageContainer) StorageContainerFactory.newInstance(parameterized.getDatabaseType(), parameterized.getStorageContainerImage(), "",
StorageContainerConfigurationFactory.newInstance(parameterized.getDatabaseType()));
storageContainer.start();
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/general/MySQLMigrationGeneralIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/general/MySQLMigrationGeneralIT.java
index 275a2f7debe..2a9610924d8 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/general/MySQLMigrationGeneralIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/general/MySQLMigrationGeneralIT.java
@@ -64,8 +64,8 @@ public final class MySQLMigrationGeneralIT extends AbstractMigrationITCase {
return result;
}
MySQLDatabaseType databaseType = new MySQLDatabaseType();
- for (String version : ENV.listDatabaseDockerImageNames(databaseType)) {
- result.add(new ScalingParameterized(databaseType, version, "env/scenario/general/mysql.xml"));
+ for (String each : ENV.listStorageContainerImages(databaseType)) {
+ result.add(new ScalingParameterized(databaseType, each, "env/scenario/general/mysql.xml"));
}
return result;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralIT.java
index e181a40838c..3d23ee97adc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralIT.java
@@ -65,11 +65,11 @@ public final class PostgreSQLMigrationGeneralIT extends AbstractMigrationITCase
if (ENV.getItEnvType() == ITEnvTypeEnum.NONE) {
return result;
}
- for (String dockerImageName : ENV.listDatabaseDockerImageNames(new PostgreSQLDatabaseType())) {
- result.add(new ScalingParameterized(new PostgreSQLDatabaseType(), dockerImageName, "env/scenario/general/postgresql.xml"));
+ for (String each : ENV.listStorageContainerImages(new PostgreSQLDatabaseType())) {
+ result.add(new ScalingParameterized(new PostgreSQLDatabaseType(), each, "env/scenario/general/postgresql.xml"));
}
- for (String dockerImageName : ENV.listDatabaseDockerImageNames(new OpenGaussDatabaseType())) {
- result.add(new ScalingParameterized(new OpenGaussDatabaseType(), dockerImageName, "env/scenario/general/postgresql.xml"));
+ for (String each : ENV.listStorageContainerImages(new OpenGaussDatabaseType())) {
+ result.add(new ScalingParameterized(new OpenGaussDatabaseType(), each, "env/scenario/general/postgresql.xml"));
}
return result;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationIT.java
index a218ceec096..e5e3e76ce6d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationIT.java
@@ -57,14 +57,14 @@ public class TextPrimaryKeyMigrationIT extends AbstractMigrationITCase {
if (ENV.getItEnvType() == ITEnvTypeEnum.NONE) {
return result;
}
- for (String version : ENV.listDatabaseDockerImageNames(new MySQLDatabaseType())) {
+ for (String version : ENV.listStorageContainerImages(new MySQLDatabaseType())) {
result.add(new ScalingParameterized(new MySQLDatabaseType(), version, "env/scenario/primary_key/text_primary_key/mysql.xml"));
result.add(new ScalingParameterized(new MySQLDatabaseType(), version, "env/scenario/primary_key/unique_key/mysql.xml"));
}
- for (String version : ENV.listDatabaseDockerImageNames(new PostgreSQLDatabaseType())) {
+ for (String version : ENV.listStorageContainerImages(new PostgreSQLDatabaseType())) {
result.add(new ScalingParameterized(new PostgreSQLDatabaseType(), version, "env/scenario/primary_key/text_primary_key/postgresql.xml"));
}
- for (String version : ENV.listDatabaseDockerImageNames(new OpenGaussDatabaseType())) {
+ for (String version : ENV.listStorageContainerImages(new OpenGaussDatabaseType())) {
result.add(new ScalingParameterized(new OpenGaussDatabaseType(), version, "env/scenario/primary_key/text_primary_key/postgresql.xml"));
}
return result;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/env/IntegrationTestEnvironment.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/env/IntegrationTestEnvironment.java
index e5c5aad54e6..134eb290975 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/env/IntegrationTestEnvironment.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/env/IntegrationTestEnvironment.java
@@ -146,12 +146,12 @@ public final class IntegrationTestEnvironment {
}
/**
- * List database docker image names.
+ * List storage contaienr images.
*
* @param databaseType database type.
- * @return database docker image names
+ * @return database storage container images
*/
- public List<String> listDatabaseDockerImageNames(final DatabaseType databaseType) {
+ public List<String> listStorageContainerImages(final DatabaseType databaseType) {
// Native mode needn't use docker image, just return a list which contain one item
if (getItEnvType() == ITEnvTypeEnum.NATIVE) {
return databaseType.getType().equalsIgnoreCase(getNativeDatabaseType()) ? Collections.singletonList("") : Collections.emptyList();
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerContainerComposer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerContainerComposer.java
index 26317245ea8..ae791e032a1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerContainerComposer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -47,12 +47,12 @@ public final class DockerContainerComposer extends BaseContainerComposer {
@Getter
private final GovernanceContainer governanceContainer;
- public DockerContainerComposer(final DatabaseType databaseType, final String dockerImageName) {
+ public DockerContainerComposer(final DatabaseType databaseType, final String storageContainerImage) {
this.databaseType = databaseType;
governanceContainer = getContainers().registerContainer(new ZookeeperContainer());
- storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, dockerImageName,
+ storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, storageContainerImage,
"", StorageContainerConfigurationFactory.newInstance(databaseType)));
- AdaptorContainerConfiguration containerConfig = ScalingProxyClusterContainerConfigurationFactory.newInstance(databaseType, dockerImageName);
+ AdaptorContainerConfiguration containerConfig = ScalingProxyClusterContainerConfigurationFactory.newInstance(databaseType, storageContainerImage);
ShardingSphereProxyClusterContainer proxyClusterContainer = (ShardingSphereProxyClusterContainer) AdapterContainerFactory.newInstance(EnvironmentConstants.CLUSTER_MODE,
AdapterContainerConstants.PROXY, databaseType, storageContainer, "", containerConfig);
proxyClusterContainer.dependsOn(governanceContainer, storageContainer);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationF [...]
index 11bed8a6568..e7facc54254 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java
@@ -38,22 +38,22 @@ public final class ScalingProxyClusterContainerConfigurationFactory {
* Create instance of adaptor container configuration.
*
* @param databaseType database type
- * @param dockerImageName docker image name
+ * @param storageContainerImage storage container image
* @return created instance
*/
- public static AdaptorContainerConfiguration newInstance(final DatabaseType databaseType, final String dockerImageName) {
- return new AdaptorContainerConfiguration(getProxyDatasourceName(databaseType), getMountedResource(databaseType, dockerImageName));
+ public static AdaptorContainerConfiguration newInstance(final DatabaseType databaseType, final String storageContainerImage) {
+ return new AdaptorContainerConfiguration(getProxyDatasourceName(databaseType), getMountedResource(databaseType, storageContainerImage));
}
private static String getProxyDatasourceName(final DatabaseType databaseType) {
return (DatabaseTypeUtil.isPostgreSQL(databaseType) || DatabaseTypeUtil.isOpenGauss(databaseType)) ? "postgres" : "";
}
- private static Map<String, String> getMountedResource(final DatabaseType databaseType, final String dockerImageName) {
+ private static Map<String, String> getMountedResource(final DatabaseType databaseType, final String storageContainerImage) {
Map<String, String> result = new HashMap<>(2, 1);
result.putAll(ProxyClusterContainerConfigurationFactory.newInstance().getMountedResources());
if (DatabaseTypeUtil.isMySQL(databaseType)) {
- String majorVersion = DatabaseTypeUtil.parseMajorVersion(dockerImageName);
+ String majorVersion = DatabaseTypeUtil.parseMajorVersion(storageContainerImage);
result.put(String.format("/env/%s/server-%s.yaml", databaseType.getType().toLowerCase(), majorVersion), ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
} else {
result.put(String.format("/env/%s/server.yaml", databaseType.getType().toLowerCase()), ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/param/ScalingParameterized.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/param/ScalingParameterized.java
index f4ebe6c4962..e99962d43d6 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/param/ScalingParameterized.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/param/ScalingParameterized.java
@@ -29,7 +29,7 @@ public final class ScalingParameterized {
private final DatabaseType databaseType;
- private final String dockerImageName;
+ private final String storageContainerImage;
private final String scenario;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
index c14e01804eb..925e41ab63b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
@@ -33,7 +33,7 @@ import java.util.Map;
*/
public final class ContainerComposerRegistry implements AutoCloseable {
- private final Map<String, ContainerComposer> containerComposers = new HashMap<>(EnvironmentConstants.DEFAULT_FULL_CONTAINER_QUANTITY, 1);
+ private final Map<String, ContainerComposer> containerComposers = new HashMap<>(EnvironmentConstants.MAX_CONTAINER_QUANTITY, 1);
/**
* Get container composer.
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
index e3ce1ec3b52..00fffe3002f 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
@@ -258,7 +258,7 @@ public abstract class BaseITCase {
final Map<String, TransactionParameterized> parameterizedMap, final String group) {
String uniqueKey = getUniqueKey(currentTestCaseInfo.getDbType(), currentTestCaseInfo.getRunningAdaptor(), transactionTypes, providers, group);
parameterizedMap.putIfAbsent(uniqueKey, new TransactionParameterized(getSqlDatabaseType(currentTestCaseInfo.getDbType()), currentTestCaseInfo.getRunningAdaptor(), transactionTypes, providers,
- getDockerImageName(currentTestCaseInfo.getDbType(), version), group, new LinkedList<>()));
+ getStorageContainerImage(currentTestCaseInfo.getDbType(), version), group, new LinkedList<>()));
parameterizedMap.get(uniqueKey).getTransactionTestCaseClasses().add(caseClass);
}
@@ -279,7 +279,7 @@ public abstract class BaseITCase {
}
}
- private static String getDockerImageName(final String databaseType, final String version) {
+ private static String getStorageContainerImage(final String databaseType, final String version) {
switch (databaseType) {
case TransactionTestConstants.MYSQL:
return "mysql/mysql-server:" + version;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerContainerComposer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerContainerComposer.java
index 1443a264e87..95d1dd19fcb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerContainerComposer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerContainerComposer.java
@@ -57,7 +57,7 @@ public final class DockerContainerComposer extends BaseContainerComposer {
public DockerContainerComposer(final TransactionParameterized parameterized) {
this.databaseType = parameterized.getDatabaseType();
governanceContainer = getContainers().registerContainer(new ZookeeperContainer());
- storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, parameterized.getDockerImageName(), "",
+ storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, parameterized.getStorageContainerImage(), "",
StorageContainerConfigurationFactory.newInstance(databaseType)));
if (AdapterContainerConstants.PROXY.equalsIgnoreCase(parameterized.getAdapter())) {
jdbcContainer = null;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/param/TransactionParameterized.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/param/TransactionParameterized.java
index c201b983355..6a85d2ef8ef 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/param/TransactionParameterized.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/param/TransactionParameterized.java
@@ -41,7 +41,7 @@ public final class TransactionParameterized {
private final List<String> providers;
- private final String dockerImageName;
+ private final String storageContainerImage;
private final String group;
@@ -49,6 +49,6 @@ public final class TransactionParameterized {
@Override
public String toString() {
- return String.format("%s -> %s -> %s -> %s -> %s -> %s", databaseType.getType(), adapter, transactionTypes, providers, dockerImageName, group);
+ return String.format("%s -> %s -> %s -> %s -> %s -> %s", databaseType.getType(), adapter, transactionTypes, providers, storageContainerImage, group);
}
}