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 9310af75418 Refactor ClusterDatabaseListenerCoordinatorType (#34492)
9310af75418 is described below
commit 9310af75418cea2344c9db7e07af84ef20490ec0
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 25 19:53:03 2025 +0800
Refactor ClusterDatabaseListenerCoordinatorType (#34492)
---
.../dispatch/handler/global/DatabaseListenerChangedHandler.java | 4 ++--
.../coordinator/database/ClusterDatabaseListenerCoordinatorType.java | 3 +--
.../cluster/persist/service/ClusterMetaDataManagerPersistService.java | 4 ++--
.../dispatch/handler/global/DatabaseListenerChangedHandlerTest.java | 4 ++--
.../database/ClusterDatabaseListenerPersistCoordinatorTest.java | 4 ++--
.../persist/service/ClusterMetaDataManagerPersistServiceTest.java | 4 ++--
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
index 51eecffd635..1e5f3d1b066 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandler.java
@@ -55,10 +55,10 @@ public final class DatabaseListenerChangedHandler
implements DataChangedEventHan
private static void handle(final ContextManager contextManager, final
String databaseName, final ClusterDatabaseListenerCoordinatorType
clusterDatabaseListenerCoordinatorType) {
ClusterPersistRepository repository = (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
- if (ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE ==
clusterDatabaseListenerCoordinatorType) {
+ if (ClusterDatabaseListenerCoordinatorType.CREATE ==
clusterDatabaseListenerCoordinatorType) {
repository.watch(DatabaseMetaDataNodePath.getDatabasePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(databaseName);
- } else if (ClusterDatabaseListenerCoordinatorType.DROP_DATABASE ==
clusterDatabaseListenerCoordinatorType) {
+ } else if (ClusterDatabaseListenerCoordinatorType.DROP ==
clusterDatabaseListenerCoordinatorType) {
repository.removeDataListener(DatabaseMetaDataNodePath.getDatabasePath(databaseName));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(databaseName);
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerCoordinatorType.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerCoordinatorType.java
index 02de681da71..e54540b677f 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerCoordinatorType.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerCoordinatorType.java
@@ -22,6 +22,5 @@ package
org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.datab
*/
public enum ClusterDatabaseListenerCoordinatorType {
- // TODO rename to CREATE and DROP after meta data compatible complete
@haoran
- CREATE_DATABASE, DROP_DATABASE
+ CREATE, DROP
}
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 6b0834b618a..0ab5a9a5c44 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
@@ -73,13 +73,13 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
@Override
public void createDatabase(final String databaseName) {
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().add(databaseName);
- clusterDatabaseListenerPersistCoordinator.persist(databaseName,
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE);
+ clusterDatabaseListenerPersistCoordinator.persist(databaseName,
ClusterDatabaseListenerCoordinatorType.CREATE);
}
@Override
public void dropDatabase(final String databaseName) {
String droppedDatabaseName =
metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName();
- clusterDatabaseListenerPersistCoordinator.persist(droppedDatabaseName,
ClusterDatabaseListenerCoordinatorType.DROP_DATABASE);
+ clusterDatabaseListenerPersistCoordinator.persist(droppedDatabaseName,
ClusterDatabaseListenerCoordinatorType.DROP);
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().drop(droppedDatabaseName);
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
index 4074c6ddd1a..e3231f41ead 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/DatabaseListenerChangedHandlerTest.java
@@ -69,7 +69,7 @@ class DatabaseListenerChangedHandlerTest {
@Test
void assertRenewWithCreateDatabaseListenerAssistedEvent() {
when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.JDBC);
- handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator/foo_db",
"CREATE_DATABASE", Type.ADDED));
+ handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator/foo_db", "CREATE",
Type.ADDED));
verify(repository).watch(eq("/metadata/foo_db"), any());
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).addDatabase("foo_db");
verify(repository).delete(StatesNodePath.getDatabaseListenerCoordinatorNodePath("foo_db"));
@@ -78,7 +78,7 @@ class DatabaseListenerChangedHandlerTest {
@Test
void assertRenewWithDropDatabaseListenerAssistedEvent() {
when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.PROXY);
- handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator/foo_db",
"DROP_DATABASE", Type.ADDED));
+ handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator/foo_db", "DROP",
Type.ADDED));
verify(repository).removeDataListener("/metadata/foo_db");
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).dropDatabase("foo_db");
verify(repository).delete(StatesNodePath.getDatabaseListenerCoordinatorNodePath("foo_db"));
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinatorTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinatorTest.java
index 850489f4027..46a8e5a566e 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinatorTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinatorTest.java
@@ -34,8 +34,8 @@ class ClusterDatabaseListenerPersistCoordinatorTest {
@Test
void assertPersist() {
- new
ClusterDatabaseListenerPersistCoordinator(repository).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE);
-
verify(repository).persistEphemeral("/states/database_listener_coordinator/foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE.name());
+ new
ClusterDatabaseListenerPersistCoordinator(repository).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE);
+
verify(repository).persistEphemeral("/states/database_listener_coordinator/foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE.name());
}
@Test
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 c1173f46a2c..d458814a0bd 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
@@ -75,14 +75,14 @@ class ClusterMetaDataManagerPersistServiceTest {
void assertCreateDatabase() {
metaDataManagerPersistService.createDatabase("foo_db");
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).add("foo_db");
- verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE);
+ verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE);
}
@Test
void assertDropDatabase() {
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
metaDataManagerPersistService.dropDatabase("foo_db");
- verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.DROP_DATABASE);
+ verify(clusterDatabaseListenerPersistCoordinator).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.DROP);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).drop("foo_db");
}
