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 e0f31346047 Rename StatesNodePath.DATABASE_LISTENER_COORDINATOR_NODE
(#34491)
e0f31346047 is described below
commit e0f31346047e382992b418dec193fc9bbfbf7073
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 25 19:46:19 2025 +0800
Rename StatesNodePath.DATABASE_LISTENER_COORDINATOR_NODE (#34491)
---
.../mode/node/path/state/StatesNodePath.java | 29 +++++++++++-----------
.../mode/node/path/state/StatesNodePathTest.java | 12 ++++-----
.../global/DatabaseListenerChangedHandler.java | 2 +-
.../ClusterDatabaseListenerPersistCoordinator.java | 4 +--
.../global/DatabaseListenerChangedHandlerTest.java | 12 ++++-----
...sterDatabaseListenerPersistCoordinatorTest.java | 4 +--
6 files changed, 31 insertions(+), 32 deletions(-)
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePath.java
index f18c5a52a8d..fb473007ad4 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePath.java
@@ -34,8 +34,7 @@ public final class StatesNodePath {
private static final String CLUSTER_STATE_NODE = "cluster_state";
- // TODO rename value to database_changed_listener_assisted after meta data
compatible complete @haoran
- private static final String DATABASE_CHANGED_LISTENER_ASSISTED_NODE =
"listener_assisted";
+ private static final String DATABASE_LISTENER_COORDINATOR_NODE =
"database_listener_coordinator";
private static final String DATABASE_PATTERN = "(\\w+)";
@@ -49,33 +48,33 @@ public final class StatesNodePath {
}
/**
- * Get database changed listener assisted node root path.
+ * Get database listener coordinator node root path.
*
- * @return database changed listener assisted node root path
+ * @return database listener coordinator node root path
*/
- public static String getDatabaseChangedListenerAssistedNodeRootPath() {
- return String.join("/", ROOT_NODE,
DATABASE_CHANGED_LISTENER_ASSISTED_NODE);
+ public static String getDatabaseListenerCoordinatorNodeRootPath() {
+ return String.join("/", ROOT_NODE, DATABASE_LISTENER_COORDINATOR_NODE);
}
/**
- * Get database changed listener assisted node path.
+ * Get database listener coordinator node path.
*
* @param databaseName database name
- * @return database changed listener assisted node path
+ * @return database listener coordinator node path
*/
- public static String getDatabaseChangedListenerAssistedNodePath(final
String databaseName) {
- return String.join("/",
getDatabaseChangedListenerAssistedNodeRootPath(), databaseName);
+ public static String getDatabaseListenerCoordinatorNodePath(final String
databaseName) {
+ return String.join("/", getDatabaseListenerCoordinatorNodeRootPath(),
databaseName);
}
/**
- * Find database name by changed listener assisted node path.
+ * Find database name by database listener coordinator node path.
*
- * @param databaseChangedListenerAssistedNodePath database changed
listener assisted node path
+ * @param databaseListenerCoordinatorNodePath database listener
coordinator node path
* @return found database name
*/
- public static Optional<String> findDatabaseName(final String
databaseChangedListenerAssistedNodePath) {
- Pattern pattern =
Pattern.compile(getDatabaseChangedListenerAssistedNodePath(DATABASE_PATTERN) +
"$", Pattern.CASE_INSENSITIVE);
- Matcher matcher =
pattern.matcher(databaseChangedListenerAssistedNodePath);
+ public static Optional<String> findDatabaseName(final String
databaseListenerCoordinatorNodePath) {
+ Pattern pattern =
Pattern.compile(getDatabaseListenerCoordinatorNodePath(DATABASE_PATTERN) + "$",
Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(databaseListenerCoordinatorNodePath);
return matcher.find() ? Optional.of(matcher.group(1)) :
Optional.empty();
}
}
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
index 11ca9e142a7..737b4b2f069 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
@@ -33,18 +33,18 @@ class StatesNodePathTest {
}
@Test
- void assertGetDatabaseChangedListenerAssistedNodeRootPath() {
-
assertThat(StatesNodePath.getDatabaseChangedListenerAssistedNodeRootPath(),
is("/states/listener_assisted"));
+ void assertGetDatabaseListenerCoordinatorNodeRootPath() {
+
assertThat(StatesNodePath.getDatabaseListenerCoordinatorNodeRootPath(),
is("/states/database_listener_coordinator"));
}
@Test
- void assertGetDatabaseChangedListenerAssistedNodePath() {
-
assertThat(StatesNodePath.getDatabaseChangedListenerAssistedNodePath("foo_db"),
is("/states/listener_assisted/foo_db"));
+ void assertGetDatabaseListenerCoordinatorNodePath() {
+
assertThat(StatesNodePath.getDatabaseListenerCoordinatorNodePath("foo_db"),
is("/states/database_listener_coordinator/foo_db"));
}
@Test
void assertFindDatabaseName() {
-
assertThat(StatesNodePath.findDatabaseName("/states/listener_assisted/foo_db"),
is(Optional.of("foo_db")));
-
assertFalse(StatesNodePath.findDatabaseName("/states/listener_assisted").isPresent());
+
assertThat(StatesNodePath.findDatabaseName("/states/database_listener_coordinator/foo_db"),
is(Optional.of("foo_db")));
+
assertFalse(StatesNodePath.findDatabaseName("/states/database_listener_coordinator").isPresent());
}
}
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 d2738fd390d..51eecffd635 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
@@ -40,7 +40,7 @@ public final class DatabaseListenerChangedHandler implements
DataChangedEventHan
@Override
public String getSubscribedKey() {
- return StatesNodePath.getDatabaseChangedListenerAssistedNodeRootPath();
+ return StatesNodePath.getDatabaseListenerCoordinatorNodeRootPath();
}
@Override
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java
index 383c7e517c1..df29146fa6b 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/database/ClusterDatabaseListenerPersistCoordinator.java
@@ -36,7 +36,7 @@ public final class ClusterDatabaseListenerPersistCoordinator {
* @param clusterDatabaseListenerCoordinatorType database changed listener
assisted type
*/
public void persist(final String databaseName, final
ClusterDatabaseListenerCoordinatorType clusterDatabaseListenerCoordinatorType) {
-
repository.persistEphemeral(StatesNodePath.getDatabaseChangedListenerAssistedNodePath(databaseName),
clusterDatabaseListenerCoordinatorType.name());
+
repository.persistEphemeral(StatesNodePath.getDatabaseListenerCoordinatorNodePath(databaseName),
clusterDatabaseListenerCoordinatorType.name());
}
/**
@@ -45,6 +45,6 @@ public final class ClusterDatabaseListenerPersistCoordinator {
* @param databaseName database name
*/
public void delete(final String databaseName) {
-
repository.delete(StatesNodePath.getDatabaseChangedListenerAssistedNodePath(databaseName));
+
repository.delete(StatesNodePath.getDatabaseListenerCoordinatorNodePath(databaseName));
}
}
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 4b41afc2197..4074c6ddd1a 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
@@ -57,30 +57,30 @@ class DatabaseListenerChangedHandlerTest {
when(contextManager.getPersistServiceFacade().getRepository()).thenReturn(repository);
when(contextManager.getMetaDataContexts().getMetaData().getTemporaryProps()).thenReturn(new
TemporaryConfigurationProperties(new Properties()));
handler =
ShardingSphereServiceLoader.getServiceInstances(DataChangedEventHandler.class).stream()
- .filter(each ->
each.getSubscribedKey().equals("/states/listener_assisted")).findFirst().orElse(null);
+ .filter(each ->
each.getSubscribedKey().equals("/states/database_listener_coordinator")).findFirst().orElse(null);
}
@Test
void assertHandleWithoutDatabase() {
- handler.handle(contextManager, new
DataChangedEvent("/states/listener_assisted", "", Type.ADDED));
+ handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator", "", Type.ADDED));
verify(contextManager.getPersistServiceFacade(),
times(0)).getRepository();
}
@Test
void assertRenewWithCreateDatabaseListenerAssistedEvent() {
when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.JDBC);
- handler.handle(contextManager, new
DataChangedEvent("/states/listener_assisted/foo_db", "CREATE_DATABASE",
Type.ADDED));
+ handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator/foo_db",
"CREATE_DATABASE", Type.ADDED));
verify(repository).watch(eq("/metadata/foo_db"), any());
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).addDatabase("foo_db");
-
verify(repository).delete(StatesNodePath.getDatabaseChangedListenerAssistedNodePath("foo_db"));
+
verify(repository).delete(StatesNodePath.getDatabaseListenerCoordinatorNodePath("foo_db"));
}
@Test
void assertRenewWithDropDatabaseListenerAssistedEvent() {
when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.PROXY);
- handler.handle(contextManager, new
DataChangedEvent("/states/listener_assisted/foo_db", "DROP_DATABASE",
Type.ADDED));
+ handler.handle(contextManager, new
DataChangedEvent("/states/database_listener_coordinator/foo_db",
"DROP_DATABASE", Type.ADDED));
verify(repository).removeDataListener("/metadata/foo_db");
verify(contextManager.getMetaDataContextManager().getSchemaMetaDataManager()).dropDatabase("foo_db");
-
verify(repository).delete(StatesNodePath.getDatabaseChangedListenerAssistedNodePath("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 7e8bd836311..850489f4027 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
@@ -35,12 +35,12 @@ class ClusterDatabaseListenerPersistCoordinatorTest {
@Test
void assertPersist() {
new
ClusterDatabaseListenerPersistCoordinator(repository).persist("foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE);
-
verify(repository).persistEphemeral("/states/listener_assisted/foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE.name());
+
verify(repository).persistEphemeral("/states/database_listener_coordinator/foo_db",
ClusterDatabaseListenerCoordinatorType.CREATE_DATABASE.name());
}
@Test
void assertDelete() {
new
ClusterDatabaseListenerPersistCoordinator(repository).delete("foo_db");
- verify(repository).delete("/states/listener_assisted/foo_db");
+
verify(repository).delete("/states/database_listener_coordinator/foo_db");
}
}
