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 d71859682b2 Move DatabaseChangedListenerAssistedPersistService to
cluster-core module (#34484)
d71859682b2 is described below
commit d71859682b2c13965446e7c8e5a5ab81254396c2
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Jan 25 14:54:13 2025 +0800
Move DatabaseChangedListenerAssistedPersistService to cluster-core module
(#34484)
---
.../shardingsphere/mode/persist/PersistServiceFacade.java | 10 +++-------
.../global/DatabaseChangedListenerAssistedChangedHandler.java | 4 ++--
.../persist/service/ClusterMetaDataManagerPersistService.java | 2 --
.../DatabaseChangedListenerAssistedPersistService.java | 2 +-
.../persist/service}/DatabaseChangedListenerAssistedType.java | 2 +-
.../DatabaseChangedListenerAssistedChangedHandlerTest.java | 2 +-
.../service/ClusterMetaDataManagerPersistServiceTest.java | 2 --
.../DatabaseChangedListenerAssistedPersistServiceTest.java | 2 +-
8 files changed, 9 insertions(+), 17 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 a8d68b7f44e..de5b3a24cad 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
@@ -21,16 +21,15 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
+import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
import org.apache.shardingsphere.mode.persist.service.ProcessPersistService;
+import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.state.cluster.ClusterStatePersistService;
import org.apache.shardingsphere.mode.state.node.ComputeNodePersistService;
-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;
/**
* Persist service facade.
@@ -50,8 +49,6 @@ public final class PersistServiceFacade {
private final ProcessPersistService processPersistService;
- private final DatabaseChangedListenerAssistedPersistService
databaseChangedListenerAssistedPersistService;
-
private final QualifiedDataSourceStatePersistService
qualifiedDataSourceStatePersistService;
public PersistServiceFacade(final PersistRepository repository, final
ModeConfiguration modeConfig, final MetaDataContextManager
metaDataContextManager) {
@@ -63,7 +60,6 @@ public final class PersistServiceFacade {
PersistServiceBuilder persistServiceBuilder =
TypedSPILoader.getService(PersistServiceBuilder.class, modeConfig.getType());
metaDataManagerPersistService =
persistServiceBuilder.buildMetaDataManagerPersistService(repository,
metaDataContextManager);
processPersistService =
persistServiceBuilder.buildProcessPersistService(repository);
- databaseChangedListenerAssistedPersistService = new
DatabaseChangedListenerAssistedPersistService(repository);
}
/**
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/DatabaseChangedListenerAssistedChangedHandler.java
index 0bf276b902b..b2ce8d22076 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/DatabaseChangedListenerAssistedChangedHandler.java
@@ -27,8 +27,8 @@ 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.state.database.DatabaseChangedListenerAssistedPersistService;
-import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.service.DatabaseChangedListenerAssistedPersistService;
+import
org.apache.shardingsphere.mode.manager.cluster.persist.service.DatabaseChangedListenerAssistedType;
import java.util.Arrays;
import java.util.Collection;
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 53194d37610..8ad3de399f2 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,6 @@ 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.DatabaseChangedListenerAssistedPersistService;
-import
org.apache.shardingsphere.mode.state.database.DatabaseChangedListenerAssistedType;
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.rule.SingleRule;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistService.java
similarity index 96%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistService.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistService.java
index eb421fabdae..8d75d30f23e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.state.database;
+package org.apache.shardingsphere.mode.manager.cluster.persist.service;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedType.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedType.java
similarity index 93%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedType.java
rename to
mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedType.java
index 14560566d2d..7a29d5ba553 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedType.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.state.database;
+package org.apache.shardingsphere.mode.manager.cluster.persist.service;
/**
* Database changed listener assisted type.
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/DatabaseChangedListenerAssistedChangedHandlerTest.java
index e27b63e102b..61dfc816bc1 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/DatabaseChangedListenerAssistedChangedHandlerTest.java
@@ -63,7 +63,7 @@ class DatabaseChangedListenerAssistedChangedHandlerTest {
@Test
void assertHandleWithoutDatabase() {
handler.handle(contextManager, new
DataChangedEvent("/states/listener_assisted", "", Type.ADDED));
- verify(contextManager.getPersistServiceFacade(),
times(0)).getDatabaseChangedListenerAssistedPersistService();
+ verify(contextManager.getPersistServiceFacade(),
times(0)).getRepository();
}
@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 bad508d4007..2a76832d7ee 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,6 @@ 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.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;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistServiceTest.java
similarity index 96%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistServiceTest.java
rename to
mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistServiceTest.java
index 6f8a701880f..fe48fac4e5e 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/database/DatabaseChangedListenerAssistedPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/DatabaseChangedListenerAssistedPersistServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.state.database;
+package org.apache.shardingsphere.mode.manager.cluster.persist.service;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import org.junit.jupiter.api.Test;
