This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 6f01110108b Optimize lock event (#17530)
6f01110108b is described below
commit 6f01110108b0a414cf33f8ef2159defe05598f28
Author: gin <jacky7...@163.com>
AuthorDate: Wed May 11 10:36:44 2022 +0800
Optimize lock event (#17530)
* Optimize lock event
* Fixed
---
.../java/org/apache/shardingsphere/infra/lock/LockType.java | 2 +-
.../cluster/coordinator}/lock/ShardingSphereGlobalLock.java | 4 +++-
.../global/{service => }/AbstractGlobalLockNodeService.java | 2 +-
.../lock/global/{service => }/GlobalLockRegistryService.java | 2 +-
.../lock/global/ShardingSphereDistributeGlobalLock.java | 4 ++--
.../lock/global/database/ShardingSphereDatabaseLock.java | 4 ++--
.../global/database/ShardingSphereDatabaseLockManager.java | 4 ++--
.../global/database/event/DatabaseAckLockReleasedEvent.java | 2 +-
.../lock/global/database/event/DatabaseAckLockedEvent.java | 2 +-
.../{ => database}/service/DatabaseLockNodeService.java | 3 ++-
.../lock/global/general/ShardingSphereGeneralLock.java | 4 ++--
.../global/general/ShardingSphereGeneralLockManager.java | 12 ++++++------
.../global/general/event/GeneralAckLockReleasedEvent.java | 6 +++---
.../lock/global/general/event/GeneralAckLockedEvent.java | 6 +++---
.../lock/global/general/event/GeneralLockReleasedEvent.java | 2 +-
.../lock/global/general/event/GeneralLockedEvent.java | 2 +-
.../global/{ => general}/service/GeneralLockNodeService.java | 3 ++-
.../lock/standard/service/StandardLockNodeService.java | 2 +-
.../manager/cluster/coordinator/lock/util/LockNodeUtil.java | 2 +-
.../manager/cluster/coordinator/lock/util}/LockState.java | 2 +-
...che.shardingsphere.mode.manager.ShardingSphereLockManager | 2 +-
...ere.mode.manager.cluster.coordinator.lock.LockNodeService | 4 ++--
.../AbstractGlobalStandardLockNodeServiceTest.java | 3 ++-
.../global/{service => }/GlobalLockRegistryServiceTest.java | 2 +-
.../service/DatabaseStandardLockNodeServiceTest.java | 4 ++--
.../service/GeneralStandardLockNodeServiceTest.java | 4 ++--
.../global/general/watcher/GeneralAckChangedWatcherTest.java | 4 ++--
.../general/watcher/GeneralLocksChangedWatcherTest.java | 4 ++--
.../cluster/coordinator/lock/util/LockNodeUtilTest.java | 2 +-
.../manager/memory/lock/ShardingSphereNonReentrantLock.java | 2 +-
.../standalone/lock/ShardingSphereNonReentrantLock.java | 2 +-
31 files changed, 54 insertions(+), 49 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockType.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockType.java
index 10d0a16af3f..94ec1a973a5 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockType.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockType.java
@@ -22,5 +22,5 @@ package org.apache.shardingsphere.infra.lock;
*/
public enum LockType {
- STANDARD, GENERAL, DATABASE
+ STANDARD, GENERAL, DATABASE, SCHEMA
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/ShardingSphereGlobalLock.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/ShardingSphereGlobalLock.java
similarity index 91%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/ShardingSphereGlobalLock.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/ShardingSphereGlobalLock.java
index b613208e71f..a93bd325f93 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/ShardingSphereGlobalLock.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/ShardingSphereGlobalLock.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.lock;
+package org.apache.shardingsphere.mode.manager.cluster.coordinator.lock;
+
+import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
/**
* Global lock of ShardingSphere.
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/service/AbstractGlobalLockNodeService.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/AbstractGlobalLockNodeService.java
similarity index 99%
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/global/service/AbstractGlobalLockNodeService.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/global/AbstractGlobalLockNodeService.java
index e8a300330c7..50598a3d941 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/service/AbstractGlobalLockNodeService.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/AbstractGlobalLockNodeService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service;
+package org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeUtil;
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/service/GlobalLockRegistryService.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/GlobalLockRegistryService.java
similarity index 98%
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/global/service/GlobalLockRegistryService.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/global/GlobalLockRegistryService.java
index 5cd68b07170..b10ba856ff5 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/service/GlobalLockRegistryService.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/GlobalLockRegistryService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service;
+package org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockRegistryService;
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/ShardingSphereDistributeGlobalLock.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/ShardingSphereDistributeGlobalLock.java
index a8e4be4b10d..8ca6b15d518 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/ShardingSphereDistributeGlobalLock.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/ShardingSphereDistributeGlobalLock.java
@@ -20,9 +20,9 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
-import org.apache.shardingsphere.infra.lock.ShardingSphereGlobalLock;
-import org.apache.shardingsphere.infra.lock.LockState;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.ShardingSphereGlobalLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockRegistryService;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockState;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
import java.util.Collection;
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/database/ShardingSphereDatabaseLock.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/database/ShardingSphereDatabaseLock.java
index adfd8a2caa3..262b3c2b080 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/database/ShardingSphereDatabaseLock.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/database/ShardingSphereDatabaseLock.java
@@ -18,10 +18,10 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.database;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
-import org.apache.shardingsphere.infra.lock.ShardingSphereGlobalLock;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.ShardingSphereGlobalLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.ShardingSphereDistributeGlobalLock;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service.GlobalLockRegistryService;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.GlobalLockRegistryService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
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/database/ShardingSphereDatabaseLockManager.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/database/ShardingSphereDatabaseLockManager.java
index f81821b7ec8..0bcad4d7662 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/database/ShardingSphereDatabaseLockManager.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/database/ShardingSphereDatabaseLockManager.java
@@ -21,9 +21,9 @@ import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.lock.LockType;
-import org.apache.shardingsphere.infra.lock.ShardingSphereGlobalLock;
-import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
import org.apache.shardingsphere.mode.manager.ShardingSphereLockManager;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.ShardingSphereGlobalLock;
+import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeServiceFactory;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.database.event.DatabaseAckLockReleasedEvent;
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/database/event/DatabaseAckLockReleasedEvent.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/database/event/DatabaseAckLockReleasedEvent.java
index aa228abd757..d5d72c52f54 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/database/event/DatabaseAckLockReleasedEvent.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/database/event/DatabaseAckLockReleasedEvent.java
@@ -32,7 +32,7 @@ public final class DatabaseAckLockReleasedEvent implements
GovernanceEvent {
private final String lockedInstance;
public DatabaseAckLockReleasedEvent(final String ackLockedName) {
- String[] databaseInstance =
LockNodeUtil.parseDatabaseLockName(ackLockedName);
+ String[] databaseInstance =
LockNodeUtil.parseAckLockName(ackLockedName);
this.database = databaseInstance[0];
this.lockedInstance = databaseInstance[1];
}
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/database/event/DatabaseAckLockedEvent.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/database/event/DatabaseAckLockedEvent.java
index 935dd969d1a..b56f96f7c91 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/database/event/DatabaseAckLockedEvent.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/database/event/DatabaseAckLockedEvent.java
@@ -32,7 +32,7 @@ public final class DatabaseAckLockedEvent implements
GovernanceEvent {
private final String lockedInstance;
public DatabaseAckLockedEvent(final String ackLockedName) {
- String[] databaseInstance =
LockNodeUtil.parseDatabaseLockName(ackLockedName);
+ String[] databaseInstance =
LockNodeUtil.parseAckLockName(ackLockedName);
this.database = databaseInstance[0];
this.lockedInstance = databaseInstance[1];
}
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/service/DatabaseLockNodeService.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/database/service/DatabaseLockNodeService.java
similarity index 91%
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/global/service/DatabaseLockNodeService.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/global/database/service/DatabaseLockNodeService.java
index 3f1aeafd54e..fd6e0b86654 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/service/DatabaseLockNodeService.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/database/service/DatabaseLockNodeService.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.database.service;
import org.apache.shardingsphere.infra.lock.LockType;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.AbstractGlobalLockNodeService;
/**
* Database lock node service.
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 dc700e9175c..6e51f9032f9 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
@@ -18,13 +18,13 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.general;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
-import org.apache.shardingsphere.infra.lock.ShardingSphereGlobalLock;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.ShardingSphereGlobalLock;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockRegistryService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.ShardingSphereDistributeGlobalLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.ShardingSphereSequencedSemaphoreLock;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service.GlobalLockRegistryService;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.GlobalLockRegistryService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
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/ShardingSphereGeneralLockManager.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/ShardingSphereGeneralLockManager.java
index a85038baf65..482dbef6971 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/ShardingSphereGeneralLockManager.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/ShardingSphereGeneralLockManager.java
@@ -21,9 +21,9 @@ import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.lock.LockType;
-import org.apache.shardingsphere.infra.lock.ShardingSphereGlobalLock;
-import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
import org.apache.shardingsphere.mode.manager.ShardingSphereLockManager;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.ShardingSphereGlobalLock;
+import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeServiceFactory;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.general.event.GeneralAckLockReleasedEvent;
@@ -114,7 +114,7 @@ public final class ShardingSphereGeneralLockManager
implements ShardingSphereLoc
*/
@Subscribe
public synchronized void locked(final GeneralLockedEvent event) {
- String lockName = event.getLockName();
+ String lockName = event.getLockedName();
ShardingSphereGeneralLock lock = locks.get(lockName);
if (null == lock) {
lock = createGeneralLock();
@@ -130,7 +130,7 @@ public final class ShardingSphereGeneralLockManager
implements ShardingSphereLoc
*/
@Subscribe
public synchronized void lockReleased(final GeneralLockReleasedEvent
event) {
- String lockName = event.getLockName();
+ String lockName = event.getLockedName();
getOptionalLock(lockName).ifPresent(optional ->
optional.releaseAckLock(lockName, getCurrentInstanceId()));
}
@@ -141,7 +141,7 @@ public final class ShardingSphereGeneralLockManager
implements ShardingSphereLoc
*/
@Subscribe
public synchronized void ackLocked(final GeneralAckLockedEvent event) {
- getOptionalLock(event.getLockName()).ifPresent(optional ->
optional.addLockedInstance(event.getLockedInstance()));
+ getOptionalLock(event.getAckLockedName()).ifPresent(optional ->
optional.addLockedInstance(event.getLockedInstance()));
}
/**
@@ -151,7 +151,7 @@ public final class ShardingSphereGeneralLockManager
implements ShardingSphereLoc
*/
@Subscribe
public synchronized void ackLockReleased(final GeneralAckLockReleasedEvent
event) {
- getOptionalLock(event.getLockName()).ifPresent(optional ->
optional.removeLockedInstance(event.getLockedInstance()));
+ getOptionalLock(event.getAckLockedName()).ifPresent(optional ->
optional.removeLockedInstance(event.getLockedInstance()));
}
private String getCurrentInstanceId() {
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/event/GeneralAckLockReleasedEvent.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/event/GeneralAckLockReleasedEvent.java
index 564e561664c..e283720efa2 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/event/GeneralAckLockReleasedEvent.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/event/GeneralAckLockReleasedEvent.java
@@ -27,13 +27,13 @@ import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
@Getter
public final class GeneralAckLockReleasedEvent implements GovernanceEvent {
- private final String lockName;
+ private final String ackLockedName;
private final String lockedInstance;
public GeneralAckLockReleasedEvent(final String ackLockName) {
- String[] databaseInstance =
LockNodeUtil.parseDatabaseLockName(ackLockName);
- lockName = databaseInstance[0];
+ String[] databaseInstance = LockNodeUtil.parseAckLockName(ackLockName);
+ ackLockedName = databaseInstance[0];
lockedInstance = databaseInstance[1];
}
}
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/event/GeneralAckLockedEvent.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/event/GeneralAckLockedEvent.java
index 52bba9a52f0..b9aa9b04381 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/event/GeneralAckLockedEvent.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/event/GeneralAckLockedEvent.java
@@ -27,13 +27,13 @@ import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
@Getter
public final class GeneralAckLockedEvent implements GovernanceEvent {
- private final String lockName;
+ private final String ackLockedName;
private final String lockedInstance;
public GeneralAckLockedEvent(final String ackLockName) {
- String[] databaseInstance =
LockNodeUtil.parseDatabaseLockName(ackLockName);
- lockName = databaseInstance[0];
+ String[] databaseInstance = LockNodeUtil.parseAckLockName(ackLockName);
+ ackLockedName = databaseInstance[0];
lockedInstance = databaseInstance[1];
}
}
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/event/GeneralLockReleasedEvent.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/event/GeneralLockReleasedEvent.java
index ca547ae8dbe..d546352a0ad 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/event/GeneralLockReleasedEvent.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/event/GeneralLockReleasedEvent.java
@@ -28,5 +28,5 @@ import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
@Getter
public final class GeneralLockReleasedEvent implements GovernanceEvent {
- private final String lockName;
+ private final String lockedName;
}
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/event/GeneralLockedEvent.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/event/GeneralLockedEvent.java
index d23d941e67e..0dd0b39d958 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/event/GeneralLockedEvent.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/event/GeneralLockedEvent.java
@@ -28,5 +28,5 @@ import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.Gover
@Getter
public final class GeneralLockedEvent implements GovernanceEvent {
- private final String lockName;
+ private final String lockedName;
}
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/service/GeneralLockNodeService.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/service/GeneralLockNodeService.java
similarity index 91%
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/global/service/GeneralLockNodeService.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/global/general/service/GeneralLockNodeService.java
index 968eab7ce32..bc62b254cbb 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/service/GeneralLockNodeService.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/service/GeneralLockNodeService.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.general.service;
import org.apache.shardingsphere.infra.lock.LockType;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.AbstractGlobalLockNodeService;
/**
* General lock node service.
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/standard/service/StandardLockNodeService.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/standard/service/StandardLockNodeService.java
index d6551bc509d..6ca5d487c33 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/standard/service/StandardLockNodeService.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/standard/service/StandardLockNodeService.java
@@ -24,7 +24,7 @@ import java.util.Optional;
public final class StandardLockNodeService implements LockNodeService {
- protected static final String LOCK_SCOPE_STANDARD = "standard";
+ private static final String LOCK_SCOPE_STANDARD = "standard";
@Override
public String getSequenceNodePath() {
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/util/LockNodeUtil.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/util/LockNodeUtil.java
index 8d90ba6bb49..02492849697 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/util/LockNodeUtil.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/util/LockNodeUtil.java
@@ -55,7 +55,7 @@ public final class LockNodeUtil {
* @param ackLockedName ack locked name
* @return string array of locked name and instance id
*/
- public static String[] parseDatabaseLockName(final String ackLockedName) {
+ public static String[] parseAckLockName(final String ackLockedName) {
return ackLockedName.trim().split(LOCK_DELIMITER);
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockState.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/util/LockState.java
similarity index 91%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockState.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/util/LockState.java
index 413ce680049..e12d8cc9acf 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockState.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/util/LockState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.lock;
+package org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util;
/**
* Lock state.
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.ShardingSphereLockManager
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.ShardingSphereLockManager
index 9abe5313f40..ff97463a14d 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.ShardingSphereLockManager
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.ShardingSphereLockManager
@@ -15,6 +15,6 @@
# limitations under the License.
#
-org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.database.ShardingSphereDatabaseLockManager
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.general.ShardingSphereGeneralLockManager
+org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.database.ShardingSphereDatabaseLockManager
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.standard.ShardingSphereStandardLockManager
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService
index 96824f602b4..630fb9d5e15 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService
@@ -15,6 +15,6 @@
# limitations under the License.
#
-org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service.GeneralLockNodeService
-org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service.DatabaseLockNodeService
+org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.general.service.GeneralLockNodeService
+org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.database.service.DatabaseLockNodeService
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.standard.service.StandardLockNodeService
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/AbstractGlobalStandardLockNodeServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/AbstractGlobalStandardLockNodeServiceTest.java
similarity index 95%
rename from
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/AbstractGlobalStandardLockNodeServiceTest.java
rename to
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/AbstractGlobalStandardLockNodeServiceTest.java
index 50036869342..01d5d1499c1 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/AbstractGlobalStandardLockNodeServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/AbstractGlobalStandardLockNodeServiceTest.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service;
+package org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.database.service.DatabaseLockNodeService;
import org.junit.Test;
import java.util.Optional;
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/GlobalLockRegistryServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/GlobalLockRegistryServiceTest.java
similarity index 99%
rename from
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/GlobalLockRegistryServiceTest.java
rename to
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/GlobalLockRegistryServiceTest.java
index 30282b96cd4..d56791107df 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/GlobalLockRegistryServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/GlobalLockRegistryServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service;
+package org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockRegistryService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeUtil;
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/DatabaseStandardLockNodeServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/database/service/DatabaseStandardLockNodeServic
[...]
similarity index 91%
rename from
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/DatabaseStandardLockNodeServiceTest.java
rename to
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/database/service/DatabaseStandardLockNodeServiceTest.java
index 15d07f59452..df2639b1f48 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/DatabaseStandardLockNodeServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/database/service/DatabaseStandardLockNodeServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.database.service;
import org.junit.Test;
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat;
public final class DatabaseStandardLockNodeServiceTest {
- private static final AbstractGlobalLockNodeService SERVICE = new
DatabaseLockNodeService();
+ private static final DatabaseLockNodeService SERVICE = new
DatabaseLockNodeService();
@Test
public void assertGetSequenceNodePath() {
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/GeneralStandardLockNodeServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/service/GeneralStandardLockNodeServiceTest.java
similarity index 91%
rename from
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/GeneralStandardLockNodeServiceTest.java
rename to
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/service/GeneralStandardLockNodeServiceTest.java
index e87966dc90f..1168678cc45 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/service/GeneralStandardLockNodeServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/service/GeneralStandardLockNodeServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.service;
+package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.global.general.service;
import org.junit.Test;
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat;
public final class GeneralStandardLockNodeServiceTest {
- private static final AbstractGlobalLockNodeService SERVICE = new
GeneralLockNodeService();
+ private static final GeneralLockNodeService SERVICE = new
GeneralLockNodeService();
@Test
public void assertGetSequenceNodePath() {
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/watcher/GeneralAckChangedWatcherTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/watcher/GeneralAckChangedWatcherTest.java
index 4643b065daf..2bd82e1a1c8 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/watcher/GeneralAckChangedWatcherTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/watcher/GeneralAckChangedWatcherTest.java
@@ -65,7 +65,7 @@ public final class GeneralAckChangedWatcherTest {
Optional<GovernanceEvent> addGovernanceEvent =
watcher.createGovernanceEvent(addDataChangedEvent);
assertTrue(addGovernanceEvent.isPresent());
assertThat(addGovernanceEvent.get(),
instanceOf(GeneralAckLockedEvent.class));
- assertThat(((GeneralAckLockedEvent)
addGovernanceEvent.get()).getLockName(), is("lock_name"));
+ assertThat(((GeneralAckLockedEvent)
addGovernanceEvent.get()).getAckLockedName(), is("lock_name"));
assertThat(((GeneralAckLockedEvent)
addGovernanceEvent.get()).getLockedInstance(), is("127.0.0.1@3307"));
}
@@ -75,7 +75,7 @@ public final class GeneralAckChangedWatcherTest {
Optional<GovernanceEvent> deleteGovernanceEvent =
watcher.createGovernanceEvent(deleteDataChangedEvent);
assertTrue(deleteGovernanceEvent.isPresent());
assertThat(deleteGovernanceEvent.get(),
instanceOf(GeneralAckLockReleasedEvent.class));
- assertThat(((GeneralAckLockReleasedEvent)
deleteGovernanceEvent.get()).getLockName(), is("lock_name"));
+ assertThat(((GeneralAckLockReleasedEvent)
deleteGovernanceEvent.get()).getAckLockedName(), is("lock_name"));
assertThat(((GeneralAckLockReleasedEvent)
deleteGovernanceEvent.get()).getLockedInstance(), is("127.0.0.1@3307"));
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/watcher/GeneralLocksChangedWatcherTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/watcher/GeneralLocksChangedWatcherTest.java
index 3506a642362..049eee1d06f 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/watcher/GeneralLocksChangedWatcherTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/global/general/watcher/GeneralLocksChangedWatcherTest.java
@@ -65,7 +65,7 @@ public final class GeneralLocksChangedWatcherTest {
Optional<GovernanceEvent> addGovernanceEvent =
watcher.createGovernanceEvent(addDataChangedEvent);
assertTrue(addGovernanceEvent.isPresent());
assertThat(addGovernanceEvent.get(),
instanceOf(GeneralLockedEvent.class));
- assertThat(((GeneralLockedEvent)
addGovernanceEvent.get()).getLockName(), is("lock_name"));
+ assertThat(((GeneralLockedEvent)
addGovernanceEvent.get()).getLockedName(), is("lock_name"));
}
@Test
@@ -74,7 +74,7 @@ public final class GeneralLocksChangedWatcherTest {
Optional<GovernanceEvent> deleteGovernanceEvent =
watcher.createGovernanceEvent(deleteDataChangedEvent);
assertTrue(deleteGovernanceEvent.isPresent());
assertThat(deleteGovernanceEvent.get(),
instanceOf(GeneralLockReleasedEvent.class));
- assertThat(((GeneralLockReleasedEvent)
deleteGovernanceEvent.get()).getLockName(), is("lock_name"));
+ assertThat(((GeneralLockReleasedEvent)
deleteGovernanceEvent.get()).getLockedName(), is("lock_name"));
}
@Test
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtilTest.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtilTest.java
index d4f92ea005d..785f608ceec 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtilTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/util/LockNodeUtilTest.java
@@ -31,7 +31,7 @@ public final class LockNodeUtilTest {
@Test
public void assertParseLockName() {
- String[] lockName =
LockNodeUtil.parseDatabaseLockName("database#@#127.0.0.1@3307");
+ String[] lockName =
LockNodeUtil.parseAckLockName("database#@#127.0.0.1@3307");
assertThat(lockName.length, is(2));
assertThat(lockName[0], is("database"));
assertThat(lockName[1], is("127.0.0.1@3307"));
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/ShardingSphereNonReentrantLock.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/ShardingSphereNonReentrantLock.java
index 45c7fb77a51..847bbe9009f 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/ShardingSphereNonReentrantLock.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/lock/ShardingSphereNonReentrantLock.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
/**
- * Non reentrant lock implemented ShardingSphereLock.
+ * Non-reentrant lock implemented ShardingSphereLock.
*/
@RequiredArgsConstructor
public final class ShardingSphereNonReentrantLock implements
ShardingSphereLock {
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/ShardingSphereNonReentrantLock.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/ShardingSphereNonReentrantLock.java
index 8755befdf39..24e324835c5 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/ShardingSphereNonReentrantLock.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/ShardingSphereNonReentrantLock.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
/**
- * Non reentrant lock implemented ShardingSphereLock.
+ * Non-reentrant lock implemented ShardingSphereLock.
*/
@RequiredArgsConstructor
public final class ShardingSphereNonReentrantLock implements
ShardingSphereLock {
