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 fcd3fe5 Add VerificationDataSource (#15379)
fcd3fe5 is described below
commit fcd3fe52e7933f4970c41e2d3a59f72afd1d227f
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Feb 12 17:59:00 2022 +0800
Add VerificationDataSource (#15379)
---
.../test/integration/engine/BaseITCase.java | 11 +++----
.../test/integration/engine/BatchITCase.java | 2 +-
.../test/integration/engine/dal/GeneralDALIT.java | 2 +-
.../test/integration/engine/dcl/GeneralDCLIT.java | 4 +--
.../test/integration/engine/ddl/BaseDDLIT.java | 10 +++---
.../test/integration/engine/ddl/GeneralDDLIT.java | 4 +--
.../integration/engine/dml/AdditionalDMLIT.java | 14 ++++-----
.../test/integration/engine/dml/BaseDMLIT.java | 2 +-
.../test/integration/engine/dml/BatchDMLIT.java | 4 +--
.../test/integration/engine/dml/GeneralDMLIT.java | 4 +--
.../integration/engine/dql/AdditionalDQLIT.java | 8 ++---
.../test/integration/engine/dql/GeneralDQLIT.java | 4 +--
.../test/integration/engine/ral/BaseRALIT.java | 4 +--
.../test/integration/engine/ral/GeneralRALIT.java | 2 +-
.../test/integration/engine/rdl/BaseRDLIT.java | 4 +--
.../test/integration/engine/rdl/GeneralRDLIT.java | 2 +-
.../test/integration/engine/rql/GeneralRQLIT.java | 2 +-
.../container/compose/ComposedContainer.java | 13 ++++++--
.../compose/mode/ClusterComposedContainer.java | 36 ++++++++++------------
.../compose/mode/MemoryComposedContainer.java | 7 ++++-
20 files changed, 72 insertions(+), 67 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 01308c3..090ff61 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
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.test.integration.cases.SQLCommandType;
import
org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCase;
import
org.apache.shardingsphere.test.integration.framework.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.integration.framework.container.compose.ComposedContainer;
-import
org.apache.shardingsphere.test.integration.framework.container.compose.mode.ClusterComposedContainer;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import
org.apache.shardingsphere.test.integration.framework.runner.ShardingSphereIntegrationTestParameterized;
import org.junit.After;
@@ -59,9 +58,9 @@ public abstract class BaseITCase {
private final StorageContainer storageContainer;
- private DataSource targetDataSource;
+ private DataSource operationDataSource;
- private DataSource anotherClientDataSource;
+ private DataSource verificationDataSource;
public BaseITCase(final ParameterizedArray parameterizedArray) {
adapter = parameterizedArray.getAdapter();
@@ -75,10 +74,8 @@ public abstract class BaseITCase {
@Before
public void init() throws Exception {
- targetDataSource = composedContainer.getClientDataSource();
- if (composedContainer instanceof ClusterComposedContainer) {
- anotherClientDataSource = ((ClusterComposedContainer)
composedContainer).getAnotherClientDataSource();
- }
+ operationDataSource = composedContainer.getOperationDataSource();
+ verificationDataSource = composedContainer.getVerificationDataSource();
}
@After
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 134c293..ecddbfa 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
@@ -93,7 +93,7 @@ public abstract class BatchITCase extends BaseITCase {
for (String each : new
InlineExpressionParser(expectedDataSetMetaData.getDataNodes()).splitAndEvaluate())
{
DataNode dataNode = new DataNode(each);
DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
- ? getAnotherClientDataSource() :
getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
+ ? getVerificationDataSource() :
getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(String.format("SELECT * FROM %s ORDER BY 1",
dataNode.getTableName()))) {
assertDataSet(preparedStatement, expected.findRows(dataNode),
expectedDataSetMetaData);
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..c61bb76 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
@@ -59,7 +59,7 @@ public final class GeneralDALIT extends BaseDALIT {
@Test
public void assertExecute() throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
assertExecuteForStatement(connection);
}
}
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..c61d2db 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
@@ -56,7 +56,7 @@ public final class GeneralDCLIT extends BaseDCLIT {
@Test
public void assertExecuteUpdate() throws SQLException, ParseException {
String sql = getSQL();
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
executeUpdateForStatement(connection, sql);
} else {
@@ -68,7 +68,7 @@ public final class GeneralDCLIT extends BaseDCLIT {
@Test
public void assertExecute() throws SQLException, ParseException {
String sql = getSQL();
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
executeForStatement(connection, sql);
} else {
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 a45b35e..61df6d1 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
@@ -56,14 +56,14 @@ public abstract class BaseDDLIT extends SingleITCase {
super.init();
assertNotNull("Expected affected table is required",
getAssertion().getInitialSQL());
assertNotNull("Init SQL is required",
getAssertion().getInitialSQL().getAffectedTable());
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
executeInitSQLs(connection);
}
}
@Override
public final void tearDown() throws Exception {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
String dropSql = String.format("DROP TABLE %s",
getAssertion().getInitialSQL().getAffectedTable());
executeUpdateForPrepareStatement(connection, dropSql);
} catch (final SQLException | NoSuchTableException ignored) {
@@ -99,7 +99,7 @@ public abstract class BaseDDLIT extends SingleITCase {
private void assertNotContainsTable(final Collection<DataNode> dataNodes)
throws SQLException {
for (DataNode each : dataNodes) {
try (Connection connection = getComposedContainer() instanceof
ClusterComposedContainer
- ? getAnotherClientDataSource().getConnection() :
getStorageContainer().getDataSourceMap().get(each.getDataSourceName()).getConnection())
{
+ ? getVerificationDataSource().getConnection() :
getStorageContainer().getDataSourceMap().get(each.getDataSourceName()).getConnection())
{
assertNotContainsTable(connection, each.getTableName());
}
}
@@ -113,7 +113,7 @@ public abstract class BaseDDLIT extends SingleITCase {
Set<DataSetColumn> result = new LinkedHashSet<>();
for (DataNode each : dataNodes) {
DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
- ? getAnotherClientDataSource() :
getStorageContainer().getDataSourceMap().get(each.getDataSourceName());
+ ? getVerificationDataSource() :
getStorageContainer().getDataSourceMap().get(each.getDataSourceName());
try (Connection connection = dataSource.getConnection()) {
result.addAll(getActualColumns(connection,
each.getTableName()));
}
@@ -139,7 +139,7 @@ public abstract class BaseDDLIT extends SingleITCase {
Set<DataSetIndex> result = new LinkedHashSet<>();
for (DataNode each : dataNodes) {
DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
- ? getAnotherClientDataSource() :
getStorageContainer().getDataSourceMap().get(each.getDataSourceName());
+ ? getVerificationDataSource() :
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 bbe9a4f..afa6b53 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
@@ -58,7 +58,7 @@ public final class GeneralDDLIT extends BaseDDLIT {
@Test
public void assertExecuteUpdate() throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
executeUpdateForStatement(connection);
} else {
@@ -82,7 +82,7 @@ public final class GeneralDDLIT extends BaseDDLIT {
@Test
public void assertExecute() throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
executeForStatement(connection);
} else {
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..bedcb8a 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
@@ -69,7 +69,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
return;
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
?
executeUpdateForStatementWithAutoGeneratedKeys(connection) :
executeUpdateForPreparedStatementWithAutoGeneratedKeys(connection);
}
@@ -98,7 +98,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
return;
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
? executeUpdateForStatementWithColumnIndexes(connection) :
executeUpdateForPreparedStatementWithColumnIndexes(connection);
}
assertDataSet(actualUpdateCount);
@@ -126,7 +126,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
return;
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
? executeUpdateForStatementWithColumnNames(connection) :
executeUpdateForPreparedStatementWithColumnNames(connection);
}
assertDataSet(actualUpdateCount);
@@ -154,7 +154,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
return;
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
? executeForStatementWithoutAutoGeneratedKeys(connection)
: executeForPreparedStatementWithoutAutoGeneratedKeys(connection);
}
@@ -185,7 +185,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
return;
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
? executeForStatementWithAutoGeneratedKeys(connection) :
executeForPreparedStatementWithAutoGeneratedKeys(connection);
}
assertDataSet(actualUpdateCount);
@@ -217,7 +217,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
return;
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
? executeForStatementWithColumnIndexes(connection) :
executeForPreparedStatementWithColumnIndexes(connection);
}
assertDataSet(actualUpdateCount);
@@ -247,7 +247,7 @@ public final class AdditionalDMLIT extends BaseDMLIT {
return;
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
? executeForStatementWithColumnNames(connection) :
executeForPreparedStatementWithColumnNames(connection);
}
assertDataSet(actualUpdateCount);
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 7503349..3fb7ef1 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
@@ -74,7 +74,7 @@ public abstract class BaseDMLIT extends SingleITCase {
for (String each : new
InlineExpressionParser(expectedDataSetMetaData.getDataNodes()).splitAndEvaluate())
{
DataNode dataNode = new DataNode(each);
DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
- ? getAnotherClientDataSource() :
getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
+ ? getVerificationDataSource() :
getStorageContainer().getDataSourceMap().get(dataNode.getDataSourceName());
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(generateFetchActualDataSQL(dataNode))) {
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..c821af0 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
@@ -71,7 +71,7 @@ public final class BatchDMLIT extends BatchITCase {
default:
}
int[] actualUpdateCounts;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCounts = executeBatchForPreparedStatement(connection);
}
assertDataSets(actualUpdateCounts);
@@ -105,7 +105,7 @@ public final class BatchDMLIT extends BatchITCase {
return;
default:
}
- try (Connection connection = getTargetDataSource().getConnection();
+ try (Connection connection = getOperationDataSource().getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(getSQL())) {
for (IntegrationTestCaseAssertion each :
getIntegrationTestCase().getAssertions()) {
addBatch(preparedStatement, each);
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..1c61af3 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
@@ -66,7 +66,7 @@ public final class GeneralDMLIT extends BaseDMLIT {
default:
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
? executeUpdateForStatement(connection) :
executeUpdateForPreparedStatement(connection);
}
assertDataSet(actualUpdateCount);
@@ -96,7 +96,7 @@ public final class GeneralDMLIT extends BaseDMLIT {
default:
}
int actualUpdateCount;
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
actualUpdateCount = SQLExecuteType.Literal == getSqlExecuteType()
? executeForStatement(connection) : executeForPreparedStatement(connection);
}
assertDataSet(actualUpdateCount);
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..a7cd0b3 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
@@ -65,7 +65,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
@Test
public void assertExecuteQueryWithResultSetTypeAndResultSetConcurrency()
throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
assertExecuteQueryForStatementWithResultSetTypeAndResultSetConcurrency(connection);
} else {
@@ -95,7 +95,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
@Test
public void
assertExecuteQueryWithResultSetTypeAndResultSetConcurrencyAndResultSetHoldability()
throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
assertExecuteQueryForStatementWithResultSetTypeAndResultSetConcurrencyAndResultSetHoldability(connection);
} else {
@@ -127,7 +127,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
@Test
public void assertExecuteWithResultSetTypeAndResultSetConcurrency() throws
SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
assertExecuteForStatementWithResultSetTypeAndResultSetConcurrency(connection);
} else {
@@ -159,7 +159,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
@Test
public void
assertExecuteWithResultSetTypeAndResultSetConcurrencyAndResultSetHoldability()
throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
assertExecuteForStatementWithResultSetTypeAndResultSetConcurrencyAndResultSetHoldability(connection);
} else {
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..9bc47d2 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
@@ -61,7 +61,7 @@ public final class GeneralDQLIT extends BaseDQLIT {
@Test
public void assertExecuteQuery() throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
assertExecuteQueryForStatement(connection);
} else {
@@ -91,7 +91,7 @@ public final class GeneralDQLIT extends BaseDQLIT {
@Test
public void assertExecute() throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
if (SQLExecuteType.Literal == getSqlExecuteType()) {
assertExecuteForStatement(connection);
} else {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
index 1924fd5..8994d8f 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/BaseRALIT.java
@@ -46,7 +46,7 @@ public abstract class BaseRALIT extends SingleITCase {
public final void init() throws Exception {
super.init();
if (getAssertion().getInitialSQL() != null) {
- try (Connection connection =
getTargetDataSource().getConnection()) {
+ try (Connection connection =
getOperationDataSource().getConnection()) {
executeInitSQLs(connection);
}
}
@@ -55,7 +55,7 @@ public abstract class BaseRALIT extends SingleITCase {
@Override
public final void tearDown() throws Exception {
if (getAssertion().getDestroySQL() != null) {
- try (Connection connection =
getTargetDataSource().getConnection()) {
+ try (Connection connection =
getOperationDataSource().getConnection()) {
executeDestroySQLs(connection);
}
}
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 3027e52..6171a6a 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
@@ -62,7 +62,7 @@ public final class GeneralRALIT extends BaseRALIT {
@Test
public void assertExecute() throws SQLException, ParseException {
DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
- ? getAnotherClientDataSource() : getTargetDataSource();
+ ? getVerificationDataSource() : getOperationDataSource();
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/BaseRDLIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
index a840abc..e185133 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/BaseRDLIT.java
@@ -47,7 +47,7 @@ public abstract class BaseRDLIT extends SingleITCase {
public final void init() throws Exception {
super.init();
assertNotNull("Init SQL is required", getAssertion().getInitialSQL());
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
executeInitSQLs(connection);
}
}
@@ -55,7 +55,7 @@ public abstract class BaseRDLIT extends SingleITCase {
@Override
public final void tearDown() throws Exception {
if (getAssertion().getDestroySQL() != null) {
- try (Connection connection =
getTargetDataSource().getConnection()) {
+ try (Connection connection =
getOperationDataSource().getConnection()) {
executeDestroySQLs(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 3516060..66046ae 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
@@ -62,7 +62,7 @@ public final class GeneralRDLIT extends BaseRDLIT {
@Test
public void assertExecute() throws SQLException, ParseException {
DataSource dataSource = getComposedContainer() instanceof
ClusterComposedContainer
- ? getAnotherClientDataSource() : getTargetDataSource();
+ ? getVerificationDataSource() : getOperationDataSource();
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 8f27fa1..1523355 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
@@ -59,7 +59,7 @@ public final class GeneralRQLIT extends BaseRQLIT {
@Test
public void assertExecute() throws SQLException, ParseException {
- try (Connection connection = getTargetDataSource().getConnection()) {
+ try (Connection connection = getOperationDataSource().getConnection())
{
assertExecuteForStatement(connection);
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainer.java
index 89e8765..bdc8245 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/ComposedContainer.java
@@ -42,9 +42,16 @@ public interface ComposedContainer {
StorageContainer getStorageContainer();
/**
- * Get client data source.
+ * Get operation data source.
*
- * @return client data source
+ * @return operation data source
*/
- DataSource getClientDataSource();
+ DataSource getOperationDataSource();
+
+ /**
+ * Get verification data source.
+ *
+ * @return verification data source
+ */
+ DataSource getVerificationDataSource();
}
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 8e1ede0..d7b40c7 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
@@ -36,48 +36,44 @@ import javax.sql.DataSource;
*/
public final class ClusterComposedContainer implements ComposedContainer {
+ private final GovernanceContainer governanceContainer;
+
@Getter
private final AtomicContainers containers;
@Getter
private final StorageContainer storageContainer;
- private final AdapterContainer adapterContainer;
+ private final AdapterContainer operationAdapterContainer;
- private final AdapterContainer adapterContainerForReader;
-
- private final GovernanceContainer governanceContainer;
+ private final AdapterContainer verificationAdapterContainer;
public ClusterComposedContainer(final String testSuiteName, final
ParameterizedArray parameterizedArray) {
containers = new AtomicContainers(testSuiteName,
parameterizedArray.getScenario());
+ // TODO support other types of governance
+ governanceContainer =
containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"),
"zk");
storageContainer = containers.registerContainer(
StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(),
parameterizedArray.getScenario()),
parameterizedArray.getDatabaseType().getName());
- adapterContainer = containers.registerContainer(
+ operationAdapterContainer = containers.registerContainer(
AdapterContainerFactory.newInstance(parameterizedArray.getAdapter(),
parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()),
parameterizedArray.getAdapter());
- // TODO support other types of governance
- governanceContainer =
containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"),
"zk");
- adapterContainer.dependsOn(storageContainer, governanceContainer);
+ operationAdapterContainer.dependsOn(governanceContainer,
storageContainer);
if ("proxy".equals(parameterizedArray.getAdapter())) {
- adapterContainerForReader = containers.registerContainer(
+ verificationAdapterContainer = containers.registerContainer(
new ShardingSphereProxyContainer("ShardingSphere-Proxy-1",
parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()),
"ShardingSphere-Proxy-1");
} else {
- adapterContainerForReader = containers.registerContainer(
+ verificationAdapterContainer = containers.registerContainer(
AdapterContainerFactory.newInstance(parameterizedArray.getAdapter(),
parameterizedArray.getDatabaseType(), parameterizedArray.getScenario()),
parameterizedArray.getAdapter());
}
- adapterContainerForReader.dependsOn(storageContainer,
governanceContainer);
+ verificationAdapterContainer.dependsOn(governanceContainer,
storageContainer);
}
@Override
- public DataSource getClientDataSource() {
- return
adapterContainer.getClientDataSource(governanceContainer.getServerLists());
+ public DataSource getOperationDataSource() {
+ return
operationAdapterContainer.getClientDataSource(governanceContainer.getServerLists());
}
- /**
- * Get another client data source.
- *
- * @return another client data source
- */
- public DataSource getAnotherClientDataSource() {
- return
adapterContainerForReader.getAnotherClientDataSource(governanceContainer.getServerLists());
+ @Override
+ public DataSource getVerificationDataSource() {
+ return
verificationAdapterContainer.getAnotherClientDataSource(governanceContainer.getServerLists());
}
}
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 5bc1c02..e0fc7dd 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
@@ -50,7 +50,12 @@ public final class MemoryComposedContainer implements
ComposedContainer {
}
@Override
- public DataSource getClientDataSource() {
+ public DataSource getOperationDataSource() {
+ return adapterContainer.getClientDataSource(null);
+ }
+
+ @Override
+ public DataSource getVerificationDataSource() {
return adapterContainer.getClientDataSource(null);
}
}
