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 b45be042d17 Refactor lock basic framework in mode (#19876)
b45be042d17 is described below
commit b45be042d171e8d25549edb03184cdf1f8201743
Author: gin <[email protected]>
AuthorDate: Fri Aug 5 11:21:22 2022 +0800
Refactor lock basic framework in mode (#19876)
---
.../shardingsphere/infra/lock/LockContext.java | 26 ++++----
.../shardingsphere/infra/lock/LockDefinition.java | 6 +-
.../infra/lock/LockNameDefinition.java | 38 ------------
.../core/api/impl/RuleAlteredJobAPIImpl.java | 6 +-
.../{manager => }/lock/AbstractLockContext.java | 16 ++---
.../mode/lock/ShardingSphereLockContext.java} | 36 +++++------
.../lock/definition/DatabaseLockDefinition.java | 14 ++++-
.../definition/ExclusiveLockDefinition.java} | 21 ++++---
.../lock/definition/LockDefinitionFactory.java | 14 ++++-
.../lock => lock/engine}/LockJudgeEngine.java | 2 +-
.../engine}/LockJudgeEngineFactory.java | 2 +-
.../engine}/ShardingSphereLockJudgeEngine.java | 4 +-
.../mode/lock/manager/LockManager.java | 41 +++---------
.../mode/lock/manager/LockPersistService.java} | 30 ++++-----
.../lock/manager/ShardingSphereLockManager.java | 53 ++++++++++++++++
.../mode/lock/manager/state/LockStateContext.java} | 41 +++++++-----
.../shardingsphere/mode/lock/util/LockKeyUtil.java | 63 +++++++++++++++++++
.../mode}/lock/util/TimeoutMilliseconds.java | 2 +-
...hardingsphere.mode.lock.engine.LockJudgeEngine} | 2 +-
.../cluster/coordinator/RegistryCenter.java | 8 +--
.../coordinator/lock/DistributedLockContext.java | 20 +++---
.../ShardingSphereDistributedDatabaseLock.java | 24 ++++----
.../event/DatabaseAckLockReleasedEvent.java | 6 +-
.../database/event/DatabaseAckLockedEvent.java | 6 +-
.../database/event/DatabaseLockReleasedEvent.java | 6 +-
.../lock/database/event/DatabaseLockedEvent.java | 6 +-
.../ShardingSphereDistributedGlobalLock.java | 2 +-
.../ShardingSphereDistributedLockManager.java | 22 +++----
.../lock/manager/ShardingSphereLockManager.java | 2 +-
.../manager/internal/ExclusiveInternalLock.java | 8 +--
.../manager/internal/ReentrantInternalLock.java | 2 +-
.../internal/ShardingSphereInternalLockHolder.java | 37 ++---------
.../manager/state/LockStateContextFactory.java | 43 -------------
...Service.java => ClusterLockPersistService.java} | 55 ++++++++++++-----
.../lock/service/LockRegistryService.java | 72 ----------------------
...coordinator.lock.manager.state.LockStateContext | 18 ------
.../lock/DistributedLockContextTest.java | 4 +-
.../watcher/DatabaseLockChangedWatcherTest.java | 8 +--
... ShardingSphereDistributedLockManagerTest.java} | 17 +++--
...est.java => ClusterLockPersistServiceTest.java} | 18 +++---
.../cluster/etcd/lock/EtcdInternalLockHolder.java | 2 +-
.../lock/ZookeeperInternalLockHolder.java | 2 +-
.../standalone/lock/StandaloneLockContext.java | 14 ++---
.../communication/DatabaseCommunicationEngine.java | 4 +-
.../distsql/DistSQLBackendHandlerFactory.java | 2 +-
45 files changed, 383 insertions(+), 442 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 a2ee03fa24e..97ab65db849 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
@@ -32,13 +32,6 @@ public interface LockContext {
default void initLockState(InstanceContext instanceContext) {
}
- /**
- * Get lock.
- *
- * @return lock
- */
- ShardingSphereLock getLock();
-
/**
* Try lock.
*
@@ -51,17 +44,17 @@ public interface LockContext {
* Try Lock.
*
* @param lockDefinition lock definition
- * @param timeoutMilliseconds timeout milliseconds
+ * @param timeoutMillis timeout milliseconds
* @return is locked or not
*/
- boolean tryLock(LockDefinition lockDefinition, long timeoutMilliseconds);
+ boolean tryLock(LockDefinition lockDefinition, long timeoutMillis);
/**
- * Release lock.
+ * Un lock.
*
* @param lockDefinition lock definition
*/
- void releaseLock(LockDefinition lockDefinition);
+ void unLock(LockDefinition lockDefinition);
/**
* Is locked.
@@ -70,4 +63,15 @@ public interface LockContext {
* @return is locked or not
*/
boolean isLocked(LockDefinition lockDefinition);
+
+ /**
+ * Get lock.
+ *
+ * @return lock
+ * @deprecated remove me when the distributed lock refactoring was
completed
+ */
+ @Deprecated
+ default ShardingSphereLock getLock() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockDefinition.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockDefinition.java
index d21ccb53c1b..e33eda1313b 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockDefinition.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockDefinition.java
@@ -23,9 +23,9 @@ package org.apache.shardingsphere.infra.lock;
public interface LockDefinition {
/**
- * Get lock name definition.
+ * Get lock key.
*
- * @return lock name definition
+ * @return lockKey
*/
- LockNameDefinition getLockNameDefinition();
+ String getLockKey();
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockNameDefinition.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockNameDefinition.java
deleted file mode 100644
index 86039d559f5..00000000000
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockNameDefinition.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.infra.lock;
-
-/**
- * Lock name definition.
- */
-public interface LockNameDefinition {
-
- /**
- * Get lock name.
- *
- * @return lock name
- */
- String getLockName();
-
- /**
- * Get database name.
- *
- * @return database name
- */
- String getDatabaseName();
-}
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
index 5d61bef6ffd..0253417f6f1 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
@@ -49,7 +49,7 @@ import org.apache.shardingsphere.infra.lock.LockContext;
import org.apache.shardingsphere.infra.lock.LockDefinition;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.config.event.rule.ScalingTaskFinishedEvent;
-import
org.apache.shardingsphere.mode.manager.lock.definition.LockDefinitionFactory;
+import org.apache.shardingsphere.mode.lock.definition.LockDefinitionFactory;
import java.time.LocalDateTime;
import java.util.Collection;
@@ -203,8 +203,8 @@ public final class RuleAlteredJobAPIImpl extends
AbstractPipelineJobAPIImpl impl
LockContext lockContext =
PipelineContext.getContextManager().getInstanceContext().getLockContext();
LockDefinition lockDefinition =
LockDefinitionFactory.newDatabaseLockDefinition(databaseName);
if (lockContext.isLocked(lockDefinition)) {
- log.info("restoreClusterWriteDB, before releaseLock,
databaseName={}, jobId={}", databaseName, jobConfig.getJobId());
- lockContext.releaseLock(lockDefinition);
+ log.info("restoreClusterWriteDB, before unLock, databaseName={},
jobId={}", databaseName, jobConfig.getJobId());
+ lockContext.unLock(lockDefinition);
return;
}
log.info("restoreClusterWriteDB, isLocked false, databaseName={}",
databaseName);
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/AbstractLockContext.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/AbstractLockContext.java
similarity index 83%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/AbstractLockContext.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/AbstractLockContext.java
index 84039765253..57142e8648f 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/AbstractLockContext.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/AbstractLockContext.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.lock;
+package org.apache.shardingsphere.mode.lock;
import org.apache.shardingsphere.infra.lock.LockContext;
import org.apache.shardingsphere.infra.lock.LockDefinition;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockDefinition;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
/**
* Abstract lock context.
@@ -37,25 +37,25 @@ public abstract class AbstractLockContext implements
LockContext {
protected abstract boolean tryLock(DatabaseLockDefinition lockDefinition);
@Override
- public boolean tryLock(final LockDefinition lockDefinition, final long
timeoutMilliseconds) {
+ public boolean tryLock(final LockDefinition lockDefinition, final long
timeoutMillis) {
if (lockDefinition instanceof DatabaseLockDefinition) {
- return tryLock((DatabaseLockDefinition) lockDefinition,
timeoutMilliseconds);
+ return tryLock((DatabaseLockDefinition) lockDefinition,
timeoutMillis);
}
throw new UnsupportedOperationException();
}
- protected abstract boolean tryLock(DatabaseLockDefinition lockDefinition,
long timeoutMilliseconds);
+ protected abstract boolean tryLock(DatabaseLockDefinition lockDefinition,
long timeoutMillis);
@Override
- public void releaseLock(final LockDefinition lockDefinition) {
+ public void unLock(final LockDefinition lockDefinition) {
if (lockDefinition instanceof DatabaseLockDefinition) {
- releaseLock((DatabaseLockDefinition) lockDefinition);
+ this.unLock((DatabaseLockDefinition) lockDefinition);
return;
}
throw new UnsupportedOperationException();
}
- protected abstract void releaseLock(DatabaseLockDefinition lockDefinition);
+ protected abstract void unLock(DatabaseLockDefinition lockDefinition);
@Override
public boolean isLocked(final LockDefinition lockDefinition) {
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/internal/ReentrantInternalLock.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContext.java
similarity index 50%
copy from
shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/manager/internal/ReentrantInternalLock.java
copy to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContext.java
index 556b19d1306..0ddde58a2d2 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/internal/ReentrantInternalLock.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContext.java
@@ -15,43 +15,39 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.internal;
+package org.apache.shardingsphere.mode.lock;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
+import org.apache.shardingsphere.infra.lock.LockContext;
+import org.apache.shardingsphere.infra.lock.LockDefinition;
+import org.apache.shardingsphere.mode.lock.manager.LockManager;
+import org.apache.shardingsphere.mode.lock.util.TimeoutMilliseconds;
/**
- * Inter mutex reentrant lock.
+ * Lock context of ShardingSphere.
*/
@RequiredArgsConstructor
-public final class ReentrantInternalLock implements InternalLock {
+public final class ShardingSphereLockContext implements LockContext {
- private final Lock internalLock;
+ private final LockManager lockManager;
@Override
- public boolean tryLock() {
- return tryLock(TimeoutMilliseconds.MAX_TRY_LOCK);
+ public boolean tryLock(final LockDefinition lockDefinition) {
+ return lockManager.tryLock(lockDefinition,
TimeoutMilliseconds.MAX_TRY_LOCK);
}
@Override
- public boolean tryLock(final long timeoutMillis) {
- try {
- return internalLock.tryLock(timeoutMillis, TimeUnit.MILLISECONDS);
- } catch (final InterruptedException ignore) {
- return false;
- }
+ public boolean tryLock(final LockDefinition lockDefinition, final long
timeoutMillis) {
+ return lockManager.tryLock(lockDefinition, timeoutMillis);
}
@Override
- public void unlock() {
- internalLock.unlock();
+ public void unLock(final LockDefinition lockDefinition) {
+ lockManager.unLock(lockDefinition);
}
@Override
- public boolean isLocked() {
- throw new UnsupportedOperationException();
+ public boolean isLocked(final LockDefinition lockDefinition) {
+ return lockManager.isLocked(lockDefinition);
}
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/DatabaseLockDefinition.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/DatabaseLockDefinition.java
similarity index 71%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/DatabaseLockDefinition.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/DatabaseLockDefinition.java
index 87b878c435c..9a684be130f 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/DatabaseLockDefinition.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/DatabaseLockDefinition.java
@@ -15,18 +15,26 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.lock.definition;
+package org.apache.shardingsphere.mode.lock.definition;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.lock.LockDefinition;
+import org.apache.shardingsphere.mode.lock.util.LockKeyUtil;
/**
- * Database lock name definition.
+ * Database lock definition.
*/
@RequiredArgsConstructor
@Getter
public final class DatabaseLockDefinition implements LockDefinition {
- private final DatabaseLockNameDefinition lockNameDefinition;
+ private final String lockKey;
+
+ private final String databaseName;
+
+ public DatabaseLockDefinition(final String databaseName) {
+ this.databaseName = databaseName;
+ lockKey = LockKeyUtil.generateDatabaseLockKey(databaseName);
+ }
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/DatabaseLockNameDefinition.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/ExclusiveLockDefinition.java
similarity index 62%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/DatabaseLockNameDefinition.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/ExclusiveLockDefinition.java
index 921eb7f9462..38922584a91 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/DatabaseLockNameDefinition.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/ExclusiveLockDefinition.java
@@ -15,23 +15,26 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.lock.definition;
+package org.apache.shardingsphere.mode.lock.definition;
import lombok.Getter;
-import org.apache.shardingsphere.infra.lock.LockNameDefinition;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.infra.lock.LockDefinition;
+import org.apache.shardingsphere.mode.lock.util.LockKeyUtil;
/**
- * Database lock name definition.
+ * Exclusive lock definition.
*/
+@RequiredArgsConstructor
@Getter
-public final class DatabaseLockNameDefinition implements LockNameDefinition {
+public final class ExclusiveLockDefinition implements LockDefinition {
- private final String lockName;
+ private final String lockKey;
- private final String databaseName;
+ private final String lockName;
- public DatabaseLockNameDefinition(final String databaseName) {
- lockName = databaseName;
- this.databaseName = databaseName;
+ public ExclusiveLockDefinition(final String lockName) {
+ this.lockName = lockName;
+ lockKey = LockKeyUtil.generateExclusiveLockKey(lockName);
}
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/LockDefinitionFactory.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/LockDefinitionFactory.java
similarity index 76%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/LockDefinitionFactory.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/LockDefinitionFactory.java
index 052354dc5a5..f8ba7a0830d 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/definition/LockDefinitionFactory.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/definition/LockDefinitionFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.lock.definition;
+package org.apache.shardingsphere.mode.lock.definition;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -27,6 +27,16 @@ import org.apache.shardingsphere.infra.lock.LockDefinition;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class LockDefinitionFactory {
+ /**
+ * New exclusive lock definition.
+ *
+ * @param lockName lock name
+ * @return database lock definition
+ */
+ public static LockDefinition newExclusiveLockDefinition(final String
lockName) {
+ return new ExclusiveLockDefinition(lockName);
+ }
+
/**
* New database lock definition.
*
@@ -34,6 +44,6 @@ public final class LockDefinitionFactory {
* @return database lock definition
*/
public static LockDefinition newDatabaseLockDefinition(final String
databaseName) {
- return new DatabaseLockDefinition(new
DatabaseLockNameDefinition(databaseName));
+ return new DatabaseLockDefinition(databaseName);
}
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/LockJudgeEngine.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/LockJudgeEngine.java
similarity index 96%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/LockJudgeEngine.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/LockJudgeEngine.java
index b836f65e55d..1b1b2a3e09b 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/LockJudgeEngine.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/LockJudgeEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.lock;
+package org.apache.shardingsphere.mode.lock.engine;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.lock.LockContext;
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/LockJudgeEngineFactory.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/LockJudgeEngineFactory.java
similarity index 96%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/LockJudgeEngineFactory.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/LockJudgeEngineFactory.java
index 80c7214ce96..223ef95d15e 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/LockJudgeEngineFactory.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/LockJudgeEngineFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.lock;
+package org.apache.shardingsphere.mode.lock.engine;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/ShardingSphereLockJudgeEngine.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/ShardingSphereLockJudgeEngine.java
similarity index 91%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/ShardingSphereLockJudgeEngine.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/ShardingSphereLockJudgeEngine.java
index dde7fa1d0a4..f10f355eb11 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/lock/ShardingSphereLockJudgeEngine.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/engine/ShardingSphereLockJudgeEngine.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.lock;
+package org.apache.shardingsphere.mode.lock.engine;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.lock.LockContext;
-import
org.apache.shardingsphere.mode.manager.lock.definition.LockDefinitionFactory;
+import org.apache.shardingsphere.mode.lock.definition.LockDefinitionFactory;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatementType;
/**
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/LockManager.java
similarity index 61%
copy from
shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
copy to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/LockManager.java
index a2ee03fa24e..f34c300bb79 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/LockManager.java
@@ -15,56 +15,33 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.lock;
+package org.apache.shardingsphere.mode.lock.manager;
-import org.apache.shardingsphere.infra.instance.InstanceContext;
+import org.apache.shardingsphere.infra.lock.LockDefinition;
/**
- * Lock context.
+ * Lock manager.
*/
-public interface LockContext {
-
- /**
- * Init lock state.
- *
- * @param instanceContext instance context
- */
- default void initLockState(InstanceContext instanceContext) {
- }
-
- /**
- * Get lock.
- *
- * @return lock
- */
- ShardingSphereLock getLock();
+public interface LockManager {
/**
* Try lock.
*
* @param lockDefinition lock definition
+ * @param timeoutMillis timeout millis
* @return is locked or not
*/
- boolean tryLock(LockDefinition lockDefinition);
-
- /**
- * Try Lock.
- *
- * @param lockDefinition lock definition
- * @param timeoutMilliseconds timeout milliseconds
- * @return is locked or not
- */
- boolean tryLock(LockDefinition lockDefinition, long timeoutMilliseconds);
+ boolean tryLock(LockDefinition lockDefinition, long timeoutMillis);
/**
- * Release lock.
+ * Un lock.
*
* @param lockDefinition lock definition
*/
- void releaseLock(LockDefinition lockDefinition);
+ void unLock(LockDefinition lockDefinition);
/**
- * Is locked.
+ * Is locked.
*
* @param lockDefinition lock definition
* @return is locked or not
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/state/LockStateContext.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/LockPersistService.java
similarity index 62%
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/manager/state/LockStateContext.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/LockPersistService.java
index 3956b769c14..4b0501e3d8e 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/state/LockStateContext.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/LockPersistService.java
@@ -15,37 +15,31 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.state;
+package org.apache.shardingsphere.mode.lock.manager;
-import org.apache.shardingsphere.infra.lock.LockNameDefinition;
import org.apache.shardingsphere.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.spi.type.required.RequiredSPI;
+import org.apache.shardingsphere.spi.type.typed.TypedSPI;
/**
- * Lock state context.
+ * Lock persist service.
*/
@SingletonSPI
-public interface LockStateContext extends RequiredSPI {
+public interface LockPersistService extends TypedSPI, RequiredSPI {
/**
- * Register lock state.
+ * Try lock.
*
- * @param lockName lock name definition
- */
- void register(LockNameDefinition lockName);
-
- /**
- * Un-register lock state.
- *
- * @param lockName lock name definition
+ * @param lockKey lock key
+ * @param timeoutMillis timeout millis
+ * @return is locked or not
*/
- void unregister(LockNameDefinition lockName);
+ boolean tryLock(String lockKey, long timeoutMillis);
/**
- * Is locked.
+ * Un lock.
*
- * @param lockName lock name definition
- * @return is locked or not
+ * @param lockKey lock key
*/
- boolean isLocked(LockNameDefinition lockName);
+ void unLock(String lockKey);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/ShardingSphereLockManager.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/ShardingSphereLockManager.java
new file mode 100644
index 00000000000..796569e1fc0
--- /dev/null
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/ShardingSphereLockManager.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.mode.lock.manager;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.infra.lock.LockDefinition;
+import org.apache.shardingsphere.mode.lock.manager.state.LockStateContext;
+
+/**
+ * Lock manager of ShardingSphere.
+ */
+@RequiredArgsConstructor
+public final class ShardingSphereLockManager implements LockManager {
+
+ private final LockStateContext lockStateContext = new LockStateContext();
+
+ private final LockPersistService lockPersistService;
+
+ @Override
+ public boolean tryLock(final LockDefinition lockDefinition, final long
timeoutMillis) {
+ if (lockPersistService.tryLock(lockDefinition.getLockKey(),
timeoutMillis)) {
+ lockStateContext.register(lockDefinition);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void unLock(final LockDefinition lockDefinition) {
+ lockPersistService.unLock(lockDefinition.getLockKey());
+ lockStateContext.unregister(lockDefinition);
+ }
+
+ @Override
+ public boolean isLocked(final LockDefinition lockDefinition) {
+ return lockStateContext.isLocked(lockDefinition);
+ }
+}
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/state/ShardingSphereLockStateContext.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/state/LockStateContext.java
similarity index 66%
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/manager/state/ShardingSphereLockStateContext.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/state/LockStateContext.java
index fb2bd79c7f4..8b54b357bf5 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/state/ShardingSphereLockStateContext.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/manager/state/LockStateContext.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.state;
+package org.apache.shardingsphere.mode.lock.manager.state;
-import org.apache.shardingsphere.infra.lock.LockNameDefinition;
+import org.apache.shardingsphere.infra.lock.LockDefinition;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -28,7 +28,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Lock state context.
*/
-public final class ShardingSphereLockStateContext implements LockStateContext {
+public final class LockStateContext {
private final ReadWriteLock lock = new ReentrantReadWriteLock();
@@ -36,13 +36,17 @@ public final class ShardingSphereLockStateContext
implements LockStateContext {
private final Map<String, Boolean> lockStates = new LinkedHashMap<>();
- @Override
- public void register(final LockNameDefinition lockName) {
+ /**
+ * Register lock state.
+ *
+ * @param lockDefinition lock definition
+ */
+ public void register(final LockDefinition lockDefinition) {
lock.writeLock().lock();
try {
- Boolean isLocked = lockStates.get(lockName.getLockName());
+ Boolean isLocked = lockStates.get(lockDefinition.getLockKey());
if (null == isLocked || !isLocked) {
- lockStates.put(lockName.getLockName(), true);
+ lockStates.put(lockDefinition.getLockKey(), true);
lockCounter.incrementAndGet();
}
} finally {
@@ -50,13 +54,17 @@ public final class ShardingSphereLockStateContext
implements LockStateContext {
}
}
- @Override
- public void unregister(final LockNameDefinition lockName) {
+ /**
+ * Un-register lock state.
+ *
+ * @param lockDefinition lock definition
+ */
+ public void unregister(final LockDefinition lockDefinition) {
lock.writeLock().lock();
try {
- Boolean isLocked = lockStates.get(lockName.getLockName());
+ Boolean isLocked = lockStates.get(lockDefinition.getLockKey());
if (null != isLocked && isLocked) {
- lockStates.put(lockName.getLockName(), false);
+ lockStates.put(lockDefinition.getLockKey(), false);
lockCounter.decrementAndGet();
}
} finally {
@@ -64,14 +72,19 @@ public final class ShardingSphereLockStateContext
implements LockStateContext {
}
}
- @Override
- public boolean isLocked(final LockNameDefinition lockName) {
+ /**
+ * Is locked.
+ *
+ * @param lockDefinition lock definition
+ * @return is locked or not
+ */
+ public boolean isLocked(final LockDefinition lockDefinition) {
if (isExistLock()) {
return false;
}
lock.readLock().lock();
try {
- Boolean isLocked = lockStates.get(lockName.getLockName());
+ Boolean isLocked = lockStates.get(lockDefinition.getLockKey());
return null != isLocked && isLocked;
} finally {
lock.readLock().unlock();
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/util/LockKeyUtil.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/util/LockKeyUtil.java
new file mode 100644
index 00000000000..92e58960718
--- /dev/null
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/util/LockKeyUtil.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.mode.lock.util;
+
+/**
+ * Lock key util.
+ */
+public final class LockKeyUtil {
+
+ private static final String PATH_DELIMITER = "/";
+
+ private static final String LOCK_ROOT = "lock";
+
+ private static final String LOCKS_NODE = "locks";
+
+ private static final String LOCKS_NODE_EXCLUSIVE = "exclusive";
+
+ private static final String LOCKS_NODE_DATABASE = "database";
+
+ /**
+ * Generate exclusive lock key.
+ *
+ * @param lockName locks name
+ * @return locks name
+ */
+ public static String generateExclusiveLockKey(final String lockName) {
+ return generateLocksNodePath(LOCKS_NODE_EXCLUSIVE) + "/" + lockName;
+ }
+
+ /**
+ * Generate database lock key.
+ *
+ * @param lockName locks name
+ * @return locks name
+ */
+ public static String generateDatabaseLockKey(final String lockName) {
+ return generateLocksNodePath(LOCKS_NODE_DATABASE) + "/" + lockName;
+ }
+
+ /**
+ * Generate locks node path.
+ *
+ * @return locks node path
+ */
+ private static String generateLocksNodePath(final String lockPath) {
+ return PATH_DELIMITER + LOCK_ROOT + PATH_DELIMITER + lockPath +
PATH_DELIMITER + LOCKS_NODE;
+ }
+}
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/TimeoutMilliseconds.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/util/TimeoutMilliseconds.java
similarity index 94%
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/util/TimeoutMilliseconds.java
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/util/TimeoutMilliseconds.java
index 6e78b9e3527..18cb7fa00a9 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/TimeoutMilliseconds.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/lock/util/TimeoutMilliseconds.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util;
+package org.apache.shardingsphere.mode.lock.util;
import lombok.SneakyThrows;
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.lock.LockJudgeEngine
b/shardingsphere-mode/shardingsphere-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.lock.engine.LockJudgeEngine
similarity index 91%
rename from
shardingsphere-mode/shardingsphere-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.lock.LockJudgeEngine
rename to
shardingsphere-mode/shardingsphere-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.lock.engine.LockJudgeEngine
index 0b5e3c4c1ba..0f9649adc56 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.lock.LockJudgeEngine
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.lock.engine.LockJudgeEngine
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.mode.manager.lock.ShardingSphereLockJudgeEngine
+org.apache.shardingsphere.mode.lock.engine.ShardingSphereLockJudgeEngine
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/RegistryCenter.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
index ae2c07144e0..e978d16ec45 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import
org.apache.shardingsphere.infra.instance.metadata.jdbc.JDBCInstanceMetaData;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockRegistryService;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.MutexLockRegistryService;
+import org.apache.shardingsphere.mode.lock.manager.LockPersistService;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.ClusterLockPersistService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcherFactory;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.cache.subscriber.ScalingRegistrySubscriber;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.subscriber.SchemaMetaDataRegistrySubscriber;
@@ -52,7 +52,7 @@ public final class RegistryCenter {
private final ComputeNodeStatusService computeNodeStatusService;
@Getter
- private final LockRegistryService lockService;
+ private final LockPersistService lockPersistService;
@Getter
private final EventBusContext eventBusContext;
@@ -71,7 +71,7 @@ public final class RegistryCenter {
this.databaseConfigs = databaseConfigs;
storageNodeStatusService = new StorageNodeStatusService(repository);
computeNodeStatusService = new ComputeNodeStatusService(repository);
- lockService = new MutexLockRegistryService(repository);
+ lockPersistService = new ClusterLockPersistService(repository);
listenerFactory = new GovernanceWatcherFactory(repository,
eventBusContext, getJDBCDatabaseName());
createSubscribers(repository);
}
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/DistributedLockContext.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/DistributedLockContext.java
index 3b0afc9135a..8579d45a58d 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/DistributedLockContext.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/DistributedLockContext.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.ShardingSphereLockManager;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.internal.ShardingSphereInternalLockHolder;
-import org.apache.shardingsphere.mode.manager.lock.AbstractLockContext;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockDefinition;
+import org.apache.shardingsphere.mode.lock.AbstractLockContext;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.spi.type.required.RequiredSPIRegistry;
@@ -53,23 +53,18 @@ public final class DistributedLockContext extends
AbstractLockContext {
lockManager.init(lockHolder, eventBusContext);
}
- @Override
- public ShardingSphereLock getLock() {
- return lockManager.getDistributedLock();
- }
-
@Override
protected boolean tryLock(final DatabaseLockDefinition lockDefinition) {
return lockManager.tryLock(lockDefinition);
}
@Override
- protected boolean tryLock(final DatabaseLockDefinition lockDefinition,
final long timeoutMilliseconds) {
- return lockManager.tryLock(lockDefinition, timeoutMilliseconds);
+ protected boolean tryLock(final DatabaseLockDefinition lockDefinition,
final long timeoutMillis) {
+ return lockManager.tryLock(lockDefinition, timeoutMillis);
}
@Override
- protected void releaseLock(final DatabaseLockDefinition lockDefinition) {
+ protected void unLock(final DatabaseLockDefinition lockDefinition) {
lockManager.releaseLock(lockDefinition);
}
@@ -77,4 +72,9 @@ public final class DistributedLockContext extends
AbstractLockContext {
protected boolean isLocked(final DatabaseLockDefinition lockDefinition) {
return lockManager.isLocked(lockDefinition);
}
+
+ @Override
+ public ShardingSphereLock getLock() {
+ return lockManager.getDistributedLock();
+ }
}
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/ShardingSphereDistributedDatabaseLock.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
index 3c8df476256..1e32e728622 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/ShardingSphereDistributedDatabaseLock.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
@@ -20,6 +20,9 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
+import org.apache.shardingsphere.mode.lock.manager.state.LockStateContext;
+import org.apache.shardingsphere.mode.lock.util.TimeoutMilliseconds;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.event.DatabaseAckLockReleasedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.event.DatabaseAckLockedEvent;
@@ -27,11 +30,8 @@ import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.event.DatabaseLockedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.internal.ExclusiveInternalLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.internal.ShardingSphereInternalLockHolder;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.state.LockStateContext;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockNodeServiceFactory;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeType;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDefinition;
import java.util.Optional;
@@ -66,7 +66,7 @@ public final class ShardingSphereDistributedDatabaseLock
implements ShardingSphe
private boolean innerTryLock(final String lockName, final long
timeoutMillis) {
if
(lockHolder.getOrCreateInterMutexLock(lockNodeService.generateLocksName(lockName)).tryLock(timeoutMillis))
{
- lockStateContext.register(new
DatabaseLockNameDefinition(lockName));
+ lockStateContext.register(new DatabaseLockDefinition(lockName));
return true;
}
return false;
@@ -81,13 +81,13 @@ public final class ShardingSphereDistributedDatabaseLock
implements ShardingSphe
Optional<ExclusiveInternalLock> interMutexLock =
getInterMutexLock(lockName);
if (interMutexLock.isPresent()) {
interMutexLock.get().unlock();
- lockStateContext.unregister(new
DatabaseLockNameDefinition(lockName));
+ lockStateContext.unregister(new DatabaseLockDefinition(lockName));
}
}
@Override
public boolean isLocked(final String lockName) {
- return lockStateContext.isLocked(new
DatabaseLockNameDefinition(lockName));
+ return lockStateContext.isLocked(new DatabaseLockDefinition(lockName));
}
/**
@@ -97,11 +97,11 @@ public final class ShardingSphereDistributedDatabaseLock
implements ShardingSphe
*/
@Subscribe
public synchronized void locked(final DatabaseLockedEvent event) {
- String database = event.getLockNameDefinition().getDatabaseName();
+ String database = event.getLockDefinition().getDatabaseName();
String lockedInstanceId = lockHolder.getCurrentInstanceId();
ExclusiveInternalLock exclusiveLock =
lockHolder.getOrCreateInterMutexLock(lockNodeService.generateLocksName(database));
exclusiveLock.ackLock(lockNodeService.generateAckLockName(database,
lockedInstanceId), lockedInstanceId);
- lockStateContext.register(event.getLockNameDefinition());
+ lockStateContext.register(event.getLockDefinition());
}
/**
@@ -111,12 +111,12 @@ public final class ShardingSphereDistributedDatabaseLock
implements ShardingSphe
*/
@Subscribe
public synchronized void lockReleased(final DatabaseLockReleasedEvent
event) {
- String database = event.getLockNameDefinition().getDatabaseName();
+ String database = event.getLockDefinition().getDatabaseName();
String lockedInstanceId = lockHolder.getCurrentInstanceId();
Optional<ExclusiveInternalLock> interMutexLock =
getInterMutexLock(database);
if (interMutexLock.isPresent()) {
interMutexLock.get().releaseAckLock(lockNodeService.generateAckLockName(database,
lockedInstanceId), lockedInstanceId);
- lockStateContext.unregister(event.getLockNameDefinition());
+ lockStateContext.unregister(event.getLockDefinition());
}
}
@@ -127,7 +127,7 @@ public final class ShardingSphereDistributedDatabaseLock
implements ShardingSphe
*/
@Subscribe
public synchronized void ackLocked(final DatabaseAckLockedEvent event) {
-
getInterMutexLock(event.getLockNameDefinition().getDatabaseName()).ifPresent(mutexLock
-> mutexLock.addLockedInstance(event.getLockedInstance()));
+
getInterMutexLock(event.getLockDefinition().getDatabaseName()).ifPresent(mutexLock
-> mutexLock.addLockedInstance(event.getLockedInstance()));
}
/**
@@ -137,6 +137,6 @@ public final class ShardingSphereDistributedDatabaseLock
implements ShardingSphe
*/
@Subscribe
public synchronized void ackLockReleased(final
DatabaseAckLockReleasedEvent event) {
-
getInterMutexLock(event.getLockNameDefinition().getDatabaseName()).ifPresent(mutexLock
-> mutexLock.removeLockedInstance(event.getLockedInstance()));
+
getInterMutexLock(event.getLockDefinition().getDatabaseName()).ifPresent(mutexLock
-> mutexLock.removeLockedInstance(event.getLockedInstance()));
}
}
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/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/database/event/DatabaseAckLockReleasedEvent.java
index 480f0618eeb..38274834c66 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/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/database/event/DatabaseAckLockReleasedEvent.java
@@ -18,9 +18,9 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.event;
import lombok.Getter;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeUtil;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDefinition;
/**
* Database ack released Lock event.
@@ -28,13 +28,13 @@ import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDe
@Getter
public final class DatabaseAckLockReleasedEvent implements GovernanceEvent {
- private final DatabaseLockNameDefinition lockNameDefinition;
+ private final DatabaseLockDefinition lockDefinition;
private final String lockedInstance;
public DatabaseAckLockReleasedEvent(final String ackLockedName) {
String[] databaseInstance =
LockNodeUtil.parseAckLockName(ackLockedName);
- lockNameDefinition = new
DatabaseLockNameDefinition(databaseInstance[0]);
+ lockDefinition = new DatabaseLockDefinition(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/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/database/event/DatabaseAckLockedEvent.java
index e5c8524b92f..a4d47c976bc 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/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/database/event/DatabaseAckLockedEvent.java
@@ -18,9 +18,9 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.event;
import lombok.Getter;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeUtil;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDefinition;
/**
* Database ack locked event.
@@ -28,13 +28,13 @@ import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDe
@Getter
public final class DatabaseAckLockedEvent implements GovernanceEvent {
- private final DatabaseLockNameDefinition lockNameDefinition;
+ private final DatabaseLockDefinition lockDefinition;
private final String lockedInstance;
public DatabaseAckLockedEvent(final String ackLockedName) {
String[] databaseInstance =
LockNodeUtil.parseAckLockName(ackLockedName);
- lockNameDefinition = new
DatabaseLockNameDefinition(databaseInstance[0]);
+ lockDefinition = new DatabaseLockDefinition(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/database/event/DatabaseLockReleasedEvent.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/event/DatabaseLockReleasedEvent.java
index f60e49a7e4b..62874a80ac4 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/event/DatabaseLockReleasedEvent.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/event/DatabaseLockReleasedEvent.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDefinition;
/**
* Database lock released event.
@@ -29,9 +29,9 @@ import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDe
@Getter
public final class DatabaseLockReleasedEvent implements GovernanceEvent {
- private final DatabaseLockNameDefinition lockNameDefinition;
+ private final DatabaseLockDefinition lockDefinition;
public DatabaseLockReleasedEvent(final String lockedName) {
- this.lockNameDefinition = new DatabaseLockNameDefinition(lockedName);
+ this.lockDefinition = new DatabaseLockDefinition(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/database/event/DatabaseLockedEvent.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/event/DatabaseLockedEvent.java
index dd75beb73bd..3476f4976cb 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/event/DatabaseLockedEvent.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/event/DatabaseLockedEvent.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceEvent;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDefinition;
/**
* Database locked event.
@@ -29,9 +29,9 @@ import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDe
@Getter
public final class DatabaseLockedEvent implements GovernanceEvent {
- private final DatabaseLockNameDefinition lockNameDefinition;
+ private final DatabaseLockDefinition lockDefinition;
public DatabaseLockedEvent(final String lockedName) {
- this.lockNameDefinition = new DatabaseLockNameDefinition(lockedName);
+ this.lockDefinition = new DatabaseLockDefinition(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/distributed/ShardingSphereDistributedGlobalLock.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/distributed/ShardingSphereDistributedGlobalLock.java
index 275c1cc1802..a8adf2038c8 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/distributed/ShardingSphereDistributedGlobalLock.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/distributed/ShardingSphereDistributedGlobalLock.java
@@ -21,6 +21,7 @@ import com.google.common.eventbus.Subscribe;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
+import org.apache.shardingsphere.mode.lock.util.TimeoutMilliseconds;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.distributed.event.DistributedAckLockReleasedEvent;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.distributed.event.DistributedAckLockedEvent;
@@ -30,7 +31,6 @@ import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.i
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.internal.ShardingSphereInternalLockHolder;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockNodeServiceFactory;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeType;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
import java.util.Optional;
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/ShardingSphereDistributedLockManager.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/ShardingSphereDistributedLockManager.java
index 5f1c1ce13ff..8ef24620595 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/ShardingSphereDistributedLockManager.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/ShardingSphereDistributedLockManager.java
@@ -20,16 +20,13 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager;
import com.google.common.base.Preconditions;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.infra.lock.LockNameDefinition;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
+import org.apache.shardingsphere.mode.lock.manager.state.LockStateContext;
+import org.apache.shardingsphere.mode.lock.util.TimeoutMilliseconds;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.ShardingSphereDistributedDatabaseLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.distributed.ShardingSphereDistributedGlobalLock;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.state.LockStateContext;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.state.LockStateContextFactory;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.internal.ShardingSphereInternalLockHolder;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockDefinition;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDefinition;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
/**
* Distribute lock manager of ShardingSphere.
@@ -37,7 +34,7 @@ import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDe
@Slf4j
public final class ShardingSphereDistributedLockManager implements
ShardingSphereLockManager {
- private LockStateContext lockStateContext;
+ private final LockStateContext lockStateContext = new LockStateContext();
private ShardingSphereLock globalDistributedLock;
@@ -45,7 +42,6 @@ public final class ShardingSphereDistributedLockManager
implements ShardingSpher
@Override
public void init(final ShardingSphereInternalLockHolder lockHolder, final
EventBusContext eventBusContext) {
- lockStateContext = LockStateContextFactory.getLockStateContext();
globalDistributedLock = new
ShardingSphereDistributedGlobalLock(lockHolder, eventBusContext);
databaseLock = new ShardingSphereDistributedDatabaseLock(lockHolder,
lockStateContext, eventBusContext);
}
@@ -64,10 +60,10 @@ public final class ShardingSphereDistributedLockManager
implements ShardingSpher
@Override
public boolean tryLock(final DatabaseLockDefinition lockDefinition, final
long timeoutMilliseconds) {
Preconditions.checkNotNull(lockDefinition, "Try Lock for database arg
lock definition can not be null.");
- return innerTryLock(lockDefinition.getLockNameDefinition(),
timeoutMilliseconds);
+ return innerTryLock(lockDefinition, timeoutMilliseconds);
}
- private synchronized boolean innerTryLock(final DatabaseLockNameDefinition
lockNameDefinition, final long timeoutMilliseconds) {
+ private synchronized boolean innerTryLock(final DatabaseLockDefinition
lockNameDefinition, final long timeoutMilliseconds) {
Preconditions.checkNotNull(lockNameDefinition, "Try Lock for database
arg database name can not be null.");
return innerDatabaseTryLock(lockNameDefinition.getDatabaseName(),
timeoutMilliseconds);
}
@@ -84,7 +80,7 @@ public final class ShardingSphereDistributedLockManager
implements ShardingSpher
@Override
public void releaseLock(final DatabaseLockDefinition lockDefinition) {
Preconditions.checkNotNull(lockDefinition, "Try Lock for database arg
lock definition can not be null.");
- String databaseName =
lockDefinition.getLockNameDefinition().getDatabaseName();
+ String databaseName = lockDefinition.getDatabaseName();
Preconditions.checkNotNull(databaseName, "Release lock write args
database name can not be null.");
databaseLock.releaseLock(databaseName);
}
@@ -92,8 +88,6 @@ public final class ShardingSphereDistributedLockManager
implements ShardingSpher
@Override
public boolean isLocked(final DatabaseLockDefinition lockDefinition) {
Preconditions.checkNotNull(lockDefinition, "Try Lock for database arg
lock definition can not be null.");
- LockNameDefinition lockNameDefinition =
lockDefinition.getLockNameDefinition();
- Preconditions.checkNotNull(lockNameDefinition, "Is locked database
args lock name definition can not be null.");
- return lockStateContext.isLocked(lockNameDefinition);
+ return lockStateContext.isLocked(lockDefinition);
}
}
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/ShardingSphereLockManager.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/ShardingSphereLockManager.java
index 7a87cc4a4d2..ce40570d0b7 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/ShardingSphereLockManager.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/ShardingSphereLockManager.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.internal.ShardingSphereInternalLockHolder;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockDefinition;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
import org.apache.shardingsphere.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.spi.type.required.RequiredSPI;
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/internal/ExclusiveInternalLock.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/internal/ExclusiveInternalLock.java
index 301e12af2f4..58e9ee3e5cb 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/internal/ExclusiveInternalLock.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/internal/ExclusiveInternalLock.java
@@ -21,9 +21,9 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.lock.LockState;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockRegistryService;
+import org.apache.shardingsphere.mode.lock.util.TimeoutMilliseconds;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.ClusterLockPersistService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeUtil;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
import java.util.Collection;
import java.util.Set;
@@ -42,7 +42,7 @@ public final class ExclusiveInternalLock implements
InternalLock, LockAckAble {
private final InternalLock sequencedInternalLock;
- private final LockRegistryService lockService;
+ private final ClusterLockPersistService lockService;
private final ComputeNodeInstance currentInstance;
@@ -153,7 +153,7 @@ public final class ExclusiveInternalLock implements
InternalLock, LockAckAble {
lockService.releaseLock(lockName);
log.debug("inter mutex lock owner lock release lock success.
lock name: {}", lockName);
} else {
- lockService.removeLock(lockName);
+ lockService.unLock(lockName);
log.debug("inter mutex lock not owner remove lock success.
lock name: {}", lockName);
}
reSetLockState();
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/internal/ReentrantInternalLock.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/internal/ReentrantInternalLock.java
index 556b19d1306..318d158511c 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/internal/ReentrantInternalLock.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/internal/ReentrantInternalLock.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.internal;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
+import org.apache.shardingsphere.mode.lock.util.TimeoutMilliseconds;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
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/internal/ShardingSphereInternalLockHolder.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/internal/ShardingSphereInternalLockHolder.java
index 6512a9284a8..ece712ebc83 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/internal/ShardingSphereInternalLockHolder.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/internal/ShardingSphereInternalLockHolder.java
@@ -19,8 +19,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.LockNodeService;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.LockRegistryService;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.MutexLockRegistryService;
+import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service.ClusterLockPersistService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeType;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeUtil;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
@@ -43,13 +42,13 @@ public final class ShardingSphereInternalLockHolder {
private final Collection<ComputeNodeInstance> computeNodeInstances;
- private final LockRegistryService mutexLockRegistryService;
+ private final ClusterLockPersistService clusterLockPersistService;
public ShardingSphereInternalLockHolder(final ClusterPersistRepository
repository, final ComputeNodeInstance instance, final
Collection<ComputeNodeInstance> nodeInstances) {
clusterRepository = repository;
currentInstance = instance;
computeNodeInstances = nodeInstances;
- mutexLockRegistryService = new
MutexLockRegistryService(clusterRepository);
+ clusterLockPersistService = new
ClusterLockPersistService(clusterRepository);
}
/**
@@ -69,7 +68,7 @@ public final class ShardingSphereInternalLockHolder {
private ExclusiveInternalLock createInterMutexLock(final String locksName)
{
ReentrantInternalLock reentrantExclusiveLock =
createInterReentrantMutexLock(LockNodeUtil.generateLockSequenceNodePath(locksName));
- return new ExclusiveInternalLock(locksName, reentrantExclusiveLock,
mutexLockRegistryService, currentInstance, computeNodeInstances);
+ return new ExclusiveInternalLock(locksName, reentrantExclusiveLock,
clusterLockPersistService, currentInstance, computeNodeInstances);
}
private ReentrantInternalLock createInterReentrantMutexLock(final String
lockNodePath) {
@@ -89,34 +88,6 @@ public final class ShardingSphereInternalLockHolder {
return Optional.ofNullable((ExclusiveInternalLock)
internalLocks.get(locksName));
}
- /**
- * Get or create inter reentrant mutex lock.
- *
- * @param locksName locks name
- * @return inter reentrant mutex lock
- */
- public synchronized ReentrantInternalLock
getOrCreateInterReentrantMutexLock(final String locksName) {
- InternalLock result = internalLocks.get(locksName);
- if (null == result) {
- result = createInterReentrantMutexLock(locksName);
- internalLocks.put(locksName, result);
- }
- return (ReentrantInternalLock) result;
- }
-
- /**
- * Get inter reentrant mutex Lock.
- *
- * @param locksName locks name
- * @return inter mutex lock
- */
- public Optional<ReentrantInternalLock> getInterReentrantMutexLock(final
String locksName) {
- if (internalLocks.isEmpty()) {
- return Optional.empty();
- }
- return Optional.ofNullable((ReentrantInternalLock)
internalLocks.get(locksName));
- }
-
/**
* Synchronize lock.
*
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/state/LockStateContextFactory.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/state/LockStateContextFactory.java
deleted file mode 100644
index 4ff543de147..00000000000
---
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/state/LockStateContextFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.state;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
-import org.apache.shardingsphere.spi.type.required.RequiredSPIRegistry;
-
-/**
- * Lock state context factory.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class LockStateContextFactory {
-
- static {
- ShardingSphereServiceLoader.register(LockStateContext.class);
- }
-
- /**
- * Get lock state context.
- *
- * @return lock state context
- */
- public static LockStateContext getLockStateContext() {
- return
RequiredSPIRegistry.getRegisteredService(LockStateContext.class);
- }
-}
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/service/MutexLockRegistryService.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/service/ClusterLockPersistService.java
similarity index 68%
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/service/MutexLockRegistryService.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/service/ClusterLockPersistService.java
index c3ae161c99a..a8607ecf555 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/service/MutexLockRegistryService.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/service/ClusterLockPersistService.java
@@ -18,6 +18,7 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service;
import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.mode.lock.manager.LockPersistService;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.LockNodeUtil;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
@@ -25,18 +26,13 @@ import java.util.Collection;
import java.util.concurrent.TimeUnit;
/**
- * Mutex lock registry service.
+ * Cluster lock persist service.
*/
@RequiredArgsConstructor
-public final class MutexLockRegistryService implements LockRegistryService {
+public final class ClusterLockPersistService implements LockPersistService {
private final ClusterPersistRepository repository;
- @Override
- public Collection<String> acquireAckLockedInstances(final String
ackLockName) {
- return repository.getChildrenKeys(ackLockName);
- }
-
@Override
public boolean tryLock(final String lockName, final long
timeoutMilliseconds) {
try {
@@ -47,21 +43,52 @@ public final class MutexLockRegistryService implements
LockRegistryService {
}
@Override
- public void releaseLock(final String lockName) {
- repository.getInternalMutexLock(lockName).unlock();
+ public void unLock(final String lockName) {
+ repository.delete(LockNodeUtil.generateLockLeasesNodePath(lockName));
}
- @Override
- public void removeLock(final String lockName) {
- repository.delete(LockNodeUtil.generateLockLeasesNodePath(lockName));
+ /**
+ * Acquire ack locked instances.
+ *
+ * @param ackLockName ack lock name
+ * @return ack locked instances
+ * @deprecated remove me when the distributed lock refactoring was
completed
+ */
+ @Deprecated
+ public Collection<String> acquireAckLockedInstances(final String
ackLockName) {
+ return repository.getChildrenKeys(ackLockName);
}
- @Override
+ /**
+ * Release lock.
+ *
+ * @param lockName lock name
+ * @deprecated remove me when the distributed lock refactoring was
completed
+ */
+ @Deprecated
+ public void releaseLock(final String lockName) {
+ repository.getInternalMutexLock(lockName).unlock();
+ }
+
+ /**
+ * Ack lock.
+ *
+ * @param lockName lock name
+ * @param lockValue lock value
+ * @deprecated remove me when the distributed lock refactoring was
completed
+ */
+ @Deprecated
public void ackLock(final String lockName, final String lockValue) {
repository.persistEphemeral(lockName, lockValue);
}
- @Override
+ /**
+ * Release ack lock.
+ *
+ * @param lockName lock name
+ * @deprecated remove me when the distributed lock refactoring was
completed
+ */
+ @Deprecated
public void releaseAckLock(final String lockName) {
repository.delete(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/service/LockRegistryService.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/service/LockRegistryService.java
deleted file mode 100644
index 71f2f7d1469..00000000000
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/lock/service/LockRegistryService.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.service;
-
-import java.util.Collection;
-
-/**
- * Lock registry service.
- */
-public interface LockRegistryService {
-
- /**
- * Acquire ack locked instances.
- *
- * @param lockName lock name
- * @return ack locked instances
- */
- Collection<String> acquireAckLockedInstances(String lockName);
-
- /**
- * Try lock.
- *
- * @param lockName lock name
- * @param timeoutMilliseconds the maximum time in milliseconds to acquire
lock
- * @return is locked or not
- */
- boolean tryLock(String lockName, long timeoutMilliseconds);
-
- /**
- * Release lock.
- *
- * @param lockName lock name
- */
- void releaseLock(String lockName);
-
- /**
- * Remove lock.
- *
- * @param lockName lock name
- */
- void removeLock(String lockName);
-
- /**
- * Ack lock.
- *
- * @param lockName lock name
- * @param lockValue lock value
- */
- void ackLock(String lockName, String lockValue);
-
- /**
- * Release ack lock.
- *
- * @param lockName lock name
- */
- void releaseAckLock(String lockName);
-}
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.manager.state.LockStateContext
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.manager.state.LockStateContext
deleted file mode 100644
index c1450fb446a..00000000000
---
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.manager.state.LockStateContext
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.state.ShardingSphereLockStateContext
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/DistributedLockContextTest.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/DistributedLockContextTest.java
index ff2da7083b3..7fc98f2d365 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/DistributedLockContextTest.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/DistributedLockContextTest.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.instance.InstanceContext;
import
org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdGenerator;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
-import
org.apache.shardingsphere.mode.manager.lock.definition.LockDefinitionFactory;
+import org.apache.shardingsphere.mode.lock.definition.LockDefinitionFactory;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.junit.Test;
@@ -59,7 +59,7 @@ public final class DistributedLockContextTest {
ComputeNodeInstance currentInstance = new ComputeNodeInstance(new
ProxyInstanceMetaData("1", 3307));
DistributedLockContext distributedLockContext = new
DistributedLockContext(mock(ClusterPersistRepository.class));
new InstanceContext(currentInstance, mock(WorkerIdGenerator.class),
mock(ModeConfiguration.class), distributedLockContext, eventBusContext);
-
distributedLockContext.releaseLock(LockDefinitionFactory.newDatabaseLockDefinition("database"));
+
distributedLockContext.unLock(LockDefinitionFactory.newDatabaseLockDefinition("database"));
}
@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/database/watcher/DatabaseLockChangedWatcherTest.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/database/watcher/DatabaseLockChangedWatcherTest.java
index 1c144031549..fdc2e8bc777 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/database/watcher/DatabaseLockChangedWatcherTest.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/database/watcher/DatabaseLockChangedWatcherTest.java
@@ -62,12 +62,12 @@ public final class DatabaseLockChangedWatcherTest {
Optional<GovernanceEvent> addGovernanceEvent =
watcher.createGovernanceEvent(addDataChangedEvent);
assertTrue(addGovernanceEvent.isPresent());
assertThat(addGovernanceEvent.get(),
instanceOf(DatabaseLockedEvent.class));
- assertThat(((DatabaseLockedEvent)
addGovernanceEvent.get()).getLockNameDefinition().getDatabaseName(),
is("sharding_db"));
+ assertThat(((DatabaseLockedEvent)
addGovernanceEvent.get()).getLockDefinition().getDatabaseName(),
is("sharding_db"));
DataChangedEvent deleteDataChangedEvent = new
DataChangedEvent(eventKey, "127.0.0.1@3307", DataChangedEvent.Type.DELETED);
Optional<GovernanceEvent> deleteGovernanceEvent =
watcher.createGovernanceEvent(deleteDataChangedEvent);
assertTrue(deleteGovernanceEvent.isPresent());
assertThat(deleteGovernanceEvent.get(),
instanceOf(DatabaseLockReleasedEvent.class));
- assertThat(((DatabaseLockReleasedEvent)
deleteGovernanceEvent.get()).getLockNameDefinition().getDatabaseName(),
is("sharding_db"));
+ assertThat(((DatabaseLockReleasedEvent)
deleteGovernanceEvent.get()).getLockDefinition().getDatabaseName(),
is("sharding_db"));
DataChangedEvent updateDataChangedEvent = new
DataChangedEvent(eventKey, "127.0.0.1@3307", DataChangedEvent.Type.UPDATED);
Optional<GovernanceEvent> updateGovernanceEvent =
watcher.createGovernanceEvent(updateDataChangedEvent);
assertFalse(updateGovernanceEvent.isPresent());
@@ -83,13 +83,13 @@ public final class DatabaseLockChangedWatcherTest {
Optional<GovernanceEvent> addGovernanceEvent =
watcher.createGovernanceEvent(addDataChangedEvent);
assertTrue(addGovernanceEvent.isPresent());
assertThat(addGovernanceEvent.get(),
instanceOf(DatabaseAckLockedEvent.class));
- assertThat(((DatabaseAckLockedEvent)
addGovernanceEvent.get()).getLockNameDefinition().getDatabaseName(),
is("sharding_db"));
+ assertThat(((DatabaseAckLockedEvent)
addGovernanceEvent.get()).getLockDefinition().getDatabaseName(),
is("sharding_db"));
assertThat(((DatabaseAckLockedEvent)
addGovernanceEvent.get()).getLockedInstance(), is("127.0.0.1@3307"));
DataChangedEvent deleteDataChangedEvent = new
DataChangedEvent(eventKey, "127.0.0.1@3307", DataChangedEvent.Type.DELETED);
Optional<GovernanceEvent> deleteGovernanceEvent =
watcher.createGovernanceEvent(deleteDataChangedEvent);
assertTrue(deleteGovernanceEvent.isPresent());
assertThat(deleteGovernanceEvent.get(),
instanceOf(DatabaseAckLockReleasedEvent.class));
- assertThat(((DatabaseAckLockReleasedEvent)
deleteGovernanceEvent.get()).getLockNameDefinition().getDatabaseName(),
is("sharding_db"));
+ assertThat(((DatabaseAckLockReleasedEvent)
deleteGovernanceEvent.get()).getLockDefinition().getDatabaseName(),
is("sharding_db"));
assertThat(((DatabaseAckLockReleasedEvent)
deleteGovernanceEvent.get()).getLockedInstance(), is("127.0.0.1@3307"));
DataChangedEvent updateDataChangedEvent = new
DataChangedEvent(eventKey, "127.0.0.1@3307", DataChangedEvent.Type.UPDATED);
Optional<GovernanceEvent> updateGovernanceEvent =
watcher.createGovernanceEvent(updateDataChangedEvent);
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/manager/ShardingSphereDistributedGlobalLockManagerTest.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/manager/ShardingSphereDistributedLockManagerTest.java
similarity index 80%
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/manager/ShardingSphereDistributedGlobalLockManagerTest.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/manager/ShardingSphereDistributedLockManagerTest.java
index 7ad57808706..b914fd3614b 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/manager/ShardingSphereDistributedGlobalLockManagerTest.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/manager/ShardingSphereDistributedLockManagerTest.java
@@ -17,12 +17,11 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager;
+import org.apache.shardingsphere.mode.lock.manager.state.LockStateContext;
+import org.apache.shardingsphere.mode.lock.util.TimeoutMilliseconds;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.database.ShardingSphereDistributedDatabaseLock;
import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.distributed.ShardingSphereDistributedGlobalLock;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.manager.state.ShardingSphereLockStateContext;
-import
org.apache.shardingsphere.mode.manager.cluster.coordinator.lock.util.TimeoutMilliseconds;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockDefinition;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockNameDefinition;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
import org.junit.Before;
import org.junit.Test;
@@ -34,13 +33,13 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class ShardingSphereDistributedGlobalLockManagerTest {
+public final class ShardingSphereDistributedLockManagerTest {
private final ShardingSphereDistributedLockManager
shardingSphereDistributedLockManager = new
ShardingSphereDistributedLockManager();
@Before
public void init() throws ReflectiveOperationException {
- ShardingSphereLockStateContext lockStateContext = new
ShardingSphereLockStateContext();
+ LockStateContext lockStateContext = new LockStateContext();
Field lockStateContextField =
shardingSphereDistributedLockManager.getClass().getDeclaredField("lockStateContext");
lockStateContextField.setAccessible(true);
lockStateContextField.set(shardingSphereDistributedLockManager,
lockStateContext);
@@ -62,16 +61,16 @@ public final class
ShardingSphereDistributedGlobalLockManagerTest {
@Test
public void assertTryReadLock() {
- assertTrue(shardingSphereDistributedLockManager.tryLock(new
DatabaseLockDefinition(new DatabaseLockNameDefinition("databaseName")), 3000L));
+ assertTrue(shardingSphereDistributedLockManager.tryLock(new
DatabaseLockDefinition("databaseName"), 3000L));
}
@Test
public void assertReleaseLock() {
- shardingSphereDistributedLockManager.releaseLock(new
DatabaseLockDefinition(new DatabaseLockNameDefinition("databaseName")));
+ shardingSphereDistributedLockManager.releaseLock(new
DatabaseLockDefinition("databaseName"));
}
@Test
public void assertIsLocked() {
- assertFalse(shardingSphereDistributedLockManager.isLocked(new
DatabaseLockDefinition(new DatabaseLockNameDefinition("databaseName"))));
+ assertFalse(shardingSphereDistributedLockManager.isLocked(new
DatabaseLockDefinition("databaseName")));
}
}
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/service/MutexLockRegistryServiceTest.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/service/ClusterLockPersistServiceTest.java
similarity index 76%
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/service/MutexLockRegistryServiceTest.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/service/ClusterLockPersistServiceTest.java
index 107489b7e78..400dd945a9b 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/service/MutexLockRegistryServiceTest.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/service/ClusterLockPersistServiceTest.java
@@ -30,36 +30,36 @@ import java.lang.reflect.Field;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
-public final class MutexLockRegistryServiceTest {
+public final class ClusterLockPersistServiceTest {
@Mock
private ClusterPersistRepository clusterPersistRepository;
- private LockRegistryService lockRegistryService;
+ private ClusterLockPersistService clusterLockPersistService;
@Before
public void setUp() throws ReflectiveOperationException {
- lockRegistryService = new
MutexLockRegistryService(clusterPersistRepository);
- Field field =
lockRegistryService.getClass().getDeclaredField("repository");
+ clusterLockPersistService = new
ClusterLockPersistService(clusterPersistRepository);
+ Field field =
clusterLockPersistService.getClass().getDeclaredField("repository");
field.setAccessible(true);
- field.set(lockRegistryService, clusterPersistRepository);
+ field.set(clusterLockPersistService, clusterPersistRepository);
}
@Test
- public void assertRemoveLock() {
- lockRegistryService.removeLock("test");
+ public void assertUnLock() {
+ clusterLockPersistService.unLock("test");
verify(clusterPersistRepository).delete(LockNodeUtil.generateLockLeasesNodePath("test"));
}
@Test
public void assertAckLock() {
- lockRegistryService.ackLock("databaseAckLock", "127.0.0.1@3307");
+ clusterLockPersistService.ackLock("databaseAckLock", "127.0.0.1@3307");
verify(clusterPersistRepository).persistEphemeral("databaseAckLock",
"127.0.0.1@3307");
}
@Test
public void assertReleaseAckLock() {
- lockRegistryService.releaseAckLock("databaseAckLock");
+ clusterLockPersistService.releaseAckLock("databaseAckLock");
verify(clusterPersistRepository).delete("databaseAckLock");
}
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphe
[...]
index 74101926b0a..49feea27551 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java
@@ -37,7 +37,7 @@ import java.util.concurrent.locks.Lock;
*/
@RequiredArgsConstructor
@Slf4j
-public class EtcdInternalLockHolder {
+public final class EtcdInternalLockHolder {
private final Map<String, EtcdInternalLock> locks = new
ConcurrentHashMap<>();
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperInternalLockHolder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repositor
[...]
index 91186495e88..a4dd8a04d7f 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperInternalLockHolder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperInternalLockHolder.java
@@ -35,7 +35,7 @@ import java.util.concurrent.locks.Lock;
* Zookeeper internal lock holder.
*/
@RequiredArgsConstructor
-public class ZookeeperInternalLockHolder {
+public final class ZookeeperInternalLockHolder {
private final Map<String, ZookeeperInternalLock> locks = new
LinkedHashMap<>();
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 9b47685e075..224b60a8969 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
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.mode.manager.standalone.lock;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
-import org.apache.shardingsphere.mode.manager.lock.AbstractLockContext;
-import
org.apache.shardingsphere.mode.manager.lock.definition.DatabaseLockDefinition;
+import org.apache.shardingsphere.mode.lock.AbstractLockContext;
+import org.apache.shardingsphere.mode.lock.definition.DatabaseLockDefinition;
/**
* Standalone lock context.
@@ -35,21 +35,21 @@ public final class StandaloneLockContext extends
AbstractLockContext {
@Override
protected boolean tryLock(final DatabaseLockDefinition lockDefinition) {
- return
standaloneLock.tryLock(lockDefinition.getLockNameDefinition().getDatabaseName());
+ return standaloneLock.tryLock(lockDefinition.getDatabaseName());
}
@Override
protected boolean tryLock(final DatabaseLockDefinition lockDefinition,
final long timeoutMilliseconds) {
- return
standaloneLock.tryLock(lockDefinition.getLockNameDefinition().getDatabaseName(),
timeoutMilliseconds);
+ return standaloneLock.tryLock(lockDefinition.getDatabaseName(),
timeoutMilliseconds);
}
@Override
- protected void releaseLock(final DatabaseLockDefinition lockDefinition) {
-
standaloneLock.releaseLock(lockDefinition.getLockNameDefinition().getDatabaseName());
+ protected void unLock(final DatabaseLockDefinition lockDefinition) {
+ standaloneLock.releaseLock(lockDefinition.getDatabaseName());
}
@Override
protected boolean isLocked(final DatabaseLockDefinition lockDefinition) {
- return
standaloneLock.isLocked(lockDefinition.getLockNameDefinition().getDatabaseName());
+ return standaloneLock.isLocked(lockDefinition.getDatabaseName());
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
index 6a503a782a6..d6c2fa06ec8 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
@@ -42,8 +42,8 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.event.MetaDataRe
import
org.apache.shardingsphere.infra.metadata.database.schema.util.SystemSchemaUtil;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import
org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRule;
-import org.apache.shardingsphere.mode.manager.lock.LockJudgeEngine;
-import org.apache.shardingsphere.mode.manager.lock.LockJudgeEngineFactory;
+import org.apache.shardingsphere.mode.lock.engine.LockJudgeEngine;
+import org.apache.shardingsphere.mode.lock.engine.LockJudgeEngineFactory;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.exception.RuleNotExistedException;
import
org.apache.shardingsphere.proxy.backend.exception.UnsupportedUpdateOperationException;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
index 6bb7d039997..df19612ff8b 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactory.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement;
import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement;
import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement;
import org.apache.shardingsphere.infra.lock.LockContext;
-import
org.apache.shardingsphere.mode.manager.lock.definition.LockDefinitionFactory;
+import org.apache.shardingsphere.mode.lock.definition.LockDefinitionFactory;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.exception.UnsupportedUpdateOperationException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
