This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 e19363edecf Move PersisRepository from ContextManager to
PersistServiceFacade (#31941)
e19363edecf is described below
commit e19363edecf3f1bc029f5f5808ee4b1e7cc98115
Author: Haoran Meng <[email protected]>
AuthorDate: Mon Jul 1 12:43:35 2024 +0800
Move PersisRepository from ContextManager to PersistServiceFacade (#31941)
---
.../java/org/apache/shardingsphere/mode/manager/ContextManager.java | 5 +----
.../apache/shardingsphere/mode/service/PersistServiceFacade.java | 3 +++
.../org/apache/shardingsphere/mode/manager/ContextManagerTest.java | 2 +-
.../registry/process/subscriber/ProcessListChangedSubscriber.java | 6 +++---
.../subscriber/ClusterDeliverEventSubscriberRegistry.java | 2 +-
.../subscriber/ClusterDispatchEventSubscriberRegistry.java | 2 +-
.../subscriber/ListenerAssistedMetaDataChangedSubscriber.java | 4 ++--
.../process/subscriber/ProcessListChangedSubscriberTest.java | 2 +-
.../registrycenter/repository/PipelineGovernanceFacadeTest.java | 2 +-
.../test/it/data/pipeline/core/util/PipelineContextUtils.java | 2 +-
.../it/data/pipeline/core/util/PipelineDistributedBarrierTest.java | 4 ++--
.../check/consistency/MigrationDataConsistencyCheckerTest.java | 2 +-
12 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 785883e3ae0..9e2cc323c01 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -76,12 +76,9 @@ public final class ContextManager implements AutoCloseable {
private final MetaDataContextManager metaDataContextManager;
- private final PersistRepository repository;
-
public ContextManager(final MetaDataContexts metaDataContexts, final
ComputeNodeInstanceContext computeNodeInstanceContext, final PersistRepository
repository) {
this.metaDataContexts = new AtomicReference<>(metaDataContexts);
this.computeNodeInstanceContext = computeNodeInstanceContext;
- this.repository = repository;
persistServiceFacade = new PersistServiceFacade(repository,
computeNodeInstanceContext.getModeConfiguration(), this);
stateContext = new
StateContext(persistServiceFacade.getStatePersistService().loadClusterState().orElse(ClusterState.OK));
metaDataContextManager = new
MetaDataContextManager(this.metaDataContexts, computeNodeInstanceContext,
persistServiceFacade);
@@ -296,6 +293,6 @@ public final class ContextManager implements AutoCloseable {
}
executorEngine.close();
metaDataContexts.get().close();
- repository.close();
+ persistServiceFacade.getRepository().close();
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/PersistServiceFacade.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/PersistServiceFacade.java
index a6af914a4d8..4bc87d754a4 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/PersistServiceFacade.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/service/PersistServiceFacade.java
@@ -38,6 +38,8 @@ import
org.apache.shardingsphere.mode.state.StatePersistService;
@Getter
public final class PersistServiceFacade {
+ private final PersistRepository repository;
+
private final MetaDataPersistService metaDataPersistService;
private final ComputeNodePersistService computeNodePersistService;
@@ -53,6 +55,7 @@ public final class PersistServiceFacade {
private final QualifiedDataSourceStatePersistService
qualifiedDataSourceStatePersistService;
public PersistServiceFacade(final PersistRepository repository, final
ModeConfiguration modeConfiguration, final ContextManager contextManager) {
+ this.repository = repository;
metaDataPersistService = new MetaDataPersistService(repository);
computeNodePersistService = new ComputeNodePersistService(repository);
statePersistService = new StatePersistService(repository);
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 9bc2010ca2b..083ad044972 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -252,7 +252,7 @@ class ContextManagerTest {
when(metaDataContexts.getMetaData().getDatabase("foo_db").getName()).thenReturn("foo_db");
ShardingSphereDatabase database = mockDatabase();
contextManager.reloadSchema(database, "foo_schema", "foo_ds");
-
verify(contextManager.getRepository()).delete(DatabaseMetaDataNode.getMetaDataSchemaPath("foo_db",
"foo_schema"));
+
verify(contextManager.getPersistServiceFacade().getRepository()).delete(DatabaseMetaDataNode.getMetaDataSchemaPath("foo_db",
"foo_schema"));
}
@Test
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
index f7ed9bb0651..c324e0b3899 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
@@ -60,10 +60,10 @@ public final class ProcessListChangedSubscriber implements
EventSubscriber {
}
Collection<Process> processes =
ProcessRegistry.getInstance().listAll();
if (!processes.isEmpty()) {
- contextManager.getRepository().persist(
+ contextManager.getPersistServiceFacade().getRepository().persist(
ProcessNode.getProcessListInstancePath(event.getTaskId(),
event.getInstanceId()),
YamlEngine.marshal(swapper.swapToYamlConfiguration(processes)));
}
-
contextManager.getRepository().delete(ComputeNode.getProcessTriggerInstanceNodePath(event.getInstanceId(),
event.getTaskId()));
+
contextManager.getPersistServiceFacade().getRepository().delete(ComputeNode.getProcessTriggerInstanceNodePath(event.getInstanceId(),
event.getTaskId()));
}
/**
@@ -94,7 +94,7 @@ public final class ProcessListChangedSubscriber implements
EventSubscriber {
each.cancel();
}
}
-
contextManager.getRepository().delete(ComputeNode.getProcessKillInstanceIdNodePath(event.getInstanceId(),
event.getProcessId()));
+
contextManager.getPersistServiceFacade().getRepository().delete(ComputeNode.getProcessKillInstanceIdNodePath(event.getInstanceId(),
event.getProcessId()));
}
/**
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDeliverEventSubscriberRegistry.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDeliverEventSubscriberRegistry.java
index 98ad5ef8d00..e1b2e816f42 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDeliverEventSubscriberRegistry.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDeliverEventSubscriberRegistry.java
@@ -28,6 +28,6 @@ import
org.apache.shardingsphere.mode.subsciber.DeliverEventSubscriberRegistry;
public class ClusterDeliverEventSubscriberRegistry extends
DeliverEventSubscriberRegistry {
public ClusterDeliverEventSubscriberRegistry(final ContextManager
contextManager) {
- super(contextManager, new
InternalQualifiedDataSourceSubscriber((ClusterPersistRepository)
contextManager.getRepository()));
+ super(contextManager, new
InternalQualifiedDataSourceSubscriber((ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository()));
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDispatchEventSubscriberRegistry.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDispatchEventSubscriberRegistry.java
index 7d213fe8170..4c872526c02 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDispatchEventSubscriberRegistry.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ClusterDispatchEventSubscriberRegistry.java
@@ -44,7 +44,7 @@ public class ClusterDispatchEventSubscriberRegistry
implements EventSubscriberRe
public ClusterDispatchEventSubscriberRegistry(final ContextManager
contextManager) {
eventBusContext =
contextManager.getComputeNodeInstanceContext().getEventBusContext();
- repository = (ClusterPersistRepository) contextManager.getRepository();
+ repository = (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
subscribers = Arrays.asList(new
RuleItemChangedSubscriber(contextManager),
new ResourceMetaDataChangedSubscriber(contextManager),
new ListenerAssistedMetaDataChangedSubscriber(contextManager),
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ListenerAssistedMetaDataChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ListenerAssistedMetaDataChangedSubscriber.java
index 385edccde34..7e9c0f5be58 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ListenerAssistedMetaDataChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ListenerAssistedMetaDataChangedSubscriber.java
@@ -51,7 +51,7 @@ public final class ListenerAssistedMetaDataChangedSubscriber
implements EventSub
if (!processor.isPresent()) {
return;
}
- new MetaDataWatchListenerManager((ClusterPersistRepository)
contextManager.getRepository())
+ new MetaDataWatchListenerManager((ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository())
.addListener(processor.get().getListenerKey(event), new
MetaDataChangedListener(contextManager.getComputeNodeInstanceContext().getEventBusContext()));
processor.get().processor(contextManager, event);
}
@@ -67,7 +67,7 @@ public final class ListenerAssistedMetaDataChangedSubscriber
implements EventSub
if (!processor.isPresent()) {
return;
}
- new MetaDataWatchListenerManager((ClusterPersistRepository)
contextManager.getRepository()).removeListener(processor.get().getListenerKey(event));
+ new MetaDataWatchListenerManager((ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository()).removeListener(processor.get().getListenerKey(event));
processor.get().processor(contextManager, event);
}
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
index 3ecc77a1f9c..b8b80cf1b87 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
@@ -88,7 +88,7 @@ class ProcessListChangedSubscriberTest {
contextManager.getMetaDataContexts().getMetaData().getGlobalResourceMetaData(),
contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData(),
new ConfigurationProperties(new Properties()))));
MemberAccessor accessor = Plugins.getMemberAccessor();
- accessor.set(contextManager.getClass().getDeclaredField("repository"),
contextManager, repository);
+
accessor.set(contextManager.getPersistServiceFacade().getClass().getDeclaredField("repository"),
contextManager.getPersistServiceFacade(), repository);
subscriber = new ProcessListChangedSubscriber(contextManager);
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
index 11269eecbc9..3004736e9ca 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/registrycenter/repository/PipelineGovernanceFacadeTest.java
@@ -191,7 +191,7 @@ class PipelineGovernanceFacadeTest {
private ClusterPersistRepository getClusterPersistRepository() {
ContextManager contextManager =
PipelineContextManager.getContext(PipelineContextUtils.getContextKey()).getContextManager();
- return (ClusterPersistRepository) contextManager.getRepository();
+ return (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
}
private MigrationJobItemContext mockJobItemContext() {
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
index 1e34ddcce44..552e95d3676 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
@@ -111,7 +111,7 @@ public final class PipelineContextUtils {
ClusterPersistRepository persistRepository =
getClusterPersistRepository((ClusterPersistRepositoryConfiguration)
modeConfig.getRepository());
MetaDataContexts metaDataContexts =
renewMetaDataContexts(contextManager.getMetaDataContexts(), new
MetaDataPersistService(persistRepository));
PipelineContext pipelineContext = new PipelineContext(modeConfig, new
ContextManager(metaDataContexts, contextManager.getComputeNodeInstanceContext(),
- contextManager.getRepository()));
+ contextManager.getPersistServiceFacade().getRepository()));
PipelineContextManager.putContext(contextKey, pipelineContext);
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierTest.java
index 6ba3a30551d..79c382982b7 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierTest.java
@@ -44,7 +44,7 @@ class PipelineDistributedBarrierTest {
void assertRegisterAndRemove() throws ReflectiveOperationException {
String jobId =
JobConfigurationBuilder.createYamlMigrationJobConfiguration().getJobId();
PipelineContextKey contextKey = PipelineContextUtils.getContextKey();
- PersistRepository repository =
PipelineContextManager.getContext(contextKey).getContextManager().getRepository();
+ PersistRepository repository =
PipelineContextManager.getContext(contextKey).getContextManager().getPersistServiceFacade().getRepository();
repository.persist(PipelineMetaDataNode.getJobRootPath(jobId), "");
PipelineDistributedBarrier instance =
PipelineDistributedBarrier.getInstance(contextKey);
String parentPath = "/barrier";
@@ -60,7 +60,7 @@ class PipelineDistributedBarrierTest {
void assertAwait() {
String jobId =
JobConfigurationBuilder.createYamlMigrationJobConfiguration().getJobId();
PipelineContextKey contextKey = PipelineContextUtils.getContextKey();
- PersistRepository repository =
PipelineContextManager.getContext(contextKey).getContextManager().getRepository();
+ PersistRepository repository =
PipelineContextManager.getContext(contextKey).getContextManager().getPersistServiceFacade().getRepository();
repository.persist(PipelineMetaDataNode.getJobRootPath(jobId), "");
PipelineDistributedBarrier instance =
PipelineDistributedBarrier.getInstance(contextKey);
String barrierEnablePath =
PipelineMetaDataNode.getJobBarrierEnablePath(jobId);
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
index 8ea69409aea..6a4336e8058 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
@@ -72,7 +72,7 @@ class MigrationDataConsistencyCheckerTest {
private ClusterPersistRepository getClusterPersistRepository() {
ContextManager contextManager =
PipelineContextManager.getContext(PipelineContextUtils.getContextKey()).getContextManager();
- return (ClusterPersistRepository) contextManager.getRepository();
+ return (ClusterPersistRepository)
contextManager.getPersistServiceFacade().getRepository();
}
private ConsistencyCheckJobItemProgressContext
createConsistencyCheckJobItemProgressContext(final String jobId) {
