You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/03/24 01:03:41 UTC
[shardingsphere] branch master updated: Rename `globalTimestamp` to `beginMills` (#24785)
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 e14efecd94b Rename `globalTimestamp` to `beginMills` (#24785)
e14efecd94b is described below
commit e14efecd94b9b4698c0e0649d509632928eb8682
Author: ZhangCheng <fl...@outlook.com>
AuthorDate: Fri Mar 24 09:03:32 2023 +0800
Rename `globalTimestamp` to `beginMills` (#24785)
* log
* Revert "log"
This reverts commit f53029affd228c5cf0e21a37e88baf9e2cbc0964.
* Rename `globalTimestamp` to `beginMills`
---
.../infra/context/transaction/TransactionConnectionContext.java | 4 ++--
.../globalclock/core/executor/GlobalClockTransactionHook.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/context/transaction/TransactionConnectionContext.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/context/transaction/TransactionConnectionContext.java
index 00dca69a08e..5c30db1b9d1 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/context/transaction/TransactionConnectionContext.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/context/transaction/TransactionConnectionContext.java
@@ -29,14 +29,14 @@ public final class TransactionConnectionContext implements AutoCloseable {
private volatile boolean inTransaction;
- private volatile long globalTimestamp;
+ private volatile long beginMills;
private volatile String readWriteSplitReplicaRoute;
@Override
public void close() {
inTransaction = false;
- globalTimestamp = 0L;
+ beginMills = 0L;
readWriteSplitReplicaRoute = null;
}
}
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/executor/GlobalClockTransactionHook.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/executor/GlobalClockTransactionHook.java
index f7998b8b1f1..ee570818595 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/executor/GlobalClockTransactionHook.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/core/executor/GlobalClockTransactionHook.java
@@ -59,7 +59,7 @@ public final class GlobalClockTransactionHook extends TransactionHookAdapter {
if (!enabled) {
return;
}
- transactionContext.setGlobalTimestamp(globalClockProvider.getCurrentTimestamp());
+ transactionContext.setBeginMills(globalClockProvider.getCurrentTimestamp());
}
@Override
@@ -67,7 +67,7 @@ public final class GlobalClockTransactionHook extends TransactionHookAdapter {
if (!enabled) {
return;
}
- globalClockTransactionExecutor.sendSnapshotTimestamp(connections, transactionContext.getGlobalTimestamp());
+ globalClockTransactionExecutor.sendSnapshotTimestamp(connections, transactionContext.getBeginMills());
}
@Override
@@ -86,7 +86,7 @@ public final class GlobalClockTransactionHook extends TransactionHookAdapter {
if (!enabled) {
return;
}
- if (lockContext.tryLock(lockDefinition, 200)) {
+ if (lockContext.tryLock(lockDefinition, 200L)) {
globalClockTransactionExecutor.sendCommitTimestamp(connections, globalClockProvider.getCurrentTimestamp());
}
}