[shardingsphere] branch master updated: optimize distributed database lock naming (#18106)

[menghaoran]

This is an automated email from the ASF dual-hosted git repository.

menghaoran 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 e2eb68d2faf optimize distributed database lock naming (#18106)
e2eb68d2faf is described below

commit e2eb68d2faf1b0b1c7fd0fa31a42b4ae377349c5
Author: gin <jacky7...@163.com>
AuthorDate: Tue May 31 21:54:29 2022 +0800

    optimize distributed database lock naming (#18106)
---
 ...DatabaseLock.java => ShardingSphereDistributedDatabaseLock.java} | 4 ++--
 .../cluster/coordinator/lock/manager/DistributedLockManager.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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/database/ShardingSphereDistributeDatabaseLock.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/database/ShardingSphereDistributedDatabaseLock.java
similarity index 96%
rename from 
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/database/ShardingSphereDistributeDatabaseLock.java
rename to 
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/database/ShardingSphereDistributedDatabaseLock.java
index 6c5c1775f19..d9804b8bf31 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/database/ShardingSphereDistributeDatabaseLock.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/database/ShardingSphereDistributedDatabaseLock.java
@@ -36,13 +36,13 @@ import java.util.Optional;
 /**
  * Distribute database lock of ShardingSphere.
  */
-public final class ShardingSphereDistributeDatabaseLock implements 
ShardingSphereLock {
+public final class ShardingSphereDistributedDatabaseLock implements 
ShardingSphereLock {
     
     private final LockNodeService lockNodeService = 
LockNodeServiceFactory.getInstance().getLockNodeService(LockNodeType.DATABASE);
     
     private final ShardingSphereInterMutexLockHolder lockHolder;
     
-    public ShardingSphereDistributeDatabaseLock(final 
ShardingSphereInterMutexLockHolder lockHolder) {
+    public ShardingSphereDistributedDatabaseLock(final 
ShardingSphereInterMutexLockHolder lockHolder) {
         this.lockHolder = lockHolder;
         ShardingSphereEventBus.getInstance().register(this);
         lockHolder.synchronizeMutexLock(lockNodeService);
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/manager/DistributedLockManager.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/manager/DistributedLockManager.java
index 0a3c271e218..049c2fdd096 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/manager/DistributedLockManager.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/manager/DistributedLockManager.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.infra.lock.LockMode;
 import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
-import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.ShardingSphereDistributeDatabaseLock;
+import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.ShardingSphereDistributedDatabaseLock;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.distributed.ShardingSphereDistributedLock;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.mutex.ShardingSphereInterMutexLockHolder;
 import 
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
@@ -34,12 +34,12 @@ public final class DistributedLockManager implements 
ShardingSphereLockManager {
     
     private ShardingSphereDistributedLock distributedLock;
     
-    private ShardingSphereDistributeDatabaseLock databaseLock;
+    private ShardingSphereDistributedDatabaseLock databaseLock;
     
     @Override
     public void init(final ShardingSphereInterMutexLockHolder lockHolder) {
         distributedLock = new ShardingSphereDistributedLock(lockHolder);
-        databaseLock = new ShardingSphereDistributeDatabaseLock(lockHolder);
+        databaseLock = new ShardingSphereDistributedDatabaseLock(lockHolder);
     }
     
     @Override