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 97118542666 Rename DatabaseChangedListenerAssistedPersistService
(#34479)
97118542666 is described below
commit 9711854266649611d3ef9c0b1a959a107b0144dd
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 25 13:27:52 2025 +0800
Rename DatabaseChangedListenerAssistedPersistService (#34479)
* Rename DatabaseChangedListenerAssistedPersistService
* Rename DatabaseChangedListenerAssistedPersistService
* Rename DatabaseChangedListenerAssistedPersistService
---
.../mode/persist/PersistServiceFacade.java | 6 ++---
...baseChangedListenerAssistedPersistService.java} | 18 +++++++-------
...va => DatabaseChangedListenerAssistedType.java} | 5 ++--
...ChangedListenerAssistedPersistServiceTest.java} | 12 ++++-----
.../mode/node/path/state/StatesNodePath.java | 29 +++++++++++-----------
.../mode/node/path/state/StatesNodePathTest.java | 8 +++---
.../global/ListenerAssistedChangedHandler.java | 14 +++++------
.../ClusterMetaDataManagerPersistService.java | 12 ++++-----
.../global/ListenerAssistedChangedHandlerTest.java | 6 ++---
.../ClusterMetaDataManagerPersistServiceTest.java | 13 +++++-----
10 files changed, 63 insertions(+), 60 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
index 83ee9946a3c..a8d68b7f44e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistServ
import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
import org.apache.shardingsphere.mode.persist.service.ProcessPersistService;
import org.apache.shardingsphere.mode.state.node.ComputeNodePersistService;
-import
org.apache.shardingsphere.mode.state.database.ListenerAssistedPersistService;
+import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedPersistService;
import
org.apache.shardingsphere.mode.state.node.QualifiedDataSourceStatePersistService;
import org.apache.shardingsphere.mode.state.cluster.ClusterStatePersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
@@ -50,7 +50,7 @@ public final class PersistServiceFacade {
private final ProcessPersistService processPersistService;
- private final ListenerAssistedPersistService
listenerAssistedPersistService;
+ private final DatabaseChangedListenerAssistedPersistService
databaseChangedListenerAssistedPersistService;
private final QualifiedDataSourceStatePersistService
qualifiedDataSourceStatePersistService;
@@ -63,7 +63,7 @@ public final class PersistServiceFacade {
PersistServiceBuilder persistServiceBuilder =
TypedSPILoader.getService(PersistServiceBuilder.class, modeConfig.getType());
metaDataManagerPersistService =
persistServiceBuilder.buildMetaDataManagerPersistService(repository,
metaDataContextManager);
processPersistService =
persistServiceBuilder.buildProcessPersistService(repository);
- listenerAssistedPersistService = new
ListenerAssistedPersistService(repository);
+ databaseChangedListenerAssistedPersistService = new
DatabaseChangedListenerAssistedPersistService(repository);
}
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistService.java
similarity index 62%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedPersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistService.java
index c9dc54d2067..eb421fabdae 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistService.java
@@ -22,29 +22,29 @@ import
org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
- * Listener assisted persist service.
+ * Database changed listener assisted persist service.
*/
@RequiredArgsConstructor
-public final class ListenerAssistedPersistService {
+public final class DatabaseChangedListenerAssistedPersistService {
private final PersistRepository repository;
/**
- * Persist database name listener assisted.
+ * Persist database changed listener assisted state.
*
* @param databaseName database name
- * @param listenerAssistedType listener assisted type
+ * @param databaseChangedListenerAssistedType database changed listener
assisted type
*/
- public void persistDatabaseNameListenerAssisted(final String databaseName,
final ListenerAssistedType listenerAssistedType) {
-
repository.persistEphemeral(StatesNodePath.getListenerAssistedNodePath(databaseName),
listenerAssistedType.name());
+ public void persist(final String databaseName, final
DatabaseChangedListenerAssistedType databaseChangedListenerAssistedType) {
+
repository.persistEphemeral(StatesNodePath.getDatabaseChangedListenerAssistedNodePath(databaseName),
databaseChangedListenerAssistedType.name());
}
/**
- * Delete database name listener assisted.
+ * Delete database changed listener assisted state.
*
* @param databaseName database name
*/
- public void deleteDatabaseNameListenerAssisted(final String databaseName) {
-
repository.delete(StatesNodePath.getListenerAssistedNodePath(databaseName));
+ public void delete(final String databaseName) {
+
repository.delete(StatesNodePath.getDatabaseChangedListenerAssistedNodePath(databaseName));
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedType.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedType.java
similarity index 83%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedType.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedType.java
index 962370cce6c..14560566d2d 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedType.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedType.java
@@ -18,9 +18,10 @@
package org.apache.shardingsphere.mode.state.database;
/**
- * Listener assisted type.
+ * Database changed listener assisted type.
*/
-public enum ListenerAssistedType {
+public enum DatabaseChangedListenerAssistedType {
+ // TODO rename to CREATE and DROP after meta data compatible complete
@haoran
CREATE_DATABASE, DROP_DATABASE
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedPersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistServiceTest.java
similarity index 76%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedPersistServiceTest.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistServiceTest.java
index 824a8ce313a..6f8a701880f 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/ListenerAssistedPersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistServiceTest.java
@@ -27,20 +27,20 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.mockito.Mockito.verify;
@ExtendWith(MockitoExtension.class)
-class ListenerAssistedPersistServiceTest {
+class DatabaseChangedListenerAssistedPersistServiceTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PersistRepository repository;
@Test
- void assertPersistDatabaseNameListenerAssisted() {
- new
ListenerAssistedPersistService(repository).persistDatabaseNameListenerAssisted("foo_db",
ListenerAssistedType.CREATE_DATABASE);
-
verify(repository).persistEphemeral("/states/listener_assisted/foo_db",
ListenerAssistedType.CREATE_DATABASE.name());
+ void assertPersist() {
+ new
DatabaseChangedListenerAssistedPersistService(repository).persist("foo_db",
DatabaseChangedListenerAssistedType.CREATE_DATABASE);
+
verify(repository).persistEphemeral("/states/listener_assisted/foo_db",
DatabaseChangedListenerAssistedType.CREATE_DATABASE.name());
}
@Test
- void assertDeleteDatabaseNameListenerAssisted() {
- new
ListenerAssistedPersistService(repository).deleteDatabaseNameListenerAssisted("foo_db");
+ void assertDelete() {
+ new
DatabaseChangedListenerAssistedPersistService(repository).delete("foo_db");
verify(repository).delete("/states/listener_assisted/foo_db");
}
}
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 d0a4a0f1397..f18c5a52a8d 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,7 +34,8 @@ public final class StatesNodePath {
private static final String CLUSTER_STATE_NODE = "cluster_state";
- private static final String LISTENER_ASSISTED_NODE = "listener_assisted";
+ // 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_PATTERN = "(\\w+)";
@@ -48,33 +49,33 @@ public final class StatesNodePath {
}
/**
- * Get listener assisted node root path.
+ * Get database changed listener assisted node root path.
*
- * @return listener assisted node root path
+ * @return database changed listener assisted node root path
*/
- public static String getListenerAssistedNodeRootPath() {
- return String.join("/", ROOT_NODE, LISTENER_ASSISTED_NODE);
+ public static String getDatabaseChangedListenerAssistedNodeRootPath() {
+ return String.join("/", ROOT_NODE,
DATABASE_CHANGED_LISTENER_ASSISTED_NODE);
}
/**
- * Get database name listener assisted node path.
+ * Get database changed listener assisted node path.
*
* @param databaseName database name
- * @return database name listener assisted node path
+ * @return database changed listener assisted node path
*/
- public static String getListenerAssistedNodePath(final String
databaseName) {
- return String.join("/", getListenerAssistedNodeRootPath(),
databaseName);
+ public static String getDatabaseChangedListenerAssistedNodePath(final
String databaseName) {
+ return String.join("/",
getDatabaseChangedListenerAssistedNodeRootPath(), databaseName);
}
/**
- * Find database name by listener assisted node path.
+ * Find database name by changed listener assisted node path.
*
- * @param listenerAssistedNodePath listener assisted node path
+ * @param databaseChangedListenerAssistedNodePath database changed
listener assisted node path
* @return found database name
*/
- public static Optional<String> findDatabaseName(final String
listenerAssistedNodePath) {
- Pattern pattern =
Pattern.compile(getListenerAssistedNodePath(DATABASE_PATTERN) + "$",
Pattern.CASE_INSENSITIVE);
- Matcher matcher = pattern.matcher(listenerAssistedNodePath);
+ public static Optional<String> findDatabaseName(final String
databaseChangedListenerAssistedNodePath) {
+ Pattern pattern =
Pattern.compile(getDatabaseChangedListenerAssistedNodePath(DATABASE_PATTERN) +
"$", Pattern.CASE_INSENSITIVE);
+ Matcher matcher =
pattern.matcher(databaseChangedListenerAssistedNodePath);
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 a18271195bb..11ca9e142a7 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,13 +33,13 @@ class StatesNodePathTest {
}
@Test
- void assertGetListenerAssistedNodeRootPath() {
- assertThat(StatesNodePath.getListenerAssistedNodeRootPath(),
is("/states/listener_assisted"));
+ void assertGetDatabaseChangedListenerAssistedNodeRootPath() {
+
assertThat(StatesNodePath.getDatabaseChangedListenerAssistedNodeRootPath(),
is("/states/listener_assisted"));
}
@Test
- void assertGetListenerAssistedNodePath() {
- assertThat(StatesNodePath.getListenerAssistedNodePath("foo_db"),
is("/states/listener_assisted/foo_db"));
+ void assertGetDatabaseChangedListenerAssistedNodePath() {
+
assertThat(StatesNodePath.getDatabaseChangedListenerAssistedNodePath("foo_db"),
is("/states/listener_assisted/foo_db"));
}
@Test
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/ListenerAssistedChangedHandler.java
index e78939f9107..0648f9b070e 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/ListenerAssistedChangedHandler.java
@@ -26,7 +26,7 @@ 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.ListenerAssistedType;
+import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import java.util.Arrays;
@@ -39,7 +39,7 @@ public final class ListenerAssistedChangedHandler implements
DataChangedEventHan
@Override
public String getSubscribedKey() {
- return StatesNodePath.getListenerAssistedNodeRootPath();
+ return StatesNodePath.getDatabaseChangedListenerAssistedNodeRootPath();
}
@Override
@@ -49,19 +49,19 @@ public final class ListenerAssistedChangedHandler
implements DataChangedEventHan
@Override
public void handle(final ContextManager contextManager, final
DataChangedEvent event) {
- StatesNodePath.findDatabaseName(event.getKey()).ifPresent(optional ->
handle(contextManager, optional,
ListenerAssistedType.valueOf(event.getValue())));
+ StatesNodePath.findDatabaseName(event.getKey()).ifPresent(optional ->
handle(contextManager, optional,
DatabaseChangedListenerAssistedType.valueOf(event.getValue())));
}
- private static void handle(final ContextManager contextManager, final
String databaseName, final ListenerAssistedType listenerAssistedType) {
+ private static void handle(final ContextManager contextManager, final
String databaseName, final DatabaseChangedListenerAssistedType
databaseChangedListenerAssistedType) {
ClusterPersistRepository repository = (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
- if (ListenerAssistedType.CREATE_DATABASE == listenerAssistedType) {
+ if (DatabaseChangedListenerAssistedType.CREATE_DATABASE ==
databaseChangedListenerAssistedType) {
repository.watch(DatabaseMetaDataNodePath.getDatabasePath(databaseName), new
DatabaseMetaDataChangedListener(contextManager));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().addDatabase(databaseName);
- } else if (ListenerAssistedType.DROP_DATABASE == listenerAssistedType)
{
+ } else if (DatabaseChangedListenerAssistedType.DROP_DATABASE ==
databaseChangedListenerAssistedType) {
repository.removeDataListener(DatabaseMetaDataNodePath.getDatabasePath(databaseName));
contextManager.getMetaDataContextManager().getSchemaMetaDataManager().dropDatabase(databaseName);
}
-
contextManager.getPersistServiceFacade().getListenerAssistedPersistService().deleteDatabaseNameListenerAssisted(databaseName);
+
contextManager.getPersistServiceFacade().getDatabaseChangedListenerAssistedPersistService().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/ClusterMetaDataManagerPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java
index 29d7e89428a..53194d37610 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
@@ -38,8 +38,8 @@ import
org.apache.shardingsphere.mode.metadata.persist.config.database.DataSourc
import
org.apache.shardingsphere.mode.metadata.persist.metadata.DatabaseMetaDataPersistFacade;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
-import
org.apache.shardingsphere.mode.state.database.ListenerAssistedPersistService;
-import org.apache.shardingsphere.mode.state.database.ListenerAssistedType;
+import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedPersistService;
+import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.rule.SingleRule;
@@ -62,24 +62,24 @@ public final class ClusterMetaDataManagerPersistService
implements MetaDataManag
private final MetaDataPersistService metaDataPersistService;
- private final ListenerAssistedPersistService
listenerAssistedPersistService;
+ private final DatabaseChangedListenerAssistedPersistService
databaseChangedListenerAssistedPersistService;
public ClusterMetaDataManagerPersistService(final MetaDataContextManager
metaDataContextManager, final PersistRepository repository) {
this.metaDataContextManager = metaDataContextManager;
metaDataPersistService =
metaDataContextManager.getMetaDataPersistService();
- listenerAssistedPersistService = new
ListenerAssistedPersistService(repository);
+ databaseChangedListenerAssistedPersistService = new
DatabaseChangedListenerAssistedPersistService(repository);
}
@Override
public void createDatabase(final String databaseName) {
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().add(databaseName);
-
listenerAssistedPersistService.persistDatabaseNameListenerAssisted(databaseName,
ListenerAssistedType.CREATE_DATABASE);
+ databaseChangedListenerAssistedPersistService.persist(databaseName,
DatabaseChangedListenerAssistedType.CREATE_DATABASE);
}
@Override
public void dropDatabase(final String databaseName) {
String droppedDatabaseName =
metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase(databaseName).getName();
-
listenerAssistedPersistService.persistDatabaseNameListenerAssisted(droppedDatabaseName,
ListenerAssistedType.DROP_DATABASE);
+
databaseChangedListenerAssistedPersistService.persist(droppedDatabaseName,
DatabaseChangedListenerAssistedType.DROP_DATABASE);
metaDataPersistService.getDatabaseMetaDataFacade().getDatabase().drop(droppedDatabaseName);
}
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/ListenerAssistedChangedHandlerTest.java
index 6c84569e95a..39a5787280b 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/ListenerAssistedChangedHandlerTest.java
@@ -62,7 +62,7 @@ class ListenerAssistedChangedHandlerTest {
@Test
void assertHandleWithoutDatabase() {
handler.handle(contextManager, new
DataChangedEvent("/states/listener_assisted", "", Type.ADDED));
- verify(contextManager.getPersistServiceFacade(),
times(0)).getListenerAssistedPersistService();
+ verify(contextManager.getPersistServiceFacade(),
times(0)).getDatabaseChangedListenerAssistedPersistService();
}
@Test
@@ -71,7 +71,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().getListenerAssistedPersistService()).deleteDatabaseNameListenerAssisted("foo_db");
+
verify(contextManager.getPersistServiceFacade().getDatabaseChangedListenerAssistedPersistService()).delete("foo_db");
}
@Test
@@ -80,6 +80,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().getListenerAssistedPersistService()).deleteDatabaseNameListenerAssisted("foo_db");
+
verify(contextManager.getPersistServiceFacade().getDatabaseChangedListenerAssistedPersistService()).delete("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 958d1bb9f29..bad508d4007 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
@@ -25,8 +25,8 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
-import
org.apache.shardingsphere.mode.state.database.ListenerAssistedPersistService;
-import org.apache.shardingsphere.mode.state.database.ListenerAssistedType;
+import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedPersistService;
+import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.junit.jupiter.api.BeforeEach;
@@ -57,7 +57,7 @@ class ClusterMetaDataManagerPersistServiceTest {
private MetaDataPersistService metaDataPersistService;
@Mock
- private ListenerAssistedPersistService listenerAssistedPersistService;
+ private DatabaseChangedListenerAssistedPersistService
databaseChangedListenerAssistedPersistService;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private MetaDataContextManager metaDataContextManager;
@@ -67,21 +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("listenerAssistedPersistService"),
metaDataManagerPersistService, listenerAssistedPersistService);
+
Plugins.getMemberAccessor().set(ClusterMetaDataManagerPersistService.class.getDeclaredField("databaseChangedListenerAssistedPersistService"),
+ metaDataManagerPersistService,
databaseChangedListenerAssistedPersistService);
}
@Test
void assertCreateDatabase() {
metaDataManagerPersistService.createDatabase("foo_db");
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).add("foo_db");
-
verify(listenerAssistedPersistService).persistDatabaseNameListenerAssisted("foo_db",
ListenerAssistedType.CREATE_DATABASE);
+
verify(databaseChangedListenerAssistedPersistService).persist("foo_db",
DatabaseChangedListenerAssistedType.CREATE_DATABASE);
}
@Test
void assertDropDatabase() {
when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
metaDataManagerPersistService.dropDatabase("foo_db");
-
verify(listenerAssistedPersistService).persistDatabaseNameListenerAssisted("foo_db",
ListenerAssistedType.DROP_DATABASE);
+
verify(databaseChangedListenerAssistedPersistService).persist("foo_db",
DatabaseChangedListenerAssistedType.DROP_DATABASE);
verify(metaDataPersistService.getDatabaseMetaDataFacade().getDatabase()).drop("foo_db");
}
