This is an automated email from the ASF dual-hosted git repository.
panjuan 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 0aeac50 Remove StorageContainer.withInitSQLMapping() (#15378)
0aeac50 is described below
commit 0aeac5003aa890ad6ed2ca73f7ecf35dc1b7ef97
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Feb 12 17:33:45 2022 +0800
Remove StorageContainer.withInitSQLMapping() (#15378)
---
.../test/integration/env/EnvironmentPath.java | 11 +++++++++++
.../container/atomic/storage/StorageContainer.java | 13 ++++---------
.../container/atomic/storage/impl/MySQLContainer.java | 2 +-
.../container/atomic/storage/impl/PostgreSQLContainer.java | 2 +-
.../container/compose/mode/ClusterComposedContainer.java | 9 ++++-----
5 files changed, 21 insertions(+), 16 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
index 8607c0b..038b9b7 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/env/EnvironmentPath.java
@@ -65,6 +65,17 @@ public final class EnvironmentPath {
}
/**
+ * Get init SQL resource path.
+ *
+ * @param databaseType database type
+ * @param scenario scenario
+ * @return init SQL resource path
+ */
+ public static String getInitSQLResourcePath(final DatabaseType
databaseType, final String scenario) {
+ return String.join("/", "", ROOT_PATH, scenario, "init-sql",
databaseType.getName().toLowerCase());
+ }
+
+ /**
* Get init SQL file.
*
* @param databaseType database type
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
index 794ae5f..c3db962 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/StorageContainer.java
@@ -23,6 +23,7 @@ import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.env.DataSourceEnvironment;
+import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
import
org.apache.shardingsphere.test.integration.env.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.integration.framework.container.atomic.AtomicContainer;
import org.testcontainers.containers.BindMode;
@@ -56,15 +57,9 @@ public abstract class StorageContainer extends
AtomicContainer {
this.scenario = scenario;
}
- /**
- * Mount a source path into container.
- *
- * @param resourcePath resource path
- * @return self
- */
- public StorageContainer withInitSQLMapping(final String resourcePath) {
- withClasspathResourceMapping(resourcePath,
"/docker-entrypoint-initdb.d/", BindMode.READ_ONLY);
- return this;
+ @Override
+ protected void configure() {
+
withClasspathResourceMapping(EnvironmentPath.getInitSQLResourcePath(databaseType,
scenario), "/docker-entrypoint-initdb.d/", BindMode.READ_ONLY);
}
/**
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/impl/MySQLContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/impl/MySQLContainer.java
index d42aba7..d79ee76 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/impl/MySQLContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/impl/MySQLContainer.java
@@ -36,8 +36,8 @@ public final class MySQLContainer extends StorageContainer {
@Override
protected void configure() {
withCommand("--sql_mode=",
"--default-authentication-plugin=mysql_native_password");
- withInitSQLMapping("/env/" + getScenario() + "/init-sql/mysql");
setEnv(Collections.singletonList("LANG=C.UTF-8"));
+ super.configure();
}
@Override
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/impl/PostgreSQLContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/impl/PostgreSQLContainer.java
index c5242b4..6b57e94 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/impl/PostgreSQLContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/storage/impl/PostgreSQLContainer.java
@@ -45,7 +45,7 @@ public final class PostgreSQLContainer extends
StorageContainer {
withCommand("--max_connections=200");
addEnv("POSTGRES_USER", "root");
addEnv("POSTGRES_PASSWORD", "root");
- withInitSQLMapping("/env/" + getScenario() + "/init-sql/postgresql");
+ super.configure();
}
@Override
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
index a843fb3..8e1ede0 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
@@ -52,20 +52,19 @@ public final class ClusterComposedContainer implements
ComposedContainer {
containers = new AtomicContainers(testSuiteName,
parameterizedArray.getScenario());
storageContainer = containers.registerContainer(
StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(),
parameterizedArray.getScenario()),
parameterizedArray.getDatabaseType().getName());
- adapterContainer =
containers.registerContainer(AdapterContainerFactory.newInstance(
- parameterizedArray.getAdapter(),
parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()),
parameterizedArray.getAdapter());
+ adapterContainer = containers.registerContainer(
+
AdapterContainerFactory.newInstance(parameterizedArray.getAdapter(),
parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()),
parameterizedArray.getAdapter());
// TODO support other types of governance
governanceContainer =
containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"),
"zk");
+ adapterContainer.dependsOn(storageContainer, governanceContainer);
if ("proxy".equals(parameterizedArray.getAdapter())) {
adapterContainerForReader = containers.registerContainer(
new ShardingSphereProxyContainer("ShardingSphere-Proxy-1",
parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()),
"ShardingSphere-Proxy-1");
- adapterContainerForReader.dependsOn(storageContainer,
governanceContainer);
} else {
adapterContainerForReader = containers.registerContainer(
AdapterContainerFactory.newInstance(parameterizedArray.getAdapter(),
parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()),
parameterizedArray.getAdapter());
- adapterContainerForReader.dependsOn(storageContainer,
governanceContainer);
}
- adapterContainer.dependsOn(storageContainer, governanceContainer);
+ adapterContainerForReader.dependsOn(storageContainer,
governanceContainer);
}
@Override
