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 5b17a6e44a6 Add broadcast table transaction test (#28355)
5b17a6e44a6 is described below
commit 5b17a6e44a6fa0a76c3f10e28027b32b59f41206
Author: ZhangCheng <[email protected]>
AuthorDate: Tue Sep 5 09:24:48 2023 +0800
Add broadcast table transaction test (#28355)
* Add implicit commit transaction E2E
* e2e
* e2e
* e2e
* fix
---
.../statement/ShardingSpherePreparedStatement.java | 2 +-
.../core/statement/ShardingSphereStatement.java | 2 +-
.../proxy/backend/connector/DatabaseConnector.java | 2 +-
.../cases/alterresource/AddResourceTestCase.java | 2 +-
.../BroadcastTableTransactionTestCase.java | 3 +-
.../ExceptionInTransactionTestCase.java | 14 ++----
...java => ImplicitCommitTransactionTestCase.java} | 50 +++++++++++-----------
.../cases/readonly/MySQLSetReadOnlyTestCase.java | 16 ++++---
.../cases/savepoint/BaseSavePointTestCase.java | 2 +-
.../cases/savepoint/MySQLSavePointTestCase.java | 2 +-
.../savepoint/OpenGaussSavePointTestCase.java | 2 +-
.../savepoint/PostgreSQLSavePointTestCase.java | 2 +-
.../engine/base/TransactionContainerComposer.java | 5 ---
.../engine/base/TransactionTestCase.java | 2 +-
.../src/test/resources/env/it-env.properties | 4 +-
.../jdbc/mysql/config-sharding-xa-narayana.yaml | 2 +-
.../env/scenario/cursor/data/actual/databases.xml | 6 +--
.../data/actual/init-sql/mysql/01-actual-init.sql | 12 +++---
.../actual/init-sql/opengauss/01-actual-init.sql | 22 +++++-----
.../actual/init-sql/postgresql/01-actual-init.sql | 12 +++---
.../proxy/conf/opengauss/config-sharding.yaml | 4 +-
.../env/scenario/default/data/actual/databases.xml | 6 +--
.../data/actual/init-sql/mysql/01-actual-init.sql | 42 +++++++++---------
.../actual/init-sql/opengauss/01-actual-init.sql | 25 ++++++-----
.../actual/init-sql/postgresql/01-actual-init.sql | 25 ++++++-----
.../default/proxy/conf/mysql/config-sharding.yaml | 4 +-
.../proxy/conf/opengauss/config-sharding.yaml | 4 +-
.../proxy/conf/postgresql/config-sharding.yaml | 4 +-
28 files changed, 138 insertions(+), 140 deletions(-)
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 2dc7d1fbc18..8e691823da2 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -450,7 +450,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
result = useDriverToExecute();
connection.commit();
// CHECKSTYLE:OFF
- } catch (final RuntimeException ex) {
+ } catch (final Exception ex) {
// CHECKSTYLE:ON
connection.rollback();
throw SQLExceptionTransformEngine.toSQLException(ex,
metaDataContexts.getMetaData().getDatabase(databaseName).getProtocolType());
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 00d18f1d3bc..6fae3f4dcf6 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -541,7 +541,7 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
result = useDriverToExecute(callback);
connection.commit();
// CHECKSTYLE:OFF
- } catch (final RuntimeException ex) {
+ } catch (final Exception ex) {
// CHECKSTYLE:ON
connection.rollback();
throw SQLExceptionTransformEngine.toSQLException(ex,
metaDataContexts.getMetaData().getDatabase(databaseName).getProtocolType());
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
index 3e5e126e96e..079fe4bea46 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
@@ -203,7 +203,7 @@ public final class DatabaseConnector implements
DatabaseBackendHandler {
result = doExecute(executionContexts);
transactionManager.commit();
// CHECKSTYLE:OFF
- } catch (final RuntimeException ex) {
+ } catch (final Exception ex) {
// CHECKSTYLE:ON
transactionManager.rollback();
String databaseName =
databaseConnectionManager.getConnectionSession().getDatabaseName();
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/AddResourceTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/AddResourceTestCase.java
index 930a1db275b..e464224e42a 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/AddResourceTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/AddResourceTestCase.java
@@ -47,7 +47,7 @@ public final class AddResourceTestCase extends
BaseTransactionTestCase {
private void assertAddResource(final TransactionContainerComposer
containerComposer) throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- getBaseTransactionITCase().addResource(connection,
"transaction_it_2", containerComposer);
+ getBaseTransactionITCase().addResource(connection, "ds_2",
containerComposer);
createThreeDataSourceAccountTableRule(connection);
reCreateAccountTable(connection);
assertRollback();
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
index 80cfa396496..4f752361667 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
@@ -21,6 +21,7 @@ import lombok.SneakyThrows;
import
org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionContainerComposer;
+import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -29,7 +30,7 @@ import java.sql.SQLException;
/**
* Broadcast table transaction integration test.
*/
-// TODO add @TransactionTestCase when migration of broadcast table data
completed when adding storage nodes
+@TransactionTestCase
public final class BroadcastTableTransactionTestCase extends
BaseTransactionTestCase {
private static final String T_ADDRESS = "t_address";
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
index 19b8271bddd..937d0cf85c2 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
@@ -66,17 +66,9 @@ public final class ExceptionInTransactionTestCase extends
BaseTransactionTestCas
connection.close();
}
}
- Thread queryThread = new Thread(() -> {
- try (Connection connection2 = getDataSource().getConnection()) {
- assertAccountRowCount(connection2, 0);
- } catch (final SQLException ignored) {
- }
- });
- queryThread.start();
- try {
- queryThread.join();
- } catch (final InterruptedException ignored) {
- Thread.currentThread().interrupt();
+ try (Connection connection2 = getDataSource().getConnection()) {
+ assertAccountRowCount(connection2, 0);
+ } catch (final SQLException ignored) {
}
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ImplicitCommitTransactionTestCase.java
similarity index 60%
copy from
test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
copy to
test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ImplicitCommitTransactionTestCase.java
index 80cfa396496..e2b10f49037 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/BroadcastTableTransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ImplicitCommitTransactionTestCase.java
@@ -17,24 +17,27 @@
package org.apache.shardingsphere.test.e2e.transaction.cases.commitrollback;
-import lombok.SneakyThrows;
import
org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionContainerComposer;
+import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
+import org.apache.shardingsphere.transaction.api.TransactionType;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
/**
- * Broadcast table transaction integration test.
+ * Implicit commit transaction integration test.
*/
-// TODO add @TransactionTestCase when migration of broadcast table data
completed when adding storage nodes
-public final class BroadcastTableTransactionTestCase extends
BaseTransactionTestCase {
+@TransactionTestCase(transactionTypes = TransactionType.XA)
+public final class ImplicitCommitTransactionTestCase extends
BaseTransactionTestCase {
private static final String T_ADDRESS = "t_address";
- public BroadcastTableTransactionTestCase(final TransactionBaseE2EIT
baseTransactionITCase, final DataSource dataSource) {
+ public ImplicitCommitTransactionTestCase(final TransactionBaseE2EIT
baseTransactionITCase, final DataSource dataSource) {
super(baseTransactionITCase, dataSource);
}
@@ -51,38 +54,35 @@ public final class BroadcastTableTransactionTestCase
extends BaseTransactionTest
}
@Override
- @SneakyThrows(SQLException.class)
- protected void executeTest(final TransactionContainerComposer
containerComposer) {
- rollback();
- commit();
+ protected void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
+ assertBroadcastTableImplicitCommit();
+ assertShardingTableImplicitCommit();
}
- private void init() throws SQLException {
+ private void assertBroadcastTableImplicitCommit() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- executeWithLog(connection, "delete from t_address;");
- assertTableRowCount(connection, T_ADDRESS, 0);
+ executeWithLog(connection, "INSERT INTO t_address (id, code,
address) VALUES (1, '1', 'Nanjing')");
+ assertThrows(SQLException.class, () -> executeWithLog(connection,
"INSERT INTO t_address (id, code, address) VALUES (1, '1', 'Nanjing')"));
+ }
+ try (Connection connection = getDataSource().getConnection()) {
+ assertTableRowCount(connection, T_ADDRESS, 1);
}
}
- private void commit() throws SQLException {
+ private void assertShardingTableImplicitCommit() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- connection.setAutoCommit(false);
- executeWithLog(connection, "delete from t_address;");
- assertTableRowCount(connection, T_ADDRESS, 0);
- executeWithLog(connection, "INSERT INTO t_address (id, code,
address) VALUES (1, '1', 'nanjing');");
- assertTableRowCount(connection, T_ADDRESS, 1);
- connection.commit();
+ executeWithLog(connection, "INSERT INTO account(id, balance,
transaction_id) VALUES (1, 1, 1), (2, 2, 2)");
+ assertThrows(SQLException.class, () -> executeWithLog(connection,
"INSERT INTO account(id, balance, transaction_id) VALUES (1, 1, 1), (2, 2,
2)"));
+ }
+ try (Connection connection = getDataSource().getConnection()) {
+ assertAccountRowCount(connection, 2);
}
}
- private void rollback() throws SQLException {
+ private void init() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
- connection.setAutoCommit(false);
- executeWithLog(connection, "delete from t_address;");
+ executeWithLog(connection, "DELETE FROM t_address");
assertTableRowCount(connection, T_ADDRESS, 0);
- executeWithLog(connection, "INSERT INTO t_address (id, code,
address) VALUES (1, '1', 'nanjing');");
- assertTableRowCount(connection, T_ADDRESS, 1);
- connection.commit();
}
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
index 4bd16dea2b9..8b09cdc68d3 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
@@ -27,6 +27,8 @@ import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
/**
@@ -47,16 +49,16 @@ public final class MySQLSetReadOnlyTestCase extends
SetReadOnlyTestCase {
}
private void assertSetReadOnly() throws SQLException {
- try (Connection connection1 = getDataSource().getConnection()) {
- executeUpdateWithLog(connection1, "insert into account(id,
balance) values (1, 0), (2, 100);");
+ try (Connection connection = getDataSource().getConnection()) {
+ executeUpdateWithLog(connection, "insert into account(id, balance)
values (1, 0), (2, 100);");
}
- try (Connection connection2 = getDataSource().getConnection()) {
- connection2.setReadOnly(true);
- assertQueryBalance(connection2);
- executeWithLog(connection2, "update account set balance = 100
where id = 2;");
+ try (Connection connection = getDataSource().getConnection()) {
+ connection.setReadOnly(true);
+ assertQueryBalance(connection);
+ executeWithLog(connection, "update account set balance = 100 where
id = 2;");
fail("Update ran successfully, should failed.");
} catch (final SQLException ex) {
- log.info("Update failed for expect.");
+ assertThat(ex.getMessage(), is("Connection is read-only. Queries
leading to data modification are not allowed."));
}
}
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/BaseSavePointTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/BaseSavePointTestCase.java
index 084e6970a99..4d88a180b46 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/BaseSavePointTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/BaseSavePointTestCase.java
@@ -34,7 +34,7 @@ public abstract class BaseSavePointTestCase extends
BaseTransactionTestCase {
super(baseTransactionITCase, dataSource);
}
- void assertRollback2Savepoint() throws SQLException {
+ void assertRollbackToSavepoint() throws SQLException {
try (Connection connection = getDataSource().getConnection()) {
connection.setAutoCommit(false);
assertAccountRowCount(connection, 0);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/MySQLSavePointTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/MySQLSavePointTestCase.java
index 5ad98bcdd51..6e79e555b1c 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/MySQLSavePointTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/MySQLSavePointTestCase.java
@@ -41,7 +41,7 @@ public final class MySQLSavePointTestCase extends
BaseSavePointTestCase {
@Override
public void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
- assertRollback2Savepoint();
+ assertRollbackToSavepoint();
assertReleaseSavepoint();
assertReleaseSavepointFailure();
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
index 9300e663407..e982904c28d 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
@@ -44,7 +44,7 @@ public final class OpenGaussSavePointTestCase extends
BaseSavePointTestCase {
@Override
public void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
- assertRollback2Savepoint();
+ assertRollbackToSavepoint();
assertReleaseSavepoint();
assertErrors();
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
index 542e81f87fd..692badc7dca 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
@@ -45,7 +45,7 @@ public final class PostgreSQLSavePointTestCase extends
BaseSavePointTestCase {
@Override
public void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
- assertRollback2Savepoint();
+ assertRollbackToSavepoint();
assertReleaseSavepoint();
assertErrors();
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
index d173c195342..03c0b6388e8 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
@@ -31,7 +31,6 @@ import
org.apache.shardingsphere.test.e2e.transaction.framework.container.compos
import
org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import javax.sql.DataSource;
-import java.util.Map;
/**
* Transaction container composer.
@@ -69,10 +68,6 @@ public final class TransactionContainerComposer implements
AutoCloseable {
private JdbcDataSource createJdbcDataSource() {
DockerContainerComposer dockerContainerComposer =
(DockerContainerComposer) containerComposer;
- DockerStorageContainer storageContainer =
dockerContainerComposer.getStorageContainer();
- Map<String, DataSource> actualDataSourceMap =
storageContainer.getActualDataSourceMap();
- actualDataSourceMap.put("ds_0", createDataSource(storageContainer,
"transaction_it_0"));
- actualDataSourceMap.put("ds_1", createDataSource(storageContainer,
"transaction_it_1"));
return new JdbcDataSource(dockerContainerComposer);
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionTestCase.java
index 6949e477eef..b213564f7ed 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionTestCase.java
@@ -36,7 +36,7 @@ public @interface TransactionTestCase {
*
* @return database types
*/
- String[] dbTypes() default {"mysql", "PostgreSQL", "OpenGauss"};
+ String[] dbTypes() default {"MySQL", "PostgreSQL", "OpenGauss"};
/**
* Specifies which adapters do the case run on.
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/it-env.properties
b/test/e2e/operation/transaction/src/test/resources/env/it-env.properties
index 56401d4fc3c..71eb6b715c1 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/it-env.properties
+++ b/test/e2e/operation/transaction/src/test/resources/env/it-env.properties
@@ -17,12 +17,12 @@
# transaction.it.type=NONE,DOCKER,NATIVE
transaction.it.env.type=NONE
# transaction.it.env.cases=ClassicTransferTestCase,
PostgreSQLSavePointTestCase
-transaction.it.env.cases=TransactionDeadlockTestCase,
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase,
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase,
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase,
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase,
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase,
MySQLSavePointTestCase, MySQLLocalTruncateTestCase, MySQLXATruncateTestCase,
OpenGaussCursorTestCase, Nes [...]
+transaction.it.env.cases=TransactionDeadlockTestCase,
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase,
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase,
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase,
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase,
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase,
MySQLSavePointTestCase, MySQLLocalTruncateTestCase, MySQLXATruncateTestCase,
OpenGaussCursorTestCase, Nes [...]
# transaction.it.env.transtypes=LOCAL, XA, BASE
transaction.it.env.transtypes=LOCAL, XA
# transaction.it.env.xa.providers=Atomikos, Narayana
transaction.it.env.xa.providers=Atomikos, Narayana
-# transaction.it.docker.mysql.version=5.7,8.0
+# transaction.it.docker.mysql.version=mysql:5.7,mysql:8.0
transaction.it.docker.mysql.version=
#
transaction.it.docker.postgresql.version=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
transaction.it.docker.postgresql.version=
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/jdbc/mysql/config-sharding-xa-narayana.yaml
b/test/e2e/operation/transaction/src/test/resources/env/jdbc/mysql/config-sharding-xa-narayana.yaml
index 7b8f2e0288b..4aa7346308d 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/jdbc/mysql/config-sharding-xa-narayana.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/jdbc/mysql/config-sharding-xa-narayana.yaml
@@ -100,4 +100,4 @@ transaction:
providerType: Narayana
props:
- sql-show: false
+ sql-show: true
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/databases.xml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/databases.xml
index 7ba6877df39..787fa1ce96e 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/databases.xml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/databases.xml
@@ -17,7 +17,7 @@
-->
<databases>
- <database>transaction_it_0</database>
- <database>transaction_it_1</database>
- <database>transaction_it_2</database>
+ <database>ds_0</database>
+ <database>ds_1</database>
+ <database>ds_2</database>
</databases>
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/mysql/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/mysql/01-actual-init.sql
index 093677cc45c..5546773f8c4 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/mysql/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/mysql/01-actual-init.sql
@@ -26,11 +26,11 @@
-- limitations under the License.
--
-DROP DATABASE IF EXISTS transaction_it_0;
-CREATE DATABASE transaction_it_0;
+DROP DATABASE IF EXISTS ds_0;
+CREATE DATABASE ds_0;
-DROP DATABASE IF EXISTS transaction_it_1;
-CREATE DATABASE transaction_it_1;
+DROP DATABASE IF EXISTS ds_1;
+CREATE DATABASE ds_1;
-DROP DATABASE IF EXISTS transaction_it_2;
-CREATE DATABASE transaction_it_2;
+DROP DATABASE IF EXISTS ds_2;
+CREATE DATABASE ds_2;
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/opengauss/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/opengauss/01-actual-init.sql
index 4b7bc981143..d1e4b5b8163 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/opengauss/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -26,19 +26,19 @@
-- limitations under the License.
--
-DROP DATABASE IF EXISTS transaction_it_0;
-DROP DATABASE IF EXISTS transaction_it_1;
-DROP DATABASE IF EXISTS transaction_it_2;
+DROP DATABASE IF EXISTS ds_0;
+DROP DATABASE IF EXISTS ds_1;
+DROP DATABASE IF EXISTS ds_2;
-CREATE DATABASE transaction_it_0;
-CREATE DATABASE transaction_it_1;
-CREATE DATABASE transaction_it_2;
+CREATE DATABASE ds_0;
+CREATE DATABASE ds_1;
+CREATE DATABASE ds_2;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_0 TO test_user;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_1 TO test_user;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_2 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_0 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_1 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_2 TO test_user;
-\c transaction_it_0;
+\c ds_0;
CREATE TABLE "t_product" ("id" INT PRIMARY KEY, "product_id" INT NOT NULL,
"address_id" INT, "product_name" varchar, "category_id" INT NOT NULL, "price"
numeric NOT NULL, "status" varchar, "creation_date" date);
CREATE TABLE "t_order_0" ("id" INT PRIMARY KEY, "order_id" INT, "address_id"
INT, "user_id" INT NOT NULL, "status" VARCHAR(45) NULL);
@@ -78,7 +78,7 @@ INSERT INTO "t_product" ("id", "product_id", "address_id",
"product_name", "cate
INSERT INTO "t_product" ("id", "product_id", "address_id", "product_name",
"category_id", "price", "status", "creation_date") VALUES (4, 4, 4, 'product4',
4, 4, 'OK', '2022-11-02');
\c
-\c transaction_it_1;
+\c ds_1;
CREATE TABLE "t_order_0" ("id" INT PRIMARY KEY, "order_id" INT, "address_id"
INT, "user_id" INT NOT NULL, "status" VARCHAR(45) NULL);
CREATE TABLE "t_order_1" ("id" INT PRIMARY KEY, "order_id" INT, "address_id"
INT, "user_id" INT NOT NULL, "status" VARCHAR(45) NULL);
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/postgresql/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/postgresql/01-actual-init.sql
index 093677cc45c..5546773f8c4 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/postgresql/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/data/actual/init-sql/postgresql/01-actual-init.sql
@@ -26,11 +26,11 @@
-- limitations under the License.
--
-DROP DATABASE IF EXISTS transaction_it_0;
-CREATE DATABASE transaction_it_0;
+DROP DATABASE IF EXISTS ds_0;
+CREATE DATABASE ds_0;
-DROP DATABASE IF EXISTS transaction_it_1;
-CREATE DATABASE transaction_it_1;
+DROP DATABASE IF EXISTS ds_1;
+CREATE DATABASE ds_1;
-DROP DATABASE IF EXISTS transaction_it_2;
-CREATE DATABASE transaction_it_2;
+DROP DATABASE IF EXISTS ds_2;
+CREATE DATABASE ds_2;
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/proxy/conf/opengauss/config-sharding.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/proxy/conf/opengauss/config-sharding.yaml
index 2d9bfdb85ff..424a1cdda23 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/proxy/conf/opengauss/config-sharding.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/cursor/proxy/conf/opengauss/config-sharding.yaml
@@ -24,7 +24,7 @@
databaseName: sharding_db
dataSources:
ds_0:
- url: jdbc:opengauss://opengauss.cursor.host:5432/transaction_it_0
+ url: jdbc:opengauss://opengauss.cursor.host:5432/ds_0
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -33,7 +33,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_1:
- url: jdbc:opengauss://opengauss.cursor.host:5432/transaction_it_1
+ url: jdbc:opengauss://opengauss.cursor.host:5432/ds_1
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/databases.xml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/databases.xml
index 7ba6877df39..787fa1ce96e 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/databases.xml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/databases.xml
@@ -17,7 +17,7 @@
-->
<databases>
- <database>transaction_it_0</database>
- <database>transaction_it_1</database>
- <database>transaction_it_2</database>
+ <database>ds_0</database>
+ <database>ds_1</database>
+ <database>ds_2</database>
</databases>
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/mysql/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/mysql/01-actual-init.sql
index 27efd5aa5a0..5a65dfb657f 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/mysql/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/mysql/01-actual-init.sql
@@ -18,26 +18,28 @@
SET character_set_database='utf8';
SET character_set_server='utf8';
-DROP DATABASE IF EXISTS transaction_it_0;
-DROP DATABASE IF EXISTS transaction_it_1;
-DROP DATABASE IF EXISTS transaction_it_2;
+DROP DATABASE IF EXISTS ds_0;
+DROP DATABASE IF EXISTS ds_1;
+DROP DATABASE IF EXISTS ds_2;
-CREATE DATABASE transaction_it_0;
-CREATE DATABASE transaction_it_1;
-CREATE DATABASE transaction_it_2;
+CREATE DATABASE ds_0;
+CREATE DATABASE ds_1;
+CREATE DATABASE ds_2;
-CREATE TABLE transaction_it_0.`t_order_0` (`order_id` INT PRIMARY KEY,
`user_id` INT NOT NULL, `status` VARCHAR(45) NULL);
-CREATE TABLE transaction_it_0.`t_order_1` (`order_id` INT PRIMARY KEY,
`user_id` INT NOT NULL, `status` VARCHAR(45) NULL);
-CREATE TABLE transaction_it_0.`t_order_item_0` (`item_id` INT PRIMARY KEY,
`order_id` int NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT
NULL);
-CREATE TABLE transaction_it_0.`t_order_item_1` (`item_id` INT PRIMARY KEY,
`order_id` int NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT
NULL);
-CREATE TABLE transaction_it_0.`account_0`(`id` INT PRIMARY KEY, `balance`
FLOAT, `transaction_id` INT);
-CREATE TABLE transaction_it_0.`account_1`(`id` INT PRIMARY KEY, `balance`
FLOAT, `transaction_id` INT);
-CREATE TABLE transaction_it_0.`t_address` (`id` INT PRIMARY KEY, `code`
VARCHAR(36) DEFAULT NULL, `address` VARCHAR(36) DEFAULT NULL);
+CREATE TABLE ds_0.`t_order_0` (`order_id` INT PRIMARY KEY, `user_id` INT NOT
NULL, `status` VARCHAR(45) NULL);
+CREATE TABLE ds_0.`t_order_1` (`order_id` INT PRIMARY KEY, `user_id` INT NOT
NULL, `status` VARCHAR(45) NULL);
+CREATE TABLE ds_0.`t_order_item_0` (`item_id` INT PRIMARY KEY, `order_id` int
NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT NULL);
+CREATE TABLE ds_0.`t_order_item_1` (`item_id` INT PRIMARY KEY, `order_id` int
NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT NULL);
+CREATE TABLE ds_0.`account_0`(`id` INT PRIMARY KEY, `balance` FLOAT,
`transaction_id` INT);
+CREATE TABLE ds_0.`account_1`(`id` INT PRIMARY KEY, `balance` FLOAT,
`transaction_id` INT);
+CREATE TABLE ds_0.`t_address` (`id` INT PRIMARY KEY, `code` VARCHAR(36)
DEFAULT NULL, `address` VARCHAR(36) DEFAULT NULL);
-CREATE TABLE transaction_it_1.`t_order_0` (`order_id` INT PRIMARY KEY,
`user_id` INT NOT NULL, `status` VARCHAR(45) NULL);
-CREATE TABLE transaction_it_1.`t_order_1` (`order_id` INT PRIMARY KEY,
`user_id` INT NOT NULL, `status` VARCHAR(45) NULL);
-CREATE TABLE transaction_it_1.`t_order_item_0` (`item_id` INT PRIMARY KEY,
`order_id` int NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT
NULL);
-CREATE TABLE transaction_it_1.`t_order_item_1` (`item_id` INT PRIMARY KEY,
`order_id` int NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT
NULL);
-CREATE TABLE transaction_it_1.`account_0`(`id` INT PRIMARY KEY, `balance`
FLOAT, `transaction_id` INT);
-CREATE TABLE transaction_it_1.`account_1`(`id` INT PRIMARY KEY, `balance`
FLOAT, `transaction_id` INT);
-CREATE TABLE transaction_it_1.`t_address` (`id` INT PRIMARY KEY, `code`
VARCHAR(36) DEFAULT NULL, `address` VARCHAR(36) DEFAULT NULL);
+CREATE TABLE ds_1.`t_order_0` (`order_id` INT PRIMARY KEY, `user_id` INT NOT
NULL, `status` VARCHAR(45) NULL);
+CREATE TABLE ds_1.`t_order_1` (`order_id` INT PRIMARY KEY, `user_id` INT NOT
NULL, `status` VARCHAR(45) NULL);
+CREATE TABLE ds_1.`t_order_item_0` (`item_id` INT PRIMARY KEY, `order_id` int
NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT NULL);
+CREATE TABLE ds_1.`t_order_item_1` (`item_id` INT PRIMARY KEY, `order_id` int
NOT NULL, `user_id` int NOT NULL, `status` varchar(50) DEFAULT NULL);
+CREATE TABLE ds_1.`account_0`(`id` INT PRIMARY KEY, `balance` FLOAT,
`transaction_id` INT);
+CREATE TABLE ds_1.`account_1`(`id` INT PRIMARY KEY, `balance` FLOAT,
`transaction_id` INT);
+CREATE TABLE ds_1.`t_address` (`id` INT PRIMARY KEY, `code` VARCHAR(36)
DEFAULT NULL, `address` VARCHAR(36) DEFAULT NULL);
+
+CREATE TABLE ds_2.`t_address` (`id` INT PRIMARY KEY, `code` VARCHAR(36)
DEFAULT NULL, `address` VARCHAR(36) DEFAULT NULL);
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/opengauss/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/opengauss/01-actual-init.sql
index ec3929070ce..f48e73cf409 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/opengauss/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -15,19 +15,19 @@
-- limitations under the License.
--
-DROP DATABASE IF EXISTS transaction_it_0;
-DROP DATABASE IF EXISTS transaction_it_1;
-DROP DATABASE IF EXISTS transaction_it_2;
+DROP DATABASE IF EXISTS ds_0;
+DROP DATABASE IF EXISTS ds_1;
+DROP DATABASE IF EXISTS ds_2;
-CREATE DATABASE transaction_it_0;
-CREATE DATABASE transaction_it_1;
-CREATE DATABASE transaction_it_2;
+CREATE DATABASE ds_0;
+CREATE DATABASE ds_1;
+CREATE DATABASE ds_2;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_0 TO test_user;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_1 TO test_user;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_2 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_0 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_1 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_2 TO test_user;
-\c transaction_it_0;
+\c ds_0;
CREATE TABLE "t_order_0" ("order_id" INT PRIMARY KEY, "user_id" INT NOT NULL,
"status" VARCHAR(45) NULL);
CREATE TABLE "t_order_1" ("order_id" INT PRIMARY KEY, "user_id" INT NOT NULL,
"status" VARCHAR(45) NULL);
@@ -37,7 +37,7 @@ CREATE TABLE "account_0"("id" INT PRIMARY KEY, "balance"
FLOAT, "transaction_id"
CREATE TABLE "account_1"("id" INT PRIMARY KEY, "balance" FLOAT,
"transaction_id" INT);
CREATE TABLE "t_address" ("id" INT PRIMARY KEY, "code" VARCHAR(36) DEFAULT
NULL, "address" VARCHAR(36) DEFAULT NULL);
-\c transaction_it_1;
+\c ds_1;
CREATE TABLE "t_order_0" ("order_id" INT PRIMARY KEY, "user_id" INT NOT NULL,
"status" VARCHAR(45) NULL);
CREATE TABLE "t_order_1" ("order_id" INT PRIMARY KEY, "user_id" INT NOT NULL,
"status" VARCHAR(45) NULL);
@@ -46,3 +46,6 @@ CREATE TABLE "t_order_item_1" ("item_id" INT PRIMARY KEY,
"order_id" int NOT NUL
CREATE TABLE "account_0"("id" INT PRIMARY KEY, "balance" FLOAT,
"transaction_id" INT);
CREATE TABLE "account_1"("id" INT PRIMARY KEY, "balance" FLOAT,
"transaction_id" INT);
CREATE TABLE "t_address" ("id" INT PRIMARY KEY, "code" VARCHAR(36) DEFAULT
NULL, "address" VARCHAR(36) DEFAULT NULL);
+
+\c ds_2;
+CREATE TABLE "t_address" ("id" INT PRIMARY KEY, "code" VARCHAR(36) DEFAULT
NULL, "address" VARCHAR(36) DEFAULT NULL);
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/postgresql/01-actual-init.sql
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/postgresql/01-actual-init.sql
index ec3929070ce..f48e73cf409 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/postgresql/01-actual-init.sql
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/data/actual/init-sql/postgresql/01-actual-init.sql
@@ -15,19 +15,19 @@
-- limitations under the License.
--
-DROP DATABASE IF EXISTS transaction_it_0;
-DROP DATABASE IF EXISTS transaction_it_1;
-DROP DATABASE IF EXISTS transaction_it_2;
+DROP DATABASE IF EXISTS ds_0;
+DROP DATABASE IF EXISTS ds_1;
+DROP DATABASE IF EXISTS ds_2;
-CREATE DATABASE transaction_it_0;
-CREATE DATABASE transaction_it_1;
-CREATE DATABASE transaction_it_2;
+CREATE DATABASE ds_0;
+CREATE DATABASE ds_1;
+CREATE DATABASE ds_2;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_0 TO test_user;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_1 TO test_user;
-GRANT ALL PRIVILEGES ON DATABASE transaction_it_2 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_0 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_1 TO test_user;
+GRANT ALL PRIVILEGES ON DATABASE ds_2 TO test_user;
-\c transaction_it_0;
+\c ds_0;
CREATE TABLE "t_order_0" ("order_id" INT PRIMARY KEY, "user_id" INT NOT NULL,
"status" VARCHAR(45) NULL);
CREATE TABLE "t_order_1" ("order_id" INT PRIMARY KEY, "user_id" INT NOT NULL,
"status" VARCHAR(45) NULL);
@@ -37,7 +37,7 @@ CREATE TABLE "account_0"("id" INT PRIMARY KEY, "balance"
FLOAT, "transaction_id"
CREATE TABLE "account_1"("id" INT PRIMARY KEY, "balance" FLOAT,
"transaction_id" INT);
CREATE TABLE "t_address" ("id" INT PRIMARY KEY, "code" VARCHAR(36) DEFAULT
NULL, "address" VARCHAR(36) DEFAULT NULL);
-\c transaction_it_1;
+\c ds_1;
CREATE TABLE "t_order_0" ("order_id" INT PRIMARY KEY, "user_id" INT NOT NULL,
"status" VARCHAR(45) NULL);
CREATE TABLE "t_order_1" ("order_id" INT PRIMARY KEY, "user_id" INT NOT NULL,
"status" VARCHAR(45) NULL);
@@ -46,3 +46,6 @@ CREATE TABLE "t_order_item_1" ("item_id" INT PRIMARY KEY,
"order_id" int NOT NUL
CREATE TABLE "account_0"("id" INT PRIMARY KEY, "balance" FLOAT,
"transaction_id" INT);
CREATE TABLE "account_1"("id" INT PRIMARY KEY, "balance" FLOAT,
"transaction_id" INT);
CREATE TABLE "t_address" ("id" INT PRIMARY KEY, "code" VARCHAR(36) DEFAULT
NULL, "address" VARCHAR(36) DEFAULT NULL);
+
+\c ds_2;
+CREATE TABLE "t_address" ("id" INT PRIMARY KEY, "code" VARCHAR(36) DEFAULT
NULL, "address" VARCHAR(36) DEFAULT NULL);
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/mysql/config-sharding.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/mysql/config-sharding.yaml
index b3023bcbd46..04220b62717 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/mysql/config-sharding.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/mysql/config-sharding.yaml
@@ -24,7 +24,7 @@
databaseName: sharding_db
dataSources:
ds_0:
- url:
jdbc:mysql://mysql.default.host:3306/transaction_it_0?serverTimezone=UTC&useSSL=false&characterEncoding=utf-8
+ url:
jdbc:mysql://mysql.default.host:3306/ds_0?serverTimezone=UTC&useSSL=false&characterEncoding=utf-8
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -33,7 +33,7 @@ dataSources:
maxPoolSize: 4
minPoolSize: 2
ds_1:
- url:
jdbc:mysql://mysql.default.host:3306/transaction_it_1?serverTimezone=UTC&useSSL=false&characterEncoding=utf-8
+ url:
jdbc:mysql://mysql.default.host:3306/ds_1?serverTimezone=UTC&useSSL=false&characterEncoding=utf-8
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/opengauss/config-sharding.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/opengauss/config-sharding.yaml
index 8c3956bf754..5ef7bd85b65 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/opengauss/config-sharding.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/opengauss/config-sharding.yaml
@@ -24,7 +24,7 @@
databaseName: sharding_db
dataSources:
ds_0:
- url: jdbc:opengauss://opengauss.default.host:5432/transaction_it_0
+ url: jdbc:opengauss://opengauss.default.host:5432/ds_0
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -33,7 +33,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_1:
- url: jdbc:opengauss://opengauss.default.host:5432/transaction_it_1
+ url: jdbc:opengauss://opengauss.default.host:5432/ds_1
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/postgresql/config-sharding.yaml
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/postgresql/config-sharding.yaml
index 8ac53f700db..f1189a1c136 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/postgresql/config-sharding.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/scenario/default/proxy/conf/postgresql/config-sharding.yaml
@@ -24,7 +24,7 @@
databaseName: sharding_db
dataSources:
ds_0:
- url: jdbc:postgresql://postgresql.default.host:5432/transaction_it_0
+ url: jdbc:postgresql://postgresql.default.host:5432/ds_0
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
@@ -33,7 +33,7 @@ dataSources:
maxPoolSize: 2
minPoolSize: 2
ds_1:
- url: jdbc:postgresql://postgresql.default.host:5432/transaction_it_1
+ url: jdbc:postgresql://postgresql.default.host:5432/ds_1
username: test_user
password: Test@123
connectionTimeoutMilliseconds: 30000
