This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 6cc68d49ba9 Add test cases for ClusterContextManagerBuilder (#32833)
6cc68d49ba9 is described below
commit 6cc68d49ba928735f7ca104dc80629d9f6b9b367
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Sep 12 12:48:41 2024 +0800
Add test cases for ClusterContextManagerBuilder (#32833)
---
.../infra/instance/ComputeNodeInstanceContext.java | 10 +--
.../mode/persist/PersistServiceFacade.java | 4 +-
.../cluster/ClusterContextManagerBuilder.java | 3 +-
.../cluster/ClusterContextManagerBuilderTest.java | 85 ++++++++++++++++++++++
4 files changed, 93 insertions(+), 9 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java
index 8f72be5f0d9..1ef7e83414b 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java
@@ -60,17 +60,17 @@ public final class ComputeNodeInstanceContext {
private final Collection<ComputeNodeInstance> allClusterInstances = new
CopyOnWriteArrayList<>();
@SuppressWarnings("rawtypes")
- public ComputeNodeInstanceContext(final ComputeNodeInstance instance,
final WorkerIdGenerator workerIdGenerator, final ModeConfiguration
modeConfiguration,
- final LockContext lockContext, final
EventBusContext eventBusContext) {
+ public ComputeNodeInstanceContext(final ComputeNodeInstance instance,
final WorkerIdGenerator workerIdGenerator,
+ final ModeConfiguration modeConfig,
final LockContext lockContext, final EventBusContext eventBusContext) {
this.instance = instance;
this.workerIdGenerator.set(workerIdGenerator);
- this.modeConfiguration = modeConfiguration;
+ this.modeConfiguration = modeConfig;
this.lockContext.set(lockContext);
this.eventBusContext = eventBusContext;
}
- public ComputeNodeInstanceContext(final ComputeNodeInstance instance,
final ModeConfiguration modeConfiguration, final EventBusContext
eventBusContext) {
- this(instance, null, modeConfiguration, null, eventBusContext);
+ public ComputeNodeInstanceContext(final ComputeNodeInstance instance,
final ModeConfiguration modeConfig, final EventBusContext eventBusContext) {
+ this(instance, null, modeConfig, null, eventBusContext);
}
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
index b8015fb5d88..18caf6537eb 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
@@ -53,13 +53,13 @@ public final class PersistServiceFacade {
private final QualifiedDataSourceStatePersistService
qualifiedDataSourceStatePersistService;
- public PersistServiceFacade(final PersistRepository repository, final
ModeConfiguration modeConfiguration, final MetaDataContextManager
metaDataContextManager) {
+ public PersistServiceFacade(final PersistRepository repository, final
ModeConfiguration modeConfig, final MetaDataContextManager
metaDataContextManager) {
this.repository = repository;
metaDataPersistService = new MetaDataPersistService(repository);
computeNodePersistService = new ComputeNodePersistService(repository);
statePersistService = new StatePersistService(repository);
qualifiedDataSourceStatePersistService = new
QualifiedDataSourceStatePersistService(repository);
- PersistServiceBuilder persistServiceBuilder =
TypedSPILoader.getService(PersistServiceBuilder.class,
modeConfiguration.getType());
+ PersistServiceBuilder persistServiceBuilder =
TypedSPILoader.getService(PersistServiceBuilder.class, modeConfig.getType());
metaDataManagerPersistService =
persistServiceBuilder.buildMetaDataManagerPersistService(repository,
metaDataContextManager);
processPersistService =
persistServiceBuilder.buildProcessPersistService(repository);
listenerAssistedPersistService = new
ListenerAssistedPersistService(repository);
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 ca4e610ea48..93e173d86fe 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
@@ -71,8 +71,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
return TypedSPILoader.getService(ClusterPersistRepository.class,
config.getType(), config.getProps());
}
- private void registerOnline(final ComputeNodeInstanceContext
computeNodeInstanceContext,
- final ContextManagerBuilderParameter param,
final ContextManager contextManager) {
+ private void registerOnline(final ComputeNodeInstanceContext
computeNodeInstanceContext, final ContextManagerBuilderParameter param, final
ContextManager contextManager) {
contextManager.getPersistServiceFacade().getComputeNodePersistService().registerOnline(computeNodeInstanceContext.getInstance());
contextManager.getComputeNodeInstanceContext().getAllClusterInstances().addAll(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadAllComputeNodeInstances());
new DataChangedEventListenerRegistry(contextManager,
getDatabaseNames(param,
contextManager.getPersistServiceFacade().getMetaDataPersistService())).register();
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java
new file mode 100644
index 00000000000..765d53891c3
--- /dev/null
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.mode.manager.cluster;
+
+import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
+import
org.apache.shardingsphere.infra.config.mode.PersistRepositoryConfiguration;
+import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
+import
org.apache.shardingsphere.infra.instance.metadata.jdbc.JDBCInstanceMetaData;
+import
org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
+import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.manager.ContextManagerBuilder;
+import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
+import
org.apache.shardingsphere.mode.manager.cluster.exception.MissingRequiredClusterRepositoryConfigurationException;
+import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@SuppressWarnings("resource")
+class ClusterContextManagerBuilderTest {
+
+ private ContextManagerBuilder builder;
+
+ @BeforeEach
+ void setUp() {
+ builder = TypedSPILoader.getService(ContextManagerBuilder.class,
"Cluster");
+ }
+
+ @Test
+ void assertBuildWithNullRepositoryConfiguration() {
+ ContextManagerBuilderParameter param =
mock(ContextManagerBuilderParameter.class, RETURNS_DEEP_STUBS);
+
when(param.getModeConfiguration()).thenReturn(mock(ModeConfiguration.class));
+ when(param.getLabels()).thenReturn(Collections.emptyList());
+
assertThrows(MissingRequiredClusterRepositoryConfigurationException.class, ()
-> builder.build(param, mock(EventBusContext.class)));
+ }
+
+ @Test
+ void assertBuildForJDBC() throws SQLException {
+ assertBuild(new JDBCInstanceMetaData("foo"));
+ }
+
+ @Test
+ void assertBuildForProxy() throws SQLException {
+ assertBuild(new ProxyInstanceMetaData("foo", 1));
+ }
+
+ private void assertBuild(final InstanceMetaData instanceMetaData) throws
SQLException {
+ ContextManager actual = builder.build(new
ContextManagerBuilderParameter(createModeConfiguration(),
+ Collections.emptyMap(), Collections.emptyMap(),
Collections.emptyList(), new Properties(), Collections.emptyList(),
instanceMetaData, false), mock(EventBusContext.class));
+
assertThat(actual.getComputeNodeInstanceContext().getInstance().getMetaData(),
is(instanceMetaData));
+ }
+
+ private static ModeConfiguration createModeConfiguration() {
+ PersistRepositoryConfiguration repositoryConfig =
mock(ClusterPersistRepositoryConfiguration.class);
+ when(repositoryConfig.getType()).thenReturn("FIXTURE");
+ return new ModeConfiguration("CLUSTER", repositoryConfig);
+ }
+}
