You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/10/28 11:45:22 UTC
[shardingsphere] branch master updated: Rename ZookeeperDistributedLock to CuratorZookeeperDistributedLock (#21831)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 7920508a632 Rename ZookeeperDistributedLock to CuratorZookeeperDistributedLock (#21831)
7920508a632 is described below
commit 7920508a632c9612811598344eca742e1c7a791b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Oct 28 19:45:15 2022 +0800
Rename ZookeeperDistributedLock to CuratorZookeeperDistributedLock (#21831)
---
.../cluster/zookeeper/CuratorZookeeperRepository.java | 4 ++--
...stributedLock.java => CuratorZookeeperDistributedLock.java} | 4 ++--
...vider.java => CuratorZookeeperDistributedLockProvider.java} | 10 +++++-----
.../cluster/zookeeper/CuratorZookeeperRepositoryTest.java | 10 +++++-----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java b/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
index 8aaed02aee6..ae49aec656e 100644
--- a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
+++ b/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
@@ -42,7 +42,7 @@ import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEve
import org.apache.shardingsphere.mode.repository.cluster.lock.DistributedLockProvider;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.CuratorZookeeperExceptionHandler;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.listener.SessionConnectionListener;
-import org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.ZookeeperDistributedLockProvider;
+import org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.CuratorZookeeperDistributedLockProvider;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperProperties;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperPropertyKey;
import org.apache.zookeeper.CreateMode;
@@ -82,7 +82,7 @@ public final class CuratorZookeeperRepository implements ClusterPersistRepositor
this.instanceMetaData = instanceMetaData;
ZookeeperProperties zookeeperProps = new ZookeeperProperties(config.getProps());
client = buildCuratorClient(config, zookeeperProps);
- distributedLockProvider = new ZookeeperDistributedLockProvider(client);
+ distributedLockProvider = new CuratorZookeeperDistributedLockProvider(client);
initCuratorClient(zookeeperProps);
}
diff --git a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLock.java b/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLock.java
similarity index 94%
rename from mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLock.java
rename to mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLock.java
index 4f22345ccc9..280e9ad3372 100644
--- a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLock.java
+++ b/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLock.java
@@ -25,10 +25,10 @@ import org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.Curat
import java.util.concurrent.TimeUnit;
/**
- * Zookeeper distributed lock.
+ * Curator ZooKeeper distributed lock.
*/
@RequiredArgsConstructor
-public final class ZookeeperDistributedLock implements DistributedLock {
+public final class CuratorZookeeperDistributedLock implements DistributedLock {
private final InterProcessLock lock;
diff --git a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLockProvider.java b/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLockProvider.java
similarity index 79%
rename from mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLockProvider.java
rename to mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLockProvider.java
index 131c9920a17..ccd4e2c7638 100644
--- a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperDistributedLockProvider.java
+++ b/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/CuratorZookeeperDistributedLockProvider.java
@@ -28,20 +28,20 @@ import java.util.Map;
import java.util.Objects;
/**
- * Zookeeper distributed lock provider.
+ * Curator ZooKeeper distributed lock provider.
*/
@RequiredArgsConstructor
-public final class ZookeeperDistributedLockProvider implements DistributedLockProvider {
+public final class CuratorZookeeperDistributedLockProvider implements DistributedLockProvider {
- private final Map<String, ZookeeperDistributedLock> locks = new LinkedHashMap<>();
+ private final Map<String, CuratorZookeeperDistributedLock> locks = new LinkedHashMap<>();
private final CuratorFramework client;
@Override
public synchronized DistributedLock getDistributedLock(final String lockKey) {
- ZookeeperDistributedLock result = locks.get(lockKey);
+ CuratorZookeeperDistributedLock result = locks.get(lockKey);
if (Objects.isNull(result)) {
- result = new ZookeeperDistributedLock(new InterProcessMutex(client, lockKey));
+ result = new CuratorZookeeperDistributedLock(new InterProcessMutex(client, lockKey));
locks.put(lockKey, result);
}
return result;
diff --git a/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepositoryTest.java b/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepositoryTest.java
index a007c9bb24e..030fca8c998 100644
--- a/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepositoryTest.java
+++ b/mode/type/cluster/repository/provider/zookeeper-curator/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepositoryTest.java
@@ -39,8 +39,8 @@ import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMeta
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.ZookeeperDistributedLock;
-import org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.ZookeeperDistributedLockProvider;
+import org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.CuratorZookeeperDistributedLock;
+import org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.CuratorZookeeperDistributedLockProvider;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.props.ZookeeperPropertyKey;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.data.Stat;
@@ -146,10 +146,10 @@ public final class CuratorZookeeperRepositoryTest {
private void mockInternalLockHolder() {
Field internalLockProviderFiled = CuratorZookeeperRepository.class.getDeclaredField("distributedLockProvider");
internalLockProviderFiled.setAccessible(true);
- ZookeeperDistributedLockProvider distributedLockProvider = new ZookeeperDistributedLockProvider(client);
- Field locksFiled = ZookeeperDistributedLockProvider.class.getDeclaredField("locks");
+ CuratorZookeeperDistributedLockProvider distributedLockProvider = new CuratorZookeeperDistributedLockProvider(client);
+ Field locksFiled = CuratorZookeeperDistributedLockProvider.class.getDeclaredField("locks");
locksFiled.setAccessible(true);
- locksFiled.set(distributedLockProvider, Collections.singletonMap("/locks/glock", new ZookeeperDistributedLock(interProcessLock)));
+ locksFiled.set(distributedLockProvider, Collections.singletonMap("/locks/glock", new CuratorZookeeperDistributedLock(interProcessLock)));
internalLockProviderFiled.set(REPOSITORY, distributedLockProvider);
}