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 252b0dd7e50 Rename DatabaseListenerPersistCoordinator (#34489)
252b0dd7e50 is described below
commit 252b0dd7e50a36c01eb345c7f4f2ac699456ab11
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Jan 25 18:29:02 2025 +0800
Rename DatabaseListenerPersistCoordinator (#34489)
* Rename DatabaseListenerChangedHandler
* Rename DatabaseListenerAssistedPersistService
* Rename DatabaseListenerPersistCoordinator
* Rename DatabaseListenerPersistCoordinator
* Rename DatabaseListenerPersistCoordinator
---
...andler.java => DatabaseListenerChangedHandler.java} | 18 +++++++++---------
.../ClusterDatabaseListenerPersistCoordinator.java} | 16 ++++++++--------
.../DatabaseListenerCoordinatorType.java} | 6 +++---
.../service/ClusterMetaDataManagerPersistService.java | 10 ++++++----
...er.cluster.dispatch.handler.DataChangedEventHandler | 2 +-
...st.java => DatabaseListenerChangedHandlerTest.java} | 2 +-
...ClusterDatabaseListenerPersistCoordinatorTest.java} | 10 +++++-----
.../ClusterMetaDataManagerPersistServiceTest.java | 12 +++++++-----
8 files changed, 40 insertions(+), 36 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
similarity index 77%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandler.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
index b2ce8d22076..d2f8e132427 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
@@ -27,16 +27,16 @@ import
org.apache.shardingsphere.mode.metadata.refresher.statistics.StatisticsRe
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.manager.cluster.persist.service.DatabaseChangedListenerAssistedPersistService;
-import
org.apache.shardingsphere.mode.manager.cluster.persist.service.DatabaseChangedListenerAssistedType;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.ClusterDatabaseListenerPersistCoordinator;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.DatabaseListenerCoordinatorType;
import java.util.Arrays;
import java.util.Collection;
/**
- * Database changed listener assisted changed handler.
+ * Database listener changed handler.
*/
-public final class DatabaseChangedListenerAssistedChangedHandler implements
DataChangedEventHandler {
+public final class DatabaseListenerChangedHandler implements
DataChangedEventHandler {
@Override
public String getSubscribedKey() {
@@ -50,19 +50,19 @@ public final class
DatabaseChangedListenerAssistedChangedHandler implements Data
@Override
public void handle(final ContextManager contextManager, final
DataChangedEvent event) {
- StatesNodePath.findDatabaseName(event.getKey()).ifPresent(optional ->
handle(contextManager, optional,
DatabaseChangedListenerAssistedType.valueOf(event.getValue())));
+ StatesNodePath.findDatabaseName(event.getKey()).ifPresent(optional ->
handle(contextManager, optional,
DatabaseListenerCoordinatorType.valueOf(event.getValue())));
}
- private static void handle(final ContextManager contextManager, final
String databaseName, final DatabaseChangedListenerAssistedType
databaseChangedListenerAssistedType) {
+ private static void handle(final ContextManager contextManager, final
String databaseName, final DatabaseListenerCoordinatorType
databaseListenerCoordinatorType) {
ClusterPersistRepository repository = (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
- if (DatabaseChangedListenerAssistedType.CREATE_DATABASE ==
databaseChangedListenerAssistedType) {
+ if (DatabaseListenerCoordinatorType.CREATE_DATABASE ==
databaseListenerCoordinatorType) {
repository.watch(DatabaseMetaDataNodePath.getDatabasePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(databaseName);
- } else if (DatabaseChangedListenerAssistedType.DROP_DATABASE ==
databaseChangedListenerAssistedType) {
+ } else if (DatabaseListenerCoordinatorType.DROP_DATABASE ==
databaseListenerCoordinatorType) {
repository.removeDataListener(DatabaseMetaDataNodePath.getDatabasePath(databaseName));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(databaseName);
}
- new
DatabaseChangedListenerAssistedPersistService(repository).delete(databaseName);
+ new
ClusterDatabaseListenerPersistCoordinator(repository).delete(databaseName);
if (InstanceType.PROXY ==
contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType())
{
new StatisticsRefreshEngine(contextManager).asyncRefresh();
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinator.java
similarity index 73%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistService.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinator.java
index 8d75d30f23e..c3e2da12579 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinator.java
@@ -15,32 +15,32 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.persist.service;
+package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
- * Database changed listener assisted persist service.
+ * Database listener persist coordinator.
*/
@RequiredArgsConstructor
-public final class DatabaseChangedListenerAssistedPersistService {
+public final class ClusterDatabaseListenerPersistCoordinator {
private final PersistRepository repository;
/**
- * Persist database changed listener assisted state.
+ * Persist database listener assisted state.
*
* @param databaseName database name
- * @param databaseChangedListenerAssistedType database changed listener
assisted type
+ * @param databaseListenerCoordinatorType database changed listener
assisted type
*/
- public void persist(final String databaseName, final
DatabaseChangedListenerAssistedType databaseChangedListenerAssistedType) {
-
repository.persistEphemeral(StatesNodePath.getDatabaseChangedListenerAssistedNodePath(databaseName),
databaseChangedListenerAssistedType.name());
+ public void persist(final String databaseName, final
DatabaseListenerCoordinatorType databaseListenerCoordinatorType) {
+
repository.persistEphemeral(StatesNodePath.getDatabaseChangedListenerAssistedNodePath(databaseName),
databaseListenerCoordinatorType.name());
}
/**
- * Delete database changed listener assisted state.
+ * Delete database listener assisted state.
*
* @param databaseName database name
*/
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedType.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/DatabaseListenerCoordinatorType.java
similarity index 84%
rename from
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedType.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/DatabaseListenerCoordinatorType.java
index 7a29d5ba553..dd1e9479226 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedType.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/DatabaseListenerCoordinatorType.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.persist.service;
+package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
/**
- * Database changed listener assisted type.
+ * Database listener coordinator type.
*/
-public enum DatabaseChangedListenerAssistedType {
+public enum DatabaseListenerCoordinatorType {
// TODO rename to CREATE and DROP after meta data compatible complete
@haoran
CREATE_DATABASE, DROP_DATABASE
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 8ad3de399f2..67fb6a7e3cb 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
@@ -29,6 +29,8 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics;
import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.ClusterDatabaseListenerPersistCoordinator;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.DatabaseListenerCoordinatorType;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.factory.MetaDataContextsFactory;
@@ -60,24 +62,24 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
private final MetaDataPersistService metaDataPersistService;
- private final DatabaseChangedListenerAssistedPersistService
databaseChangedListenerAssistedPersistService;
+ private final ClusterDatabaseListenerPersistCoordinator
clusterDatabaseListenerPersistCoordinator;
public ClusterMetaDataManagerPersistService(final MetaDataContextManager
metaDataContextManager, final PersistRepository repository) {
this.metaDataContextManager = metaDataContextManager;
metaDataPersistService =
metaDataContextManager.getMetaDataPersistService();
- databaseChangedListenerAssistedPersistService = new
DatabaseChangedListenerAssistedPersistService(repository);
+ clusterDatabaseListenerPersistCoordinator = new
ClusterDatabaseListenerPersistCoordinator(repository);
}
@Override
public void createDatabase(final String databaseName) {
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().add(databaseName);
- databaseChangedListenerAssistedPersistService.persist(databaseName,
DatabaseChangedListenerAssistedType.CREATE_DATABASE);
+ clusterDatabaseListenerPersistCoordinator.persist(databaseName,
DatabaseListenerCoordinatorType.CREATE_DATABASE);
}
@Override
public void dropDatabase(final String databaseName) {
String droppedDatabaseName =
metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName();
-
databaseChangedListenerAssistedPersistService.persist(droppedDatabaseName,
DatabaseChangedListenerAssistedType.DROP_DATABASE);
+ clusterDatabaseListenerPersistCoordinator.persist(droppedDatabaseName,
DatabaseListenerCoordinatorType.DROP_DATABASE);
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().drop(droppedDatabaseName);
}
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 1ed734cabb9..69d090bad03 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.DatabaseChangedListenerAssistedChangedHandler
+org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.DatabaseListenerChangedHandler
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/DatabaseChangedListenerAssistedChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
similarity index 98%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandlerTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
index 61dfc816bc1..4b41afc2197 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseChangedListenerAssistedChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class DatabaseChangedListenerAssistedChangedHandlerTest {
+class DatabaseListenerChangedHandlerTest {
private DataChangedEventHandler handler;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinatorTest.java
similarity index 77%
rename from
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistServiceTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinatorTest.java
index fe48fac4e5e..6b427e4745e 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterDatabaseListenerPersistCoordinatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.manager.cluster.persist.service;
+package org.apache.shardingsphere.mode.manager.cluster.persist.coordinator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.Test;
@@ -27,20 +27,20 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.mockito.Mockito.verify;
@ExtendWith(MockitoExtension.class)
-class DatabaseChangedListenerAssistedPersistServiceTest {
+class ClusterDatabaseListenerPersistCoordinatorTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PersistRepository repository;
@Test
void assertPersist() {
- new
DatabaseChangedListenerAssistedPersistService(repository).persist("foo_db",
DatabaseChangedListenerAssistedType.CREATE_DATABASE);
-
verify(repository).persistEphemeral("/states/listener_assisted/foo_db",
DatabaseChangedListenerAssistedType.CREATE_DATABASE.name());
+ new
ClusterDatabaseListenerPersistCoordinator(repository).persist("foo_db",
DatabaseListenerCoordinatorType.CREATE_DATABASE);
+
verify(repository).persistEphemeral("/states/listener_assisted/foo_db",
DatabaseListenerCoordinatorType.CREATE_DATABASE.name());
}
@Test
void assertDelete() {
- new
DatabaseChangedListenerAssistedPersistService(repository).delete("foo_db");
+ new
ClusterDatabaseListenerPersistCoordinator(repository).delete("foo_db");
verify(repository).delete("/states/listener_assisted/foo_db");
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
index 2a76832d7ee..74d6d167bd6 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
@@ -22,6 +22,8 @@ import
org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.ClusterDatabaseListenerPersistCoordinator;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.DatabaseListenerCoordinatorType;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -55,7 +57,7 @@ class ClusterMetaDataManagerPersistServiceTest {
private MetaDataPersistService metaDataPersistService;
@Mock
- private DatabaseChangedListenerAssistedPersistService
databaseChangedListenerAssistedPersistService;
+ private ClusterDatabaseListenerPersistCoordinator
clusterDatabaseListenerPersistCoordinator;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private MetaDataContextManager metaDataContextManager;
@@ -65,22 +67,22 @@ class ClusterMetaDataManagerPersistServiceTest {
void setUp() {
metaDataManagerPersistService = new
ClusterMetaDataManagerPersistService(metaDataContextManager,
mock(PersistRepository.class));
Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("metaDataPersistService"),
metaDataManagerPersistService, metaDataPersistService);
-
Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("databaseChangedListenerAssistedPersistService"),
- metaDataManagerPersistService,
databaseChangedListenerAssistedPersistService);
+
Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("clusterDatabaseListenerPersistCoordinator"),
+ metaDataManagerPersistService,
clusterDatabaseListenerPersistCoordinator);
}
@Test
void assertCreateDatabase() {
metaDataManagerPersistService.createDatabase("foo_db");
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).add("foo_db");
-
verify(databaseChangedListenerAssistedPersistService).persist("foo_db",
DatabaseChangedListenerAssistedType.CREATE_DATABASE);
+ verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
DatabaseListenerCoordinatorType.CREATE_DATABASE);
}
@Test
void assertDropDatabase() {
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
metaDataManagerPersistService.dropDatabase("foo_db");
-
verify(databaseChangedListenerAssistedPersistService).persist("foo_db",
DatabaseChangedListenerAssistedType.DROP_DATABASE);
+ verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
DatabaseListenerCoordinatorType.DROP_DATABASE);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).drop("foo_db");
}
