You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/12 13:39:19 UTC
(shardingsphere) branch master updated: Refactor DockerStorageContainer (#36546)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e45075c43a3 Refactor DockerStorageContainer (#36546)
e45075c43a3 is described below
commit e45075c43a3c68d1310a88e72d0b1b7ef2f1bd25
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Sep 12 21:39:13 2025 +0800
Refactor DockerStorageContainer (#36546)
---
.../type/docker/DockerStorageContainer.java | 39 ++++++++++++----------
.../storage/type/docker/impl/HiveContainer.java | 2 +-
.../storage/type/docker/impl/MariaDBContainer.java | 2 +-
.../storage/type/docker/impl/MySQLContainer.java | 2 +-
.../type/docker/impl/OpenGaussContainer.java | 2 +-
.../type/docker/impl/PostgreSQLContainer.java | 2 +-
6 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
index aa9939afdf9..f4171268620 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
@@ -67,45 +67,50 @@ public abstract class DockerStorageContainer extends DockerITContainer implement
@Override
protected void configure() {
- setCommands(storageContainerConfig.getConfigurationOption().getCommand());
- addEnvs(storageContainerConfig.getConfigurationOption().getEnvironments());
+ setCommands();
+ addEnvironments();
mapResources(storageContainerConfig.getMountedConfigurationResources());
mapResources(storageContainerConfig.getMountedSQLResources());
- if (storageContainerConfig.getConfigurationOption().withPrivilegedMode()) {
- withPrivilegedMode(true);
- }
+ setPrivilegedMode();
withExposedPorts(getExposedPort());
withStartupTimeout(Duration.of(storageContainerConfig.getConfigurationOption().getStartupTimeoutSeconds(), ChronoUnit.SECONDS));
setWaitStrategy(new JdbcConnectionWaitStrategy(() -> DriverManager.getConnection(getURL(), CHECK_READY_USER, CHECK_READY_PASSWORD)));
}
- private String getURL() {
- return getDefaultDatabaseName().isPresent()
- ? DataSourceEnvironment.getURL(databaseType, "localhost", getFirstMappedPort(), getDefaultDatabaseName().get())
- : DataSourceEnvironment.getURL(databaseType, "localhost", getFirstMappedPort());
- }
-
- protected final void setCommands(final String command) {
+ private void setCommands() {
+ String command = storageContainerConfig.getConfigurationOption().getCommand();
if (!Strings.isNullOrEmpty(command)) {
setCommand(command);
}
}
- protected final void addEnvs(final Map<String, String> envs) {
- envs.forEach(this::addEnv);
+ private void addEnvironments() {
+ storageContainerConfig.getConfigurationOption().getEnvironments().forEach(this::addEnv);
}
- protected final void mapResources(final Map<String, String> resources) {
+ private void mapResources(final Map<String, String> resources) {
resources.forEach((key, value) -> withClasspathResourceMapping(key, value, BindMode.READ_ONLY));
}
+ private void setPrivilegedMode() {
+ if (storageContainerConfig.getConfigurationOption().withPrivilegedMode()) {
+ withPrivilegedMode(true);
+ }
+ }
+
+ private String getURL() {
+ return getDefaultDatabaseName().isPresent()
+ ? DataSourceEnvironment.getURL(databaseType, "localhost", getFirstMappedPort(), getDefaultDatabaseName().get())
+ : DataSourceEnvironment.getURL(databaseType, "localhost", getFirstMappedPort());
+ }
+
@Override
protected void postStart() {
- actualDataSourceMap.putAll(createAccessDataSource(getDatabaseNames()));
+ actualDataSourceMap.putAll(createAccessDataSource(getActualDatabaseNames()));
expectedDataSourceMap.putAll(createAccessDataSource(getExpectedDatabaseNames()));
}
- protected abstract Collection<String> getDatabaseNames();
+ protected abstract Collection<String> getActualDatabaseNames();
protected abstract Collection<String> getExpectedDatabaseNames();
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java
index 1dd2c7391cf..d4da6c9df53 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java
@@ -43,7 +43,7 @@ public final class HiveContainer extends DockerStorageContainer {
}
@Override
- protected Collection<String> getDatabaseNames() {
+ protected Collection<String> getActualDatabaseNames() {
return getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
}
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MariaDBContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MariaDBContainer.java
index fb97ab286f4..d00cc0b78e9 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MariaDBContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MariaDBContainer.java
@@ -40,7 +40,7 @@ public final class MariaDBContainer extends DockerStorageContainer {
}
@Override
- protected Collection<String> getDatabaseNames() {
+ protected Collection<String> getActualDatabaseNames() {
return getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
}
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MySQLContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MySQLContainer.java
index a68f311164e..2585d336072 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MySQLContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MySQLContainer.java
@@ -40,7 +40,7 @@ public final class MySQLContainer extends DockerStorageContainer {
}
@Override
- protected Collection<String> getDatabaseNames() {
+ protected Collection<String> getActualDatabaseNames() {
return getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
}
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/OpenGaussContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/OpenGaussContainer.java
index 36ff97159db..4b4870b7e8e 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/OpenGaussContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/OpenGaussContainer.java
@@ -42,7 +42,7 @@ public final class OpenGaussContainer extends DockerStorageContainer {
}
@Override
- protected Collection<String> getDatabaseNames() {
+ protected Collection<String> getActualDatabaseNames() {
return getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
}
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/PostgreSQLContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/PostgreSQLContainer.java
index 0f235c864ba..3a093fb34da 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/PostgreSQLContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/PostgreSQLContainer.java
@@ -40,7 +40,7 @@ public final class PostgreSQLContainer extends DockerStorageContainer {
}
@Override
- protected Collection<String> getDatabaseNames() {
+ protected Collection<String> getActualDatabaseNames() {
return getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry -> entry.getValue() == getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
}