You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/02/13 13:53:35 UTC
[shardingsphere] branch master updated: Refactor ComposedContainerManager (#15391)
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 8351cfc Refactor ComposedContainerManager (#15391)
8351cfc is described below
commit 8351cfc672f805bca9fa16a81e6df9b4db5f9860
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Feb 13 21:50:47 2022 +0800
Refactor ComposedContainerManager (#15391)
---
.../test/integration/engine/dal/GeneralDALIT.java | 2 +-
.../test/integration/engine/dcl/GeneralDCLIT.java | 2 +-
.../test/integration/engine/ddl/GeneralDDLIT.java | 2 +-
.../test/integration/engine/dml/AdditionalDMLIT.java | 2 +-
.../test/integration/engine/dml/BatchDMLIT.java | 2 +-
.../test/integration/engine/dml/GeneralDMLIT.java | 2 +-
.../test/integration/engine/dql/AdditionalDQLIT.java | 2 +-
.../test/integration/engine/dql/GeneralDQLIT.java | 2 +-
.../test/integration/engine/ral/GeneralRALIT.java | 2 +-
.../test/integration/engine/rdl/GeneralRDLIT.java | 2 +-
.../test/integration/engine/rql/GeneralRQLIT.java | 2 +-
.../framework/container/atomic/AtomicContainers.java | 4 +---
.../framework/container/compose/ComposedContainerManager.java | 11 +++--------
.../container/compose/mode/ClusterComposedContainer.java | 4 ++--
.../container/compose/mode/MemoryComposedContainer.java | 4 ++--
15 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
index 7866e7e..ded6bbf 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
public final class GeneralDALIT extends BaseDALIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("GeneralDALIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public GeneralDALIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
index d4850b2..72766c4 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
public final class GeneralDCLIT extends BaseDCLIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("GeneralDCLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public GeneralDCLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
index bbe9a4f..289ea46 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertFalse;
public final class GeneralDDLIT extends BaseDDLIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("GeneralDDLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public GeneralDDLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
index 78499b9..1f2dd25 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertFalse;
public final class AdditionalDMLIT extends BaseDMLIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("AdditionalDMLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public AdditionalDMLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
index 99f12cd..15b41dd 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertThat;
public final class BatchDMLIT extends BatchITCase {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("BatchDMLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public BatchDMLIT(final CaseParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
index b5cd1db..c568b09 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertFalse;
public final class GeneralDMLIT extends BaseDMLIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("GeneralDMLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public GeneralDMLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
index c377422..4127b76 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue;
public final class AdditionalDQLIT extends BaseDQLIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("AdditionalDQLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public AdditionalDQLIT(final AssertionParameterizedArray parameter) {
super(parameter);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
index 91acbb4..6cdc146 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
public final class GeneralDQLIT extends BaseDQLIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("GeneralDQLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public GeneralDQLIT(final AssertionParameterizedArray parameter) {
super(parameter);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
index 418f243..87e050d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
public final class GeneralRALIT extends BaseRALIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("GeneralRALIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public GeneralRALIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
index d392221..e319892 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
public final class GeneralRDLIT extends BaseRDLIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("GeneralRDLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public GeneralRDLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
index 8f27fa1..dd824c5 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
public final class GeneralRQLIT extends BaseRQLIT {
@ClassRule
- public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager("GeneralRQLIT");
+ public static final ComposedContainerManager COMPOSED_CONTAINER_MANAGER = new ComposedContainerManager();
public GeneralRQLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainers.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainers.java
index ed0eaca..c5e9221 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainers.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/atomic/AtomicContainers.java
@@ -33,8 +33,6 @@ import java.util.concurrent.TimeUnit;
@RequiredArgsConstructor
public final class AtomicContainers implements AutoCloseable {
- private final String testSuiteName;
-
private final String scenario;
private final Network network = Network.newNetwork();
@@ -54,7 +52,7 @@ public final class AtomicContainers implements AutoCloseable {
public <T extends AtomicContainer> T registerContainer(final T container, final String containerType) {
container.setNetwork(network);
container.setNetworkAliases(Collections.singletonList(String.join(".", containerType.toLowerCase(), scenario, "host")));
- String loggerName = String.join(":", testSuiteName, container.getName());
+ String loggerName = String.join(":", container.getName(), container.getContainerId());
container.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(loggerName), true));
containers.add(container);
return container;
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerManager.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerManager.java
index dd661e7..e532d91 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerManager.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainerManager.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.test.integration.framework.container.compose;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.test.integration.framework.container.compose.mode.ClusterComposedContainer;
import org.apache.shardingsphere.test.integration.framework.container.compose.mode.MemoryComposedContainer;
import org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -29,11 +28,8 @@ import java.util.Map;
/**
* Composed container manager.
*/
-@RequiredArgsConstructor
public final class ComposedContainerManager extends ExternalResource {
- private final String testSuiteName;
-
private final Map<String, ComposedContainer> composedContainers = new HashMap<>();
/**
@@ -54,12 +50,11 @@ public final class ComposedContainerManager extends ExternalResource {
private ComposedContainer createComposedContainer(final ParameterizedArray parameterizedArray) {
// TODO fix sharding_governance
- return "sharding_governance".equals(parameterizedArray.getScenario())
- ? new ClusterComposedContainer(testSuiteName, parameterizedArray) : new MemoryComposedContainer(testSuiteName, parameterizedArray);
+ return "sharding_governance".equals(parameterizedArray.getScenario()) ? new ClusterComposedContainer(parameterizedArray) : new MemoryComposedContainer(parameterizedArray);
}
- private String generateKey(final ParameterizedArray parameter) {
- return String.join("-", testSuiteName, parameter.getScenario(), parameter.getAdapter(), parameter.getDatabaseType().getName());
+ private String generateKey(final ParameterizedArray parameterizedArray) {
+ return String.join("-", parameterizedArray.getScenario(), parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType().getName());
}
@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 8bfc4be..9967691 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
@@ -46,8 +46,8 @@ public final class ClusterComposedContainer implements ComposedContainer {
private final AdapterContainer adapterContainer;
- public ClusterComposedContainer(final String testSuiteName, final ParameterizedArray parameterizedArray) {
- containers = new AtomicContainers(testSuiteName, parameterizedArray.getScenario());
+ public ClusterComposedContainer(final ParameterizedArray parameterizedArray) {
+ containers = new AtomicContainers(parameterizedArray.getScenario());
// TODO support other types of governance
governanceContainer = containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"), "zk");
storageContainer = containers.registerContainer(
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/MemoryComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/MemoryComposedContainer.java
index aaa9670..2e572eb 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/MemoryComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/MemoryComposedContainer.java
@@ -41,8 +41,8 @@ public final class MemoryComposedContainer implements ComposedContainer {
private final AdapterContainer adapterContainer;
- public MemoryComposedContainer(final String testSuiteName, final ParameterizedArray parameterizedArray) {
- containers = new AtomicContainers(testSuiteName, parameterizedArray.getScenario());
+ public MemoryComposedContainer(final ParameterizedArray parameterizedArray) {
+ containers = new AtomicContainers(parameterizedArray.getScenario());
storageContainer = containers.registerContainer(
StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()), parameterizedArray.getDatabaseType().getName());
adapterContainer = containers.registerContainer(