You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/03/09 12:04:28 UTC
(shardingsphere) branch master updated: Rename ClusterState to ShardingSphereState (#34942)
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 230e1034eba Rename ClusterState to ShardingSphereState (#34942)
230e1034eba is described below
commit 230e1034ebaa9d2d2197632a0e4f6b7c966e23b6
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Mar 9 20:04:22 2025 +0800
Rename ClusterState to ShardingSphereState (#34942)
* Rename ClusterState to ShardingSphereState
* Rename ClusterState to ShardingSphereState
---
.../datasource/ShardingSphereDataSourceTest.java | 6 ++--
...tion.java => ShardingSphereStateException.java} | 6 ++--
.../mode/manager/ContextManager.java | 6 ++--
.../mode/persist/PersistServiceFacade.java | 6 ++--
...{ClusterState.java => ShardingSphereState.java} | 10 +++----
...{ClusterStateContext.java => StateContext.java} | 26 ++++++++---------
...ersistService.java => StatePersistService.java} | 22 +++++++--------
.../mode/state/ClusterStateContextTest.java | 33 ----------------------
...StateTest.java => ShardingSphereStateTest.java} | 6 ++--
.../mode/state/StateContextTest.java | 10 +++----
...rviceTest.java => StatePersistServiceTest.java} | 16 +++++------
.../{ClusterNodePath.java => StateNodePath.java} | 4 +--
...terNodePathTest.java => StateNodePathTest.java} | 4 +--
...hangedHandler.java => StateChangedHandler.java} | 12 ++++----
...ch.handler.global.GlobalDataChangedEventHandler | 2 +-
...ndlerTest.java => StateChangedHandlerTest.java} | 10 +++----
.../handler/ProxyBackendHandlerFactory.java | 8 +++---
.../distsql/ral/updatable/LockClusterExecutor.java | 4 +--
.../ral/updatable/UnlockClusterExecutor.java | 6 ++--
.../lock/impl/ClusterReadWriteLockStrategy.java | 4 +--
.../lock/impl/ClusterWriteLockStrategy.java | 4 +--
.../backend/state/impl/ReadOnlyProxyState.java | 4 +--
.../backend/state/impl/UnavailableProxyState.java | 4 +--
.../proxy/backend/context/ProxyContextTest.java | 4 +--
.../handler/ProxyBackendHandlerFactoryTest.java | 4 +--
.../ral/updatable/LockClusterExecutorTest.java | 8 +++---
.../ral/updatable/UnlockClusterExecutorTest.java | 6 ++--
.../backend/state/impl/ReadOnlyProxyStateTest.java | 4 +--
.../state/impl/UnavailableProxyStateTest.java | 4 +--
29 files changed, 105 insertions(+), 138 deletions(-)
diff --git a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
index 27b9b0b3286..1c8f28f88f0 100644
--- a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
+++ b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConne
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
import org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.infra.state.instance.InstanceState;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;
@@ -56,7 +56,7 @@ class ShardingSphereDataSourceTest {
try (ShardingSphereDataSource actual = new ShardingSphereDataSource("foo_db", null)) {
ContextManager contextManager = getContextManager(actual);
assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db"));
- assertThat(contextManager.getStateContext().getState(), is(ClusterState.OK));
+ assertThat(contextManager.getStateContext().getState(), is(ShardingSphereState.OK));
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getState().getCurrentState(), is(InstanceState.OK));
assertTrue(contextManager.getStorageUnits("foo_db").isEmpty());
}
@@ -69,7 +69,7 @@ class ShardingSphereDataSourceTest {
try (ShardingSphereDataSource actual = createShardingSphereDataSource(new MockedDataSource(connection))) {
ContextManager contextManager = getContextManager(actual);
assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db"));
- assertThat(contextManager.getStateContext().getState(), is(ClusterState.OK));
+ assertThat(contextManager.getStateContext().getState(), is(ShardingSphereState.OK));
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getState().getCurrentState(), is(InstanceState.OK));
assertThat(contextManager.getStorageUnits("foo_db").size(), is(1));
assertThat(contextManager.getStorageUnits("foo_db").get("ds").getDataSource().getConnection().getMetaData().getURL(), is("jdbc:mock://127.0.0.1/foo_ds"));
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/exception/ClusterStateException.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/exception/ShardingSphereStateException.java
similarity index 87%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/exception/ClusterStateException.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/exception/ShardingSphereStateException.java
index f4b7e57364e..62d814cb4c8 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/exception/ClusterStateException.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/exception/ShardingSphereStateException.java
@@ -22,13 +22,13 @@ import org.apache.shardingsphere.infra.exception.core.external.sql.type.kernel.c
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
/**
- * Cluster state exception.
+ * ShardingSphere state exception.
*/
-public final class ClusterStateException extends ClusterSQLException {
+public final class ShardingSphereStateException extends ClusterSQLException {
private static final long serialVersionUID = 3834132923835083492L;
- public ClusterStateException(final String type, final SQLStatement sqlStatement) {
+ public ShardingSphereStateException(final String type, final SQLStatement sqlStatement) {
super(XOpenSQLState.GENERAL_ERROR, 20, "The cluster state is %s, can not support SQL statement '%s'.", type, sqlStatement.getClass().getSimpleName());
}
}
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 5579f66b027..56be3b0bae9 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
@@ -47,7 +47,7 @@ import org.apache.shardingsphere.mode.metadata.factory.MetaDataContextsFactory;
import org.apache.shardingsphere.mode.metadata.manager.resource.SwitchingResource;
import org.apache.shardingsphere.mode.persist.PersistServiceFacade;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
-import org.apache.shardingsphere.mode.state.ClusterStateContext;
+import org.apache.shardingsphere.mode.state.StateContext;
import java.sql.SQLException;
import java.util.Collection;
@@ -67,7 +67,7 @@ public final class ContextManager implements AutoCloseable {
private final ExecutorEngine executorEngine;
- private final ClusterStateContext stateContext;
+ private final StateContext stateContext;
private final PersistServiceFacade persistServiceFacade;
@@ -78,7 +78,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.getClusterStatePersistService().load());
+ stateContext = new StateContext(persistServiceFacade.getStatePersistService().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 664aaf8cc0f..6f1074f8933 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.spi.repository.PersistRepository;
-import org.apache.shardingsphere.mode.state.ClusterStatePersistService;
+import org.apache.shardingsphere.mode.state.StatePersistService;
import org.apache.shardingsphere.mode.node.ComputeNodePersistService;
import org.apache.shardingsphere.mode.node.QualifiedDataSourceStatePersistService;
@@ -43,7 +43,7 @@ public final class PersistServiceFacade {
private final ComputeNodePersistService computeNodePersistService;
- private final ClusterStatePersistService clusterStatePersistService;
+ private final StatePersistService statePersistService;
private final MetaDataManagerPersistService metaDataManagerPersistService;
@@ -55,7 +55,7 @@ public final class PersistServiceFacade {
this.repository = repository;
metaDataPersistFacade = new MetaDataPersistFacade(repository);
computeNodePersistService = new ComputeNodePersistService(repository);
- clusterStatePersistService = new ClusterStatePersistService(repository);
+ statePersistService = new StatePersistService(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/state/ClusterState.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ShardingSphereState.java
similarity index 79%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterState.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/state/ShardingSphereState.java
index b63bef44703..f0fcbe0862a 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterState.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ShardingSphereState.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.mode.state;
import com.google.common.base.Strings;
/**
- * Cluster state.
+ * ShardingSphere state.
*/
-public enum ClusterState {
+public enum ShardingSphereState {
OK, READ_ONLY, UNAVAILABLE;
@@ -30,9 +30,9 @@ public enum ClusterState {
* Value from.
*
* @param value value
- * @return cluster state
+ * @return state
*/
- public static ClusterState valueFrom(final String value) {
- return Strings.isNullOrEmpty(value) ? ClusterState.OK : ClusterState.valueOf(value);
+ public static ShardingSphereState valueFrom(final String value) {
+ return Strings.isNullOrEmpty(value) ? ShardingSphereState.OK : ShardingSphereState.valueOf(value);
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStateContext.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java
similarity index 64%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStateContext.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java
index c47672be9a6..a158d54031f 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStateContext.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java
@@ -20,31 +20,31 @@ package org.apache.shardingsphere.mode.state;
import java.util.concurrent.atomic.AtomicReference;
/**
- * Cluster state context.
+ * State context.
*/
-public final class ClusterStateContext {
+public final class StateContext {
- private final AtomicReference<ClusterState> clusterState;
+ private final AtomicReference<ShardingSphereState> state;
- public ClusterStateContext(final ClusterState clusterState) {
- this.clusterState = new AtomicReference<>(clusterState);
+ public StateContext(final ShardingSphereState state) {
+ this.state = new AtomicReference<>(state);
}
/**
- * Get cluster state.
+ * Get state.
*
- * @return cluster state
+ * @return state
*/
- public ClusterState getState() {
- return clusterState.get();
+ public ShardingSphereState getState() {
+ return state.get();
}
/**
- * Switch cluster state.
+ * Switch state.
*
- * @param state to be switched cluster state
+ * @param state to be switched state
*/
- public void switchState(final ClusterState state) {
- clusterState.set(state);
+ public void switchState(final ShardingSphereState state) {
+ this.state.set(state);
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStatePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StatePersistService.java
similarity index 70%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStatePersistService.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/state/StatePersistService.java
index d4a03592d6a..abc13fc0448 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStatePersistService.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StatePersistService.java
@@ -19,32 +19,32 @@ package org.apache.shardingsphere.mode.state;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import org.apache.shardingsphere.mode.node.path.type.global.state.ClusterNodePath;
+import org.apache.shardingsphere.mode.node.path.type.global.state.StateNodePath;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
/**
- * Cluster state persist service.
+ * State persist service.
*/
@RequiredArgsConstructor
-public final class ClusterStatePersistService {
+public final class StatePersistService {
private final PersistRepository repository;
/**
- * Update cluster state.
+ * Update state.
*
- * @param state to be updated cluster state
+ * @param state to be updated state
*/
- public void update(final ClusterState state) {
- repository.persist(NodePathGenerator.toPath(new ClusterNodePath(), false), state.name());
+ public void update(final ShardingSphereState state) {
+ repository.persist(NodePathGenerator.toPath(new StateNodePath(), false), state.name());
}
/**
- * Load cluster state.
+ * Load state.
*
- * @return loaded cluster state
+ * @return loaded state
*/
- public ClusterState load() {
- return ClusterState.valueFrom(repository.query(NodePathGenerator.toPath(new ClusterNodePath(), false)));
+ public ShardingSphereState load() {
+ return ShardingSphereState.valueFrom(repository.query(NodePathGenerator.toPath(new StateNodePath(), false)));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStateContextTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStateContextTest.java
deleted file mode 100644
index a08b18010ff..00000000000
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStateContextTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.mode.state;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-class ClusterStateContextTest {
-
- @Test
- void assertSwitchState() {
- ClusterStateContext clusterStateContext = new ClusterStateContext(ClusterState.OK);
- clusterStateContext.switchState(ClusterState.READ_ONLY);
- assertThat(clusterStateContext.getState(), is(ClusterState.READ_ONLY));
- }
-}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStateTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ShardingSphereStateTest.java
similarity index 83%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStateTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/state/ShardingSphereStateTest.java
index ad6540e0ed1..c930d193ab4 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStateTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ShardingSphereStateTest.java
@@ -22,15 +22,15 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ClusterStateTest {
+class ShardingSphereStateTest {
@Test
void assertValueFromEmptyValue() {
- assertThat(ClusterState.valueFrom(""), is(ClusterState.OK));
+ assertThat(ShardingSphereState.valueFrom(""), is(ShardingSphereState.OK));
}
@Test
void assertValueFrom() {
- assertThat(ClusterState.valueFrom("UNAVAILABLE"), is(ClusterState.UNAVAILABLE));
+ assertThat(ShardingSphereState.valueFrom("UNAVAILABLE"), is(ShardingSphereState.UNAVAILABLE));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java
index e4dcef13a0b..e8ea7020172 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java
@@ -24,17 +24,17 @@ import static org.hamcrest.MatcherAssert.assertThat;
class StateContextTest {
- private final ClusterStateContext stateContext = new ClusterStateContext(ClusterState.OK);
+ private final StateContext stateContext = new StateContext(ShardingSphereState.OK);
@Test
void assertGetClusterState() {
- assertThat(stateContext.getState(), is(ClusterState.OK));
+ assertThat(stateContext.getState(), is(ShardingSphereState.OK));
}
@Test
void assertSwitchClusterState() {
- assertThat(stateContext.getState(), is(ClusterState.OK));
- stateContext.switchState(ClusterState.UNAVAILABLE);
- assertThat(stateContext.getState(), is(ClusterState.UNAVAILABLE));
+ assertThat(stateContext.getState(), is(ShardingSphereState.OK));
+ stateContext.switchState(ShardingSphereState.UNAVAILABLE);
+ assertThat(stateContext.getState(), is(ShardingSphereState.UNAVAILABLE));
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStatePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StatePersistServiceTest.java
similarity index 78%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStatePersistServiceTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/state/StatePersistServiceTest.java
index bd0304e943c..04a7249477c 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStatePersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/state/StatePersistServiceTest.java
@@ -30,33 +30,33 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class ClusterStatePersistServiceTest {
+class StatePersistServiceTest {
- private ClusterStatePersistService clusterStatePersistService;
+ private StatePersistService statePersistService;
@Mock
private PersistRepository repository;
@BeforeEach
void setUp() {
- clusterStatePersistService = new ClusterStatePersistService(repository);
+ statePersistService = new StatePersistService(repository);
}
@Test
void assertUpdate() {
- clusterStatePersistService.update(ClusterState.OK);
- verify(repository).persist("/states/cluster_state", ClusterState.OK.name());
+ statePersistService.update(ShardingSphereState.OK);
+ verify(repository).persist("/states/cluster_state", ShardingSphereState.OK.name());
}
@Test
void assertLoad() {
- when(repository.query("/states/cluster_state")).thenReturn(ClusterState.READ_ONLY.name());
- assertThat(clusterStatePersistService.load(), is(ClusterState.READ_ONLY));
+ when(repository.query("/states/cluster_state")).thenReturn(ShardingSphereState.READ_ONLY.name());
+ assertThat(statePersistService.load(), is(ShardingSphereState.READ_ONLY));
}
@Test
void assertLoadWithEmptyState() {
when(repository.query("/states/cluster_state")).thenReturn("");
- assertThat(clusterStatePersistService.load(), is(ClusterState.OK));
+ assertThat(statePersistService.load(), is(ShardingSphereState.OK));
}
}
diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePath.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/StateNodePath.java
similarity index 92%
rename from mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePath.java
rename to mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/StateNodePath.java
index 95dbd095a78..459c8b67b3a 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePath.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/path/type/global/state/StateNodePath.java
@@ -21,8 +21,8 @@ import org.apache.shardingsphere.mode.node.path.NodePath;
import org.apache.shardingsphere.mode.node.path.NodePathEntity;
/**
- * Cluster node path.
+ * State node path.
*/
@NodePathEntity("/states/cluster_state")
-public final class ClusterNodePath implements NodePath {
+public final class StateNodePath implements NodePath {
}
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePathTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/StateNodePathTest.java
similarity index 89%
rename from mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePathTest.java
rename to mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/StateNodePathTest.java
index d722bc29f00..6450d797ffa 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/ClusterNodePathTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/path/type/global/state/StateNodePathTest.java
@@ -23,10 +23,10 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ClusterNodePathTest {
+class StateNodePathTest {
@Test
void assertToPath() {
- assertThat(NodePathGenerator.toPath(new ClusterNodePath(), false), is("/states/cluster_state"));
+ assertThat(NodePathGenerator.toPath(new StateNodePath(), false), is("/states/cluster_state"));
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/ClusterStateChangedHandler.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/StateChangedHandler.java
similarity index 83%
rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/ClusterStateChangedHandler.java
rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/StateChangedHandler.java
index 7de1e2f844c..060d985496e 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/ClusterStateChangedHandler.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/StateChangedHandler.java
@@ -22,20 +22,20 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler;
import org.apache.shardingsphere.mode.node.path.NodePath;
-import org.apache.shardingsphere.mode.node.path.type.global.state.ClusterNodePath;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.node.path.type.global.state.StateNodePath;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import java.util.Arrays;
import java.util.Collection;
/**
- * Cluster state changed handler.
+ * State changed handler.
*/
-public final class ClusterStateChangedHandler implements GlobalDataChangedEventHandler {
+public final class StateChangedHandler implements GlobalDataChangedEventHandler {
@Override
public NodePath getSubscribedNodePath() {
- return new ClusterNodePath();
+ return new StateNodePath();
}
@Override
@@ -45,6 +45,6 @@ public final class ClusterStateChangedHandler implements GlobalDataChangedEventH
@Override
public void handle(final ContextManager contextManager, final DataChangedEvent event) {
- contextManager.getStateContext().switchState(ClusterState.valueFrom(event.getValue()));
+ contextManager.getStateContext().switchState(ShardingSphereState.valueFrom(event.getValue()));
}
}
diff --git a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler
index 4f3b50834da..e404f021758 100644
--- a/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler
+++ b/mode/type/cluster/core/src/main/resources/META-INF/services/org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler
@@ -18,7 +18,7 @@
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.config.type.GlobalRuleChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.config.type.PropertiesChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.state.DatabaseListenerChangedHandler
-org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.state.ClusterStateChangedHandler
+org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.state.StateChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.QualifiedDataSourceChangedHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.ComputeNodeOnlineHandler
org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.node.ComputeNodeStateChangedHandler
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/ClusterStateChangedHandlerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/StateChangedHandlerTest.java
similarity index 87%
rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/ClusterStateChangedHandlerTest.java
rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/StateChangedHandlerTest.java
index 5d73645d521..dca55aedf23 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/ClusterStateChangedHandlerTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/StateChangedHandlerTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.mode.event.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler;
import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -34,7 +34,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.mockito.Mockito.verify;
@ExtendWith(MockitoExtension.class)
-class ClusterStateChangedHandlerTest {
+class StateChangedHandlerTest {
private GlobalDataChangedEventHandler handler;
@@ -49,13 +49,13 @@ class ClusterStateChangedHandlerTest {
@Test
void assertHandleWithValidClusterState() {
- handler.handle(contextManager, new DataChangedEvent("/states/cluster_state", ClusterState.READ_ONLY.name(), Type.UPDATED));
- verify(contextManager.getStateContext()).switchState(ClusterState.READ_ONLY);
+ handler.handle(contextManager, new DataChangedEvent("/states/cluster_state", ShardingSphereState.READ_ONLY.name(), Type.UPDATED));
+ verify(contextManager.getStateContext()).switchState(ShardingSphereState.READ_ONLY);
}
@Test
void assertHandleWithInvalidClusterState() {
handler.handle(contextManager, new DataChangedEvent("/states/cluster_state", "", Type.UPDATED));
- verify(contextManager.getStateContext()).switchState(ClusterState.OK);
+ verify(contextManager.getStateContext()).switchState(ShardingSphereState.OK);
}
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
index 4accdc98adc..f2e0ed5b328 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
@@ -38,7 +38,7 @@ import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.distsql.DistSQLStatementContext;
import org.apache.shardingsphere.proxy.backend.handler.admin.DatabaseAdminBackendHandlerFactory;
@@ -188,9 +188,9 @@ public final class ProxyBackendHandlerFactory {
}
private static void checkClusterState(final SQLStatement sqlStatement) {
- ClusterState clusterCurrentState = ProxyContext.getInstance().getContextManager().getStateContext().getState();
- if (ClusterState.OK != clusterCurrentState) {
- TypedSPILoader.getService(ProxyClusterState.class, clusterCurrentState.name()).check(sqlStatement);
+ ShardingSphereState currentState = ProxyContext.getInstance().getContextManager().getStateContext().getState();
+ if (ShardingSphereState.OK != currentState) {
+ TypedSPILoader.getService(ProxyClusterState.class, currentState.name()).check(sqlStatement);
}
}
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
index ff857d28340..a6c5858248f 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.exception.core.ShardingSpherePrecondition
import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
import org.apache.shardingsphere.infra.lock.LockContext;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.mode.lock.exception.LockedClusterException;
import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -56,7 +56,7 @@ public final class LockClusterExecutor implements DistSQLUpdateExecutor<LockClus
}
private void checkState(final ContextManager contextManager) {
- ShardingSpherePreconditions.checkState(ClusterState.OK == contextManager.getStateContext().getState(), LockedClusterException::new);
+ ShardingSpherePreconditions.checkState(ShardingSphereState.OK == contextManager.getStateContext().getState(), LockedClusterException::new);
}
private void checkAlgorithm(final LockClusterStatement sqlStatement) {
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 923078f6e5f..8fa05264b2f 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
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorCluster
import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.lock.LockContext;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.mode.lock.exception.NotLockedClusterException;
import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
@@ -43,7 +43,7 @@ public final class UnlockClusterExecutor implements DistSQLUpdateExecutor<Unlock
if (lockContext.tryLock(lockDefinition, timeoutMillis)) {
try {
checkState(contextManager);
- contextManager.getPersistServiceFacade().getClusterStatePersistService().update(ClusterState.OK);
+ contextManager.getPersistServiceFacade().getStatePersistService().update(ShardingSphereState.OK);
// TODO unlock snapshot info if locked
} finally {
lockContext.unlock(lockDefinition);
@@ -52,7 +52,7 @@ public final class UnlockClusterExecutor implements DistSQLUpdateExecutor<Unlock
}
private void checkState(final ContextManager contextManager) {
- ShardingSpherePreconditions.checkState(ClusterState.OK != contextManager.getStateContext().getState(), NotLockedClusterException::new);
+ ShardingSpherePreconditions.checkState(ShardingSphereState.OK != contextManager.getStateContext().getState(), NotLockedClusterException::new);
}
@Override
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 584cb747e5b..e01d54a43a4 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.lock.impl;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy;
@@ -28,7 +28,7 @@ public class ClusterReadWriteLockStrategy implements ClusterLockStrategy {
@Override
public void lock() {
- ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getClusterStatePersistService().update(ClusterState.UNAVAILABLE);
+ ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getStatePersistService().update(ShardingSphereState.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 00e2e110c31..48409898aa0 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.lock.impl;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy;
@@ -28,7 +28,7 @@ public class ClusterWriteLockStrategy implements ClusterLockStrategy {
@Override
public void lock() {
- ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getClusterStatePersistService().update(ClusterState.READ_ONLY);
+ ProxyContext.getInstance().getContextManager().getPersistServiceFacade().getStatePersistService().update(ShardingSphereState.READ_ONLY);
}
@Override
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyState.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyState.java
index 23cf2e8a7c1..ff74670f60b 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyState.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyState.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.statement.ral.updatable.UpdatableRALSta
import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
import org.apache.shardingsphere.distsql.statement.rdl.RDLStatement;
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
-import org.apache.shardingsphere.mode.exception.ClusterStateException;
+import org.apache.shardingsphere.mode.exception.ShardingSphereStateException;
import org.apache.shardingsphere.proxy.backend.state.ProxyClusterState;
import org.apache.shardingsphere.proxy.backend.state.SQLSupportedJudgeEngine;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
@@ -48,7 +48,7 @@ public final class ReadOnlyProxyState implements ProxyClusterState {
@Override
public void check(final SQLStatement sqlStatement) {
- ShardingSpherePreconditions.checkState(judgeEngine.isSupported(sqlStatement), () -> new ClusterStateException(getType(), sqlStatement));
+ ShardingSpherePreconditions.checkState(judgeEngine.isSupported(sqlStatement), () -> new ShardingSphereStateException(getType(), sqlStatement));
}
@Override
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyState.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyState.java
index e8817ff352d..e49496eba22 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyState.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyState.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataS
import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
import org.apache.shardingsphere.distsql.statement.rql.RQLStatement;
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
-import org.apache.shardingsphere.mode.exception.ClusterStateException;
+import org.apache.shardingsphere.mode.exception.ShardingSphereStateException;
import org.apache.shardingsphere.proxy.backend.state.ProxyClusterState;
import org.apache.shardingsphere.proxy.backend.state.SQLSupportedJudgeEngine;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
@@ -49,7 +49,7 @@ public final class UnavailableProxyState implements ProxyClusterState {
@Override
public void check(final SQLStatement sqlStatement) {
- ShardingSpherePreconditions.checkState(judgeEngine.isSupported(sqlStatement), () -> new ClusterStateException(getType(), sqlStatement));
+ ShardingSpherePreconditions.checkState(judgeEngine.isSupported(sqlStatement), () -> new ShardingSphereStateException(getType(), sqlStatement));
}
@Override
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
index 0d91127aed2..f6052c637df 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -74,7 +74,7 @@ class ProxyContextTest {
MetaDataContexts metaDataContexts = new MetaDataContexts(metaData, new ShardingSphereStatistics());
ProxyContext.init(new ContextManager(metaDataContexts, mock(ComputeNodeInstanceContext.class, RETURNS_DEEP_STUBS), mock(PersistRepository.class)));
assertThat(ProxyContext.getInstance().getContextManager().getStateContext(), is(ProxyContext.getInstance().getContextManager().getStateContext()));
- assertThat(ProxyContext.getInstance().getContextManager().getStateContext().getState(), is(ClusterState.OK));
+ assertThat(ProxyContext.getInstance().getContextManager().getStateContext().getState(), is(ShardingSphereState.OK));
assertThat(ProxyContext.getInstance().getContextManager().getMetaDataContexts(), is(ProxyContext.getInstance().getContextManager().getMetaDataContexts()));
assertTrue(ProxyContext.getInstance().getInstanceStateContext().isPresent());
assertThat(ProxyContext.getInstance().getInstanceStateContext(), is(ProxyContext.getInstance().getInstanceStateContext()));
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
index 071c4be8678..4a8a642adbe 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import org.apache.shardingsphere.infra.session.connection.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
@@ -100,7 +100,7 @@ class ProxyBackendHandlerFactoryTest {
when(databaseConnectionManager.getConnectionSession()).thenReturn(connectionSession);
when(connectionSession.getDatabaseConnectionManager()).thenReturn(databaseConnectionManager);
ContextManager contextManager = mockContextManager();
- when(contextManager.getStateContext().getState()).thenReturn(ClusterState.OK);
+ when(contextManager.getStateContext().getState()).thenReturn(ShardingSphereState.OK);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
}
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutorTest.java
index 8df61e0556d..48dbc6251cc 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutorTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
import org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStatement;
import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.mode.lock.exception.LockedClusterException;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -46,21 +46,21 @@ class LockClusterExecutorTest {
@Test
void assertExecuteUpdateWithLockedCluster() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getStateContext().getState()).thenReturn(ClusterState.UNAVAILABLE);
+ when(contextManager.getStateContext().getState()).thenReturn(ShardingSphereState.UNAVAILABLE);
assertThrows(LockedClusterException.class, () -> executor.executeUpdate(new LockClusterStatement(new AlgorithmSegment("FOO", new Properties()), null), contextManager));
}
@Test
void assertExecuteUpdateWithWrongAlgorithm() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getStateContext().getState()).thenReturn(ClusterState.OK);
+ when(contextManager.getStateContext().getState()).thenReturn(ShardingSphereState.OK);
assertThrows(ServiceProviderNotFoundException.class, () -> executor.executeUpdate(new LockClusterStatement(new AlgorithmSegment("FOO", new Properties()), null), contextManager));
}
@Test
void assertExecuteUpdateWithUsingTimeout() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getStateContext().getState()).thenReturn(ClusterState.OK);
+ when(contextManager.getStateContext().getState()).thenReturn(ShardingSphereState.OK);
assertDoesNotThrow(() -> executor.executeUpdate(new LockClusterStatement(new AlgorithmSegment("WRITE", new Properties()), 2000L), contextManager));
}
}
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutorTest.java
index 27bcd03af8a..348153a836b 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutorTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
-import org.apache.shardingsphere.mode.state.ClusterState;
+import org.apache.shardingsphere.mode.state.ShardingSphereState;
import org.apache.shardingsphere.mode.lock.exception.NotLockedClusterException;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -42,7 +42,7 @@ class UnlockClusterExecutorTest {
@Test
void assertExecuteUpdateWithNotLockedCluster() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getStateContext().getState()).thenReturn(ClusterState.OK);
+ when(contextManager.getStateContext().getState()).thenReturn(ShardingSphereState.OK);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
assertThrows(NotLockedClusterException.class, () -> executor.executeUpdate(new UnlockClusterStatement(null), contextManager));
}
@@ -50,7 +50,7 @@ class UnlockClusterExecutorTest {
@Test
void assertExecuteUpdateWithUsingTimeout() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- when(contextManager.getStateContext().getState()).thenReturn(ClusterState.UNAVAILABLE);
+ when(contextManager.getStateContext().getState()).thenReturn(ShardingSphereState.UNAVAILABLE);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
assertDoesNotThrow(() -> executor.executeUpdate(new UnlockClusterStatement(2000L), contextManager));
}
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyStateTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyStateTest.java
index 8f63da9c9a5..c9e61c16453 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyStateTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/ReadOnlyProxyStateTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.proxy.backend.state.impl;
-import org.apache.shardingsphere.mode.exception.ClusterStateException;
+import org.apache.shardingsphere.mode.exception.ShardingSphereStateException;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
import org.junit.jupiter.api.Test;
@@ -29,7 +29,7 @@ class ReadOnlyProxyStateTest {
@Test
void assertExecuteWithUnsupportedSQL() {
- assertThrows(ClusterStateException.class, () -> new ReadOnlyProxyState().check(mock(InsertStatement.class)));
+ assertThrows(ShardingSphereStateException.class, () -> new ReadOnlyProxyState().check(mock(InsertStatement.class)));
}
@Test
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyStateTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyStateTest.java
index 4074a640e52..334fd6a009a 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyStateTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/state/impl/UnavailableProxyStateTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.state.impl;
import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportMetaDataStatement;
-import org.apache.shardingsphere.mode.exception.ClusterStateException;
+import org.apache.shardingsphere.mode.exception.ShardingSphereStateException;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.DMLStatement;
import org.junit.jupiter.api.Test;
@@ -29,7 +29,7 @@ class UnavailableProxyStateTest {
@Test
void assertExecuteWithUnsupportedSQL() {
- assertThrows(ClusterStateException.class, () -> new UnavailableProxyState().check(mock(DMLStatement.class)));
+ assertThrows(ShardingSphereStateException.class, () -> new UnavailableProxyState().check(mock(DMLStatement.class)));
}
@Test