You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/10/29 09:34:48 UTC
[shardingsphere] branch master updated: Remove useless code (#21841)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 285027512b9 Remove useless code (#21841)
285027512b9 is described below
commit 285027512b978297eca12c41d0da56aa75ccc868
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Sat Oct 29 17:34:41 2022 +0800
Remove useless code (#21841)
* Remove useless code
* Remove unless code
* Fixed
* Fix unit test
* Fix checkstyle
* Fix checkstyle
---
.../fixture/FixtureClusterPersistRepository.java | 40 +-------
.../core/api/impl/GovernanceRepositoryAPIImpl.java | 2 +-
.../mode/persist/PersistRepository.java | 10 --
.../registry/GovernanceWatcherFactory.java | 2 +-
.../fixture/ClusterPersistRepositoryFixture.java | 40 +-------
...ProcessListClusterPersistRepositoryFixture.java | 40 +-------
.../cluster/ClusterPersistRepository.java | 58 +----------
.../cluster/consul/ConsulRepository.java | 45 +--------
.../cluster/consul/ConsulRepositoryTest.java | 4 +-
.../repository/cluster/etcd/EtcdRepository.java | 45 +--------
.../cluster/etcd/EtcdRepositoryTest.java | 6 +-
.../repository/cluster/nacos/NacosRepository.java | 45 +--------
.../cluster/nacos/NacosRepositoryTest.java | 6 +-
.../zookeeper/CuratorZookeeperRepository.java | 106 +--------------------
.../zookeeper/CuratorZookeeperRepositoryTest.java | 22 +----
.../StandalonePersistRepositoryFixture.java | 5 -
.../repository/standalone/jdbc/JDBCRepository.java | 6 --
.../fixture/ClusterPersistRepositoryFixture.java | 40 +-------
.../fixture/TestClusterPersistRepository.java | 40 +-------
19 files changed, 24 insertions(+), 538 deletions(-)
diff --git a/jdbc/spring/core/spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java b/jdbc/spring/core/spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
index fc52507236e..76188a2b84c 100644
--- a/jdbc/spring/core/spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
+++ b/jdbc/spring/core/spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
@@ -27,7 +27,6 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Executor;
public final class FixtureClusterPersistRepository implements ClusterPersistRepository {
@@ -38,33 +37,6 @@ public final class FixtureClusterPersistRepository implements ClusterPersistRepo
registryData.put("/metadata", DefaultDatabase.LOGIC_NAME);
}
- @Override
- public int getNumChildren(final String key) {
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- return null;
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- }
-
- @Override
- public String get(final String key) {
- return null;
- }
-
@Override
public String getDirectly(final String key) {
return registryData.get(key);
@@ -103,17 +75,7 @@ public final class FixtureClusterPersistRepository implements ClusterPersistRepo
}
@Override
- public long getRegistryCenterTime(final String key) {
- return 0;
- }
-
- @Override
- public Object getRawClient() {
- return null;
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener listener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/GovernanceRepositoryAPIImpl.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/GovernanceRepositoryAPIImpl.java
index 7e6de96f919..b34774e04d2 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/GovernanceRepositoryAPIImpl.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/GovernanceRepositoryAPIImpl.java
@@ -131,7 +131,7 @@ public final class GovernanceRepositoryAPIImpl implements GovernanceRepositoryAP
@Override
public void watch(final String key, final DataChangedEventListener listener) {
- repository.watch(key, listener, null);
+ repository.watch(key, listener);
}
@Override
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistRepository.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistRepository.java
index 76e31f226cc..b0a8c8f84c6 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistRepository.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistRepository.java
@@ -31,16 +31,6 @@ public interface PersistRepository extends TypedSPI {
*/
String PATH_SEPARATOR = "/";
- /**
- * Get data from registry center.
- *
- * <p>Maybe use cache if existed.</p>
- *
- * @param key key of data
- * @return value of data
- */
- String get(String key);
-
/**
* Get value from registry center directly.
*
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/GovernanceWatcherFactory.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/GovernanceWatcherFactory.java
index 463915a9f16..01f5c6f3991 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/GovernanceWatcherFactory.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/GovernanceWatcherFactory.java
@@ -58,6 +58,6 @@ public final class GovernanceWatcherFactory {
if (listener.getWatchingTypes().contains(dataChangedEventListener.getType())) {
listener.createGovernanceEvent(dataChangedEventListener).ifPresent(eventBusContext::post);
}
- }, null);
+ });
}
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
index ce38fcd3c17..d8899a6843d 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
@@ -24,7 +24,6 @@ import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEve
import java.util.Collections;
import java.util.List;
-import java.util.concurrent.Executor;
public final class ClusterPersistRepositoryFixture implements ClusterPersistRepository {
@@ -32,33 +31,6 @@ public final class ClusterPersistRepositoryFixture implements ClusterPersistRepo
public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
}
- @Override
- public int getNumChildren(final String key) {
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- return null;
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- }
-
- @Override
- public String get(final String key) {
- return null;
- }
-
@Override
public String getDirectly(final String key) {
return "";
@@ -94,16 +66,6 @@ public final class ClusterPersistRepositoryFixture implements ClusterPersistRepo
public void delete(final String key) {
}
- @Override
- public long getRegistryCenterTime(final String key) {
- return 0;
- }
-
- @Override
- public Object getRawClient() {
- return null;
- }
-
@Override
public boolean tryLock(final String lockKey, final long timeoutMillis) {
return false;
@@ -114,7 +76,7 @@ public final class ClusterPersistRepositoryFixture implements ClusterPersistRepo
}
@Override
- public void watch(final String key, final DataChangedEventListener listener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
index 69004bf3a3b..ad9b6a21b18 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
@@ -26,7 +26,6 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Executor;
public final class ProcessListClusterPersistRepositoryFixture implements ClusterPersistRepository {
@@ -36,33 +35,6 @@ public final class ProcessListClusterPersistRepositoryFixture implements Cluster
public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
}
- @Override
- public int getNumChildren(final String key) {
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- return null;
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- }
-
- @Override
- public String get(final String key) {
- return null;
- }
-
@Override
public String getDirectly(final String key) {
return REGISTRY_DATA.get(key);
@@ -101,16 +73,6 @@ public final class ProcessListClusterPersistRepositoryFixture implements Cluster
REGISTRY_DATA.remove(key);
}
- @Override
- public long getRegistryCenterTime(final String key) {
- return 0;
- }
-
- @Override
- public Object getRawClient() {
- return null;
- }
-
@Override
public boolean tryLock(final String lockKey, final long timeoutMillis) {
return false;
@@ -121,7 +83,7 @@ public final class ProcessListClusterPersistRepositoryFixture implements Cluster
}
@Override
- public void watch(final String key, final DataChangedEventListener listener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override
diff --git a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
index 686371b6938..24fd2ce64e1 100644
--- a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
+++ b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
@@ -21,8 +21,6 @@ import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import java.util.concurrent.Executor;
-
/**
* Cluster persist repository.
*/
@@ -36,59 +34,6 @@ public interface ClusterPersistRepository extends PersistRepository {
*/
void init(ClusterPersistRepositoryConfiguration config, InstanceMetaData instanceMetaData);
- /**
- * Get current time from registry center.
- *
- * @param key key
- * @return current time from registry center
- */
- long getRegistryCenterTime(String key);
-
- /**
- * Get raw client for registry center client.
- **
- * @return registry center raw client
- */
- Object getRawClient();
-
- /**
- * Get children number.
- *
- * @param key key
- * @return children number
- */
- int getNumChildren(String key);
-
- /**
- * Add data to cache.
- *
- * @param cachePath cache path
- */
- void addCacheData(String cachePath);
-
- /**
- * Evict data from cache.
- *
- * @param cachePath cache path
- */
- void evictCacheData(String cachePath);
-
- /**
- * Get raw cache object of registry center.
- *
- * @param cachePath cache path
- * @return raw cache object of registry center
- */
- Object getRawCache(String cachePath);
-
- /**
- * Update data in transaction.
- *
- * @param key key
- * @param value value
- */
- void updateInTransaction(String key, String value);
-
/**
* Persist ephemeral data.
*
@@ -126,7 +71,6 @@ public interface ClusterPersistRepository extends PersistRepository {
*
* @param key key of data
* @param listener data changed event listener
- * @param executor event notify executor
*/
- void watch(String key, DataChangedEventListener listener, Executor executor);
+ void watch(String key, DataChangedEventListener listener);
}
diff --git a/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java b/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java
index 0708a23169c..6aa7bbcab4f 100644
--- a/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java
+++ b/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java
@@ -39,7 +39,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -63,38 +62,6 @@ public class ConsulRepository implements ClusterPersistRepository {
watchKeyMap = new HashMap<>(6, 1);
}
- @Override
- public int getNumChildren(final String key) {
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- // TODO
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- // TODO
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- // TODO
- return null;
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- // TODO
- }
-
- @Override
- public String get(final String key) {
- // TODO
- return null;
- }
-
@Override
public String getDirectly(final String key) {
Response<GetValue> response = consulClient.getKVValue(key);
@@ -127,16 +94,6 @@ public class ConsulRepository implements ClusterPersistRepository {
consulClient.deleteKVValue(key);
}
- @Override
- public long getRegistryCenterTime(final String key) {
- return 0;
- }
-
- @Override
- public Object getRawClient() {
- return consulClient;
- }
-
@Override
public void close() {
// TODO
@@ -176,7 +133,7 @@ public class ConsulRepository implements ClusterPersistRepository {
}
@Override
- public void watch(final String key, final DataChangedEventListener listener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener listener) {
Thread watchThread = new Thread(() -> watchChildKeyChangeEvent(key, listener));
watchThread.setDaemon(true);
watchThread.start();
diff --git a/mode/type/cluster/repository/provider/consul/src/test/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepositoryTest.java b/mode/type/cluster/repository/provider/consul/src/test/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepositoryTest.java
index abd8c26fc1a..ba734a2e14f 100644
--- a/mode/type/cluster/repository/provider/consul/src/test/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepositoryTest.java
+++ b/mode/type/cluster/repository/provider/consul/src/test/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepositoryTest.java
@@ -155,7 +155,7 @@ public final class ConsulRepositoryTest {
getValue1.setValue(v1);
when(responseGetValueList.getValue()).thenReturn(Collections.singletonList(getValue1));
repository.watch(key, event -> {
- }, null);
+ });
client.setKVValue(k1, "value1-1");
verify(client, atLeastOnce()).getKVValues(any(String.class), any(QueryParams.class));
Thread.sleep(10000L);
@@ -176,7 +176,7 @@ public final class ConsulRepositoryTest {
getValue1.setValue(v1);
when(responseGetValueList.getValue()).thenReturn(Collections.singletonList(getValue1));
repository.watch(key, event -> {
- }, null);
+ });
client.deleteKVValue(k2);
verify(client, atLeastOnce()).getKVValues(any(String.class), any(QueryParams.class));
Thread.sleep(10000L);
diff --git a/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java b/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
index a5a9229e3a6..e49a6043616 100644
--- a/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
+++ b/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
@@ -46,7 +46,6 @@ import org.apache.shardingsphere.mode.repository.cluster.lock.DistributedLockPro
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
import java.util.stream.Collectors;
/**
@@ -70,38 +69,6 @@ public final class EtcdRepository implements ClusterPersistRepository {
distributedLockHolder = new EtcdDistributedLockProvider(client, etcdProps);
}
- @Override
- public int getNumChildren(final String key) {
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- // TODO
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- // TODO
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- // TODO
- return null;
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- // TODO
- }
-
- @Override
- public String get(final String key) {
- // TODO
- return null;
- }
-
@SneakyThrows({InterruptedException.class, ExecutionException.class})
@Override
public String getDirectly(final String key) {
@@ -176,17 +143,7 @@ public final class EtcdRepository implements ClusterPersistRepository {
}
@Override
- public long getRegistryCenterTime(final String key) {
- return 0;
- }
-
- @Override
- public Object getRawClient() {
- return client;
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener dataChangedEventListener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener dataChangedEventListener) {
Watch.Listener listener = Watch.listener(response -> {
for (WatchEvent each : response.getEvents()) {
Type type = getEventChangedType(each);
diff --git a/mode/type/cluster/repository/provider/etcd/src/test/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepositoryTest.java b/mode/type/cluster/repository/provider/etcd/src/test/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepositoryTest.java
index 46f7436e05f..d89878bd934 100644
--- a/mode/type/cluster/repository/provider/etcd/src/test/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepositoryTest.java
+++ b/mode/type/cluster/repository/provider/etcd/src/test/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepositoryTest.java
@@ -173,7 +173,7 @@ public final class EtcdRepositoryTest {
return mock(Watch.Watcher.class);
}).when(watch).watch(any(ByteSequence.class), any(WatchOption.class), any(Watch.Listener.class));
repository.watch("key1", event -> {
- }, null);
+ });
verify(watch).watch(any(ByteSequence.class), any(WatchOption.class), any(Watch.Listener.class));
}
@@ -185,7 +185,7 @@ public final class EtcdRepositoryTest {
return mock(Watch.Watcher.class);
}).when(watch).watch(any(ByteSequence.class), any(WatchOption.class), any(Watch.Listener.class));
repository.watch("key1", event -> {
- }, null);
+ });
verify(watch).watch(any(ByteSequence.class), any(WatchOption.class), any(Watch.Listener.class));
}
@@ -197,7 +197,7 @@ public final class EtcdRepositoryTest {
return mock(Watch.Watcher.class);
}).when(watch).watch(any(ByteSequence.class), any(WatchOption.class), any(Watch.Listener.class));
repository.watch("key1", event -> {
- }, null);
+ });
verify(watch).watch(any(ByteSequence.class), any(WatchOption.class), any(Watch.Listener.class));
}
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
index e9884e005d9..24b514cd787 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
@@ -52,7 +52,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.Random;
-import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -75,32 +74,6 @@ public final class NacosRepository implements ClusterPersistRepository {
initServiceMetadata();
}
- @Override
- public int getNumChildren(final String key) {
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- // TODO
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- // TODO
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- // TODO
- return null;
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- // TODO
- }
-
private NamingService createClient(final ClusterPersistRepositoryConfiguration config) {
Properties props = new Properties();
props.setProperty("serverAddr", config.getServerLists());
@@ -163,7 +136,7 @@ public final class NacosRepository implements ClusterPersistRepository {
}
@Override
- public void watch(final String key, final DataChangedEventListener listener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener listener) {
try {
for (ServiceMetadata each : serviceController.getAllServices()) {
NamingEventListener eventListener = each.getListener();
@@ -181,12 +154,6 @@ public final class NacosRepository implements ClusterPersistRepository {
}
}
- @Override
- public String get(final String key) {
- // TODO
- return null;
- }
-
@Override
public String getDirectly(final String key) {
try {
@@ -341,16 +308,6 @@ public final class NacosRepository implements ClusterPersistRepository {
}
}
- @Override
- public long getRegistryCenterTime(final String key) {
- return 0;
- }
-
- @Override
- public Object getRawClient() {
- return client;
- }
-
private Collection<Instance> findExistedInstance(final String key, final boolean ephemeral) throws NacosException {
return client.getAllInstances(serviceController.getService(ephemeral).getServiceName(), false).stream()
.filter(each -> Objects.equals(key, NacosMetaDataUtil.getKey(each))).collect(Collectors.toList());
diff --git a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
index 68b70971128..1d493d30786 100644
--- a/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
+++ b/mode/type/cluster/repository/provider/nacos/src/test/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepositoryTest.java
@@ -282,7 +282,7 @@ public final class NacosRepositoryTest {
Event event = new NamingEvent(ephemeralService.getServiceName(), Collections.singletonList(instance));
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(null, event))).when(client).subscribe(anyString(), any(EventListener.class));
SettableFuture<DataChangedEvent> settableFuture = SettableFuture.create();
- REPOSITORY.watch(key, settableFuture::set, null);
+ REPOSITORY.watch(key, settableFuture::set);
DataChangedEvent dataChangedEvent = settableFuture.get();
assertThat(dataChangedEvent.getType(), is(DataChangedEvent.Type.ADDED));
assertThat(dataChangedEvent.getKey(), is(key));
@@ -308,7 +308,7 @@ public final class NacosRepositoryTest {
Event event = new NamingEvent(persistentService.getServiceName(), Collections.singletonList(instance));
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(preInstance, event))).when(client).subscribe(anyString(), any(EventListener.class));
SettableFuture<DataChangedEvent> settableFuture = SettableFuture.create();
- REPOSITORY.watch(key, settableFuture::set, null);
+ REPOSITORY.watch(key, settableFuture::set);
DataChangedEvent dataChangedEvent = settableFuture.get();
assertThat(dataChangedEvent.getType(), is(DataChangedEvent.Type.UPDATED));
assertThat(dataChangedEvent.getKey(), is(key));
@@ -325,7 +325,7 @@ public final class NacosRepositoryTest {
Event event = new NamingEvent(persistentService.getServiceName(), Collections.emptyList());
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(preInstance, event))).when(client).subscribe(anyString(), any(EventListener.class));
SettableFuture<DataChangedEvent> settableFuture = SettableFuture.create();
- REPOSITORY.watch(key, settableFuture::set, null);
+ REPOSITORY.watch(key, settableFuture::set);
DataChangedEvent dataChangedEvent = settableFuture.get();
assertThat(dataChangedEvent.getType(), is(DataChangedEvent.Type.DELETED));
assertThat(dataChangedEvent.getKey(), is(key));
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 ae49aec656e..798385a1499 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
@@ -17,14 +17,11 @@
package org.apache.shardingsphere.mode.repository.cluster.zookeeper;
-import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.CuratorFrameworkFactory.Builder;
import org.apache.curator.framework.api.ACLProvider;
-import org.apache.curator.framework.api.transaction.TransactionOp;
-import org.apache.curator.framework.recipes.cache.ChildData;
import org.apache.curator.framework.recipes.cache.CuratorCache;
import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
@@ -50,16 +47,13 @@ import org.apache.zookeeper.KeeperException.NodeExistsException;
import org.apache.zookeeper.KeeperException.OperationTimeoutException;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Stat;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
-import java.util.Optional;
import java.util.List;
import java.util.Map;
import java.util.Comparator;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
/**
@@ -133,78 +127,6 @@ public final class CuratorZookeeperRepository implements ClusterPersistRepositor
}
}
- @Override
- public int getNumChildren(final String key) {
- try {
- Stat stat = client.checkExists().forPath(key);
- if (null != stat) {
- return stat.getNumChildren();
- }
- // CHECKSTYLE:OFF
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
- }
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- CuratorCache cache = CuratorCache.build(client, cachePath);
- try {
- cache.start();
- // CHECKSTYLE:OFF
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
- }
- caches.put(cachePath + "/", cache);
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- CuratorCache cache = caches.remove(cachePath + "/");
- if (null != cache) {
- cache.close();
- }
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- return caches.get(cachePath + "/");
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- try {
- TransactionOp transactionOp = client.transactionOp();
- client.transaction().forOperations(transactionOp.check().forPath(key), transactionOp.setData().forPath(key, value.getBytes(StandardCharsets.UTF_8)));
- // CHECKSTYLE:OFF
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
- }
- }
-
- @Override
- public String get(final String key) {
- CuratorCache cache = findCuratorCache(key);
- if (null == cache) {
- return getDirectly(key);
- }
- Optional<ChildData> resultInCache = cache.get(key);
- return resultInCache.map(v -> null == v.getData() ? null : new String(v.getData(), StandardCharsets.UTF_8)).orElseGet(() -> getDirectly(key));
- }
-
- private CuratorCache findCuratorCache(final String key) {
- for (Map.Entry<String, CuratorCache> entry : caches.entrySet()) {
- if (key.startsWith(entry.getKey())) {
- return entry.getValue();
- }
- }
- return null;
- }
-
@Override
public List<String> getChildrenKeys(final String key) {
try {
@@ -311,27 +233,7 @@ public final class CuratorZookeeperRepository implements ClusterPersistRepositor
}
@Override
- public long getRegistryCenterTime(final String key) {
- long result = 0L;
- try {
- persist(key, "");
- result = client.checkExists().forPath(key).getMtime();
- // CHECKSTYLE:OFF
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- CuratorZookeeperExceptionHandler.handleException(ex);
- }
- Preconditions.checkState(0L != result, "Cannot get registry center time.");
- return result;
- }
-
- @Override
- public Object getRawClient() {
- return client;
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener listener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener listener) {
CuratorCache cache = caches.get(key);
if (null == cache) {
cache = CuratorCache.build(client, key);
@@ -345,11 +247,7 @@ public final class CuratorZookeeperRepository implements ClusterPersistRepositor
new String(treeCacheListener.getData().getData(), StandardCharsets.UTF_8), changedType));
}
}).build();
- if (null != executor) {
- cache.listenable().addListener(curatorCacheListener, executor);
- } else {
- cache.listenable().addListener(curatorCacheListener);
- }
+ cache.listenable().addListener(curatorCacheListener);
start(cache);
}
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 030fca8c998..2583e033e5f 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
@@ -208,7 +208,7 @@ public final class CuratorZookeeperRepositoryTest {
ChildData data = new ChildData("/test/children_updated/1", null, "value2".getBytes());
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(CuratorCacheListener.Type.NODE_CHANGED, oldData, data))).when(listenable).addListener(any(CuratorCacheListener.class));
SettableFuture<DataChangedEvent> settableFuture = SettableFuture.create();
- REPOSITORY.watch("/test/children_updated/1", settableFuture::set, null);
+ REPOSITORY.watch("/test/children_updated/1", settableFuture::set);
DataChangedEvent dataChangedEvent = settableFuture.get();
assertThat(dataChangedEvent.getType(), is(Type.UPDATED));
assertThat(dataChangedEvent.getKey(), is("/test/children_updated/1"));
@@ -222,7 +222,7 @@ public final class CuratorZookeeperRepositoryTest {
ChildData data = new ChildData("/test/children_deleted/5", null, "value5".getBytes());
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(CuratorCacheListener.Type.NODE_DELETED, oldData, data))).when(listenable).addListener(any(CuratorCacheListener.class));
SettableFuture<DataChangedEvent> settableFuture = SettableFuture.create();
- REPOSITORY.watch("/test/children_deleted/5", settableFuture::set, null);
+ REPOSITORY.watch("/test/children_deleted/5", settableFuture::set);
DataChangedEvent dataChangedEvent = settableFuture.get();
assertThat(dataChangedEvent.getType(), is(Type.DELETED));
assertThat(dataChangedEvent.getKey(), is("/test/children_deleted/5"));
@@ -235,7 +235,7 @@ public final class CuratorZookeeperRepositoryTest {
ChildData data = new ChildData("/test/children_added/4", null, "value4".getBytes());
doAnswer(AdditionalAnswers.answerVoid(getListenerAnswer(CuratorCacheListener.Type.NODE_CREATED, null, data))).when(listenable).addListener(any(CuratorCacheListener.class));
SettableFuture<DataChangedEvent> settableFuture = SettableFuture.create();
- REPOSITORY.watch("/test/children_added/4", settableFuture::set, null);
+ REPOSITORY.watch("/test/children_added/4", settableFuture::set);
DataChangedEvent dataChangedEvent = settableFuture.get();
assertThat(dataChangedEvent.getType(), is(Type.ADDED));
assertThat(dataChangedEvent.getKey(), is("/test/children_added/4"));
@@ -305,20 +305,4 @@ public final class CuratorZookeeperRepositoryTest {
REPOSITORY.delete("/test/children/1");
verify(backgroundVersionable).forPath("/test/children/1");
}
-
- @Test
- public void assertGetNumChildrenGtZero() throws Exception {
- Stat stat = new Stat(1L, 2L, 3L, 4L, 5, 6, 7, 8L, 9, 10, 11L);
- when(existsBuilder.forPath("/test/children")).thenReturn(stat);
- int children = REPOSITORY.getNumChildren("/test/children");
- assertThat(children, is(10));
- }
-
- @Test
- public void assertGetNumChildrenEqZero() throws Exception {
- Stat stat = new Stat();
- when(existsBuilder.forPath("/test/children")).thenReturn(stat);
- int children = REPOSITORY.getNumChildren("/test/children");
- assertThat(children, is(0));
- }
}
diff --git a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/fixture/StandalonePersistRepositoryFixture.java b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/fixture/StandalonePersistRepositoryFixture.java
index 4e7368507e9..a56fdee4551 100644
--- a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/fixture/StandalonePersistRepositoryFixture.java
+++ b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/fixture/StandalonePersistRepositoryFixture.java
@@ -33,11 +33,6 @@ public final class StandalonePersistRepositoryFixture implements StandalonePersi
public void init(final Properties props) {
}
- @Override
- public String get(final String key) {
- return null;
- }
-
@Override
public String getDirectly(final String key) {
return persistMap.get(key);
diff --git a/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepository.java b/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepository.java
index 94a24b0619f..b9e6cdbe6f8 100644
--- a/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepository.java
+++ b/mode/type/standalone/repository/provider/jdbc/core/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepository.java
@@ -74,12 +74,6 @@ public final class JDBCRepository implements StandalonePersistRepository {
}
}
- @Override
- public String get(final String key) {
- // TODO
- return null;
- }
-
@Override
public String getDirectly(final String key) {
try (
diff --git a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
index 628fd8dd497..b2f60c359e0 100644
--- a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
+++ b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
@@ -26,7 +26,6 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Executor;
public final class ClusterPersistRepositoryFixture implements ClusterPersistRepository {
@@ -36,33 +35,6 @@ public final class ClusterPersistRepositoryFixture implements ClusterPersistRepo
public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
}
- @Override
- public int getNumChildren(final String key) {
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- return null;
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- }
-
- @Override
- public String get(final String key) {
- return null;
- }
-
@Override
public String getDirectly(final String key) {
return REGISTRY_DATA.get(key);
@@ -101,17 +73,7 @@ public final class ClusterPersistRepositoryFixture implements ClusterPersistRepo
}
@Override
- public long getRegistryCenterTime(final String key) {
- return 0;
- }
-
- @Override
- public Object getRawClient() {
- return null;
- }
-
- @Override
- public void watch(final String key, final DataChangedEventListener listener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override
diff --git a/test/integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java b/test/integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
index d6c4a80cbb5..d08f3105bf0 100644
--- a/test/integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
+++ b/test/integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
@@ -27,7 +27,6 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Executor;
public final class TestClusterPersistRepository implements ClusterPersistRepository {
@@ -38,33 +37,6 @@ public final class TestClusterPersistRepository implements ClusterPersistReposit
registryData.put("/metadata", DefaultDatabase.LOGIC_NAME);
}
- @Override
- public int getNumChildren(final String key) {
- return 0;
- }
-
- @Override
- public void addCacheData(final String cachePath) {
- }
-
- @Override
- public void evictCacheData(final String cachePath) {
- }
-
- @Override
- public Object getRawCache(final String cachePath) {
- return null;
- }
-
- @Override
- public void updateInTransaction(final String key, final String value) {
- }
-
- @Override
- public String get(final String key) {
- return null;
- }
-
@Override
public String getDirectly(final String key) {
return registryData.get(key);
@@ -102,16 +74,6 @@ public final class TestClusterPersistRepository implements ClusterPersistReposit
public void delete(final String key) {
}
- @Override
- public long getRegistryCenterTime(final String key) {
- return 0;
- }
-
- @Override
- public Object getRawClient() {
- return null;
- }
-
@Override
public boolean tryLock(final String lockKey, final long timeoutMillis) {
return false;
@@ -122,7 +84,7 @@ public final class TestClusterPersistRepository implements ClusterPersistReposit
}
@Override
- public void watch(final String key, final DataChangedEventListener listener, final Executor executor) {
+ public void watch(final String key, final DataChangedEventListener listener) {
}
@Override