You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by tu...@apache.org on 2022/11/07 09:17:26 UTC
[shardingsphere] branch master updated: Remove instance metadata paramater when init ClusterPersistRepository (#21988)
This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 249e3ad09f9 Remove instance metadata paramater when init ClusterPersistRepository (#21988)
249e3ad09f9 is described below
commit 249e3ad09f95435c22d3d9550751053f27b56a94
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Mon Nov 7 17:17:19 2022 +0800
Remove instance metadata paramater when init ClusterPersistRepository (#21988)
* Remove InstanceMetaData paramater when init ClusterPersistRepository
* Fix checkstyle
* Fix checkstyle
* Fix checkstyle
---
.../namespace/fixture/FixtureClusterPersistRepository.java | 3 +--
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 3 +--
.../coordinator/ClusterPersistRepositoryFactoryTest.java | 5 ++---
.../coordinator/fixture/ClusterPersistRepositoryFixture.java | 3 +--
.../process/ProcessListClusterPersistRepositoryFixture.java | 3 +--
.../mode/repository/cluster/ClusterPersistRepository.java | 4 +---
.../repository/cluster/ClusterPersistRepositoryFactory.java | 6 ++----
.../mode/repository/cluster/consul/ConsulRepository.java | 3 +--
.../mode/repository/cluster/etcd/EtcdRepository.java | 3 +--
.../mode/repository/cluster/nacos/NacosRepository.java | 3 +--
.../repository/cluster/zookeeper/ZookeeperRepository.java | 8 ++------
.../cluster/zookeeper/listener/SessionConnectionListener.java | 8 +++-----
.../repository/cluster/zookeeper/ZookeeperRepositoryTest.java | 11 +++++------
.../proxy/fixture/ClusterPersistRepositoryFixture.java | 3 +--
.../driver/fixture/TestClusterPersistRepository.java | 3 +--
.../data/pipeline/framework/watcher/ScalingWatcher.java | 4 +---
.../data/pipeline/core/util/PipelineContextUtil.java | 4 +---
17 files changed, 26 insertions(+), 51 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 0f662a63b4f..da9daee3e88 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
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.spring.namespace.fixture;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
@@ -34,7 +33,7 @@ public final class FixtureClusterPersistRepository implements ClusterPersistRepo
private final Map<String, String> registryData = new LinkedHashMap<>();
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public void init(final ClusterPersistRepositoryConfiguration config) {
registryData.put("/metadata", DefaultDatabase.LOGIC_NAME);
}
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 27ac8cef90e..e3247de01ff 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
@@ -46,8 +46,7 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
@Override
public ContextManager build(final ContextManagerBuilderParameter parameter) throws SQLException {
- ClusterPersistRepository repository = ClusterPersistRepositoryFactory.getInstance((ClusterPersistRepositoryConfiguration) parameter.getModeConfiguration().getRepository(),
- parameter.getInstanceMetaData());
+ ClusterPersistRepository repository = ClusterPersistRepositoryFactory.getInstance((ClusterPersistRepositoryConfiguration) parameter.getModeConfiguration().getRepository());
MetaDataPersistService persistService = new MetaDataPersistService(repository);
persistConfigurations(persistService, parameter);
RegistryCenter registryCenter = new RegistryCenter(repository, new EventBusContext(), parameter.getInstanceMetaData(), parameter.getDatabaseConfigs());
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterPersistRepositoryFactoryTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterPersistRepositoryFactoryTest.java
index 67b94ae4704..dcb0d43f4ac 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterPersistRepositoryFactoryTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterPersistRepositoryFactoryTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mode.manager.cluster.coordinator;
-import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryFactory;
import org.junit.Test;
@@ -31,7 +30,7 @@ public final class ClusterPersistRepositoryFactoryTest {
@Test
public void assertNewInstance() {
- assertThat(ClusterPersistRepositoryFactory.getInstance(new ClusterPersistRepositoryConfiguration("FIXTURE", "", "", new Properties()),
- new ProxyInstanceMetaData("foo_id", 3307)).getType(), is("FIXTURE"));
+ assertThat(ClusterPersistRepositoryFactory.getInstance(new ClusterPersistRepositoryConfiguration("FIXTURE", "", "",
+ new Properties())).getType(), is("FIXTURE"));
}
}
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 67d3a6c6edb..149a82771a5 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mode.manager.cluster.coordinator.fixture;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
@@ -29,7 +28,7 @@ import java.util.List;
public final class ClusterPersistRepositoryFixture implements ClusterPersistRepository {
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public void init(final ClusterPersistRepositoryConfiguration config) {
}
@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 c6286893389..e2514ab760d 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.process;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
@@ -33,7 +32,7 @@ public final class ProcessListClusterPersistRepositoryFixture implements Cluster
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public void init(final ClusterPersistRepositoryConfiguration config) {
}
@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 7d5ebd52910..8bd1b15189a 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mode.repository.cluster;
-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 org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
@@ -31,9 +30,8 @@ public interface ClusterPersistRepository extends PersistRepository {
* Initialize registry center.
*
* @param config cluster persist repository configuration
- * @param instanceMetaData instance meta data
*/
- void init(ClusterPersistRepositoryConfiguration config, InstanceMetaData instanceMetaData);
+ void init(ClusterPersistRepositoryConfiguration config);
/**
* Persist ephemeral data.
diff --git a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepositoryFactory.java b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepositoryFactory.java
index ba839933b8f..cbf5a65ddca 100644
--- a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepositoryFactory.java
+++ b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepositoryFactory.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.mode.repository.cluster;
import com.google.common.base.Preconditions;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPIRegistry;
@@ -38,13 +37,12 @@ public final class ClusterPersistRepositoryFactory {
* Get instance of cluster persist repository.
*
* @param config persist repository configuration
- * @param instanceMetaData instance meta data
* @return got instance
*/
- public static ClusterPersistRepository getInstance(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public static ClusterPersistRepository getInstance(final ClusterPersistRepositoryConfiguration config) {
Preconditions.checkNotNull(config, "Cluster persist repository configuration cannot be null.");
ClusterPersistRepository result = TypedSPIRegistry.getRegisteredService(ClusterPersistRepository.class, config.getType(), config.getProps());
- result.init(config, instanceMetaData);
+ result.init(config);
return result;
}
}
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 fef02030f79..46caccc3aff 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
@@ -27,7 +27,6 @@ import com.ecwid.consul.v1.session.model.NewSession;
import com.ecwid.consul.v1.session.model.Session;
import com.google.common.base.Strings;
import lombok.Getter;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.consul.props.ConsulProperties;
@@ -63,7 +62,7 @@ public final class ConsulRepository implements ClusterPersistRepository {
private Map<String, Collection<String>> watchKeyMap;
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public void init(final ClusterPersistRepositoryConfiguration config) {
ConsulRawClient rawClient = Strings.isNullOrEmpty(config.getServerLists()) ? new ConsulRawClient() : new ConsulRawClient(config.getServerLists());
consulClient = new ShardingSphereConsulClient(rawClient);
consulProps = new ConsulProperties(config.getProps());
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 3ad947091ed..2b8ac1e9f3c 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
@@ -33,7 +33,6 @@ import io.etcd.jetcd.support.Util;
import io.etcd.jetcd.watch.WatchEvent;
import lombok.Getter;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.etcd.props.EtcdProperties;
@@ -61,7 +60,7 @@ public final class EtcdRepository implements ClusterPersistRepository {
private DistributedLockHolder distributedLockHolder;
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public void init(final ClusterPersistRepositoryConfiguration config) {
etcdProps = new EtcdProperties(config.getProps());
client = Client.builder().endpoints(Util.toURIs(Splitter.on(",").trimResults().splitToList(config.getServerLists())))
.namespace(ByteSequence.from(config.getNamespace(), StandardCharsets.UTF_8))
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 2aa69c8cc20..a5f63a19aab 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
@@ -27,7 +27,6 @@ import com.alibaba.nacos.common.utils.StringUtils;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.instance.utils.IpUtils;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
@@ -69,7 +68,7 @@ public final class NacosRepository implements ClusterPersistRepository {
private ServiceController serviceController;
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public void init(final ClusterPersistRepositoryConfiguration config) {
nacosProps = new NacosProperties(config.getProps());
client = createClient(config);
initServiceMetadata();
diff --git a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
index e7d5c2f9c15..1a52502c4f5 100644
--- a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
+++ b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java
@@ -30,7 +30,6 @@ import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.curator.utils.CloseableUtils;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.instance.InstanceContextAware;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersistRepositoryException;
@@ -70,11 +69,8 @@ public final class ZookeeperRepository implements ClusterPersistRepository, Inst
@Getter
private DistributedLockHolder distributedLockHolder;
- private InstanceMetaData instanceMetaData;
-
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
- this.instanceMetaData = instanceMetaData;
+ public void init(final ClusterPersistRepositoryConfiguration config) {
ZookeeperProperties zookeeperProps = new ZookeeperProperties(config.getProps());
client = buildCuratorClient(config, zookeeperProps);
distributedLockHolder = new DistributedLockHolder(getType(), client, zookeeperProps);
@@ -296,7 +292,7 @@ public final class ZookeeperRepository implements ClusterPersistRepository, Inst
@Override
public void setInstanceContext(final InstanceContext instanceContext) {
- client.getConnectionStateListenable().addListener(new SessionConnectionListener(instanceMetaData, instanceContext, this));
+ client.getConnectionStateListenable().addListener(new SessionConnectionListener(instanceContext, this));
}
@Override
diff --git a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
index 843bfe72868..64efcfa5184 100644
--- a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
+++ b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionListener.java
@@ -24,7 +24,6 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.state.ConnectionState;
import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.shardingsphere.infra.instance.InstanceContext;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.metadata.persist.node.ComputeNode;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.ZookeeperExceptionHandler;
@@ -41,8 +40,6 @@ public final class SessionConnectionListener implements ConnectionStateListener
private static final int RECONNECT_INTERVAL_SECONDS = 5;
- private final InstanceMetaData instanceMetaData;
-
private final InstanceContext instanceContext;
private final ClusterPersistRepository repository;
@@ -54,7 +51,7 @@ public final class SessionConnectionListener implements ConnectionStateListener
do {
reRegistered = reRegister(client);
} while (!reRegistered);
- log.debug("instance re-register success instance id: {}", instanceMetaData.getId());
+ log.debug("instance re-register success instance id: {}", instanceContext.getInstance().getCurrentInstanceId());
}
}
@@ -64,7 +61,8 @@ public final class SessionConnectionListener implements ConnectionStateListener
if (isNeedGenerateWorkerId()) {
instanceContext.generateWorkerId(new Properties());
}
- repository.persistEphemeral(ComputeNode.getOnlineInstanceNodePath(instanceMetaData.getId(), instanceMetaData.getType()), instanceMetaData.getAttributes());
+ repository.persistEphemeral(ComputeNode.getOnlineInstanceNodePath(instanceContext.getInstance().getCurrentInstanceId(),
+ instanceContext.getInstance().getMetaData().getType()), instanceContext.getInstance().getMetaData().getAttributes());
return true;
}
sleepInterval();
diff --git a/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepositoryTest.java b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepositoryTest.java
index fb1740fdd6b..52c075572c3 100644
--- a/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepositoryTest.java
+++ b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepositoryTest.java
@@ -34,7 +34,6 @@ import org.apache.curator.framework.listen.Listenable;
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.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
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;
@@ -120,7 +119,7 @@ public final class ZookeeperRepositoryTest {
mockClient();
mockBuilder();
ClusterPersistRepositoryConfiguration config = new ClusterPersistRepositoryConfiguration(REPOSITORY.getType(), "governance", SERVER_LISTS, new Properties());
- REPOSITORY.init(config, new ProxyInstanceMetaData("foo_id", 3307));
+ REPOSITORY.init(config);
mockDistributedLockHolder();
}
@@ -262,7 +261,7 @@ public final class ZookeeperRepositoryTest {
props.setProperty(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS.getKey(), "1000");
props.setProperty(ZookeeperPropertyKey.OPERATION_TIMEOUT_MILLISECONDS.getKey(), "2000");
ClusterPersistRepositoryConfiguration config = new ClusterPersistRepositoryConfiguration(REPOSITORY.getType(), "governance", SERVER_LISTS, props);
- REPOSITORY.init(config, new ProxyInstanceMetaData("foo_id", 3307));
+ REPOSITORY.init(config);
}
@Test
@@ -270,7 +269,7 @@ public final class ZookeeperRepositoryTest {
Properties props = new Properties();
props.setProperty(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS.getKey(), "0");
ClusterPersistRepositoryConfiguration config = new ClusterPersistRepositoryConfiguration(REPOSITORY.getType(), "governance", SERVER_LISTS, props);
- REPOSITORY.init(config, new ProxyInstanceMetaData("foo_id", 3307));
+ REPOSITORY.init(config);
}
@Test
@@ -278,7 +277,7 @@ public final class ZookeeperRepositoryTest {
Properties props = new Properties();
props.setProperty(ZookeeperPropertyKey.OPERATION_TIMEOUT_MILLISECONDS.getKey(), "0");
ClusterPersistRepositoryConfiguration config = new ClusterPersistRepositoryConfiguration(REPOSITORY.getType(), "governance", SERVER_LISTS, props);
- REPOSITORY.init(config, new ProxyInstanceMetaData("foo_id", 3307));
+ REPOSITORY.init(config);
}
@Test
@@ -286,7 +285,7 @@ public final class ZookeeperRepositoryTest {
Properties props = new Properties();
props.setProperty(ZookeeperPropertyKey.DIGEST.getKey(), "any");
ClusterPersistRepositoryConfiguration config = new ClusterPersistRepositoryConfiguration(REPOSITORY.getType(), "governance", SERVER_LISTS, props);
- REPOSITORY.init(config, new ProxyInstanceMetaData("foo_id", 3307));
+ REPOSITORY.init(config);
verify(builder).aclProvider(any(ACLProvider.class));
}
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 91381ef3bf9..57971f2ee54 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.proxy.fixture;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
@@ -33,7 +32,7 @@ public final class ClusterPersistRepositoryFixture implements ClusterPersistRepo
private static final Map<String, String> REGISTRY_DATA = new LinkedHashMap<>();
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public void init(final ClusterPersistRepositoryConfiguration config) {
}
@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 b6dd5998f75..4c3e4adaf3b 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
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.driver.fixture;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
@@ -34,7 +33,7 @@ public final class TestClusterPersistRepository implements ClusterPersistReposit
private final Map<String, String> registryData = new LinkedHashMap<>();
@Override
- public void init(final ClusterPersistRepositoryConfiguration config, final InstanceMetaData instanceMetaData) {
+ public void init(final ClusterPersistRepositoryConfiguration config) {
registryData.put("/metadata", DefaultDatabase.LOGIC_NAME);
}
diff --git a/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java b/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
index 295dc3b3617..e87a72d9189 100644
--- a/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
+++ b/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.integration.data.pipeline.framework.watcher;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.BaseContainerComposer;
import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.DockerContainerComposer;
import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.NativeContainerComposer;
@@ -34,7 +33,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.UUID;
@RequiredArgsConstructor
@Slf4j
@@ -57,7 +55,7 @@ public class ScalingWatcher extends TestWatcher {
ClusterPersistRepositoryConfiguration config = new ClusterPersistRepositoryConfiguration("ZooKeeper", namespace,
dockerContainerComposer.getGovernanceContainer().getServerLists(), new Properties());
ClusterPersistRepository zookeeperRepository = new ZookeeperRepository();
- zookeeperRepository.init(config, new ProxyInstanceMetaData(UUID.randomUUID().toString(), 3307));
+ zookeeperRepository.init(config);
List<String> childrenKeys = zookeeperRepository.getChildrenKeys("/");
for (String each : childrenKeys) {
if (!"scaling".equals(each)) {
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java
index 33ac50bd99b..66c28c5d3ce 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/util/PipelineContextUtil.java
@@ -41,7 +41,6 @@ import org.apache.shardingsphere.data.pipeline.yaml.process.YamlPipelineReadConf
import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.database.DefaultDatabase;
-import org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereColumn;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -58,7 +57,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import java.util.UUID;
public final class PipelineContextUtil {
@@ -76,7 +74,7 @@ public final class PipelineContextUtil {
@Override
protected ClusterPersistRepository initialize() {
- return ClusterPersistRepositoryFactory.getInstance(PERSIST_REPOSITORY_CONFIG, new ProxyInstanceMetaData(UUID.randomUUID().toString(), 3307));
+ return ClusterPersistRepositoryFactory.getInstance(PERSIST_REPOSITORY_CONFIG);
}
};
}