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 4e20f6a67c7 Improve integration test (#19625)
4e20f6a67c7 is described below
commit 4e20f6a67c7574b9b0b224858ea991032dd3bea0
Author: Xinze Guo <[email protected]>
AuthorDate: Thu Jul 28 16:23:15 2022 +0800
Improve integration test (#19625)
* Specify the name of the file to be mounted in the container
* Remove commandParts
* Remove server-id at my.cnf
* Remove useless code
* Add log
---
.../pipeline/core/execute/PipelineJobExecutor.java | 1 +
.../scenario/rulealtered/RuleAlteredJobCenter.java | 2 ++
.../atomic/storage/DockerStorageContainer.java | 4 +--
.../atomic/storage/StorageContainerFactory.java | 9 +++--
.../atomic/storage/impl/MySQLContainer.java | 7 ++--
.../atomic/storage/impl/OpenGaussContainer.java | 7 ----
.../atomic/storage/impl/PostgreSQLContainer.java | 17 ++--------
.../pom.xml | 3 --
.../data/pipeline/cases/base/BaseITCase.java | 8 +----
.../pipeline/env/IntegrationTestEnvironment.java | 8 -----
.../container/compose/DockerComposedContainer.java | 5 +--
.../framework/helper/ScalingCaseHelper.java | 39 ----------------------
.../src/test/resources/env/mysql/my.cnf | 1 -
.../shardingsphere-integration-test-suite/pom.xml | 3 --
.../src/test/resources/env/mysql/my.cnf | 1 -
15 files changed, 15 insertions(+), 100 deletions(-)
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/PipelineJobExecutor.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/PipelineJobExecutor.java
index d3d2c33623d..a9bbcba3c67 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/PipelineJobExecutor.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/execute/PipelineJobExecutor.java
@@ -90,6 +90,7 @@ public final class PipelineJobExecutor extends
AbstractLifecycleExecutor {
if
(RuleAlteredJobCenter.isJobExisting(jobConfigPOJO.getJobName())) {
log.info("{} added to executing jobs failed since it
already exists", jobConfigPOJO.getJobName());
} else {
+ log.info("{} executing jobs", jobConfigPOJO.getJobName());
executor.execute(() -> execute(jobConfigPOJO));
}
break;
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobCenter.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobCenter.java
index 5c8ace8b80e..15cdb66c0ef 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobCenter.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/rulealtered/RuleAlteredJobCenter.java
@@ -37,6 +37,7 @@ public final class RuleAlteredJobCenter {
* @param job job
*/
public static void addJob(final String jobId, final RuleAlteredJob job) {
+ log.info("add job, jobId={}", jobId);
JOB_MAP.put(jobId, job);
}
@@ -62,6 +63,7 @@ public final class RuleAlteredJobCenter {
return;
}
job.stop();
+ log.info("remove job, jobId={}", jobId);
JOB_MAP.remove(jobId);
}
}
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 39fc4e6b568..2dc74f341cf 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
@@ -68,9 +68,9 @@ public abstract class DockerStorageContainer extends
DockerITContainer implement
@Override
protected void configure() {
- withClasspathResourceMapping("/container/init-sql/" +
databaseType.getType().toLowerCase() + "/00-init-authority.sql",
"/docker-entrypoint-initdb.d/", BindMode.READ_ONLY);
+ withClasspathResourceMapping("/container/init-sql/" +
databaseType.getType().toLowerCase() + "/00-init-authority.sql",
"/docker-entrypoint-initdb.d/00-init-authority.sql", BindMode.READ_ONLY);
if (Strings.isNullOrEmpty(scenario)) {
- withClasspathResourceMapping("/env/" +
databaseType.getType().toLowerCase() + "/01-initdb.sql",
"/docker-entrypoint-initdb.d/", BindMode.READ_ONLY);
+ withClasspathResourceMapping("/env/" +
databaseType.getType().toLowerCase() + "/01-initdb.sql",
"/docker-entrypoint-initdb.d/01-initdb.sql", BindMode.READ_ONLY);
} else {
withClasspathResourceMapping(new
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.ACTUAL, databaseType),
"/docker-entrypoint-initdb.d/", BindMode.READ_ONLY);
withClasspathResourceMapping(new
ScenarioDataPath(scenario).getInitSQLResourcePath(Type.EXPECTED, databaseType),
"/docker-entrypoint-initdb.d/", BindMode.READ_ONLY);
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 1a949ccd6c7..14ee92e68a9 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
@@ -38,17 +38,16 @@ public final class StorageContainerFactory {
* @param dockerImageName docker image name
* @param scenario scenario
* @param useRootUsername use root username
- * @param commandParts command parts
* @return created instance
*/
- public static StorageContainer newInstance(final DatabaseType
databaseType, final String dockerImageName, final String scenario, final
boolean useRootUsername, final String... commandParts) {
+ public static StorageContainer newInstance(final DatabaseType
databaseType, final String dockerImageName, final String scenario, final
boolean useRootUsername) {
switch (databaseType.getType()) {
case "MySQL":
- return new MySQLContainer(dockerImageName, scenario,
useRootUsername, commandParts);
+ return new MySQLContainer(dockerImageName, scenario,
useRootUsername);
case "PostgreSQL":
- return new PostgreSQLContainer(dockerImageName, scenario,
useRootUsername, commandParts);
+ return new PostgreSQLContainer(dockerImageName, scenario,
useRootUsername);
case "openGauss":
- return new OpenGaussContainer(dockerImageName, scenario,
useRootUsername, commandParts);
+ return new OpenGaussContainer(dockerImageName, scenario,
useRootUsername);
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 ec52ecaab1d..26c58caf76f 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
@@ -29,17 +29,14 @@ import java.util.Optional;
*/
public final class MySQLContainer extends DockerStorageContainer {
- private final String[] commandParts;
-
public MySQLContainer(final String dockerImageName, final String scenario,
final boolean useRootUsername, final String... commandParts) {
super(DatabaseTypeFactory.getInstance("MySQL"),
Strings.isNullOrEmpty(dockerImageName) ? "mysql/mysql-server:5.7" :
dockerImageName, scenario, useRootUsername);
- this.commandParts = commandParts;
}
@Override
protected void configure() {
- // command config will override config at my.cnf.
- setCommand(commandParts);
+ // TODO need auto set server-id by generator, now always set server-id
to 1
+ setCommand("--server-id=1");
addEnv("LANG", "C.UTF-8");
addEnv("MYSQL_ROOT_PASSWORD", getUnifiedPassword());
addEnv("MYSQL_ROOT_HOST", "%");
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 a9edd1b01b7..6a5ae35e14f 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
@@ -31,20 +31,13 @@ import java.util.Optional;
*/
public final class OpenGaussContainer extends DockerStorageContainer {
- private final String[] commandParts;
-
public OpenGaussContainer(final String dockerImageName, final String
scenario, final boolean useRootUsername, final String... commandParts) {
super(DatabaseTypeFactory.getInstance("openGauss"),
Strings.isNullOrEmpty(dockerImageName) ? "enmotech/opengauss:3.0.0" :
dockerImageName, scenario, useRootUsername);
- this.commandParts = commandParts;
}
@Override
protected void configure() {
List<String> commandParts = new LinkedList<>();
- for (String each : this.commandParts) {
- commandParts.add("-c");
- commandParts.add(each);
- }
setCommand(commandParts.toArray(new String[0]));
addEnv("GS_PASSWORD", getUnifiedPassword());
withClasspathResourceMapping("/env/postgresql/postgresql.conf",
"/usr/local/opengauss/share/postgresql/postgresql.conf.sample",
BindMode.READ_ONLY);
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 25551d22d33..c8288ca757d 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
@@ -20,11 +20,8 @@ package
org.apache.shardingsphere.test.integration.env.container.atomic.storage.
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.DockerStorageContainer;
-import
org.apache.shardingsphere.test.integration.env.container.atomic.util.CommandPartUtil;
import org.testcontainers.containers.BindMode;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Optional;
/**
@@ -32,26 +29,16 @@ import java.util.Optional;
*/
public final class PostgreSQLContainer extends DockerStorageContainer {
- private static final String[] DEFAULT_COMMAND_PARTS = new
String[]{"config_file=/etc/postgresql/postgresql.conf"};
-
- private final String[] commandParts;
-
- public PostgreSQLContainer(final String dockerImageName, final String
scenario, final boolean useRootUsername, final String... commandParts) {
+ public PostgreSQLContainer(final String dockerImageName, final String
scenario, final boolean useRootUsername) {
super(DatabaseTypeFactory.getInstance("PostgreSQL"),
Strings.isNullOrEmpty(dockerImageName) ? "postgres:12-alpine" :
dockerImageName, scenario, useRootUsername);
- this.commandParts = commandParts;
}
@Override
protected void configure() {
- List<String> commandParts = new LinkedList<>();
- for (String each :
CommandPartUtil.mergeCommandParts(DEFAULT_COMMAND_PARTS, this.commandParts)) {
- commandParts.add("-c");
- commandParts.add(each);
- }
- setCommand(commandParts.toArray(new String[0]));
addEnv("POSTGRES_USER", getRootUsername());
addEnv("POSTGRES_PASSWORD", getUnifiedPassword());
withClasspathResourceMapping("/env/postgresql/postgresql.conf",
"/etc/postgresql/postgresql.conf", BindMode.READ_ONLY);
+ setCommand("-c config_file=/etc/postgresql/postgresql.conf");
super.configure();
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
index a747890314e..1b5a9014a68 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/pom.xml
@@ -105,9 +105,6 @@
<configuration>
<outputDirectory>target/test-classes</outputDirectory>
<resources>
- <resource>
-
<directory>${project.basedir}/../shardingsphere-integration-test-env/src/test/resources</directory>
- </resource>
<resource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
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 784debf6fc3..17da802eeb9 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
@@ -35,7 +35,6 @@ import
org.apache.shardingsphere.integration.data.pipeline.env.enums.ScalingITEn
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.BaseComposedContainer;
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.DockerComposedContainer;
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.NativeComposedContainer;
-import
org.apache.shardingsphere.integration.data.pipeline.framework.helper.ScalingCaseHelper;
import
org.apache.shardingsphere.integration.data.pipeline.framework.param.ScalingParameterized;
import
org.apache.shardingsphere.integration.data.pipeline.framework.watcher.ScalingWatcher;
import
org.apache.shardingsphere.integration.data.pipeline.util.DatabaseTypeUtil;
@@ -59,7 +58,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Properties;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -145,9 +143,6 @@ public abstract class BaseITCase {
defaultDatabaseName = "postgres";
}
String jdbcUrl =
composedContainer.getProxyJdbcUrl(defaultDatabaseName);
- if (DatabaseTypeUtil.isPostgreSQL(databaseType) ||
DatabaseTypeUtil.isOpenGauss(databaseType)) {
- jdbcUrl = JDBC_URL_APPENDER.appendQueryProperties(jdbcUrl,
ScalingCaseHelper.getPostgreSQLQueryProperties());
- }
try (Connection connection = DriverManager.getConnection(jdbcUrl,
"root", "Root@123")) {
if (ENV.getItEnvType() == ScalingITEnvTypeEnum.NATIVE) {
try {
@@ -198,8 +193,7 @@ public abstract class BaseITCase {
addSourceResource0(connection);
}
} else {
- Properties queryProps =
ScalingCaseHelper.getPostgreSQLQueryProperties();
- try (Connection connection =
DriverManager.getConnection(JDBC_URL_APPENDER.appendQueryProperties(getComposedContainer().getProxyJdbcUrl("sharding_db"),
queryProps), "root", "Root@123")) {
+ try (Connection connection =
DriverManager.getConnection(getComposedContainer().getProxyJdbcUrl("sharding_db"),
"root", "Root@123")) {
addSourceResource0(connection);
}
}
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 6640b8fcc23..869aff8b163 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
@@ -48,20 +48,12 @@ public final class IntegrationTestEnvironment {
private final List<String> openGaussVersions;
- private final String[] commandParts;
-
private IntegrationTestEnvironment() {
props = loadProperties();
itEnvType =
ScalingITEnvTypeEnum.valueOf(StringUtils.defaultIfBlank(props.getProperty("scaling.it.env.type").toUpperCase(),
ScalingITEnvTypeEnum.NONE.name()));
mysqlVersions =
Arrays.stream(props.getOrDefault("scaling.it.docker.mysql.version",
"").toString().split(",")).filter(StringUtils::isNotBlank).collect(Collectors.toList());
postgresVersions =
Arrays.stream(props.getOrDefault("scaling.it.docker.postgresql.version",
"").toString().split(",")).filter(StringUtils::isNotBlank).collect(Collectors.toList());
openGaussVersions =
Arrays.stream(props.getOrDefault("scaling.it.docker.opengauss.version",
"").toString().split(",")).filter(StringUtils::isNotBlank).collect(Collectors.toList());
- String commands = props.getOrDefault("scaling.it.database.command",
"").toString();
- if (StringUtils.isNotBlank(commands)) {
- commandParts = commands.split(",");
- } else {
- commandParts = new String[0];
- }
}
@SneakyThrows(IOException.class)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
index a5d8b518453..0618151fe0d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.integration.data.pipeline.framework.container.
import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.integration.data.pipeline.env.IntegrationTestEnvironment;
import
org.apache.shardingsphere.integration.data.pipeline.framework.container.proxy.ShardingSphereProxyDockerContainer;
import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.integration.env.container.atomic.governance.impl.ZookeeperContainer;
@@ -32,8 +31,6 @@ import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironm
*/
public final class DockerComposedContainer extends BaseComposedContainer {
- private static final IntegrationTestEnvironment ENV =
IntegrationTestEnvironment.getInstance();
-
private final DatabaseType databaseType;
private final ShardingSphereProxyDockerContainer proxyContainer;
@@ -44,7 +41,7 @@ public final class DockerComposedContainer extends
BaseComposedContainer {
public DockerComposedContainer(final DatabaseType databaseType, final
String dockerImageName) {
this.databaseType = databaseType;
GovernanceContainer governanceContainer =
getContainers().registerContainer(new ZookeeperContainer());
- storageContainer =
getContainers().registerContainer((DockerStorageContainer)
StorageContainerFactory.newInstance(databaseType, dockerImageName, "", false,
ENV.getCommandParts()));
+ storageContainer =
getContainers().registerContainer((DockerStorageContainer)
StorageContainerFactory.newInstance(databaseType, dockerImageName, "", false));
ShardingSphereProxyDockerContainer proxyContainer = new
ShardingSphereProxyDockerContainer(databaseType);
proxyContainer.dependsOn(governanceContainer, storageContainer);
ShardingSphereProxyDockerContainer anotherProxyContainer = new
ShardingSphereProxyDockerContainer(databaseType);
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/helper/ScalingCaseHelper.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/helper/ScalingCaseHelper.java
index 19bcb23ed6c..03f02b63c88 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/helper/ScalingCaseHelper.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/helper/ScalingCaseHelper.java
@@ -21,7 +21,6 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
-import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import java.math.BigDecimal;
@@ -29,7 +28,6 @@ import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
@@ -37,17 +35,6 @@ import java.util.concurrent.ThreadLocalRandom;
*/
public final class ScalingCaseHelper {
- /**
- * Get query properties by database type.
- *
- * @return query properties
- */
- public static Properties getPostgreSQLQueryProperties() {
- Properties result = new Properties();
- result.put("preferQueryMode", "extendedForPrepared");
- return result;
- }
-
/**
* Generate MySQL insert data, contains full fields.
*
@@ -99,30 +86,4 @@ public final class ScalingCaseHelper {
private static double generateDouble(final double min, final double max) {
return ThreadLocalRandom.current().nextDouble(min, max);
}
-
- /**
- * Get username by database type.
- *
- * @param databaseType database type
- * @return username
- */
- public static String getUsername(final DatabaseType databaseType) {
- if (databaseType instanceof OpenGaussDatabaseType) {
- return "gaussdb";
- }
- return "root";
- }
-
- /**
- * Get password by database type.
- *
- * @param databaseType database type
- * @return username
- */
- public static String getPassword(final DatabaseType databaseType) {
- if (databaseType instanceof OpenGaussDatabaseType) {
- return "Root@123";
- }
- return "Root@123";
- }
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/my.cnf
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/my.cnf
index 552b13ae282..6d55640b7b2 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/my.cnf
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/mysql/my.cnf
@@ -18,7 +18,6 @@
[mysql]
[mysqld]
-server-id=1
log-bin=mysql-bin
binlog-format=row
binlog-row-image=full
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
index 3eefa0699fe..6095c517b67 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml
@@ -77,9 +77,6 @@
<configuration>
<outputDirectory>target/test-classes</outputDirectory>
<resources>
- <resource>
-
<directory>${project.basedir}/../shardingsphere-integration-test-env/src/test/resources</directory>
- </resource>
<resource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/mysql/my.cnf
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/mysql/my.cnf
index 552b13ae282..6d55640b7b2 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/mysql/my.cnf
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/mysql/my.cnf
@@ -18,7 +18,6 @@
[mysql]
[mysqld]
-server-id=1
log-bin=mysql-bin
binlog-format=row
binlog-row-image=full
