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 739a7592e65 Move ClusterStatePersistService to state package (#34421)
739a7592e65 is described below
commit 739a7592e65057db744b8ec943bd366292db750c
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jan 21 23:05:26 2025 +0800
Move ClusterStatePersistService to state package (#34421)
* Move ClusterStatePersistService to state package
* Move ClusterStatePersistService to state package
---
.../apache/shardingsphere/mode/manager/ContextManager.java | 2 +-
.../shardingsphere/mode/persist/PersistServiceFacade.java | 6 +++---
.../persist/service/unified/ComputeNodePersistService.java | 2 +-
.../service/unified/ListenerAssistedPersistService.java | 2 +-
.../persist/ClusterStatePersistService.java} | 8 ++++----
...ServiceTest.java => ClusterStatePersistServiceTest.java} | 13 +++++++------
.../mode/node/path/{metadata => state}/ComputeNodePath.java | 2 +-
.../mode/node/path/{metadata => state}/ProcessNodePath.java | 2 +-
.../node/path/{metadata => state}/ReservationNodePath.java | 2 +-
.../mode/node/path/{metadata => state}/StatesNodePath.java | 2 +-
.../mode/node/path/{ => state}/ComputeNodePathTest.java | 3 +--
.../mode/node/path/{ => state}/ProcessNodePathTest.java | 3 +--
.../mode/node/path/{ => state}/ProcessNodeTest.java | 3 +--
.../mode/node/path/{ => state}/ReservationNodePathTest.java | 3 +--
.../mode/node/path/{ => state}/StatesNodePathTest.java | 3 +--
.../dispatch/handler/global/ClusterStateChangedHandler.java | 2 +-
.../dispatch/handler/global/ComputeNodeOnlineHandler.java | 2 +-
.../handler/global/ComputeNodeStateChangedHandler.java | 2 +-
.../cluster/dispatch/handler/global/KillProcessHandler.java | 2 +-
.../handler/global/ListenerAssistedChangedHandler.java | 2 +-
.../dispatch/handler/global/ShowProcessListHandler.java | 2 +-
.../coordinator/ClusterProcessPersistCoordinator.java | 4 ++--
.../persist/service/ClusterProcessPersistService.java | 4 ++--
.../cluster/persist/service/ReservationPersistService.java | 2 +-
.../persist/service/ClusterProcessPersistServiceTest.java | 2 +-
.../distsql/ral/updatable/UnlockClusterExecutor.java | 2 +-
.../backend/lock/impl/ClusterReadWriteLockStrategy.java | 2 +-
.../proxy/backend/lock/impl/ClusterWriteLockStrategy.java | 2 +-
28 files changed, 41 insertions(+), 45 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 e02a1e7a5ae..64ad4429bca 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
@@ -71,7 +71,7 @@ public final class ContextManager implements AutoCloseable {
this.computeNodeInstanceContext = computeNodeInstanceContext;
metaDataContextManager = new MetaDataContextManager(metaDataContexts,
computeNodeInstanceContext, repository);
persistServiceFacade = new PersistServiceFacade(repository,
computeNodeInstanceContext.getModeConfiguration(), metaDataContextManager);
- stateContext = new
ClusterStateContext(persistServiceFacade.getStatePersistService().load());
+ stateContext = new
ClusterStateContext(persistServiceFacade.getClusterStatePersistService().load());
executorEngine =
ExecutorEngine.createExecutorEngineWithSize(metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE));
for (ContextManagerLifecycleListener each :
ShardingSphereServiceLoader.getServiceInstances(ContextManagerLifecycleListener.class))
{
each.onInitialized(this);
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 3fe37ae5e9c..95e6ac5c3b4 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
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.mode.persist.service.divided.ProcessPersistServ
import
org.apache.shardingsphere.mode.persist.service.unified.ComputeNodePersistService;
import
org.apache.shardingsphere.mode.persist.service.unified.ListenerAssistedPersistService;
import
org.apache.shardingsphere.mode.persist.service.unified.QualifiedDataSourceStatePersistService;
-import
org.apache.shardingsphere.mode.persist.service.unified.StatePersistService;
+import org.apache.shardingsphere.mode.state.persist.ClusterStatePersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
@@ -44,7 +44,7 @@ public final class PersistServiceFacade {
private final ComputeNodePersistService computeNodePersistService;
- private final StatePersistService statePersistService;
+ private final ClusterStatePersistService clusterStatePersistService;
private final MetaDataManagerPersistService metaDataManagerPersistService;
@@ -58,7 +58,7 @@ public final class PersistServiceFacade {
this.repository = repository;
metaDataPersistService = new MetaDataPersistService(repository);
computeNodePersistService = new ComputeNodePersistService(repository);
- statePersistService = new StatePersistService(repository);
+ clusterStatePersistService = new
ClusterStatePersistService(repository);
qualifiedDataSourceStatePersistService = new
QualifiedDataSourceStatePersistService(repository);
PersistServiceBuilder persistServiceBuilder =
TypedSPILoader.getService(PersistServiceBuilder.class, modeConfig.getType());
metaDataManagerPersistService =
persistServiceBuilder.buildMetaDataManagerPersistService(repository,
metaDataContextManager);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
index 9fb55aa19ba..b9c0bef10d8 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeData;
import
org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeDataSwapper;
import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Arrays;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ListenerAssistedPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ListenerAssistedPersistService.java
index 9a546fae2db..510c9128bc1 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ListenerAssistedPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ListenerAssistedPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.persist.service.unified;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.metadata.StatesNodePath;
+import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/persist/ClusterStatePersistService.java
similarity index 88%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistService.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/state/persist/ClusterStatePersistService.java
index c6c6d379f93..aefbde5806e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/persist/ClusterStatePersistService.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.persist.service.unified;
+package org.apache.shardingsphere.mode.state.persist;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.state.ClusterState;
-import org.apache.shardingsphere.mode.node.path.metadata.StatesNodePath;
+import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
- * State persist service.
+ * Cluster state persist service.
*/
@RequiredArgsConstructor
-public final class StatePersistService {
+public final class ClusterStatePersistService {
private final PersistRepository repository;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/ClusterStatePersistServiceTest.java
similarity index 79%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistServiceTest.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/ClusterStatePersistServiceTest.java
index 8e4a623be08..bde320e2a95 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/StatePersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/ClusterStatePersistServiceTest.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.mode.persist.service.unified;
import org.apache.shardingsphere.mode.state.ClusterState;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
+import org.apache.shardingsphere.mode.state.persist.ClusterStatePersistService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -31,33 +32,33 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class StatePersistServiceTest {
+class ClusterStatePersistServiceTest {
- private StatePersistService statePersistService;
+ private ClusterStatePersistService clusterStatePersistService;
@Mock
private PersistRepository repository;
@BeforeEach
void setUp() {
- statePersistService = new StatePersistService(repository);
+ clusterStatePersistService = new
ClusterStatePersistService(repository);
}
@Test
void assertUpdate() {
- statePersistService.update(ClusterState.OK);
+ clusterStatePersistService.update(ClusterState.OK);
verify(repository).persist("/states/cluster_state",
ClusterState.OK.name());
}
@Test
void assertLoad() {
when(repository.query("/states/cluster_state")).thenReturn(ClusterState.READ_ONLY.name());
- assertThat(statePersistService.load(), is(ClusterState.READ_ONLY));
+ assertThat(clusterStatePersistService.load(),
is(ClusterState.READ_ONLY));
}
@Test
void assertLoadWithEmptyState() {
when(repository.query("/states/cluster_state")).thenReturn("");
- assertThat(statePersistService.load(), is(ClusterState.OK));
+ assertThat(clusterStatePersistService.load(), is(ClusterState.OK));
}
}
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ComputeNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePath.java
similarity index 98%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ComputeNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePath.java
index 1b911389e28..f67d5bdaf25 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ComputeNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.metadata;
+package org.apache.shardingsphere.mode.node.path.state;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ProcessNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePath.java
similarity index 96%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ProcessNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePath.java
index f3311fe69ca..cd540d01878 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ProcessNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.metadata;
+package org.apache.shardingsphere.mode.node.path.state;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ReservationNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePath.java
similarity index 96%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ReservationNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePath.java
index 6728d431740..5ef59cd0213 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/ReservationNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.metadata;
+package org.apache.shardingsphere.mode.node.path.state;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/StatesNodePath.java
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePath.java
similarity index 97%
rename from
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/StatesNodePath.java
rename to
mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePath.java
index d138fff1862..d0a4a0f1397 100644
---
a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/metadata/StatesNodePath.java
+++
b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePath.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path.metadata;
+package org.apache.shardingsphere.mode.node.path.state;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ComputeNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathTest.java
similarity index 97%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ComputeNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathTest.java
index eba82c11650..755b2dc5f47 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ComputeNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ComputeNodePathTest.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path;
+package org.apache.shardingsphere.mode.node.path.state;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
import org.junit.jupiter.api.Test;
import java.util.Optional;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ProcessNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathTest.java
similarity index 91%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ProcessNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathTest.java
index 55ad90a45bd..398c38a7e80 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ProcessNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodePathTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path;
+package org.apache.shardingsphere.mode.node.path.state;
-import org.apache.shardingsphere.mode.node.path.metadata.ProcessNodePath;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ProcessNodeTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodeTest.java
similarity index 92%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ProcessNodeTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodeTest.java
index f729e72b27f..81844a4fd38 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ProcessNodeTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ProcessNodeTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path;
+package org.apache.shardingsphere.mode.node.path.state;
-import org.apache.shardingsphere.mode.node.path.metadata.ProcessNodePath;
import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ReservationNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathTest.java
similarity index 89%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ReservationNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathTest.java
index 736b9f56157..cc65f43ce43 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/ReservationNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/ReservationNodePathTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path;
+package org.apache.shardingsphere.mode.node.path.state;
-import org.apache.shardingsphere.mode.node.path.metadata.ReservationNodePath;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Test;
diff --git
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/StatesNodePathTest.java
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
similarity index 93%
rename from
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/StatesNodePathTest.java
rename to
mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
index cc3020d0471..a18271195bb 100644
---
a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/StatesNodePathTest.java
+++
b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/state/StatesNodePathTest.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.node.path;
+package org.apache.shardingsphere.mode.node.path.state;
-import org.apache.shardingsphere.mode.node.path.metadata.StatesNodePath;
import org.junit.jupiter.api.Test;
import java.util.Optional;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java
index 53afbdfd4d2..19542046ff5 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ClusterStateChangedHandler.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
-import org.apache.shardingsphere.mode.node.path.metadata.StatesNodePath;
+import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java
index f4a2797ef21..ca0ca0d00ba 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeData;
import
org.apache.shardingsphere.infra.instance.yaml.YamlComputeNodeDataSwapper;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandler.java
index e35253dcb4d..44758a4869d 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeStateChangedHandler.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandler.java
index fca286b6170..68c3f6f8896 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/KillProcessHandler.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
import
org.apache.shardingsphere.infra.exception.core.external.sql.type.wrapper.SQLWrapperException;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
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 1d4f3223169..ea5de080977 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
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import
org.apache.shardingsphere.mode.node.path.metadata.DatabaseMetaDataNodePath;
-import org.apache.shardingsphere.mode.node.path.metadata.StatesNodePath;
+import org.apache.shardingsphere.mode.node.path.state.StatesNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java
index ff3c2abce30..523662b70c4 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ShowProcessListHandler.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global;
import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath;
import org.apache.shardingsphere.mode.event.DataChangedEvent;
import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinator.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinator.java
index 4d7f46366c9..4f5c1cadb9e 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinator.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/coordinator/ClusterProcessPersistCoordinator.java
@@ -22,8 +22,8 @@ import
org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
import
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlProcessListSwapper;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
-import org.apache.shardingsphere.mode.node.path.metadata.ProcessNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ProcessNodePath;
import
org.apache.shardingsphere.mode.persist.coordinator.ProcessPersistCoordinator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistService.java
index 307358926df..b9685bd9ebe 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistService.java
@@ -24,8 +24,8 @@ import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessList
import
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlProcessListSwapper;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
-import org.apache.shardingsphere.mode.node.path.metadata.ProcessNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ProcessNodePath;
import
org.apache.shardingsphere.mode.persist.service.divided.ProcessPersistService;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ReservationPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ReservationPersistService.java
index 65235c0cda2..fc0f5e696ab 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ReservationPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ReservationPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.mode.manager.cluster.persist.service;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.mode.node.path.metadata.ReservationNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ReservationNodePath;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import
org.apache.shardingsphere.mode.repository.cluster.exception.ClusterRepositoryPersistException;
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistServiceTest.java
index 8275b19bd83..c57c3eabc51 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterProcessPersistServiceTest.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcess;
import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessList;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import org.apache.shardingsphere.mode.node.path.metadata.ComputeNodePath;
+import org.apache.shardingsphere.mode.node.path.state.ComputeNodePath;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
index 12ee06fda82..923078f6e5f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
@@ -43,7 +43,7 @@ public final class UnlockClusterExecutor implements
DistSQLUpdateExecutor<Unlock
if (lockContext.tryLock(lockDefinition, timeoutMillis)) {
try {
checkState(contextManager);
-
contextManager.getPersistServiceFacade().getStatePersistService().update(ClusterState.OK);
+
contextManager.getPersistServiceFacade().getClusterStatePersistService().update(ClusterState.OK);
// TODO unlock snapshot info if locked
} finally {
lockContext.unlock(lockDefinition);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterReadWriteLockStrategy.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterReadWriteLockStrategy.java
index 178aa3f3101..584cb747e5b 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterReadWriteLockStrategy.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterReadWriteLockStrategy.java
@@ -28,7 +28,7 @@ public class ClusterReadWriteLockStrategy implements
ClusterLockStrategy {
@Override
public void lock() {
-
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getStatePersistService().update(ClusterState.UNAVAILABLE);
+
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getClusterStatePersistService().update(ClusterState.UNAVAILABLE);
}
@Override
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterWriteLockStrategy.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterWriteLockStrategy.java
index 216123200fd..00e2e110c31 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterWriteLockStrategy.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterWriteLockStrategy.java
@@ -28,7 +28,7 @@ public class ClusterWriteLockStrategy implements
ClusterLockStrategy {
@Override
public void lock() {
-
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getStatePersistService().update(ClusterState.READ_ONLY);
+
ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getClusterStatePersistService().update(ClusterState.READ_ONLY);
}
@Override
