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 6976e65968ad4..27b9b0b328637 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.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.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; 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 @@ void assertNewConstructorWithModeConfigurationOnly() throws Exception { try (ShardingSphereDataSource actual = new ShardingSphereDataSource("foo_db", null)) { ContextManager contextManager = getContextManager(actual); assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db")); - assertThat(contextManager.getStateContext().getClusterState(), is(ClusterState.OK)); + assertThat(contextManager.getStateContext().getState(), is(ClusterState.OK)); assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getState().getCurrentState(), is(InstanceState.OK)); assertTrue(contextManager.getStorageUnits("foo_db").isEmpty()); } @@ -69,7 +69,7 @@ void assertNewConstructorWithAllArguments() throws Exception { try (ShardingSphereDataSource actual = createShardingSphereDataSource(new MockedDataSource(connection))) { ContextManager contextManager = getContextManager(actual); assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db")); - assertThat(contextManager.getStateContext().getClusterState(), is(ClusterState.OK)); + assertThat(contextManager.getStateContext().getState(), is(ClusterState.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/manager/ContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java index 5afaf40b62535..fda6a08f0d90f 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 @@ -38,7 +38,7 @@ import org.apache.shardingsphere.mode.metadata.MetaDataContexts; import org.apache.shardingsphere.mode.persist.PersistServiceFacade; import org.apache.shardingsphere.mode.spi.PersistRepository; -import org.apache.shardingsphere.mode.state.StateContext; +import org.apache.shardingsphere.mode.state.ClusterStateContext; import java.sql.SQLException; import java.util.Collections; @@ -58,7 +58,7 @@ public final class ContextManager implements AutoCloseable { private final ExecutorEngine executorEngine; - private final StateContext stateContext; + private final ClusterStateContext stateContext; private final PersistServiceFacade persistServiceFacade; @@ -69,7 +69,7 @@ public ContextManager(final MetaDataContexts metaDataContexts, final ComputeNode this.computeNodeInstanceContext = computeNodeInstanceContext; metaDataContextManager = new MetaDataContextManager(this.metaDataContexts, computeNodeInstanceContext, repository); persistServiceFacade = new PersistServiceFacade(repository, computeNodeInstanceContext.getModeConfiguration(), metaDataContextManager); - stateContext = new StateContext(persistServiceFacade.getStatePersistService().load()); + stateContext = new ClusterStateContext(persistServiceFacade.getStatePersistService().load()); executorEngine = ExecutorEngine.createExecutorEngineWithSize(metaDataContexts.getMetaData().getProps().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/service/StatePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/StatePersistService.java index c79fc73016509..6f5a39d6ea9ab 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/StatePersistService.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/StatePersistService.java @@ -19,7 +19,7 @@ import com.google.common.base.Strings; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.metadata.persist.node.StatesNode; import org.apache.shardingsphere.mode.spi.PersistRepository; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/state/cluster/ClusterState.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterState.java similarity index 94% rename from infra/common/src/main/java/org/apache/shardingsphere/infra/state/cluster/ClusterState.java rename to mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterState.java index f3fbb5d96d0b7..4c4fd72df4ad8 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/state/cluster/ClusterState.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.infra.state.cluster; +package org.apache.shardingsphere.mode.state; /** * Cluster state. diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStateContext.java similarity index 82% rename from mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java rename to mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStateContext.java index d5f8e289db0af..c47672be9a6f5 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStateContext.java @@ -17,18 +17,16 @@ package org.apache.shardingsphere.mode.state; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; - import java.util.concurrent.atomic.AtomicReference; /** - * State context. + * Cluster state context. */ -public final class StateContext { +public final class ClusterStateContext { private final AtomicReference clusterState; - public StateContext(final ClusterState clusterState) { + public ClusterStateContext(final ClusterState clusterState) { this.clusterState = new AtomicReference<>(clusterState); } @@ -37,7 +35,7 @@ public StateContext(final ClusterState clusterState) { * * @return cluster state */ - public ClusterState getClusterState() { + public ClusterState getState() { return clusterState.get(); } @@ -46,7 +44,7 @@ public ClusterState getClusterState() { * * @param state to be switched cluster state */ - public void switchClusterState(final ClusterState state) { + public void switchState(final ClusterState state) { clusterState.set(state); } } diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/StatePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/StatePersistServiceTest.java index 901e303d5089a..8d731f7a489ce 100644 --- a/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/StatePersistServiceTest.java +++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/StatePersistServiceTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mode.persist.service; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.mode.spi.PersistRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; 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 fd1458c7a7db3..e4dcef13a0b86 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 @@ -17,7 +17,6 @@ package org.apache.shardingsphere.mode.state; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; @@ -25,17 +24,17 @@ class StateContextTest { - private final StateContext stateContext = new StateContext(ClusterState.OK); + private final ClusterStateContext stateContext = new ClusterStateContext(ClusterState.OK); @Test void assertGetClusterState() { - assertThat(stateContext.getClusterState(), is(ClusterState.OK)); + assertThat(stateContext.getState(), is(ClusterState.OK)); } @Test void assertSwitchClusterState() { - assertThat(stateContext.getClusterState(), is(ClusterState.OK)); - stateContext.switchClusterState(ClusterState.UNAVAILABLE); - assertThat(stateContext.getClusterState(), is(ClusterState.UNAVAILABLE)); + assertThat(stateContext.getState(), is(ClusterState.OK)); + stateContext.switchState(ClusterState.UNAVAILABLE); + assertThat(stateContext.getState(), is(ClusterState.UNAVAILABLE)); } } diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/builder/type/ClusterStateDispatchEventBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/builder/type/ClusterStateDispatchEventBuilder.java index e362ee22ea056..fdc7db6c7a369 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/builder/type/ClusterStateDispatchEventBuilder.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/builder/type/ClusterStateDispatchEventBuilder.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.metadata.persist.node.StatesNode; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/event/state/cluster/ClusterStateEvent.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/event/state/cluster/ClusterStateEvent.java index d46ffc02b7433..52614460681ea 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/event/state/cluster/ClusterStateEvent.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/event/state/cluster/ClusterStateEvent.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.event.DispatchEvent; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; /** * Cluster state event. diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/StateChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/StateChangedSubscriber.java index 99d28be93e196..40728cb3315c2 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/StateChangedSubscriber.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/StateChangedSubscriber.java @@ -38,6 +38,6 @@ public final class StateChangedSubscriber implements DispatchEventSubscriber { */ @Subscribe public synchronized void renew(final ClusterStateEvent event) { - contextManager.getStateContext().switchClusterState(event.getClusterState()); + contextManager.getStateContext().switchState(event.getClusterState()); } } diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/builder/type/ClusterStateDispatchEventBuilderTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/builder/type/ClusterStateDispatchEventBuilderTest.java index a52973c4333a7..c23bffcea4458 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/builder/type/ClusterStateDispatchEventBuilderTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/builder/type/ClusterStateDispatchEventBuilderTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.builder.type; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.event.DispatchEvent; diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/StateChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/StateChangedSubscriberTest.java index fb03144774414..9d29ac80f9c68 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/StateChangedSubscriberTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/dispatch/subscriber/type/StateChangedSubscriberTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.type; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.event.state.cluster.ClusterStateEvent; import org.apache.shardingsphere.mode.manager.ContextManager; import org.junit.jupiter.api.BeforeEach; @@ -45,6 +45,6 @@ void setUp() { @Test void assertRenew() { subscriber.renew(new ClusterStateEvent(ClusterState.READ_ONLY)); - verify(contextManager.getStateContext()).switchClusterState(ClusterState.READ_ONLY); + verify(contextManager.getStateContext()).switchState(ClusterState.READ_ONLY); } } 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 cceba19245953..4accdc98adcb4 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.session.query.QueryContext; import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; 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,7 +188,7 @@ private static void checkUnsupportedSQLStatement(final SQLStatement sqlStatement } private static void checkClusterState(final SQLStatement sqlStatement) { - ClusterState clusterCurrentState = ProxyContext.getInstance().getContextManager().getStateContext().getClusterState(); + ClusterState clusterCurrentState = ProxyContext.getInstance().getContextManager().getStateContext().getState(); if (ClusterState.OK != clusterCurrentState) { TypedSPILoader.getService(ProxyClusterState.class, clusterCurrentState.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 cba160afa02f2..ff857d28340bf 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.external.sql.identifier.SQLExceptionIdentifier; import org.apache.shardingsphere.infra.lock.LockContext; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; 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 void executeUpdate(final LockClusterStatement sqlStatement, final Context } private void checkState(final ContextManager contextManager) { - ShardingSpherePreconditions.checkState(ClusterState.OK == contextManager.getStateContext().getClusterState(), LockedClusterException::new); + ShardingSpherePreconditions.checkState(ClusterState.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 e1d6e423fce51..12ee06fda82c3 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.statement.ral.updatable.UnlockClusterStatement; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.lock.LockContext; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.mode.lock.exception.NotLockedClusterException; import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition; import org.apache.shardingsphere.mode.manager.ContextManager; @@ -52,7 +52,7 @@ public void executeUpdate(final UnlockClusterStatement sqlStatement, final Conte } private void checkState(final ContextManager contextManager) { - ShardingSpherePreconditions.checkState(ClusterState.OK != contextManager.getStateContext().getClusterState(), NotLockedClusterException::new); + ShardingSpherePreconditions.checkState(ClusterState.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 93820e91e5603..178aa3f310188 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.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy; 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 081f8f6bb0d30..216123200fdcb 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.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy; 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 de91f84566bb1..7b94bce84c5c1 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 @@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; -import org.apache.shardingsphere.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; import org.apache.shardingsphere.metadata.persist.MetaDataPersistService; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.metadata.MetaDataContexts; @@ -73,7 +73,7 @@ void assertInit() { MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(mock(MetaDataPersistService.class), new ShardingSphereMetaData()); 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().getClusterState(), is(ClusterState.OK)); + assertThat(ProxyContext.getInstance().getContextManager().getStateContext().getState(), is(ClusterState.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 66421f2d0ab8a..071c4be86789e 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.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.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; 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 @@ void setUp() { when(databaseConnectionManager.getConnectionSession()).thenReturn(connectionSession); when(connectionSession.getDatabaseConnectionManager()).thenReturn(databaseConnectionManager); ContextManager contextManager = mockContextManager(); - when(contextManager.getStateContext().getClusterState()).thenReturn(ClusterState.OK); + when(contextManager.getStateContext().getState()).thenReturn(ClusterState.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 7e86f7bcbec46..8df61e0556d68 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 @@ 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.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; 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().getClusterState()).thenReturn(ClusterState.UNAVAILABLE); + when(contextManager.getStateContext().getState()).thenReturn(ClusterState.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().getClusterState()).thenReturn(ClusterState.OK); + when(contextManager.getStateContext().getState()).thenReturn(ClusterState.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().getClusterState()).thenReturn(ClusterState.OK); + when(contextManager.getStateContext().getState()).thenReturn(ClusterState.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 58bc57722d118..27bcd03af8aff 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.infra.state.cluster.ClusterState; +import org.apache.shardingsphere.mode.state.ClusterState; 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().getClusterState()).thenReturn(ClusterState.OK); + when(contextManager.getStateContext().getState()).thenReturn(ClusterState.OK); when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager); assertThrows(NotLockedClusterException.class, () -> executor.executeUpdate(new UnlockClusterStatement(null), contextManager)); } @@ -50,7 +50,7 @@ void assertExecuteUpdateWithNotLockedCluster() { @Test void assertExecuteUpdateWithUsingTimeout() { ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS); - when(contextManager.getStateContext().getClusterState()).thenReturn(ClusterState.UNAVAILABLE); + when(contextManager.getStateContext().getState()).thenReturn(ClusterState.UNAVAILABLE); when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager); assertDoesNotThrow(() -> executor.executeUpdate(new UnlockClusterStatement(2000L), contextManager)); }