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 9c80adb8d1f Add TCL statement transaction E2E cases (#31890)
9c80adb8d1f is described below
commit 9c80adb8d1f64074204be222a3213fa279779d57
Author: ZhangCheng <[email protected]>
AuthorDate: Thu Jun 27 13:58:53 2024 +0800
Add TCL statement transaction E2E cases (#31890)
* Add TCL statement transaction E2E cases
* Add TCL statement transaction E2E cases
---
.../BaseTCLStatementTransactionTestCase.java | 49 ++++++++++++
.../cases/statement/MySQLTCLStatementTestCase.java | 92 ++++++++++++++++++++++
.../statement/PostgreSQLTCLStatementTestCase.java | 69 ++++++++++++++++
.../src/test/resources/env/it-env.properties | 2 +-
4 files changed, 211 insertions(+), 1 deletion(-)
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/BaseTCLStatementTransactionTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/BaseTCLStatementTransactionTestCase.java
new file mode 100644
index 00000000000..d8e26b5f038
--- /dev/null
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/BaseTCLStatementTransactionTestCase.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.test.e2e.transaction.cases.statement;
+
+import
org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * Base TCL statement transaction test case.
+ */
+public abstract class BaseTCLStatementTransactionTestCase extends
BaseTransactionTestCase {
+
+ public BaseTCLStatementTransactionTestCase(final
TransactionTestCaseParameter testCaseParam) {
+ super(testCaseParam);
+ }
+
+ protected void assertRollback(final Connection connection, final
Connection queryConnection) throws SQLException {
+ executeWithLog(connection, "BEGIN");
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (1, 1, 1), (2, 2, 2)");
+ assertAccountBalances(queryConnection);
+ executeWithLog(connection, "ROLLBACK");
+ assertAccountBalances(queryConnection);
+ }
+
+ protected void assertCommit(final Connection connection, final Connection
queryConnection) throws SQLException {
+ executeWithLog(connection, "BEGIN");
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (1, 1, 1), (2, 2, 2)");
+ assertAccountBalances(queryConnection);
+ executeWithLog(connection, "COMMIT");
+ assertAccountBalances(queryConnection, 1, 2);
+ }
+}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/MySQLTCLStatementTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/MySQLTCLStatementTestCase.java
new file mode 100644
index 00000000000..6e9229a15ce
--- /dev/null
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/MySQLTCLStatementTestCase.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.test.e2e.transaction.cases.statement;
+
+import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionContainerComposer;
+import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
+import
org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * MySQL TCL statement transaction test case.
+ */
+@TransactionTestCase(adapters = TransactionTestConstants.PROXY, dbTypes =
TransactionTestConstants.MYSQL)
+public final class MySQLTCLStatementTestCase extends
BaseTCLStatementTransactionTestCase {
+
+ public MySQLTCLStatementTestCase(final TransactionTestCaseParameter
testCaseParam) {
+ super(testCaseParam);
+ }
+
+ @Override
+ protected void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
+ try (
+ Connection connection = getDataSource().getConnection();
+ Connection queryConnection = getDataSource().getConnection()) {
+ assertRollback(connection, queryConnection);
+ assertCommit(connection, queryConnection);
+ assertBegin(connection, queryConnection);
+ assertStartTransaction(connection, queryConnection);
+ assertSetAutoCommit(connection, queryConnection);
+ }
+ }
+
+ private void assertBegin(final Connection connection, final Connection
queryConnection) throws SQLException {
+ executeWithLog(connection, "BEGIN");
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (3, 3, 3), (4, 4, 4)");
+ assertAccountBalances(queryConnection, 1, 2);
+ executeWithLog(connection, "BEGIN");
+ assertAccountBalances(queryConnection, 1, 2, 3, 4);
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (5, 5, 5), (6, 6, 6)");
+ executeWithLog(connection, "ROLLBACK");
+ assertAccountBalances(queryConnection, 1, 2, 3, 4);
+ }
+
+ private void assertStartTransaction(final Connection connection, final
Connection queryConnection) throws SQLException {
+ executeWithLog(connection, "DELETE FROM account");
+ assertAccountRowCount(queryConnection, 0);
+ executeWithLog(connection, "START TRANSACTION");
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (1, 1, 1), (2, 2, 2)");
+ assertAccountBalances(queryConnection);
+ executeWithLog(connection, "COMMIT");
+ assertAccountBalances(queryConnection, 1, 2);
+ }
+
+ private void assertSetAutoCommit(final Connection connection, final
Connection queryConnection) throws SQLException {
+ executeWithLog(connection, "DELETE FROM account");
+ assertAccountBalances(queryConnection);
+ executeWithLog(connection, "SET AUTOCOMMIT=0");
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (1, 1, 1), (2, 2, 2)");
+ assertAccountBalances(queryConnection);
+ executeWithLog(connection, "COMMIT");
+ assertAccountBalances(queryConnection, 1, 2);
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (3, 3, 3), (4, 4, 4)");
+ assertAccountBalances(queryConnection, 1, 2);
+ executeWithLog(connection, "BEGIN");
+ assertAccountBalances(queryConnection, 1, 2, 3, 4);
+ assertTrue(connection.getAutoCommit());
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (5, 5, 5), (6, 6, 6)");
+ assertAccountBalances(queryConnection, 1, 2, 3, 4);
+ executeWithLog(connection, "SET AUTOCOMMIT=1");
+ assertAccountBalances(queryConnection, 1, 2, 3, 4, 5, 6);
+ assertTrue(connection.getAutoCommit());
+ }
+}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/PostgreSQLTCLStatementTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/PostgreSQLTCLStatementTestCase.java
new file mode 100644
index 00000000000..fd06ffa3072
--- /dev/null
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/statement/PostgreSQLTCLStatementTestCase.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.test.e2e.transaction.cases.statement;
+
+import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionContainerComposer;
+import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
+import
org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * PostgreSQL TCL statement transaction test case.
+ */
+@TransactionTestCase(adapters = TransactionTestConstants.PROXY, dbTypes =
TransactionTestConstants.POSTGRESQL)
+public final class PostgreSQLTCLStatementTestCase extends
BaseTCLStatementTransactionTestCase {
+
+ public PostgreSQLTCLStatementTestCase(final TransactionTestCaseParameter
testCaseParam) {
+ super(testCaseParam);
+ }
+
+ @Override
+ protected void executeTest(final TransactionContainerComposer
containerComposer) throws SQLException {
+ try (
+ Connection connection = getDataSource().getConnection();
+ Connection queryConnection = getDataSource().getConnection()) {
+ assertRollback(connection, queryConnection);
+ assertCommit(connection, queryConnection);
+ assertBegin(connection, queryConnection);
+ assertBeginTransaction(connection, queryConnection);
+ }
+ }
+
+ private void assertBegin(final Connection connection, final Connection
queryConnection) throws SQLException {
+ executeWithLog(connection, "BEGIN");
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (3, 3, 3), (4, 4, 4)");
+ assertAccountBalances(queryConnection, 1, 2);
+ assertThrows(SQLException.class, () -> executeWithLog(connection,
"BEGIN"));
+ executeWithLog(connection, "ROLLBACK");
+ assertAccountBalances(queryConnection, 1, 2);
+ }
+
+ private void assertBeginTransaction(final Connection connection, final
Connection queryConnection) throws SQLException {
+ executeWithLog(connection, "DELETE FROM account");
+ assertAccountRowCount(queryConnection, 0);
+ executeWithLog(connection, "BEGIN TRANSACTION");
+ executeWithLog(connection, "INSERT INTO account (id, balance,
transaction_id) VALUES (1, 1, 1), (2, 2, 2)");
+ assertAccountBalances(queryConnection);
+ executeWithLog(connection, "END TRANSACTION");
+ assertAccountBalances(queryConnection, 1, 2);
+ }
+}
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 d3b41f196f4..f697f771e4d 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
@@ -18,7 +18,7 @@
transaction.it.env.type=NONE
# transaction.it.proxy.binding.ports=63308:3308
# transaction.it.env.cases=ClassicTransferTestCase
-transaction.it.env.cases=TransactionDeadlockTestCase,
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase,
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase,
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase,
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase,
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase,
MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase,
NestedTransactionTestCase, [...]
+transaction.it.env.cases=TransactionDeadlockTestCase,
MultiJDBCConnectionsTestCase, MultiTransactionInConnectionTestCase,
MultiOperationsCommitAndRollbackTestCase, MySQLAutoCommitTestCase,
PostgreSQLAutoCommitTestCase, BroadcastTableTransactionTestCase,
ExceptionInTransactionTestCase, MultiTableCommitAndRollbackTestCase,
SingleTableCommitAndRollbackTestCase, MySQLSetReadOnlyTestCase,
MySQLLocalTruncateTestCase, MySQLXATruncateTestCase, OpenGaussCursorTestCase,
NestedTransactionTestCase, [...]
# transaction.it.env.transtypes=LOCAL, XA, BASE
transaction.it.env.transtypes=LOCAL, XA
# transaction.it.env.xa.providers=Atomikos, Narayana
