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 709d72b1cbf Move back DistributedLockHolder to
cluster-mode-repository-core module (#35117)
709d72b1cbf is described below
commit 709d72b1cbfe6bdc49edf1b01994381e85ac34bd
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Mar 31 18:23:06 2025 +0800
Move back DistributedLockHolder to cluster-mode-repository-core module
(#35117)
---
.../mode/manager/cluster/lock/global/GlobalLockPersistService.java | 2 +-
.../mode/repository/cluster/core}/lock/DistributedLockHolder.java | 6 +++---
.../cluster/core/lock/{ => type}/DefaultDistributedLock.java | 6 +++---
.../cluster/core/lock/{ => type}/props/DefaultLockPropertyKey.java | 2 +-
.../core/lock/{ => type}/props/DefaultLockTypedProperties.java | 2 +-
.../cluster/core/lock/{ => type}/DefaultDistributedLockTest.java | 6 +++---
.../core/lock/{ => type}/props/DefaultLockTypedPropertiesTest.java | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistService.java
index d4ab4810ca2..41b8ea1902c 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/global/GlobalLockPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.cluster.lock.global;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.mode.manager.cluster.lock.DistributedLockHolder;
+import
org.apache.shardingsphere.mode.repository.cluster.core.lock.DistributedLockHolder;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
/**
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/DistributedLockHolder.java
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DistributedLockHolder.java
similarity index 93%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/DistributedLockHolder.java
rename to
mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DistributedLockHolder.java
index 2de04214652..4115a6aeeca 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/DistributedLockHolder.java
+++
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DistributedLockHolder.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.lock;
+package org.apache.shardingsphere.mode.repository.cluster.core.lock;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import
org.apache.shardingsphere.mode.repository.cluster.core.lock.DefaultDistributedLock;
-import
org.apache.shardingsphere.mode.repository.cluster.core.lock.props.DefaultLockTypedProperties;
+import
org.apache.shardingsphere.mode.repository.cluster.core.lock.type.DefaultDistributedLock;
+import
org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props.DefaultLockTypedProperties;
import org.apache.shardingsphere.mode.repository.cluster.lock.DistributedLock;
import java.util.Map;
diff --git
a/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DefaultDistributedLock.java
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLock.java
similarity index 97%
rename from
mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DefaultDistributedLock.java
rename to
mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLock.java
index 539b7d1cb47..4ee12cc12a4 100644
---
a/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DefaultDistributedLock.java
+++
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLock.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.repository.cluster.core.lock;
+package org.apache.shardingsphere.mode.repository.cluster.core.lock.type;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.retry.RetryExecutor;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.lock.DistributedLock;
-import
org.apache.shardingsphere.mode.repository.cluster.core.lock.props.DefaultLockPropertyKey;
-import
org.apache.shardingsphere.mode.repository.cluster.core.lock.props.DefaultLockTypedProperties;
+import
org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props.DefaultLockPropertyKey;
+import
org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props.DefaultLockTypedProperties;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git
a/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockPropertyKey.java
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockPropertyKey.java
similarity index 98%
rename from
mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockPropertyKey.java
rename to
mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockPropertyKey.java
index 3c4044db854..859fa661015 100644
---
a/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockPropertyKey.java
+++
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockPropertyKey.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.repository.cluster.core.lock.props;
+package org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockTypedProperties.java
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockTypedProperties.java
similarity index 98%
rename from
mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockTypedProperties.java
rename to
mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockTypedProperties.java
index 43cf5c5fb3b..d905d5cbdd8 100644
---
a/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockTypedProperties.java
+++
b/mode/type/cluster/repository/core/src/main/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockTypedProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.repository.cluster.core.lock.props;
+package org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props;
import org.apache.shardingsphere.infra.props.TypedProperties;
diff --git
a/mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DefaultDistributedLockTest.java
b/mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLockTest.java
similarity index 97%
rename from
mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DefaultDistributedLockTest.java
rename to
mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLockTest.java
index 80a2a71300a..15b401d0803 100644
---
a/mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/DefaultDistributedLockTest.java
+++
b/mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/DefaultDistributedLockTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.repository.cluster.core.lock;
+package org.apache.shardingsphere.mode.repository.cluster.core.lock.type;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import
org.apache.shardingsphere.mode.repository.cluster.core.lock.props.DefaultLockPropertyKey;
-import
org.apache.shardingsphere.mode.repository.cluster.core.lock.props.DefaultLockTypedProperties;
+import
org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props.DefaultLockPropertyKey;
+import
org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props.DefaultLockTypedProperties;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockTypedPropertiesTest.java
b/mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockTypedPropertiesTest.java
similarity index 99%
rename from
mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockTypedPropertiesTest.java
rename to
mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockTypedPropertiesTest.java
index ac29835497f..acb4b15f961 100644
---
a/mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/props/DefaultLockTypedPropertiesTest.java
+++
b/mode/type/cluster/repository/core/src/test/java/org/apache/shardingsphere/mode/repository/cluster/core/lock/type/props/DefaultLockTypedPropertiesTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.repository.cluster.core.lock.props;
+package org.apache.shardingsphere.mode.repository.cluster.core.lock.type.props;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
