This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 81a5ad855e0 Move GlobalLockPersistService (#35060)
81a5ad855e0 is described below
commit 81a5ad855e01ef3a38cf1b518190fb0915b36a7f
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Mar 23 11:33:13 2025 +0800
Move GlobalLockPersistService (#35060)
* Move GlobalLockPersistService
* Move GlobalLockPersistService
---
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 2 +-
.../mode/manager/cluster/lock/ClusterLockContext.java | 1 +
.../mode/manager/cluster/lock/global/GlobalLockDefinition.java | 6 +-----
.../manager/cluster/lock/{ => global}/GlobalLockPersistService.java | 3 +--
.../mode/manager/cluster/lock/ClusterLockContextTest.java | 1 +
.../cluster/lock/{ => global}/GlobalLockPersistServiceTest.java | 4 +---
6 files changed, 6 insertions(+), 11 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 33679594d8d..15a5594a31d 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.mode.manager.builder.ContextManagerBuilderParam
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.DataChangedEventListenerRegistry;
import
org.apache.shardingsphere.mode.manager.cluster.exception.MissingRequiredClusterRepositoryConfigurationException;
import org.apache.shardingsphere.mode.manager.cluster.lock.ClusterLockContext;
-import
org.apache.shardingsphere.mode.manager.cluster.lock.GlobalLockPersistService;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockPersistService;
import
org.apache.shardingsphere.mode.manager.cluster.persist.facade.ClusterPersistServiceFacade;
import
org.apache.shardingsphere.mode.manager.cluster.workerid.ClusterWorkerIdGenerator;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
index 35eb228ab18..891847584aa 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
@@ -21,6 +21,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.lock.LockContext;
import org.apache.shardingsphere.mode.lock.LockDefinition;
import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockPersistService;
/**
* Cluster lock context.
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockDefinition.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockDefinition.java
index 2d8d0acd75a..a255be96922 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockDefinition.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockDefinition.java
@@ -32,11 +32,7 @@ public final class GlobalLockDefinition implements
LockDefinition {
nodePath = new GlobalLockNodePath(globalLock.getName());
}
- /**
- * Get lock key.
- *
- * @return lock key
- */
+ @Override
public String getLockKey() {
return NodePathGenerator.toPath(nodePath);
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistService.java
similarity index 92%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistService.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistService.java
index 71dcd746257..586a408a591 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistService.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.lock;
+package org.apache.shardingsphere.mode.manager.cluster.lock.global;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
/**
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContextTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContextTest.java
index f9bc9ee7301..0dd01ad8c4b 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContextTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContextTest.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.mode.manager.cluster.lock;
import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
+import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockPersistService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistServiceTest.java
similarity index 90%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistServiceTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistServiceTest.java
index 734c9151b0e..5bb2ca50124 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/GlobalLockPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistServiceTest.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.lock;
+package org.apache.shardingsphere.mode.manager.cluster.lock.global;
-import org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLock;
-import
org.apache.shardingsphere.mode.manager.cluster.lock.global.GlobalLockDefinition;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
