You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ch...@apache.org on 2026/05/06 05:44:58 UTC
(shardingsphere) branch master updated: Minor refactor ContainerComposerRegistry (#38671)
This is an automated email from the ASF dual-hosted git repository.
FlyingZC 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 1e47eb3a241 Minor refactor ContainerComposerRegistry (#38671)
1e47eb3a241 is described below
commit 1e47eb3a2410370d157624c4e0d64980c5fc969a
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Wed May 6 13:44:50 2026 +0800
Minor refactor ContainerComposerRegistry (#38671)
---
.../test/e2e/sql/env/DataSetEnvironmentManager.java | 2 +-
.../env/container/compose/ContainerComposerRegistry.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
index 65c284303eb..bfeab25433b 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/DataSetEnvironmentManager.java
@@ -102,7 +102,7 @@ public final class DataSetEnvironmentManager {
}
fillDataTasks.add(new InsertTask(dataSourceMap.get(dataNode.getDataSourceName()), insertSQL, sqlValueGroups, databaseType));
}
- final List<Future<Void>> futures = EXECUTOR_SERVICE_MANAGER.getExecutorService().invokeAll(fillDataTasks);
+ List<Future<Void>> futures = EXECUTOR_SERVICE_MANAGER.getExecutorService().invokeAll(fillDataTasks);
for (Future<Void> future : futures) {
future.get();
}
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
index d2cf95b3279..4dd926852ce 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
@@ -56,6 +56,7 @@ public final class ContainerComposerRegistry implements AutoCloseable {
}
synchronized (containerComposers) {
if (!containerComposers.containsKey(key)) {
+ close();
containerComposers.put(key, createContainerComposer(isClusterMode(mode, adapter), scenario, databaseType, adapter));
}
return containerComposers.get(key);
@@ -72,12 +73,14 @@ public final class ContainerComposerRegistry implements AutoCloseable {
@Override
public void close() {
- for (ContainerComposer each : containerComposers.values()) {
- closeTargetDataSource(each.getTargetDataSource());
- closeActualDataSourceMap(each.getActualDataSourceMap());
- closeContainer(each);
+ synchronized (containerComposers) {
+ for (ContainerComposer each : containerComposers.values()) {
+ closeTargetDataSource(each.getTargetDataSource());
+ closeActualDataSourceMap(each.getActualDataSourceMap());
+ closeContainer(each);
+ }
+ containerComposers.clear();
}
- containerComposers.clear();
}
@SneakyThrows(Exception.class)