(shardingsphere) branch master updated: Rename TransactionCommitLock (#35050)

[zhangliang]

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 b7306258a24 Rename TransactionCommitLock (#35050)
b7306258a24 is described below

commit b7306258a24ea1cec6f53e4eb9772973767cbe78
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Mar 20 19:56:15 2025 +0800

    Rename TransactionCommitLock (#35050)
---
 .../connector/jdbc/transaction/BackendTransactionManager.java     | 3 +--
 .../backend/connector/jdbc/transaction/TransactionCommitLock.java | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
index cca7075bc70..f69792c63e2 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.proxy.backend.connector.jdbc.transaction;
 
-import org.apache.shardingsphere.globalclock.executor.GlobalClockLock;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.mode.lock.LockContext;
 import org.apache.shardingsphere.mode.lock.LockDefinition;
@@ -105,7 +104,7 @@ public final class BackendTransactionManager implements 
TransactionManager {
             return;
         }
         boolean isNeedLock = 
transactionHooks.values().stream().anyMatch(TransactionHook::isNeedLockWhenCommit);
-        LockDefinition lockDefinition = new GlobalLockDefinition(new 
GlobalClockLock());
+        LockDefinition lockDefinition = new GlobalLockDefinition(new 
TransactionCommitLock());
         try {
             // FIXME if timeout when lock required, TSO not assigned, but 
commit will continue, solution is use redis lock in impl to instead of reg 
center's lock. #35041
             if (isNeedLock && !lockContext.tryLock(lockDefinition, 200L)) {
diff --git 
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockLock.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/TransactionCommitLock.java
similarity index 81%
rename from 
kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockLock.java
rename to 
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/TransactionCommitLock.java
index 589b13b4e81..a88aff14f8e 100644
--- 
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockLock.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/TransactionCommitLock.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.globalclock.executor;
+package org.apache.shardingsphere.proxy.backend.connector.jdbc.transaction;
 
 import org.apache.shardingsphere.mode.lock.global.GlobalLock;
 
 /**
- * Global clock lock.
+ * Transaction commit lock.
  */
-public final class GlobalClockLock implements GlobalLock {
+public final class TransactionCommitLock implements GlobalLock {
     
     @Override
     public String getName() {
-        return "global_clock";
+        return "transaction_commit";
     }
 }