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 c94230e2bba Remove TransactionHookAdapter (#32933)
c94230e2bba is described below
commit c94230e2bba8d166b0f5e9a610ed8bb14cddeedd
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 20 12:50:00 2024 +0800
Remove TransactionHookAdapter (#32933)
---
.../executor/GlobalClockTransactionHook.java | 18 +++++-
.../transaction/spi/TransactionHookAdapter.java | 64 ----------------------
.../connector/ProxyDatabaseConnectionManager.java | 4 +-
3 files changed, 17 insertions(+), 69 deletions(-)
diff --git
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHook.java
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHook.java
index b316907aefc..1a9a6ca5d8e 100644
---
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHook.java
+++
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHook.java
@@ -18,16 +18,16 @@
package org.apache.shardingsphere.globalclock.executor;
import org.apache.shardingsphere.globalclock.provider.GlobalClockProvider;
+import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.lock.GlobalLockNames;
import org.apache.shardingsphere.infra.lock.LockContext;
import org.apache.shardingsphere.infra.lock.LockDefinition;
import
org.apache.shardingsphere.infra.session.connection.transaction.TransactionConnectionContext;
-import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.lock.GlobalLockDefinition;
import
org.apache.shardingsphere.sql.parser.statement.core.enums.TransactionIsolationLevel;
-import org.apache.shardingsphere.transaction.spi.TransactionHookAdapter;
+import org.apache.shardingsphere.transaction.spi.TransactionHook;
import java.sql.Connection;
import java.sql.SQLException;
@@ -38,7 +38,7 @@ import java.util.Properties;
/**
* Global clock transaction hook.
*/
-public final class GlobalClockTransactionHook extends TransactionHookAdapter {
+public final class GlobalClockTransactionHook implements TransactionHook {
private final LockDefinition lockDefinition = new
GlobalLockDefinition(GlobalLockNames.GLOBAL_LOCK.getLockName());
@@ -60,6 +60,10 @@ public final class GlobalClockTransactionHook extends
TransactionHookAdapter {
globalClockProvider =
TypedSPILoader.getService(GlobalClockProvider.class, String.join(".",
props.getProperty("type"), props.getProperty("provider")));
}
+ @Override
+ public void beforeBegin(final TransactionConnectionContext
transactionContext) {
+ }
+
@Override
public void afterBegin(final TransactionConnectionContext
transactionContext) {
if (!enabled) {
@@ -110,6 +114,14 @@ public final class GlobalClockTransactionHook extends
TransactionHookAdapter {
}
}
+ @Override
+ public void beforeRollback(final Collection<Connection> connections, final
TransactionConnectionContext transactionContext) throws SQLException {
+ }
+
+ @Override
+ public void afterRollback(final Collection<Connection> connections, final
TransactionConnectionContext transactionContext) throws SQLException {
+ }
+
@Override
public String getType() {
return "GLOBAL_CLOCK";
diff --git
a/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/TransactionHookAdapter.java
b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/TransactionHookAdapter.java
deleted file mode 100644
index 9be95c21381..00000000000
---
a/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/TransactionHookAdapter.java
+++ /dev/null
@@ -1,64 +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.transaction.spi;
-
-import
org.apache.shardingsphere.infra.session.connection.transaction.TransactionConnectionContext;
-import org.apache.shardingsphere.infra.lock.LockContext;
-import
org.apache.shardingsphere.sql.parser.statement.core.enums.TransactionIsolationLevel;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Collection;
-
-/**
- * ShardingSphere transaction hook adapter.
- */
-public abstract class TransactionHookAdapter implements TransactionHook {
-
- @Override
- public void beforeBegin(final TransactionConnectionContext
transactionContext) {
- }
-
- @Override
- public void afterBegin(final TransactionConnectionContext
transactionContext) {
- }
-
- @Override
- public void afterCreateConnections(final Collection<Connection>
connections, final TransactionConnectionContext transactionContext) throws
SQLException {
- }
-
- @Override
- public void beforeExecuteSQL(final Collection<Connection> connections,
final TransactionConnectionContext connectionContext, final
TransactionIsolationLevel isolationLevel) throws SQLException {
- }
-
- @Override
- public void beforeCommit(final Collection<Connection> connections, final
TransactionConnectionContext transactionContext, final LockContext lockContext)
throws SQLException {
- }
-
- @Override
- public void afterCommit(final Collection<Connection> connections, final
TransactionConnectionContext transactionContext, final LockContext lockContext)
{
- }
-
- @Override
- public void beforeRollback(final Collection<Connection> connections, final
TransactionConnectionContext transactionContext) {
- }
-
- @Override
- public void afterRollback(final Collection<Connection> connections, final
TransactionConnectionContext transactionContext) {
- }
-}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManager.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManager.java
index 771d13f57b1..81290d2003a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManager.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManager.java
@@ -106,10 +106,10 @@ public final class ProxyDatabaseConnectionManager
implements DatabaseConnectionM
return databaseName.toLowerCase() + "." + dataSourceName;
}
- private void executeTransactionHooksAfterCreateConnections(final
List<Connection> result) throws SQLException {
+ private void executeTransactionHooksAfterCreateConnections(final
List<Connection> connections) throws SQLException {
if (connectionSession.getTransactionStatus().isInTransaction()) {
for (TransactionHook each : transactionHooks) {
- each.afterCreateConnections(result,
connectionSession.getConnectionContext().getTransactionContext());
+ each.afterCreateConnections(connections,
connectionSession.getConnectionContext().getTransactionContext());
}
}
}
