This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 084d653ee5f Rename TransactionBackendHandler to TCLBackendHandler
(#35171)
084d653ee5f is described below
commit 084d653ee5ffcb458badc2c60913a622228efd4a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Apr 12 21:49:12 2025 +0800
Rename TransactionBackendHandler to TCLBackendHandler (#35171)
* Rename TransactionBackendHandler to TCLBackendHandler
* Rename TransactionBackendHandler to TCLBackendHandler
---
.../handler/ProxyBackendHandlerFactory.java | 6 ++--
.../SetTransactionHandler.java} | 6 ++--
.../TCLBackendHandler.java} | 8 ++---
.../TCLBackendHandlerFactory.java} | 24 +++++++--------
...ansactionalErrorAllowedSQLStatementHandler.java | 4 +--
.../XATCLHandler.java} | 8 ++---
.../handler/ProxyBackendHandlerFactoryTest.java | 4 +--
.../TCLBackendHandlerFactoryTest.java} | 34 +++++++++++-----------
.../TCLBackendHandlerTest.java} | 6 ++--
...ansactionalErrorAllowedSQLStatementHandler.java | 2 +-
...l.TransactionalErrorAllowedSQLStatementHandler} | 0
...ctionalErrorAllowedSQLStatementHandlerTest.java | 2 +-
...ansactionalErrorAllowedSQLStatementHandler.java | 2 +-
...l.TransactionalErrorAllowedSQLStatementHandler} | 0
...ctionalErrorAllowedSQLStatementHandlerTest.java | 2 +-
15 files changed, 54 insertions(+), 54 deletions(-)
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
index f2e0ed5b328..24994f85fb3 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
@@ -46,8 +46,8 @@ import
org.apache.shardingsphere.proxy.backend.handler.data.DatabaseBackendHandl
import
org.apache.shardingsphere.proxy.backend.handler.database.DatabaseOperateBackendHandlerFactory;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandlerFactory;
import org.apache.shardingsphere.proxy.backend.handler.skip.SkipBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionBackendHandlerFactory;
-import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.tcl.TCLBackendHandlerFactory;
+import
org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.state.ProxyClusterState;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
@@ -123,7 +123,7 @@ public final class ProxyBackendHandlerFactory {
String sql = queryContext.getSql();
handleAutoCommit(sqlStatement, connectionSession);
if (sqlStatement instanceof TCLStatement) {
- return
TransactionBackendHandlerFactory.newInstance(sqlStatementContext, sql,
connectionSession);
+ return TCLBackendHandlerFactory.newInstance(sqlStatementContext,
sql, connectionSession);
}
Optional<ProxyBackendHandler> backendHandler =
DatabaseAdminBackendHandlerFactory.newInstance(databaseType,
sqlStatementContext, connectionSession, sql, queryContext.getParameters());
if (backendHandler.isPresent()) {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionSetHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/SetTransactionHandler.java
similarity index 95%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionSetHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/SetTransactionHandler.java
index 0bb94051a1a..5954181d37a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionSetHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/SetTransactionHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.handler.transaction;
+package org.apache.shardingsphere.proxy.backend.handler.tcl;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
@@ -32,10 +32,10 @@ import
org.apache.shardingsphere.transaction.exception.SwitchTypeInTransactionEx
import java.sql.Connection;
/**
- * Set transaction handler.
+ * Transaction set handler.
*/
@RequiredArgsConstructor
-public final class TransactionSetHandler implements ProxyBackendHandler {
+public final class SetTransactionHandler implements ProxyBackendHandler {
private final SetTransactionStatement sqlStatement;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandler.java
similarity index 95%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandler.java
index d7e521e0552..12e7c922ee4 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.handler.transaction;
+package org.apache.shardingsphere.proxy.backend.handler.tcl;
import
org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
@@ -44,9 +44,9 @@ import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
/**
- * Transaction backend handler.
+ * TCL backend handler.
*/
-public final class TransactionBackendHandler implements ProxyBackendHandler {
+public final class TCLBackendHandler implements ProxyBackendHandler {
private final TCLStatement tclStatement;
@@ -58,7 +58,7 @@ public final class TransactionBackendHandler implements
ProxyBackendHandler {
private final TransactionManager backendTransactionManager;
- public TransactionBackendHandler(final TCLStatement tclStatement, final
TransactionOperationType operationType, final ConnectionSession
connectionSession) {
+ public TCLBackendHandler(final TCLStatement tclStatement, final
TransactionOperationType operationType, final ConnectionSession
connectionSession) {
this.tclStatement = tclStatement;
this.operationType = operationType;
this.connectionSession = connectionSession;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerFactory.java
similarity index 78%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactory.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerFactory.java
index 5fb9c826e5f..fd41fcdcc25 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.handler.transaction;
+package org.apache.shardingsphere.proxy.backend.handler.tcl;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -42,10 +42,10 @@ import
org.apache.shardingsphere.transaction.core.TransactionOperationType;
import java.util.Collections;
/**
- * Transaction backend handler factory.
+ * TCL backend handler factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class TransactionBackendHandlerFactory {
+public final class TCLBackendHandlerFactory {
/**
* New instance of backend handler.
@@ -58,30 +58,30 @@ public final class TransactionBackendHandlerFactory {
public static ProxyBackendHandler newInstance(final SQLStatementContext
sqlStatementContext, final String sql, final ConnectionSession
connectionSession) {
TCLStatement tclStatement = (TCLStatement)
sqlStatementContext.getSqlStatement();
if (tclStatement instanceof BeginTransactionStatement || tclStatement
instanceof StartTransactionStatement) {
- return new TransactionBackendHandler(tclStatement,
TransactionOperationType.BEGIN, connectionSession);
+ return new TCLBackendHandler(tclStatement,
TransactionOperationType.BEGIN, connectionSession);
}
if (tclStatement instanceof SetAutoCommitStatement) {
- return new TransactionBackendHandler(tclStatement,
TransactionOperationType.SET_AUTOCOMMIT, connectionSession);
+ return new TCLBackendHandler(tclStatement,
TransactionOperationType.SET_AUTOCOMMIT, connectionSession);
}
if (tclStatement instanceof SavepointStatement) {
- return new TransactionBackendHandler(tclStatement,
TransactionOperationType.SAVEPOINT, connectionSession);
+ return new TCLBackendHandler(tclStatement,
TransactionOperationType.SAVEPOINT, connectionSession);
}
if (tclStatement instanceof ReleaseSavepointStatement) {
- return new TransactionBackendHandler(tclStatement,
TransactionOperationType.RELEASE_SAVEPOINT, connectionSession);
+ return new TCLBackendHandler(tclStatement,
TransactionOperationType.RELEASE_SAVEPOINT, connectionSession);
}
if (tclStatement instanceof CommitStatement) {
- return new TransactionBackendHandler(tclStatement,
TransactionOperationType.COMMIT, connectionSession);
+ return new TCLBackendHandler(tclStatement,
TransactionOperationType.COMMIT, connectionSession);
}
if (tclStatement instanceof RollbackStatement) {
return ((RollbackStatement)
tclStatement).getSavepointName().isPresent()
- ? new TransactionBackendHandler(tclStatement,
TransactionOperationType.ROLLBACK_TO_SAVEPOINT, connectionSession)
- : new TransactionBackendHandler(tclStatement,
TransactionOperationType.ROLLBACK, connectionSession);
+ ? new TCLBackendHandler(tclStatement,
TransactionOperationType.ROLLBACK_TO_SAVEPOINT, connectionSession)
+ : new TCLBackendHandler(tclStatement,
TransactionOperationType.ROLLBACK, connectionSession);
}
if (tclStatement instanceof SetTransactionStatement &&
OperationScope.GLOBAL != ((SetTransactionStatement) tclStatement).getScope()) {
- return new TransactionSetHandler((SetTransactionStatement)
tclStatement, connectionSession);
+ return new SetTransactionHandler((SetTransactionStatement)
tclStatement, connectionSession);
}
if (tclStatement instanceof XAStatement) {
- return new TransactionXAHandler(sqlStatementContext, sql,
connectionSession);
+ return new XATCLHandler(sqlStatementContext, sql,
connectionSession);
}
QueryContext queryContext = new QueryContext(sqlStatementContext, sql,
Collections.emptyList(), new HintValueContext(),
connectionSession.getConnectionContext(),
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData());
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionalErrorAllowedSQLStatementHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TransactionalErrorAllowedSQLStatementHandler.java
similarity index 92%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionalErrorAllowedSQLStatementHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TransactionalErrorAllowedSQLStatementHandler.java
index 480607ccab3..97582829e17 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionalErrorAllowedSQLStatementHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TransactionalErrorAllowedSQLStatementHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.handler.transaction;
+package org.apache.shardingsphere.proxy.backend.handler.tcl;
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
@@ -30,7 +30,7 @@ import java.sql.SQLException;
public interface TransactionalErrorAllowedSQLStatementHandler extends
DatabaseTypedSPI {
/**
- * Judge SQL statement can be executed continuously if exception occur
during transactional SQL executing.
+ * Judge SQL statement can be executed continuously if exceptions occur
during transactional SQL executing.
*
* @param statement statement to be judged
* @throws SQLException SQL exception
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionXAHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/XATCLHandler.java
similarity index 94%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionXAHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/XATCLHandler.java
index 6b404c50e22..dfce2ae4106 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionXAHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/tcl/XATCLHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.handler.transaction;
+package org.apache.shardingsphere.proxy.backend.handler.tcl;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
@@ -42,11 +42,11 @@ import java.sql.SQLException;
import java.util.Collections;
/**
- * XA transaction handler.
+ * XA TCL handler.
*/
// TODO Currently XA transaction started with `XA START` doesn't support for
database with multiple datasource, a flag should be added for this both in init
progress and add datasource from DistSQL.
@RequiredArgsConstructor
-public final class TransactionXAHandler implements ProxyBackendHandler {
+public final class XATCLHandler implements ProxyBackendHandler {
private final XAStatement xaStatement;
@@ -54,7 +54,7 @@ public final class TransactionXAHandler implements
ProxyBackendHandler {
private final DatabaseConnector backendHandler;
- public TransactionXAHandler(final SQLStatementContext sqlStatementContext,
final String sql, final ConnectionSession connectionSession) {
+ public XATCLHandler(final SQLStatementContext sqlStatementContext, final
String sql, final ConnectionSession connectionSession) {
xaStatement = (XAStatement) sqlStatementContext.getSqlStatement();
this.connectionSession = connectionSession;
backendHandler =
DatabaseConnectorFactory.getInstance().newInstance(new
QueryContext(sqlStatementContext, sql, Collections.emptyList(), new
HintValueContext(),
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
index 79326507500..81d81f374ae 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
@@ -43,7 +43,7 @@ import
org.apache.shardingsphere.proxy.backend.handler.data.impl.UnicastDatabase
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLQueryBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.skip.SkipBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionBackendHandler;
+import org.apache.shardingsphere.proxy.backend.handler.tcl.TCLBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.EmptyStatement;
@@ -148,7 +148,7 @@ class ProxyBackendHandlerFactoryTest {
void assertNewInstanceWithTCL(final String sql) throws SQLException {
SQLStatement sqlStatement = ProxySQLComQueryParser.parse(sql,
databaseType, connectionSession);
ProxyBackendHandler actual =
ProxyBackendHandlerFactory.newInstance(databaseType, sql, sqlStatement,
connectionSession, new HintValueContext());
- assertThat(actual, instanceOf(TransactionBackendHandler.class));
+ assertThat(actual, instanceOf(TCLBackendHandler.class));
}
@Test
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerFactoryTest.java
similarity index 81%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerFactoryTest.java
index 212e3ee40de..86a61d18aa5 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerFactoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.handler.transaction;
+package org.apache.shardingsphere.proxy.backend.handler.tcl;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
@@ -62,12 +62,12 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings({ProxyContext.class, DatabaseConnectorFactory.class})
-class TransactionBackendHandlerFactoryTest {
+class TCLBackendHandlerFactoryTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@Test
- void
assertTransactionBackendHandlerReturnedWhenTCLStatementInstanceOfCommitStatement()
{
+ void
assertTCLBackendHandlerReturnedWhenTCLStatementInstanceOfCommitStatement() {
ConnectionSession connectionSession = mock(ConnectionSession.class,
Answers.RETURNS_DEEP_STUBS);
ProxyDatabaseConnectionManager databaseConnectionManager =
mock(ProxyDatabaseConnectionManager.class);
when(connectionSession.getDatabaseConnectionManager()).thenReturn(databaseConnectionManager);
@@ -78,15 +78,15 @@ class TransactionBackendHandlerFactoryTest {
when(context.getSqlStatement()).thenReturn(mock(CommitStatement.class));
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- ProxyBackendHandler proxyBackendHandler =
TransactionBackendHandlerFactory.newInstance(context, null, connectionSession);
- assertThat(proxyBackendHandler,
instanceOf(TransactionBackendHandler.class));
- TransactionBackendHandler transactionBackendHandler =
(TransactionBackendHandler) proxyBackendHandler;
- assertFieldOfInstance(transactionBackendHandler, "operationType",
is(TransactionOperationType.COMMIT));
-
assertFieldOfInstance(getBackendTransactionManager(transactionBackendHandler),
"connection", is(databaseConnectionManager));
+ ProxyBackendHandler proxyBackendHandler =
TCLBackendHandlerFactory.newInstance(context, null, connectionSession);
+ assertThat(proxyBackendHandler, instanceOf(TCLBackendHandler.class));
+ TCLBackendHandler backendHandler = (TCLBackendHandler)
proxyBackendHandler;
+ assertFieldOfInstance(backendHandler, "operationType",
is(TransactionOperationType.COMMIT));
+ assertFieldOfInstance(getBackendTransactionManager(backendHandler),
"connection", is(databaseConnectionManager));
}
@Test
- void
assertTransactionBackendHandlerReturnedWhenTCLStatementInstanceOfRollbackStatement()
{
+ void
assertTCLBackendHandlerReturnedWhenTCLStatementInstanceOfRollbackStatement() {
ConnectionSession connectionSession = mock(ConnectionSession.class,
Answers.RETURNS_DEEP_STUBS);
ProxyDatabaseConnectionManager databaseConnectionManager =
mock(ProxyDatabaseConnectionManager.class);
when(connectionSession.getDatabaseConnectionManager()).thenReturn(databaseConnectionManager);
@@ -98,11 +98,11 @@ class TransactionBackendHandlerFactoryTest {
when(context.getSqlStatement()).thenReturn(mock(RollbackStatement.class));
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- ProxyBackendHandler proxyBackendHandler =
TransactionBackendHandlerFactory.newInstance(context, null, connectionSession);
- assertThat(proxyBackendHandler,
instanceOf(TransactionBackendHandler.class));
- TransactionBackendHandler transactionBackendHandler =
(TransactionBackendHandler) proxyBackendHandler;
- assertFieldOfInstance(transactionBackendHandler, "operationType",
is(TransactionOperationType.ROLLBACK));
-
assertFieldOfInstance(getBackendTransactionManager(transactionBackendHandler),
"connection", is(databaseConnectionManager));
+ ProxyBackendHandler proxyBackendHandler =
TCLBackendHandlerFactory.newInstance(context, null, connectionSession);
+ assertThat(proxyBackendHandler, instanceOf(TCLBackendHandler.class));
+ TCLBackendHandler backendHandler = (TCLBackendHandler)
proxyBackendHandler;
+ assertFieldOfInstance(backendHandler, "operationType",
is(TransactionOperationType.ROLLBACK));
+ assertFieldOfInstance(getBackendTransactionManager(backendHandler),
"connection", is(databaseConnectionManager));
}
private ContextManager mockContextManager() {
@@ -123,7 +123,7 @@ class TransactionBackendHandlerFactoryTest {
ConnectionSession connectionSession = mock(ConnectionSession.class);
ConnectionContext connectionContext = mockConnectionContext();
when(connectionSession.getConnectionContext()).thenReturn(connectionContext);
- assertThat(TransactionBackendHandlerFactory.newInstance(context, null,
connectionSession), instanceOf(DatabaseConnector.class));
+ assertThat(TCLBackendHandlerFactory.newInstance(context, null,
connectionSession), instanceOf(DatabaseConnector.class));
}
private ConnectionContext mockConnectionContext() {
@@ -140,7 +140,7 @@ class TransactionBackendHandlerFactoryTest {
}
@SneakyThrows(ReflectiveOperationException.class)
- private BackendTransactionManager getBackendTransactionManager(final
TransactionBackendHandler transactionBackendHandler) {
- return (BackendTransactionManager)
Plugins.getMemberAccessor().get(TransactionBackendHandler.class.getDeclaredField("backendTransactionManager"),
transactionBackendHandler);
+ private BackendTransactionManager getBackendTransactionManager(final
TCLBackendHandler backendHandler) {
+ return (BackendTransactionManager)
Plugins.getMemberAccessor().get(TCLBackendHandler.class.getDeclaredField("backendTransactionManager"),
backendHandler);
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerTest.java
similarity index 92%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerTest.java
index 182b9a5b9f7..3b744617302 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/transaction/TransactionBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/tcl/TCLBackendHandlerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.handler.transaction;
+package org.apache.shardingsphere.proxy.backend.handler.tcl;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
-class TransactionBackendHandlerTest {
+class TCLBackendHandlerTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@@ -59,7 +59,7 @@ class TransactionBackendHandlerTest {
when(databaseConnectionManager.getConnectionSession()).thenReturn(connectionSession);
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- assertThat(new TransactionBackendHandler(mock(TCLStatement.class),
TransactionOperationType.BEGIN, connectionSession).execute(),
instanceOf(UpdateResponseHeader.class));
+ assertThat(new TCLBackendHandler(mock(TCLStatement.class),
TransactionOperationType.BEGIN, connectionSession).execute(),
instanceOf(UpdateResponseHeader.class));
}
private ContextManager mockContextManager() {
diff --git
a/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/transaction/OpenGaussTransactionalErrorAllowedSQLStatementHandler.java
b/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/transaction/OpenGaussTransactionalErrorAllowedSQLStatementHandler.java
index aa0edacb3ab..8f97eb01b01 100644
---
a/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/transaction/OpenGaussTransactionalErrorAllowedSQLStatementHandler.java
+++
b/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/transaction/OpenGaussTransactionalErrorAllowedSQLStatementHandler.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.opengauss.handler.transaction;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
-import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.CommitStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.RollbackStatement;
diff --git
a/proxy/backend/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler
b/proxy/backend/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler
similarity index 100%
rename from
proxy/backend/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler
rename to
proxy/backend/type/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler
diff --git
a/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/transaction/OpenGaussTransactionalErrorAllowedSQLStatementHandlerTest.java
b/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/transaction/OpenGaussTransactionalErrorAllowedSQLStatementHandlerTest.java
index d38931864aa..699da7bb8fa 100644
---
a/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/transaction/OpenGaussTransactionalErrorAllowedSQLStatementHandlerTest.java
+++
b/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/transaction/OpenGaussTransactionalErrorAllowedSQLStatementHandlerTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.proxy.backend.opengauss.handler.transaction;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.CommitStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.RollbackStatement;
diff --git
a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/transaction/PostgreSQLTransactionalErrorAllowedSQLStatementHandler.java
b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/transaction/PostgreSQLTransactionalErrorAllowedSQLStatementHandler.java
index f002a8af937..6ead919567a 100644
---
a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/transaction/PostgreSQLTransactionalErrorAllowedSQLStatementHandler.java
+++
b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/transaction/PostgreSQLTransactionalErrorAllowedSQLStatementHandler.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.postgresql.handler.transaction;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
-import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.CommitStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.RollbackStatement;
diff --git
a/proxy/backend/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler
b/proxy/backend/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler
similarity index 100%
rename from
proxy/backend/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler
rename to
proxy/backend/type/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler
diff --git
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/transaction/PostgreSQLTransactionalErrorAllowedSQLStatementHandlerTest.java
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/transaction/PostgreSQLTransactionalErrorAllowedSQLStatementHandlerTest.java
index 03291295ccf..eeda7539246 100644
---
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/transaction/PostgreSQLTransactionalErrorAllowedSQLStatementHandlerTest.java
+++
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/transaction/PostgreSQLTransactionalErrorAllowedSQLStatementHandlerTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.proxy.backend.postgresql.handler.transaction;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.tcl.TransactionalErrorAllowedSQLStatementHandler;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.CommitStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.tcl.RollbackStatement;
