You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2024/09/15 02:45:40 UTC

(shardingsphere) branch master updated: Remove DataChangedEventListenerManager (#32874)

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang 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 930a27cf776 Remove DataChangedEventListenerManager (#32874)
930a27cf776 is described below

commit 930a27cf776a84e773e603d918113f32c347b790
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Sep 15 10:45:35 2024 +0800

    Remove DataChangedEventListenerManager (#32874)
---
 .../dispatch/ListenerAssistedSubscriber.java       | 10 ++---
 .../listener/DataChangedEventListenerManager.java  | 50 ----------------------
 .../listener/DataChangedEventListenerRegistry.java |  8 ++--
 .../DataChangedEventListenerRegistryTest.java      | 20 +++------
 4 files changed, 14 insertions(+), 74 deletions(-)

diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ListenerAssistedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ListenerAssistedSubscriber.java
index 9c0d364ed89..2a64143c579 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ListenerAssistedSubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ListenerAssistedSubscriber.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.mode.event.dispatch.assisted.CreateDatabaseList
 import org.apache.shardingsphere.mode.event.dispatch.assisted.DropDatabaseListenerAssistedEvent;
 import org.apache.shardingsphere.mode.lock.GlobalLockContext;
 import org.apache.shardingsphere.mode.manager.ContextManager;
-import org.apache.shardingsphere.mode.manager.cluster.listener.DataChangedEventListenerManager;
 import org.apache.shardingsphere.mode.manager.cluster.listener.DatabaseMetaDataChangedListener;
 import org.apache.shardingsphere.mode.manager.cluster.lock.GlobalLockPersistService;
 import org.apache.shardingsphere.mode.metadata.refresher.ShardingSphereStatisticsRefreshEngine;
@@ -40,11 +39,11 @@ public final class ListenerAssistedSubscriber implements EventSubscriber {
     
     private final ContextManager contextManager;
     
-    private final DataChangedEventListenerManager listenerManager;
+    private final ClusterPersistRepository repository;
     
     public ListenerAssistedSubscriber(final ContextManager contextManager) {
         this.contextManager = contextManager;
-        listenerManager = new DataChangedEventListenerManager((ClusterPersistRepository) contextManager.getPersistServiceFacade().getRepository());
+        repository = (ClusterPersistRepository) contextManager.getPersistServiceFacade().getRepository();
     }
     
     /**
@@ -54,8 +53,7 @@ public final class ListenerAssistedSubscriber implements EventSubscriber {
      */
     @Subscribe
     public synchronized void renew(final CreateDatabaseListenerAssistedEvent event) {
-        listenerManager.addListener(DatabaseMetaDataNode.getDatabaseNamePath(event.getDatabaseName()),
-                new DatabaseMetaDataChangedListener(contextManager.getComputeNodeInstanceContext().getEventBusContext()));
+        repository.watch(DatabaseMetaDataNode.getDatabaseNamePath(event.getDatabaseName()), new DatabaseMetaDataChangedListener(contextManager.getComputeNodeInstanceContext().getEventBusContext()));
         contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(event.getDatabaseName());
         contextManager.getPersistServiceFacade().getListenerAssistedPersistService().deleteDatabaseNameListenerAssisted(event.getDatabaseName());
         refreshShardingSphereStatisticsData();
@@ -68,7 +66,7 @@ public final class ListenerAssistedSubscriber implements EventSubscriber {
      */
     @Subscribe
     public synchronized void renew(final DropDatabaseListenerAssistedEvent event) {
-        listenerManager.removeListener(DatabaseMetaDataNode.getDatabaseNamePath(event.getDatabaseName()));
+        repository.removeDataListener(DatabaseMetaDataNode.getDatabaseNamePath(event.getDatabaseName()));
         contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(event.getDatabaseName());
         contextManager.getPersistServiceFacade().getListenerAssistedPersistService().deleteDatabaseNameListenerAssisted(event.getDatabaseName());
         refreshShardingSphereStatisticsData();
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerManager.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerManager.java
deleted file mode 100644
index 7dfc4b92ff1..00000000000
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerManager.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.listener;
-
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-
-/**
- * Data changed event listener manager.
- */
-@RequiredArgsConstructor
-public final class DataChangedEventListenerManager {
-    
-    private final ClusterPersistRepository repository;
-    
-    /**
-     * Add listener.
-     *
-     * @param listenerKey listener key
-     * @param dataChangedEventListener data changed event listener
-     */
-    public void addListener(final String listenerKey, final DataChangedEventListener dataChangedEventListener) {
-        repository.watch(listenerKey, dataChangedEventListener);
-    }
-    
-    /**
-     * Remove listener.
-     *
-     * @param listenerKey listener key
-     */
-    public void removeListener(final String listenerKey) {
-        repository.removeDataListener(listenerKey);
-    }
-}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerRegistry.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerRegistry.java
index c781869fa30..c466934367e 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerRegistry.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerRegistry.java
@@ -31,14 +31,14 @@ import java.util.Collection;
  */
 public final class DataChangedEventListenerRegistry {
     
-    private final DataChangedEventListenerManager listenerManager;
+    private final ClusterPersistRepository repository;
     
     private final EventBusContext eventBusContext;
     
     private final Collection<String> databaseNames;
     
     public DataChangedEventListenerRegistry(final ContextManager contextManager, final Collection<String> databaseNames) {
-        listenerManager = new DataChangedEventListenerManager((ClusterPersistRepository) contextManager.getPersistServiceFacade().getRepository());
+        repository = (ClusterPersistRepository) contextManager.getPersistServiceFacade().getRepository();
         eventBusContext = contextManager.getComputeNodeInstanceContext().getEventBusContext();
         this.databaseNames = databaseNames;
     }
@@ -52,10 +52,10 @@ public final class DataChangedEventListenerRegistry {
     }
     
     private void registerDatabaseListeners(final String databaseName) {
-        listenerManager.addListener(DatabaseMetaDataNode.getDatabaseNamePath(databaseName), new DatabaseMetaDataChangedListener(eventBusContext));
+        repository.watch(DatabaseMetaDataNode.getDatabaseNamePath(databaseName), new DatabaseMetaDataChangedListener(eventBusContext));
     }
     
     private void registerGlobalListeners(final DispatchEventBuilder<?> builder) {
-        builder.getSubscribedKeys().forEach(each -> listenerManager.addListener(each, new GlobalMetaDataChangedListener(eventBusContext, builder)));
+        builder.getSubscribedKeys().forEach(each -> repository.watch(each, new GlobalMetaDataChangedListener(eventBusContext, builder)));
     }
 }
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerRegistryTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerRegistryTest.java
index 51276c0c31f..fc42cf23a6e 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerRegistryTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/listener/DataChangedEventListenerRegistryTest.java
@@ -17,17 +17,17 @@
 
 package org.apache.shardingsphere.mode.manager.cluster.listener;
 
-import lombok.SneakyThrows;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Field;
 import java.util.Collections;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -37,19 +37,11 @@ class DataChangedEventListenerRegistryTest {
     @Test
     void assertRegister() {
         ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
-        when(contextManager.getPersistServiceFacade().getRepository()).thenReturn(mock(ClusterPersistRepository.class));
-        DataChangedEventListenerManager listenerManager = mock(DataChangedEventListenerManager.class);
+        ClusterPersistRepository repository = mock(ClusterPersistRepository.class);
+        when(contextManager.getPersistServiceFacade().getRepository()).thenReturn(repository);
         DataChangedEventListenerRegistry registry = new DataChangedEventListenerRegistry(contextManager, Collections.singleton("foo_db"));
-        setDataChangedEventListenerManager(registry, listenerManager);
         registry.register();
-        verify(listenerManager).addListener(eq("/metadata/foo_db"), any());
-    }
-    
-    @SneakyThrows(ReflectiveOperationException.class)
-    private void setDataChangedEventListenerManager(final DataChangedEventListenerRegistry registry, final DataChangedEventListenerManager listenerManager) {
-        Field field = DataChangedEventListenerRegistry.class.getDeclaredField("listenerManager");
-        field.setAccessible(true);
-        field.set(registry, listenerManager);
-        field.setAccessible(false);
+        verify(repository).watch(eq("/metadata/foo_db"), any(DatabaseMetaDataChangedListener.class));
+        verify(repository, atLeastOnce()).watch(anyString(), any(GlobalMetaDataChangedListener.class));
     }
 }