You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/06/14 02:53:43 UTC
[shardingsphere] branch master updated: Refact the handler of autocommit (#18335)
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 9534fa51674 Refact the handler of autocommit (#18335)
9534fa51674 is described below
commit 9534fa516742280caac6bdc4cc817b522449df3d
Author: JingShang Lu <ji...@gmail.com>
AuthorDate: Tue Jun 14 10:53:32 2022 +0800
Refact the handler of autocommit (#18335)
* Delete transactionautocommithandler and move relevant logic to transactionbackendhandler
* fix
---
.../transaction/core/TransactionOperationType.java | 2 +-
.../transaction/TransactionAutoCommitHandler.java | 44 ----------------------
.../transaction/TransactionBackendHandler.java | 19 ++++++++++
.../TransactionBackendHandlerFactory.java | 2 +-
.../TextProtocolBackendHandlerFactoryTest.java | 9 ++---
5 files changed, 25 insertions(+), 51 deletions(-)
diff --git a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionOperationType.java b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionOperationType.java
index 1761a50dc48..bc30e9173ed 100644
--- a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionOperationType.java
+++ b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionOperationType.java
@@ -22,5 +22,5 @@ package org.apache.shardingsphere.transaction.core;
*/
public enum TransactionOperationType {
- BEGIN, COMMIT, ROLLBACK, SAVEPOINT, ROLLBACK_TO_SAVEPOINT, RELEASE_SAVEPOINT
+ BEGIN, COMMIT, ROLLBACK, SAVEPOINT, ROLLBACK_TO_SAVEPOINT, RELEASE_SAVEPOINT, SET_AUTOCOMMIT
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionAutoCommitHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionAutoCommitHandler.java
deleted file mode 100644
index 9c028ce1c91..00000000000
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionAutoCommitHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.proxy.backend.text.transaction;
-
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
-import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
-import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
-import org.apache.shardingsphere.proxy.backend.text.TextProtocolBackendHandler;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.SetAutoCommitStatement;
-
-import java.sql.SQLException;
-
-/**
- * Set autocommit handler.
- */
-@RequiredArgsConstructor
-public final class TransactionAutoCommitHandler implements TextProtocolBackendHandler {
-
- private final SetAutoCommitStatement sqlStatement;
-
- private final ConnectionSession connectionSession;
-
- @Override
- public ResponseHeader execute() throws SQLException {
- connectionSession.setAutoCommit(sqlStatement.isAutoCommit());
- return new UpdateResponseHeader(sqlStatement);
- }
-}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
index 3a58353383c..4cf04133af8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandler.java
@@ -33,8 +33,10 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.ReleaseSavepointStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.RollbackStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.SavepointStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.SetAutoCommitStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.TCLStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.tcl.MySQLBeginTransactionStatement;
+import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.tcl.MySQLSetAutoCommitStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.tcl.OpenGaussCommitStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.tcl.OpenGaussRollbackStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.tcl.PostgreSQLCommitStatement;
@@ -122,6 +124,9 @@ public final class TransactionBackendHandler implements TextProtocolBackendHandl
case ROLLBACK:
backendTransactionManager.rollback();
break;
+ case SET_AUTOCOMMIT:
+ handleSetAutoCommit();
+ break;
default:
throw new SQLFeatureNotSupportedException(operationType.name());
}
@@ -167,4 +172,18 @@ public final class TransactionBackendHandler implements TextProtocolBackendHandl
}
return result;
}
+
+ private void handleSetAutoCommit() throws SQLException {
+ if (tclStatement instanceof MySQLSetAutoCommitStatement) {
+ handleMySQLSetAutoCommit();
+ }
+ connectionSession.setAutoCommit(((SetAutoCommitStatement) tclStatement).isAutoCommit());
+ }
+
+ private void handleMySQLSetAutoCommit() throws SQLException {
+ MySQLSetAutoCommitStatement statement = (MySQLSetAutoCommitStatement) tclStatement;
+ if (statement.isAutoCommit() && connectionSession.getTransactionStatus().isInTransaction()) {
+ backendTransactionManager.commit();
+ }
+ }
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
index 380ad06e608..e8224493f29 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/transaction/TransactionBackendHandlerFactory.java
@@ -56,7 +56,7 @@ public final class TransactionBackendHandlerFactory {
return new TransactionBackendHandler(tclStatement, TransactionOperationType.BEGIN, connectionSession);
}
if (tclStatement instanceof SetAutoCommitStatement) {
- return new TransactionAutoCommitHandler((SetAutoCommitStatement) tclStatement, connectionSession);
+ return new TransactionBackendHandler(tclStatement, TransactionOperationType.SET_AUTOCOMMIT, connectionSession);
}
if (tclStatement instanceof SavepointStatement) {
return new TransactionBackendHandler(tclStatement, TransactionOperationType.SAVEPOINT, connectionSession);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
index 15c8dd30f6b..03a746da256 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactoryTest.java
@@ -40,7 +40,6 @@ import org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.HintDistS
import org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.updatable.SetVariableHandler;
import org.apache.shardingsphere.proxy.backend.text.distsql.rql.RQLBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.skip.SkipBackendHandler;
-import org.apache.shardingsphere.proxy.backend.text.transaction.TransactionAutoCommitHandler;
import org.apache.shardingsphere.proxy.backend.text.transaction.TransactionBackendHandler;
import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
@@ -147,28 +146,28 @@ public final class TextProtocolBackendHandlerFactoryTest extends ProxyContextRes
public void assertNewInstanceWithSetAutoCommitToOff() throws SQLException {
String sql = "SET AUTOCOMMIT=0";
TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, Optional::empty, connectionSession);
- assertThat(actual, instanceOf(TransactionAutoCommitHandler.class));
+ assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithScopeSetAutoCommitToOff() throws SQLException {
String sql = "SET @@SESSION.AUTOCOMMIT = OFF";
TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, Optional::empty, connectionSession);
- assertThat(actual, instanceOf(TransactionAutoCommitHandler.class));
+ assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithSetAutoCommitToOn() throws SQLException {
String sql = "SET AUTOCOMMIT=1";
TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, Optional::empty, connectionSession);
- assertThat(actual, instanceOf(TransactionAutoCommitHandler.class));
+ assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test
public void assertNewInstanceWithScopeSetAutoCommitToOnForInTransaction() throws SQLException {
String sql = "SET @@SESSION.AUTOCOMMIT = ON";
TextProtocolBackendHandler actual = TextProtocolBackendHandlerFactory.newInstance(databaseType, sql, Optional::empty, connectionSession);
- assertThat(actual, instanceOf(TransactionAutoCommitHandler.class));
+ assertThat(actual, instanceOf(TransactionBackendHandler.class));
}
@Test