Use DataChangedEventHandler to instead of DispatchEventBuilder

apache · Dec 31, 2024 · 79ecc24 · 79ecc24
1 parent 5e79134
commit 79ecc24
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 159 deletions.
diff --git a/...shardingsphere/mode/manager/cluster/event/dispatch/event/config/AlterPropertiesEvent.java b/...shardingsphere/mode/manager/cluster/event/dispatch/event/config/AlterPropertiesEvent.java
diff --git a/...dingsphere/mode/manager/cluster/event/dispatch/handler/type/GlobalRuleChangedHandler.java b/...dingsphere/mode/manager/cluster/event/dispatch/handler/type/GlobalRuleChangedHandler.java
@@ -58,7 +58,7 @@ public void handle(final ContextManager contextManager, final DataChangedEvent e
             return;
         }
         Preconditions.checkArgument(event.getValue().equals(
-                        contextManager.getPersistServiceFacade().getMetaDataPersistService().getMetaDataVersionPersistService().getActiveVersionByFullPath(event.getKey())),
+                contextManager.getPersistServiceFacade().getMetaDataPersistService().getMetaDataVersionPersistService().getActiveVersionByFullPath(event.getKey())),
                 "Invalid active version: %s of key: %s", event.getValue(), event.getKey());
         Optional<RuleConfiguration> ruleConfig = contextManager.getPersistServiceFacade().getMetaDataPersistService().getGlobalRuleService().load(ruleName.get());
         Preconditions.checkArgument(ruleConfig.isPresent(), "Can not find rule configuration with name: %s", ruleName.get());

diff --git a/.../type/PropertiesDispatchEventBuilder.java → ...andler/type/PropertiesChangedHandler.java b/.../type/PropertiesDispatchEventBuilder.java → ...andler/type/PropertiesChangedHandler.java
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.type;
 
+import com.google.common.base.Preconditions;
 import org.apache.shardingsphere.metadata.persist.node.GlobalNode;
 import org.apache.shardingsphere.mode.event.DataChangedEvent;
 import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
-import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.event.config.AlterPropertiesEvent;
-import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.DispatchEventBuilder;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.DataChangedEventHandler;
 import org.apache.shardingsphere.mode.path.GlobalNodePath;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Optional;
 
 /**
- * Properties dispatch event builder.
+ * Properties changed handler.
  */
-public final class PropertiesDispatchEventBuilder implements DispatchEventBuilder<AlterPropertiesEvent> {
+public final class PropertiesChangedHandler implements DataChangedEventHandler {
 
     @Override
     public String getSubscribedKey() {
@@ -44,7 +44,13 @@ public Collection<Type> getSubscribedTypes() {
     }
 
     @Override
-    public Optional<AlterPropertiesEvent> build(final DataChangedEvent event) {
-        return GlobalNodePath.isPropsActiveVersionPath(event.getKey()) ? Optional.of(new AlterPropertiesEvent(event.getKey(), event.getValue())) : Optional.empty();
+    public void handle(final ContextManager contextManager, final DataChangedEvent event) {
+        if (!GlobalNodePath.isPropsActiveVersionPath(event.getKey())) {
+            return;
+        }
+        Preconditions.checkArgument(event.getValue().equals(
+                contextManager.getPersistServiceFacade().getMetaDataPersistService().getMetaDataVersionPersistService().getActiveVersionByFullPath(event.getKey())),
+                "Invalid active version: %s of key: %s", event.getValue(), event.getKey());
+        contextManager.getMetaDataContextManager().getGlobalConfigurationManager().alterProperties(contextManager.getPersistServiceFacade().getMetaDataPersistService().getPropsService().load());
     }
 }
diff --git a/...ode/manager/cluster/event/dispatch/subscriber/ClusterDispatchEventSubscriberRegistry.java b/...ode/manager/cluster/event/dispatch/subscriber/ClusterDispatchEventSubscriberRegistry.java
@@ -26,7 +26,6 @@
 import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type.ListenerAssistedSubscriber;
 import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type.MetaDataChangedSubscriber;
 import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type.ProcessListChangedSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type.PropertiesEventSubscriber;
 import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type.QualifiedDataSourceSubscriber;
 import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type.RuleItemChangedSubscriber;
 import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type.StorageUnitEventSubscriber;
@@ -51,7 +50,6 @@ public ClusterDispatchEventSubscriberRegistry(final ContextManager contextManage
                 new CacheEvictedSubscriber(),
                 new ComputeNodeStateSubscriber(contextManager),
                 new QualifiedDataSourceSubscriber(contextManager),
-                new StorageUnitEventSubscriber(contextManager),
-                new PropertiesEventSubscriber(contextManager));
+                new StorageUnitEventSubscriber(contextManager));
     }
 }
diff --git a/...sphere/mode/manager/cluster/event/dispatch/subscriber/type/PropertiesEventSubscriber.java b/...sphere/mode/manager/cluster/event/dispatch/subscriber/type/PropertiesEventSubscriber.java
diff --git a/...rg.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.DispatchEventBuilder b/...rg.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.DispatchEventBuilder
@@ -18,7 +18,6 @@
 org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type.QualifiedDataSourceDispatchEventBuilder
 org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type.ComputeNodeStateDispatchEventBuilder
 org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type.ShardingSphereDataDispatchEventBuilder
-org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type.PropertiesDispatchEventBuilder
 org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type.ListenerAssistedDispatchEventBuilder
 org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type.ComputeNodeOnlineDispatchEventBuilder
 org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type.ShowProcessListDispatchEventBuilder

diff --git a/...apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.DataChangedEventHandler b/...apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.DataChangedEventHandler
@@ -16,4 +16,5 @@
 #
 
 org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.type.ClusterStateChangedHandler
-org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.type.GlobalRuleChangedHandler
+org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.type.GlobalRuleChangedHandler
+org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.type.PropertiesChangedHandler
diff --git a/.../mode/manager/cluster/event/dispatch/builder/type/PropertiesDispatchEventBuilderTest.java b/.../mode/manager/cluster/event/dispatch/builder/type/PropertiesDispatchEventBuilderTest.java
diff --git a/...r/type/PropertiesEventSubscriberTest.java → ...er/type/PropertiesChangedHandlerTest.java b/...r/type/PropertiesEventSubscriberTest.java → ...er/type/PropertiesChangedHandlerTest.java
@@ -15,10 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type;
+package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.type;
 
-import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.event.config.AlterPropertiesEvent;
+import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
+import org.apache.shardingsphere.mode.event.DataChangedEvent;
+import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
 import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.handler.DataChangedEventHandler;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,27 +31,37 @@
 
 import java.util.Properties;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-class PropertiesEventSubscriberTest {
+class PropertiesChangedHandlerTest {
 
-    private PropertiesEventSubscriber subscriber;
+    private DataChangedEventHandler handler;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private ContextManager contextManager;
 
     @BeforeEach
     void setUp() {
-        subscriber = new PropertiesEventSubscriber(contextManager);
+        handler = ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream()
+                .filter(each -> each.getSubscribedKey().equals("/props")).findFirst().orElse(null);
     }
 
     @Test
-    void assertRenew() {
-        when(contextManager.getPersistServiceFacade().getMetaDataPersistService().getMetaDataVersionPersistService().getActiveVersionByFullPath("key")).thenReturn("value");
-        when(contextManager.getPersistServiceFacade().getMetaDataPersistService().getPropsService().load()).thenReturn(new Properties());
-        subscriber.renew(new AlterPropertiesEvent("key", "value"));
-        verify(contextManager.getMetaDataContextManager().getGlobalConfigurationManager()).alterProperties(new Properties());
+    void assertHandleWithInvalidEventKey() {
+        handler.handle(contextManager, new DataChangedEvent("/props/xxx", "key=value", Type.ADDED));
+        verify(contextManager, times(0)).getPersistServiceFacade();
+    }
+
+    @Test
+    void assertHandle() {
+        when(contextManager.getPersistServiceFacade().getMetaDataPersistService().getMetaDataVersionPersistService().getActiveVersionByFullPath("/props/active_version")).thenReturn("key=value");
+        Properties props = mock(Properties.class);
+        when(contextManager.getPersistServiceFacade().getMetaDataPersistService().getPropsService().load()).thenReturn(props);
+        handler.handle(contextManager, new DataChangedEvent("/props/active_version", "key=value", Type.ADDED));
+        verify(contextManager.getMetaDataContextManager().getGlobalConfigurationManager()).alterProperties(props);
     }
 }