This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 6955e381c5c Rename DatabaseChangedListenerAssistedChangedHandler
(#34481)
6955e381c5c is described below
commit 6955e381c5cc136f7d8c4e0a64b50d4aa4db1bd5
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Jan 25 14:06:05 2025 +0800
Rename DatabaseChangedListenerAssistedChangedHandler (#34481)
---
...a => DatabaseChangedListenerAssistedChangedHandler.java} | 13 +++++++------
...manager.cluster.dispatch.handler.DataChangedEventHandler | 2 +-
... DatabaseChangedListenerAssistedChangedHandlerTest.java} | 7 ++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandler.java
similarity index 91%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandler.java
index 0648f9b070e..0bf276b902b 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandler.java
@@ -18,24 +18,25 @@
package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
-import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath;
-import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
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.dispatch.handler.DataChangedEventHandler;
import
org.apache.shardingsphere.mode.manager.cluster.dispatch.listener.type.DatabaseMetaDataChangedListener;
import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRefreshEngine;
-import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
+import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath;
+import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
+import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedPersistService;
+import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
import java.util.Arrays;
import java.util.Collection;
/**
- * Listener assisted changed handler.
+ * Database changed listener assisted changed handler.
*/
-public final class ListenerAssistedChangedHandler implements
DataChangedEventHandler {
+public final class DatabaseChangedListenerAssistedChangedHandler implements
DataChangedEventHandler {
@Override
public String getSubscribedKey() {
@@ -61,7 +62,7 @@ public final class ListenerAssistedChangedHandler implements
DataChangedEventHan
repository.removeDataListener(DatabaseMetaDataNodePath.getDatabasePath(databaseName));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(databaseName);
}
-
contextManager.getPersistServiceFacade().getDatabaseChangedListenerAssistedPersistService().delete(databaseName);
+ new
DatabaseChangedListenerAssistedPersistService(repository).delete(databaseName);
if (InstanceType.PROXY ==
contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType())
{
new StatisticsRefreshEngine(contextManager).asyncRefresh();
}
diff --git
a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler
b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler
index df5c55d6443..1ed734cabb9 100644
---
a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler
+++
b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.DataChangedEventHandler
@@ -22,6 +22,6 @@
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.ComputeNo
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.ShardingSphereStatisticsChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalRuleChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.PropertiesChangedHandler
-org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.ListenerAssistedChangedHandler
+org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DatabaseChangedListenerAssistedChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.ShowProcessListHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.KillProcessHandler
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandlerTest.java
similarity index 92%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandlerTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandlerTest.java
index 39a5787280b..e27b63e102b 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ListenerAssistedChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandlerTest.java
@@ -24,6 +24,7 @@ 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.dispatch.handler.DataChangedEventHandler;
+import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -41,7 +42,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class ListenerAssistedChangedHandlerTest {
+class DatabaseChangedListenerAssistedChangedHandlerTest {
private DataChangedEventHandler handler;
@@ -71,7 +72,7 @@ class ListenerAssistedChangedHandlerTest {
handler.handle(contextManager, new
DataChangedEvent("/states/listener_assisted/foo_db", "CREATE_DATABASE",
Type.ADDED));
verify(repository).watch(eq("/metadata/foo_db"), any());
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).addDatabase("foo_db");
-
verify(contextManager.getPersistServiceFacade().getDatabaseChangedListenerAssistedPersistService()).delete("foo_db");
+
verify(repository).delete(StatesNodePath.getDatabaseChangedListenerAssistedNodePath("foo_db"));
}
@Test
@@ -80,6 +81,6 @@ class ListenerAssistedChangedHandlerTest {
handler.handle(contextManager, new
DataChangedEvent("/states/listener_assisted/foo_db", "DROP_DATABASE",
Type.ADDED));
verify(repository).removeDataListener("/metadata/foo_db");
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).dropDatabase("foo_db");
-
verify(contextManager.getPersistServiceFacade().getDatabaseChangedListenerAssistedPersistService()).delete("foo_db");
+
verify(repository).delete(StatesNodePath.getDatabaseChangedListenerAssistedNodePath("foo_db"));
}
}
