You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/04/27 07:35:06 UTC
[shardingsphere] branch master updated: Fix general lock path (#17141)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 9d92300dde3 Fix general lock path (#17141)
9d92300dde3 is described below
commit 9d92300dde3cb55b683ba932a8225a757fa72587
Author: gin <ja...@163.com>
AuthorDate: Wed Apr 27 15:35:00 2022 +0800
Fix general lock path (#17141)
---
.../apache/shardingsphere/infra/lock/LockContext.java | 16 ++++++++--------
.../cluster/coordinator/lock/DistributeLockContext.java | 12 ++++++------
.../lock/global/general/ShardingSphereGeneralLock.java | 2 +-
.../mode/manager/memory/lock/MemoryLockContext.java | 16 ++++++++--------
.../manager/standalone/lock/StandaloneLockContext.java | 16 ++++++++--------
5 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
index 6b49b7feed3..8edde9ebdf0 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
@@ -56,18 +56,18 @@ public interface LockContext {
boolean isLockedDatabase(String databaseName);
/**
- * Get or create database lock.
+ * Get or create global lock.
*
- * @param databaseName database name
- * @return database lock
+ * @param lockName lock name
+ * @return global lock
*/
- ShardingSphereLock getOrCreateGlobalLock(String databaseName);
+ ShardingSphereLock getOrCreateGlobalLock(String lockName);
/**
- * Get database lock.
+ * Get global lock.
*
- * @param databaseName database name
- * @return database name
+ * @param lockName lock name
+ * @return global lock
*/
- ShardingSphereLock getGlobalLock(String databaseName);
+ ShardingSphereLock getGlobalLock(String lockName);
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContext.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContext.java
index 09f47285f43..4d91e2e7cde 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContext.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/DistributeLockContext.java
@@ -92,14 +92,14 @@ public final class DistributeLockContext implements LockContext {
}
@Override
- public synchronized ShardingSphereLock getOrCreateGlobalLock(final String databaseName) {
- Preconditions.checkNotNull(databaseName, "Get or create database lock args database name can not be null.");
- return lockManagers.get(LockType.GENERAL).getOrCreateLock(databaseName);
+ public synchronized ShardingSphereLock getOrCreateGlobalLock(final String lockName) {
+ Preconditions.checkNotNull(lockName, "Get or create global lock args lock name can not be null.");
+ return lockManagers.get(LockType.GENERAL).getOrCreateLock(lockName);
}
@Override
- public ShardingSphereLock getGlobalLock(final String databaseName) {
- Preconditions.checkNotNull(databaseName, "Get database lock args database name can not be null.");
- return lockManagers.get(LockType.GENERAL).getLock(databaseName);
+ public ShardingSphereLock getGlobalLock(final String lockName) {
+ Preconditions.checkNotNull(lockName, "Get global lock args lock name can not be null.");
+ return lockManagers.get(LockType.GENERAL).getLock(lockName);
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/ShardingSphereGeneralLock.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/ShardingSphereGeneralLock.java
index bd67e5a99e1..1e3050b478d 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/ShardingSphereGeneralLock.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/ShardingSphereGeneralLock.java
@@ -64,7 +64,7 @@ public final class ShardingSphereGeneralLock implements ShardingSphereGlobalLock
return false;
}
try {
- return innerDistributeGlobalLock.tryLock(lockName, timeoutMillis);
+ return innerDistributeGlobalLock.tryLock(lockNodeService.generateGlobalLocksName(lockName), timeoutMillis);
} finally {
sequencedSemaphoreLock.releaseLock(lockName);
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/MemoryLockContext.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/MemoryLockContext.java
index 7b3e372e571..d3c009444b2 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/MemoryLockContext.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/MemoryLockContext.java
@@ -58,26 +58,26 @@ public final class MemoryLockContext implements LockContext {
}
@Override
- public ShardingSphereLock getOrCreateGlobalLock(final String databaseName) {
- Preconditions.checkNotNull(databaseName, "Get or create databaseName lock args databaseName name can not be null.");
- ShardingSphereLock result = locks.get(databaseName);
+ public ShardingSphereLock getOrCreateGlobalLock(final String lockName) {
+ Preconditions.checkNotNull(lockName, "Get or create global lock args lock name can not be null.");
+ ShardingSphereLock result = locks.get(lockName);
if (null != result) {
return result;
}
synchronized (locks) {
- result = locks.get(databaseName);
+ result = locks.get(lockName);
if (null != result) {
return result;
}
result = new ShardingSphereNonReentrantLock(new ReentrantLock());
- locks.put(databaseName, result);
+ locks.put(lockName, result);
return result;
}
}
@Override
- public ShardingSphereLock getGlobalLock(final String databaseName) {
- Preconditions.checkNotNull(databaseName, "Get database lock args database name can not be null.");
- return locks.get(databaseName);
+ public ShardingSphereLock getGlobalLock(final String lockName) {
+ Preconditions.checkNotNull(lockName, "Get global lock args lock name can not be null.");
+ return locks.get(lockName);
}
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
index 093708487c1..ffd0ff20194 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
@@ -58,26 +58,26 @@ public final class StandaloneLockContext implements LockContext {
}
@Override
- public ShardingSphereLock getOrCreateGlobalLock(final String databaseName) {
- Preconditions.checkNotNull(databaseName, "Get or create database lock args database name can not be null.");
- ShardingSphereLock result = locks.get(databaseName);
+ public ShardingSphereLock getOrCreateGlobalLock(final String lockName) {
+ Preconditions.checkNotNull(lockName, "Get or create global lock args lock name can not be null.");
+ ShardingSphereLock result = locks.get(lockName);
if (null != result) {
return result;
}
synchronized (locks) {
- result = locks.get(databaseName);
+ result = locks.get(lockName);
if (null != result) {
return result;
}
result = new ShardingSphereNonReentrantLock(new ReentrantLock());
- locks.put(databaseName, result);
+ locks.put(lockName, result);
return result;
}
}
@Override
- public ShardingSphereLock getGlobalLock(final String databaseName) {
- Preconditions.checkNotNull(databaseName, "Get database lock args database name can not be null.");
- return locks.get(databaseName);
+ public ShardingSphereLock getGlobalLock(final String lockName) {
+ Preconditions.checkNotNull(lockName, "Get global lock args lock name can not be null.");
+ return locks.get(lockName);
}
}