You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2024/06/28 02:53:15 UTC
(shardingsphere) branch master updated: Remove unnecessary repository parameter of deliver and dispatch EventSubscriberRegistry (#31907)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 45bd24e5596 Remove unnecessary repository parameter of deliver and dispatch EventSubscriberRegistry (#31907)
45bd24e5596 is described below
commit 45bd24e5596a6efb6b5b16d65cebf761cbea3c8b
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Fri Jun 28 10:53:09 2024 +0800
Remove unnecessary repository parameter of deliver and dispatch EventSubscriberRegistry (#31907)
---
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 8 ++++----
.../subscriber/ClusterDeliverEventSubscriberRegistry.java | 4 ++--
.../subscriber/ClusterDispatchEventSubscriberRegistry.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
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 7ee47880de6..1082f684539 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
@@ -62,7 +62,7 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
MetaDataPersistService metaDataPersistService = new MetaDataPersistService(repository);
MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(metaDataPersistService, param, computeNodeInstanceContext);
ContextManager result = new ContextManager(metaDataContexts, computeNodeInstanceContext, repository);
- registerOnline(eventBusContext, computeNodeInstanceContext, repository, param, result);
+ registerOnline(eventBusContext, computeNodeInstanceContext, param, result);
return result;
}
@@ -77,12 +77,12 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
}
private void registerOnline(final EventBusContext eventBusContext, final ComputeNodeInstanceContext computeNodeInstanceContext,
- final ClusterPersistRepository repository, final ContextManagerBuilderParameter param, final ContextManager contextManager) {
+ final ContextManagerBuilderParameter param, final ContextManager contextManager) {
contextManager.getPersistServiceFacade().getComputeNodePersistService().registerOnline(computeNodeInstanceContext.getInstance());
watchDatabaseMetaDataListener(param, contextManager.getPersistServiceFacade().getMetaDataPersistService(), eventBusContext);
contextManager.getComputeNodeInstanceContext().getAllClusterInstances().addAll(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadAllComputeNodeInstances());
- new ClusterDeliverEventSubscriberRegistry(contextManager, repository).register();
- new ClusterDispatchEventSubscriberRegistry(contextManager, repository).register();
+ new ClusterDeliverEventSubscriberRegistry(contextManager).register();
+ new ClusterDispatchEventSubscriberRegistry(contextManager).register();
}
private void watchDatabaseMetaDataListener(final ContextManagerBuilderParameter param, final MetaDataPersistService metaDataPersistService, final EventBusContext eventBusContext) {
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDeliverEventSubscriberRegistry.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDeliverEventSubscriberRegistry.java
index 3ca9743bd47..98ad5ef8d00 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDeliverEventSubscriberRegistry.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDeliverEventSubscriberRegistry.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.mode.subsciber.DeliverEventSubscriberRegistry;
*/
public class ClusterDeliverEventSubscriberRegistry extends DeliverEventSubscriberRegistry {
- public ClusterDeliverEventSubscriberRegistry(final ContextManager contextManager, final ClusterPersistRepository repository) {
- super(contextManager, new InternalQualifiedDataSourceSubscriber(repository));
+ public ClusterDeliverEventSubscriberRegistry(final ContextManager contextManager) {
+ super(contextManager, new InternalQualifiedDataSourceSubscriber((ClusterPersistRepository) contextManager.getRepository()));
}
}
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 e2cee20e917..5572b8fd24d 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
@@ -42,9 +42,9 @@ public class ClusterDispatchEventSubscriberRegistry implements EventSubscriberRe
private final ClusterPersistRepository repository;
- public ClusterDispatchEventSubscriberRegistry(final ContextManager contextManager, final ClusterPersistRepository repository) {
+ public ClusterDispatchEventSubscriberRegistry(final ContextManager contextManager) {
eventBusContext = contextManager.getComputeNodeInstanceContext().getEventBusContext();
- this.repository = repository;
+ repository = (ClusterPersistRepository) contextManager.getRepository();
subscribers = Arrays.asList(new RuleItemChangedSubscriber(contextManager),
new ConfigurationChangedSubscriber(contextManager),
new ResourceMetaDataChangedSubscriber(contextManager),