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 0f6d14bedca Move getActualDatabaseNames() and
getExpectedDatabaseNames() to parent class DockerStorageContainer (#36561)
0f6d14bedca is described below
commit 0f6d14bedcacafbee7f112b93d62c1c83151da33
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Sep 14 12:39:21 2025 +0800
Move getActualDatabaseNames() and getExpectedDatabaseNames() to parent
class DockerStorageContainer (#36561)
* Move getActualDatabaseNames() and getExpectedDatabaseNames() to parent
class DockerStorageContainer
* Move getActualDatabaseNames() and getExpectedDatabaseNames() to parent
class DockerStorageContainer
---
.../type/docker/DockerStorageContainer.java | 25 +++++++++-------------
.../storage/type/docker/impl/HiveContainer.java | 13 -----------
.../storage/type/docker/impl/MariaDBContainer.java | 14 ------------
.../storage/type/docker/impl/MySQLContainer.java | 14 ------------
.../type/docker/impl/OpenGaussContainer.java | 14 ------------
.../type/docker/impl/PostgreSQLContainer.java | 14 ------------
6 files changed, 10 insertions(+), 84 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 8a0e92ad378..0cef9991f14 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
@@ -39,6 +39,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -102,13 +103,17 @@ public abstract class DockerStorageContainer extends
DockerITContainer implement
@Override
protected void postStart() {
-
actualDataSourceMap.putAll(createAccessDataSource(getActualDatabaseNames()));
-
expectedDataSourceMap.putAll(createAccessDataSource(getExpectedDatabaseNames()));
+
actualDataSourceMap.putAll(createAccessDataSources(getDataSourceNames(storageContainerConfig.getActualDatabaseTypes())));
+
expectedDataSourceMap.putAll(createAccessDataSources(getDataSourceNames(storageContainerConfig.getExpectedDatabaseTypes())));
}
- protected abstract Collection<String> getActualDatabaseNames();
+ private Collection<String> getDataSourceNames(final Map<String,
DatabaseType> dataSourceNameAndTypeMap) {
+ return dataSourceNameAndTypeMap.entrySet().stream().filter(entry ->
entry.getValue() ==
databaseType).map(Entry::getKey).collect(Collectors.toList());
+ }
- protected abstract Collection<String> getExpectedDatabaseNames();
+ private Map<String, DataSource> createAccessDataSources(final
Collection<String> dataSourceNames) {
+ return
dataSourceNames.stream().distinct().collect(Collectors.toMap(Function.identity(),
this::createAccessDataSource));
+ }
/**
* Create access data source.
@@ -120,16 +125,6 @@ public abstract class DockerStorageContainer extends
DockerITContainer implement
return
StorageContainerUtils.generateDataSource(getJdbcUrl(dataSourceName),
StorageContainerConstants.OPERATION_USER,
StorageContainerConstants.OPERATION_PASSWORD, 20);
}
- /**
- * Create access data source map.
- *
- * @param dataSourceNames data source name collection
- * @return access data source map
- */
- public final Map<String, DataSource> createAccessDataSource(final
Collection<String> dataSourceNames) {
- return
dataSourceNames.stream().distinct().collect(Collectors.toMap(Function.identity(),
this::createAccessDataSource));
- }
-
/**
* Get JDBC URL.
*
@@ -161,7 +156,7 @@ public abstract class DockerStorageContainer extends
DockerITContainer implement
}
@Override
- public Map<String, String> getLinkReplacements() {
+ public final Map<String, String> getLinkReplacements() {
Map<String, String> result = new HashMap<>();
for (String each : getNetworkAliases()) {
for (Integer exposedPort : getExposedPorts()) {
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 abd1d61bd94..6723d2ccb7f 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
@@ -25,9 +25,6 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.St
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
import java.io.IOException;
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
/**
* Hive container.
@@ -41,16 +38,6 @@ public final class HiveContainer extends
DockerStorageContainer {
super(TypedSPILoader.getService(DatabaseType.class, "Hive"),
Strings.isNullOrEmpty(containerImage) ? "apache/hive:4.0.1" : containerImage,
storageContainerConfig);
}
- @Override
- protected Collection<String> getActualDatabaseNames() {
- return
getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
- @Override
- protected Collection<String> getExpectedDatabaseNames() {
- return
getStorageContainerConfig().getExpectedDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
@Override
public int getExposedPort() {
return EXPOSED_PORT;
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 bab788abf4e..b4cf41c1fd5 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
@@ -23,10 +23,6 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
/**
* MariaDB container.
*/
@@ -38,16 +34,6 @@ public final class MariaDBContainer extends
DockerStorageContainer {
super(TypedSPILoader.getService(DatabaseType.class, "MariaDB"),
Strings.isNullOrEmpty(containerImage) ? "mariadb:11" : containerImage,
storageContainerConfig);
}
- @Override
- protected Collection<String> getActualDatabaseNames() {
- return
getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
- @Override
- protected Collection<String> getExpectedDatabaseNames() {
- return
getStorageContainerConfig().getExpectedDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
@Override
public int getExposedPort() {
return EXPOSED_PORT;
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 4ab2a849f92..28c49450a23 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
@@ -23,10 +23,6 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
/**
* MySQL container.
*/
@@ -38,16 +34,6 @@ public final class MySQLContainer extends
DockerStorageContainer {
super(TypedSPILoader.getService(DatabaseType.class, "MySQL"),
Strings.isNullOrEmpty(containerImage) ? "mysql:8.0.40" : containerImage,
storageContainerConfig);
}
- @Override
- protected Collection<String> getActualDatabaseNames() {
- return
getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
- @Override
- protected Collection<String> getExpectedDatabaseNames() {
- return
getStorageContainerConfig().getExpectedDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
@Override
public int getExposedPort() {
return EXPOSED_PORT;
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 2e937e5d4d4..35c5ccc2f42 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
@@ -23,10 +23,6 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
/**
* OpenGauss container.
*/
@@ -38,16 +34,6 @@ public final class OpenGaussContainer extends
DockerStorageContainer {
super(TypedSPILoader.getService(DatabaseType.class, "openGauss"),
Strings.isNullOrEmpty(containerImage) ? "opengauss/opengauss:3.1.0" :
containerImage, storageContainerConfig);
}
- @Override
- protected Collection<String> getActualDatabaseNames() {
- return
getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
- @Override
- protected Collection<String> getExpectedDatabaseNames() {
- return
getStorageContainerConfig().getExpectedDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
@Override
public int getExposedPort() {
return EXPOSED_PORT;
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 5583e32f657..b35fd0053ef 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
@@ -23,10 +23,6 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
/**
* PostgreSQL container.
*/
@@ -38,16 +34,6 @@ public final class PostgreSQLContainer extends
DockerStorageContainer {
super(TypedSPILoader.getService(DatabaseType.class, "PostgreSQL"),
Strings.isNullOrEmpty(containerImage) ? "postgres:12-alpine" : containerImage,
storageContainerConfig);
}
- @Override
- protected Collection<String> getActualDatabaseNames() {
- return
getStorageContainerConfig().getActualDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
- @Override
- protected Collection<String> getExpectedDatabaseNames() {
- return
getStorageContainerConfig().getExpectedDatabaseTypes().entrySet().stream().filter(entry
-> entry.getValue() ==
getDatabaseType()).map(Entry::getKey).collect(Collectors.toList());
- }
-
@Override
public int getExposedPort() {
return EXPOSED_PORT;
