You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2024/06/28 02:30:21 UTC
(shardingsphere) branch master updated: Remove unnecessary repository parameter for ProcessListChangedSubscriber (#31906)
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 51a8d7613c9 Remove unnecessary repository parameter for ProcessListChangedSubscriber (#31906)
51a8d7613c9 is described below
commit 51a8d7613c9cc3017ef9358ba5c905f9cbb2730d
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Fri Jun 28 10:30:14 2024 +0800
Remove unnecessary repository parameter for ProcessListChangedSubscriber (#31906)
---
.../process/subscriber/ProcessListChangedSubscriber.java | 12 ++++--------
.../subscriber/ClusterDispatchEventSubscriberRegistry.java | 2 +-
.../process/subscriber/ProcessListChangedSubscriberTest.java | 12 ++++++++----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
index 995841026b4..f7ed9bb0651 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
@@ -32,15 +32,13 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.statu
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.KillLocalProcessEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ReportLocalProcessesCompletedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ReportLocalProcessesEvent;
-import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collection;
/**
- * TODO replace the old ProcessListChangedSubscriber after meta data refactor completed
- * New process list changed subscriber.
+ * Process list changed subscriber.
*/
@SuppressWarnings("unused")
@RequiredArgsConstructor
@@ -48,8 +46,6 @@ public final class ProcessListChangedSubscriber implements EventSubscriber {
private final ContextManager contextManager;
- private final ClusterPersistRepository repository;
-
private final YamlProcessListSwapper swapper = new YamlProcessListSwapper();
/**
@@ -64,10 +60,10 @@ public final class ProcessListChangedSubscriber implements EventSubscriber {
}
Collection<Process> processes = ProcessRegistry.getInstance().listAll();
if (!processes.isEmpty()) {
- repository.persist(
+ contextManager.getRepository().persist(
ProcessNode.getProcessListInstancePath(event.getTaskId(), event.getInstanceId()), YamlEngine.marshal(swapper.swapToYamlConfiguration(processes)));
}
- repository.delete(ComputeNode.getProcessTriggerInstanceNodePath(event.getInstanceId(), event.getTaskId()));
+ contextManager.getRepository().delete(ComputeNode.getProcessTriggerInstanceNodePath(event.getInstanceId(), event.getTaskId()));
}
/**
@@ -98,7 +94,7 @@ public final class ProcessListChangedSubscriber implements EventSubscriber {
each.cancel();
}
}
- repository.delete(ComputeNode.getProcessKillInstanceIdNodePath(event.getInstanceId(), event.getProcessId()));
+ contextManager.getRepository().delete(ComputeNode.getProcessKillInstanceIdNodePath(event.getInstanceId(), event.getProcessId()));
}
/**
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDispatchEventSubscriberRegistry.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDispatchEventSubscriberRegistry.java
index f2f02eff017..e2cee20e917 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDispatchEventSubscriberRegistry.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDispatchEventSubscriberRegistry.java
@@ -51,7 +51,7 @@ public class ClusterDispatchEventSubscriberRegistry implements EventSubscriberRe
new ListenerAssistedMetaDataChangedSubscriber(contextManager),
new StateChangedSubscriber(contextManager),
new DatabaseChangedSubscriber(contextManager),
- new ProcessListChangedSubscriber(contextManager, repository),
+ new ProcessListChangedSubscriber(contextManager),
new CacheEvictedSubscriber(),
new ComputeNodeOnlineSubscriber(contextManager),
new QualifiedDataSourceSubscriber(contextManager));
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
index e4fcab2de20..3ecc77a1f9c 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
@@ -39,15 +39,17 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.statu
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ReportLocalProcessesCompletedEvent;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.event.ReportLocalProcessesEvent;
import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
-import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
+import org.apache.shardingsphere.mode.spi.PersistRepository;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Answers;
import org.mockito.Mock;
+import org.mockito.internal.configuration.plugins.Plugins;
import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.plugins.MemberAccessor;
import java.sql.SQLException;
import java.util.Collections;
@@ -73,19 +75,21 @@ class ProcessListChangedSubscriberTest {
private ContextManager contextManager;
@Mock
- private ClusterPersistRepository repository;
+ private PersistRepository repository;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ShardingSphereDatabase database;
@BeforeEach
- void setUp() throws SQLException {
+ void setUp() throws SQLException, NoSuchFieldException, IllegalAccessException {
EventBusContext eventBusContext = new EventBusContext();
contextManager = new ClusterContextManagerBuilder().build(createContextManagerBuilderParameter(), eventBusContext);
contextManager.renewMetaDataContexts(MetaDataContextsFactory.create(contextManager.getPersistServiceFacade().getMetaDataPersistService(), new ShardingSphereMetaData(createDatabases(),
contextManager.getMetaDataContexts().getMetaData().getGlobalResourceMetaData(), contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(),
new ConfigurationProperties(new Properties()))));
- subscriber = new ProcessListChangedSubscriber(contextManager, repository);
+ MemberAccessor accessor = Plugins.getMemberAccessor();
+ accessor.set(contextManager.getClass().getDeclaredField("repository"), contextManager, repository);
+ subscriber = new ProcessListChangedSubscriber(contextManager);
}
private ContextManagerBuilderParameter createContextManagerBuilderParameter() {