This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 54d53ca Rename ComposedContainer (#15299)
54d53ca is described below
commit 54d53cad88c5a34eaa9be9d5a07c98b0df6697a5
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Feb 8 20:39:42 2022 +0800
Rename ComposedContainer (#15299)
* Rename ComposedContainer
* Refactor BaseITCase
---
.../test/integration/engine/BaseITCase.java | 16 +++++++--------
.../test/integration/engine/BatchITCase.java | 4 ++--
.../test/integration/engine/dal/GeneralDALIT.java | 6 +++---
.../test/integration/engine/dcl/GeneralDCLIT.java | 6 +++---
.../test/integration/engine/ddl/BaseDDLIT.java | 8 ++++----
.../test/integration/engine/ddl/GeneralDDLIT.java | 6 +++---
.../integration/engine/dml/AdditionalDMLIT.java | 6 +++---
.../test/integration/engine/dml/BaseDMLIT.java | 6 +++---
.../test/integration/engine/dml/BatchDMLIT.java | 6 +++---
.../test/integration/engine/dml/GeneralDMLIT.java | 6 +++---
.../integration/engine/dql/AdditionalDQLIT.java | 6 +++---
.../test/integration/engine/dql/BaseDQLIT.java | 2 +-
.../test/integration/engine/dql/GeneralDQLIT.java | 4 ++--
.../test/integration/engine/ral/GeneralRALIT.java | 10 ++++-----
.../test/integration/engine/rdl/GeneralRDLIT.java | 10 ++++-----
.../test/integration/engine/rql/GeneralRQLIT.java | 6 +++---
...ontainerCompose.java => ComposedContainer.java} | 6 +++---
...eManager.java => ComposedContainerManager.java} | 19 ++++++++++-------
.../ClusterComposedContainer.java} | 24 ++++++++++++----------
.../MemoryComposedContainer.java} | 15 ++++++--------
.../container/governance/ZookeeperContainer.java | 4 ++--
.../param/model/AssertionParameterizedArray.java | 4 ++--
.../param/model/CaseParameterizedArray.java | 4 ++--
.../framework/param/model/ParameterizedArray.java | 6 +++---
24 files changed, 97 insertions(+), 93 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
index 39113a0..4cc4653 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataS
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCase;
-import
org.apache.shardingsphere.test.integration.framework.compose.ContainerCompose;
-import
org.apache.shardingsphere.test.integration.framework.compose.GovernanceContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainer;
+import
org.apache.shardingsphere.test.integration.framework.compose.mode.ClusterComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.container.adapter.ShardingSphereAdapterContainer;
import
org.apache.shardingsphere.test.integration.framework.container.storage.ShardingSphereStorageContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -49,7 +49,7 @@ public abstract class BaseITCase {
public static final String NOT_VERIFY_FLAG = "NOT_VERIFY";
@Rule
- public final ContainerCompose compose;
+ public final ComposedContainer composedContainer;
private final String adapter;
@@ -73,20 +73,20 @@ public abstract class BaseITCase {
public BaseITCase(final ParameterizedArray parameterizedArray) {
adapter = parameterizedArray.getAdapter();
- compose = parameterizedArray.getCompose();
+ composedContainer = parameterizedArray.getCompose();
scenario = parameterizedArray.getScenario();
databaseType = parameterizedArray.getDatabaseType();
sqlCommandType = parameterizedArray.getSqlCommandType();
- storageContainer = compose.getStorageContainer();
- adapterContainer = compose.getAdapterContainer();
+ storageContainer = composedContainer.getStorageContainer();
+ adapterContainer = composedContainer.getAdapterContainer();
integrationTestCase =
parameterizedArray.getTestCaseContext().getTestCase();
}
@Before
public void init() throws Exception {
- dataSourceMap = compose.getDataSourceMap();
+ dataSourceMap = composedContainer.getDataSourceMap();
targetDataSource = dataSourceMap.get("adapterForWriter");
- if (compose instanceof GovernanceContainerCompose) {
+ if (composedContainer instanceof ClusterComposedContainer) {
dataSourceForReader = dataSourceMap.get("adapterForReader");
int waitForGov = 10;
while (waitForGov-- > 0) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
index d729329..ac7db2d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BatchITCase.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
import
org.apache.shardingsphere.test.integration.env.dataset.DataSetEnvironmentManager;
-import
org.apache.shardingsphere.test.integration.framework.compose.GovernanceContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.mode.ClusterComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
import javax.sql.DataSource;
@@ -92,7 +92,7 @@ public abstract class BatchITCase extends BaseITCase {
DataSetMetaData expectedDataSetMetaData =
expected.getMetaDataList().get(0);
for (String each : new
InlineExpressionParser(expectedDataSetMetaData.getDataNodes()).splitAndEvaluate())
{
DataNode dataNode = new DataNode(each);
- DataSource dataSource = getCompose() instanceof
GovernanceContainerCompose
+ DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
? getDataSourceForReader() :
getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(String.format("SELECT * FROM %s ORDER BY 1",
dataNode.getTableName()))) {
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 34c341d..50fa561 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.dal;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
public final class GeneralDALIT extends BaseDALIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("GeneralDALIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("GeneralDALIT");
public GeneralDALIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
@@ -53,7 +53,7 @@ public final class GeneralDALIT extends BaseDALIT {
.stream()
.filter(each -> SQLExecuteType.Literal ==
each.getSqlExecuteType())
.filter(each -> "proxy".equals(each.getAdapter()))
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
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 0368384..ffe7f61 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.dcl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
public final class GeneralDCLIT extends BaseDCLIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("GeneralDCLIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("GeneralDCLIT");
public GeneralDCLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
@@ -49,7 +49,7 @@ public final class GeneralDCLIT extends BaseDCLIT {
public static Collection<ParameterizedArray> getParameters() {
return
ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DCL)
.stream()
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
index dccd7fd..a2eb3fb 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/BaseDDLIT.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSet
import
org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetIndex;
import
org.apache.shardingsphere.test.integration.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
-import
org.apache.shardingsphere.test.integration.framework.compose.GovernanceContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.mode.ClusterComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import javax.sql.DataSource;
@@ -98,7 +98,7 @@ public abstract class BaseDDLIT extends SingleITCase {
private void assertNotContainsTable(final Collection<DataNode> dataNodes)
throws SQLException {
for (DataNode each : dataNodes) {
- try (Connection connection = getCompose() instanceof
GovernanceContainerCompose
+ try (Connection connection = getComposedContainer() instanceof
ClusterComposedContainer
? getDataSourceForReader().getConnection() :
getStorageContainer().getDataSourceMap().get(each.getDataSourceName()).getConnection())
{
assertNotContainsTable(connection, each.getTableName());
}
@@ -112,7 +112,7 @@ public abstract class BaseDDLIT extends SingleITCase {
private List<DataSetColumn> getActualColumns(final Collection<DataNode>
dataNodes) throws SQLException {
Set<DataSetColumn> result = new LinkedHashSet<>();
for (DataNode each : dataNodes) {
- DataSource dataSource = getCompose() instanceof
GovernanceContainerCompose
+ DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
? getDataSourceForReader() :
getStorageContainer().getDataSourceMap().get(each.getDataSourceName());
try (Connection connection = dataSource.getConnection()) {
result.addAll(getActualColumns(connection,
each.getTableName()));
@@ -138,7 +138,7 @@ public abstract class BaseDDLIT extends SingleITCase {
private List<DataSetIndex> getActualIndexes(final Collection<DataNode>
dataNodes) throws SQLException {
Set<DataSetIndex> result = new LinkedHashSet<>();
for (DataNode each : dataNodes) {
- DataSource dataSource = getCompose() instanceof
GovernanceContainerCompose
+ DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
? getDataSourceForReader() :
getStorageContainer().getDataSourceMap().get(each.getDataSourceName());
try (Connection connection = dataSource.getConnection()) {
result.addAll(getActualIndexes(connection,
each.getTableName()));
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 478e82d..b9e2d12 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.ddl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertFalse;
public final class GeneralDDLIT extends BaseDDLIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("GeneralDDLIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("GeneralDDLIT");
public GeneralDDLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
@@ -52,7 +52,7 @@ public final class GeneralDDLIT extends BaseDDLIT {
public static Collection<AssertionParameterizedArray> getParameters() {
return
ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DDL)
.stream()
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
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 dc4007a..0d221bb 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
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertFalse;
public final class AdditionalDMLIT extends BaseDMLIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("AdditionalDMLIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("AdditionalDMLIT");
public AdditionalDMLIT(final AssertionParameterizedArray
parameterizedArray) {
super(parameterizedArray);
@@ -56,7 +56,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
if
(IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases()) {
return
ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DML)
.stream()
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
return Collections.emptyList();
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
index 1c9a055..4a82d59 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BaseDMLIT.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.test.integration.cases.dataset.row.DataSetRow;
import org.apache.shardingsphere.test.integration.engine.SingleITCase;
import org.apache.shardingsphere.test.integration.env.EnvironmentPath;
import
org.apache.shardingsphere.test.integration.env.dataset.DataSetEnvironmentManager;
-import
org.apache.shardingsphere.test.integration.framework.compose.GovernanceContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.mode.ClusterComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import javax.sql.DataSource;
@@ -74,7 +74,7 @@ public abstract class BaseDMLIT extends SingleITCase {
DataSetMetaData expectedDataSetMetaData =
getDataSet().getMetaDataList().get(0);
for (String each : new
InlineExpressionParser(expectedDataSetMetaData.getDataNodes()).splitAndEvaluate())
{
DataNode dataNode = new DataNode(each);
- DataSource dataSource = getCompose() instanceof
GovernanceContainerCompose
+ DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
? getDataSourceForReader() :
getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
try (
Connection connection = dataSource.getConnection();
@@ -102,7 +102,7 @@ public abstract class BaseDMLIT extends SingleITCase {
private String getPrimaryKeyColumnNameForPostgreSQL(final DataNode
dataNode) throws SQLException {
String sql = String.format("SELECT a.attname, format_type(a.atttypid,
a.atttypmod) AS data_type "
+ "FROM pg_index i JOIN pg_attribute a ON a.attrelid =
i.indrelid AND a.attnum = ANY(i.indkey) WHERE i.indrelid = '%s'::regclass AND
i.indisprimary", dataNode.getTableName());
- DataSource dataSource = getCompose() instanceof
GovernanceContainerCompose
+ DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
? getDataSourceForReader() :
getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
try (
Connection connection = dataSource.getConnection();
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 902231c..f79d731 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
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.engine.BatchITCase;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertThat;
public final class BatchDMLIT extends BatchITCase {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("BatchDMLIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("BatchDMLIT");
public BatchDMLIT(final CaseParameterizedArray parameterizedArray) {
super(parameterizedArray);
@@ -55,7 +55,7 @@ public final class BatchDMLIT extends BatchITCase {
public static Collection<ParameterizedArray> getParameters() {
return
ParameterizedArrayFactory.getCaseParameterized(SQLCommandType.DML)
.stream()
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
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 c259693..b7aa9fe 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.dml;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertFalse;
public final class GeneralDMLIT extends BaseDMLIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("GeneralDMLIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("GeneralDMLIT");
public GeneralDMLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
@@ -53,7 +53,7 @@ public final class GeneralDMLIT extends BaseDMLIT {
public static Collection<AssertionParameterizedArray> getParameters() {
return
ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DML)
.stream()
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
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 07ef360..ec8dd74 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
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
@@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue;
public final class AdditionalDQLIT extends BaseDQLIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("AdditionalDQLIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("AdditionalDQLIT");
public AdditionalDQLIT(final AssertionParameterizedArray parameter) {
super(parameter);
@@ -57,7 +57,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
if
(IntegrationTestEnvironment.getInstance().isRunAdditionalTestCases()) {
return
ParameterizedArrayFactory.getAssertionParameterized(SQLCommandType.DQL)
.stream()
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
return Collections.emptyList();
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
index 1c122a3..7857ece 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
@@ -50,7 +50,7 @@ public abstract class BaseDQLIT extends SingleITCase {
@Override
public void init() throws Exception {
super.init();
- compose.executeOnStarted(compose -> {
+ composedContainer.executeOnStarted(compose -> {
try {
new DataSetEnvironmentManager(
EnvironmentPath.getDataSetFile(getScenario()),
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 d4c6a61..27e8659 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.integration.engine.dql;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
public final class GeneralDQLIT extends BaseDQLIT {
@ClassRule
- public static ComposeManager composeMaYamlProxyServerConfigurationnager =
new ComposeManager("GeneralDQLIT");
+ public static ComposedContainerManager
composeMaYamlProxyServerConfigurationnager = new
ComposedContainerManager("GeneralDQLIT");
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 af8d149..723aa57 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
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.integration.engine.ral;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
-import
org.apache.shardingsphere.test.integration.framework.compose.GovernanceContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.mode.ClusterComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
public final class GeneralRALIT extends BaseRALIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("GeneralRALIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("GeneralRALIT");
public GeneralRALIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
@@ -55,13 +55,13 @@ public final class GeneralRALIT extends BaseRALIT {
.stream()
.filter(each -> SQLExecuteType.Literal ==
each.getSqlExecuteType())
.filter(each -> "proxy".equals(each.getAdapter()))
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
@Test
public void assertExecute() throws SQLException, ParseException {
- DataSource dataSource = getCompose() instanceof
GovernanceContainerCompose
+ DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
? getDataSourceForReader() : getTargetDataSource();
try (Connection connection = dataSource.getConnection()) {
assertExecuteForStatement(connection);
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 386fb5d..64a247b 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
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.integration.engine.rdl;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
-import
org.apache.shardingsphere.test.integration.framework.compose.GovernanceContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.mode.ClusterComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
public final class GeneralRDLIT extends BaseRDLIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("GeneralRDLIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("GeneralRDLIT");
public GeneralRDLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
@@ -55,13 +55,13 @@ public final class GeneralRDLIT extends BaseRDLIT {
.stream()
.filter(each -> SQLExecuteType.Literal ==
each.getSqlExecuteType())
.filter(each -> "proxy".equals(each.getAdapter()))
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
@Test
public void assertExecute() throws SQLException, ParseException {
- DataSource dataSource = getCompose() instanceof
GovernanceContainerCompose
+ DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
? getDataSourceForReader() : getTargetDataSource();
try (Connection connection = dataSource.getConnection()) {
assertExecuteForStatement(connection);
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 a162d15..4784232 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.integration.engine.rql;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ComposeManager;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainerManager;
import
org.apache.shardingsphere.test.integration.framework.param.ParameterizedArrayFactory;
import
org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
public final class GeneralRQLIT extends BaseRQLIT {
@ClassRule
- public static ComposeManager composeManager = new
ComposeManager("GeneralRQLIT");
+ public static ComposedContainerManager composedContainerManager = new
ComposedContainerManager("GeneralRQLIT");
public GeneralRQLIT(final AssertionParameterizedArray parameterizedArray) {
super(parameterizedArray);
@@ -53,7 +53,7 @@ public final class GeneralRQLIT extends BaseRQLIT {
.stream()
.filter(each -> SQLExecuteType.Literal ==
each.getSqlExecuteType())
.filter(each -> "proxy".equals(each.getAdapter()))
- .peek(each ->
each.setCompose(composeManager.getOrCreateCompose(each)))
+ .peek(each ->
each.setCompose(composedContainerManager.getOrCreateCompose(each)))
.collect(Collectors.toList());
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ContainerCompose.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainer.java
similarity index 97%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ContainerCompose.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainer.java
index 2960c74..bf5158c 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ContainerCompose.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainer.java
@@ -46,11 +46,11 @@ import java.util.function.Consumer;
import java.util.function.Supplier;
/**
- * Container compose.
+ * Composed container.
*/
@RequiredArgsConstructor
@Getter(AccessLevel.PROTECTED)
-public abstract class ContainerCompose extends ExternalResource implements
Closeable {
+public abstract class ComposedContainer extends ExternalResource implements
Closeable {
private final String clusterName;
@@ -176,7 +176,7 @@ public abstract class ContainerCompose extends
ExternalResource implements Close
*
* @param consumer initializer
*/
- public final void executeOnStarted(final Consumer<ContainerCompose>
consumer) {
+ public final void executeOnStarted(final Consumer<ComposedContainer>
consumer) {
if (!executed) {
synchronized (this) {
if (!executed) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposeManager.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainerManager.java
similarity index 76%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposeManager.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainerManager.java
index 7180091..1cd5119 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposeManager.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/ComposedContainerManager.java
@@ -20,16 +20,21 @@ package
org.apache.shardingsphere.test.integration.framework.compose;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.test.integration.env.EnvironmentType;
import
org.apache.shardingsphere.test.integration.env.IntegrationTestEnvironment;
+import
org.apache.shardingsphere.test.integration.framework.compose.mode.ClusterComposedContainer;
+import
org.apache.shardingsphere.test.integration.framework.compose.mode.MemoryComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import org.junit.rules.ExternalResource;
import java.util.HashMap;
import java.util.Map;
+/**
+ * Composed container manager.
+ */
@RequiredArgsConstructor
-public final class ComposeManager extends ExternalResource {
+public final class ComposedContainerManager extends ExternalResource {
- private final Map<String, ContainerCompose> composeMap = new HashMap<>();
+ private final Map<String, ComposedContainer> composeMap = new HashMap<>();
private final String suiteName;
@@ -39,17 +44,17 @@ public final class ComposeManager extends ExternalResource {
* @param parameterizedArray parameterized array
* @return container compose
*/
- public ContainerCompose getOrCreateCompose(final ParameterizedArray
parameterizedArray) {
+ public ComposedContainer getOrCreateCompose(final ParameterizedArray
parameterizedArray) {
String key = generateKey(parameterizedArray);
if (composeMap.containsKey(key)) {
return composeMap.get(key);
}
- ContainerCompose result;
+ ComposedContainer result;
// TODO fix sharding_governance
if ("sharding_governance".equals(parameterizedArray.getScenario())) {
- result = new GovernanceContainerCompose(suiteName,
parameterizedArray);
+ result = new ClusterComposedContainer(suiteName,
parameterizedArray);
} else {
- result = new SimpleContainerCompose(suiteName, parameterizedArray);
+ result = new MemoryComposedContainer(suiteName,
parameterizedArray);
}
composeMap.put(key, result);
return result;
@@ -71,6 +76,6 @@ public final class ComposeManager extends ExternalResource {
@Override
protected void after() {
- composeMap.values().forEach(ContainerCompose::close);
+ composeMap.values().forEach(ComposedContainer::close);
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/GovernanceContainerCompose.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/ClusterComposedContainer.java
similarity index 89%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/GovernanceContainerCompose.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/ClusterComposedContainer.java
index aca428a..aeecc76 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/GovernanceContainerCompose.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/ClusterComposedContainer.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.framework.compose;
+package org.apache.shardingsphere.test.integration.framework.compose.mode;
+import lombok.AccessLevel;
import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.container.adapter.ShardingSphereAdapterContainer;
import
org.apache.shardingsphere.test.integration.framework.container.adapter.impl.ShardingSphereProxyContainer;
import
org.apache.shardingsphere.test.integration.framework.container.governance.ZookeeperContainer;
@@ -30,21 +31,22 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-@Slf4j
-public final class GovernanceContainerCompose extends ContainerCompose {
+/**
+ * Cluster composed container.
+ */
+@Getter
+public final class ClusterComposedContainer extends ComposedContainer {
- @Getter
private final ShardingSphereStorageContainer storageContainer;
- @Getter
private final ShardingSphereAdapterContainer adapterContainer;
-
- @Getter
+
private final ShardingSphereAdapterContainer adapterContainerForReader;
-
+
+ @Getter(AccessLevel.NONE)
private final ZookeeperContainer zookeeperContainer;
-
- public GovernanceContainerCompose(final String clusterName, final
ParameterizedArray parameterizedArray) {
+
+ public ClusterComposedContainer(final String clusterName, final
ParameterizedArray parameterizedArray) {
super(clusterName, parameterizedArray);
this.storageContainer = createStorageContainer();
this.adapterContainer = createAdapterContainer();
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/SimpleContainerCompose.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/MemoryComposedContainer.java
similarity index 83%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/SimpleContainerCompose.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/MemoryComposedContainer.java
index 4bf7579..115bf0a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/SimpleContainerCompose.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/compose/mode/MemoryComposedContainer.java
@@ -15,31 +15,28 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.framework.compose;
+package org.apache.shardingsphere.test.integration.framework.compose.mode;
import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.container.adapter.ShardingSphereAdapterContainer;
import
org.apache.shardingsphere.test.integration.framework.container.storage.ShardingSphereStorageContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
/**
- * Container compose.
+ * Memory composed container.
*/
-@Slf4j
-public final class SimpleContainerCompose extends ContainerCompose {
+@Getter
+public final class MemoryComposedContainer extends ComposedContainer {
- @Getter
private final ShardingSphereStorageContainer storageContainer;
- @Getter
private final ShardingSphereAdapterContainer adapterContainer;
- public SimpleContainerCompose(final String clusterName, final
ParameterizedArray parameterizedArray) {
+ public MemoryComposedContainer(final String clusterName, final
ParameterizedArray parameterizedArray) {
super(clusterName, parameterizedArray);
this.storageContainer = createStorageContainer();
this.adapterContainer = createAdapterContainer();
adapterContainer.dependsOn(storageContainer);
}
-
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/governance/ZookeeperContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/governance/ZookeeperContainer.java
index af91ab9..565309e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/governance/ZookeeperContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/governance/ZookeeperContainer.java
@@ -22,12 +22,12 @@ import
org.apache.shardingsphere.test.integration.framework.param.model.Paramete
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
public final class ZookeeperContainer extends ShardingSphereContainer {
-
+
public ZookeeperContainer(final ParameterizedArray parameterizedArray) {
super("zookeeper", "zookeeper:3.6.2", false, parameterizedArray);
setWaitStrategy(new
LogMessageWaitStrategy().withRegEx(".*PrepRequestProcessor \\(sid:[0-9]+\\)
started.*"));
}
-
+
/**
* Get server list.
*
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
index 9552d99..1a89add 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/AssertionParameterizedArray.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseConte
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCaseAssertion;
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainer;
/**
* Parameterized array of assertion based integration test.
@@ -49,7 +49,7 @@ public final class AssertionParameterizedArray implements
ParameterizedArray {
private final SQLCommandType sqlCommandType;
@Setter
- private ContainerCompose compose;
+ private ComposedContainer compose;
@Override
public String toString() {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
index 27d02b1..1b8a243 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/CaseParameterizedArray.java
@@ -23,7 +23,7 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainer;
/**
* Parameterized array of case based integration test.
@@ -43,7 +43,7 @@ public final class CaseParameterizedArray implements
ParameterizedArray {
private final SQLCommandType sqlCommandType;
@Setter
- private ContainerCompose compose;
+ private ComposedContainer compose;
@Override
public String toString() {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ParameterizedArray.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ParameterizedArray.java
index a4bb010..f96e3e0 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ParameterizedArray.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/model/ParameterizedArray.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.integration.framework.param.model;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.cases.IntegrationTestCaseContext;
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
-import
org.apache.shardingsphere.test.integration.framework.compose.ContainerCompose;
+import
org.apache.shardingsphere.test.integration.framework.compose.ComposedContainer;
/**
* Parameterized array.
@@ -67,12 +67,12 @@ public interface ParameterizedArray {
*
* @return container compose
*/
- ContainerCompose getCompose();
+ ComposedContainer getCompose();
/**
* Set container compose.
*
* @param compose container compose
*/
- void setCompose(ContainerCompose compose);
+ void setCompose(ComposedContainer compose);
}
