This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 65bcadc6bbc Optimize method names for StateContext and remove useless
methods for ContextManager (#31322)
65bcadc6bbc is described below
commit 65bcadc6bbce011e2451a45a615442be1fa1a158
Author: Haoran Meng <[email protected]>
AuthorDate: Tue May 21 11:58:51 2024 +0800
Optimize method names for StateContext and remove useless methods for
ContextManager (#31322)
* Optimize method names for StateContext and remove useless methods for
ContextManager
* Optimize method names for StateContext and remove useless methods for
ContextManager
---
.../jdbc/core/datasource/ShardingSphereDataSourceTest.java | 4 ++--
.../apache/shardingsphere/mode/manager/ContextManager.java | 10 ----------
.../org/apache/shardingsphere/mode/state/StateContext.java | 10 +++++-----
.../shardingsphere/mode/manager/ContextManagerTest.java | 7 -------
.../apache/shardingsphere/mode/state/StateContextTest.java | 12 ++++++------
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 2 +-
.../coordinator/subscriber/StateChangedSubscriber.java | 2 +-
.../coordinator/subscriber/StateChangedSubscriberTest.java | 4 ++--
.../proxy/backend/handler/ProxyBackendHandlerFactory.java | 2 +-
.../handler/distsql/ral/updatable/LockClusterExecutor.java | 2 +-
.../handler/distsql/ral/updatable/UnlockClusterExecutor.java | 2 +-
.../proxy/backend/context/ProxyContextTest.java | 2 +-
.../backend/handler/ProxyBackendHandlerFactoryTest.java | 2 +-
.../distsql/ral/updatable/LockClusterExecutorTest.java | 4 ++--
.../distsql/ral/updatable/UnlockClusterExecutorTest.java | 2 +-
15 files changed, 25 insertions(+), 42 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 b22a82c35c0..1f98fcf6353 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
@@ -57,7 +57,7 @@ class ShardingSphereDataSourceTest {
try (ShardingSphereDataSource actual = new
ShardingSphereDataSource(DefaultDatabase.LOGIC_NAME, null)) {
ContextManager contextManager = getContextManager(actual);
assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME));
- assertThat(contextManager.getStateContext().getCurrentState(),
is(ClusterState.OK));
+
assertThat(contextManager.getStateContext().getCurrentClusterState(),
is(ClusterState.OK));
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getState().getCurrentState(),
is(InstanceState.OK));
assertTrue(contextManager.getStorageUnits(DefaultDatabase.LOGIC_NAME).isEmpty());
}
@@ -70,7 +70,7 @@ class ShardingSphereDataSourceTest {
try (ShardingSphereDataSource actual =
createShardingSphereDataSource(new MockedDataSource(connection))) {
ContextManager contextManager = getContextManager(actual);
assertNotNull(contextManager.getMetaDataContexts().getMetaData().getDatabase(DefaultDatabase.LOGIC_NAME));
- assertThat(contextManager.getStateContext().getCurrentState(),
is(ClusterState.OK));
+
assertThat(contextManager.getStateContext().getCurrentClusterState(),
is(ClusterState.OK));
assertThat(contextManager.getComputeNodeInstanceContext().getInstance().getState().getCurrentState(),
is(InstanceState.OK));
assertThat(contextManager.getStorageUnits(DefaultDatabase.LOGIC_NAME).size(),
is(1));
assertThat(contextManager.getStorageUnits(DefaultDatabase.LOGIC_NAME).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 e99c5900f2d..26629fd2cb0 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
@@ -37,7 +37,6 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericS
import
org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
-import org.apache.shardingsphere.infra.state.cluster.ClusterState;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.mode.manager.context.ConfigurationContextManager;
import
org.apache.shardingsphere.mode.manager.context.ResourceMetaDataContextManager;
@@ -274,15 +273,6 @@ public final class ContextManager implements AutoCloseable
{
.persist(database.getName(), schemaName,
Collections.singletonMap(tableName, schema.getTable(tableName)));
}
- /**
- * Update cluster state.
- *
- * @param clusterState cluster state
- */
- public void updateClusterState(final ClusterState clusterState) {
- stateContext.switchState(clusterState);
- }
-
@Override
public void close() {
executorEngine.close();
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/StateContext.java
index 70b74effc3d..0e0371242fa 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/StateContext.java
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicReference;
@RequiredArgsConstructor
public final class StateContext {
- private final AtomicReference<ClusterState> currentState = new
AtomicReference<>(ClusterState.OK);
+ private final AtomicReference<ClusterState> currentClusterState = new
AtomicReference<>(ClusterState.OK);
@Getter
private final StateService stateService;
@@ -38,8 +38,8 @@ public final class StateContext {
*
* @return current cluster state
*/
- public ClusterState getCurrentState() {
- return currentState.get();
+ public ClusterState getCurrentClusterState() {
+ return currentClusterState.get();
}
/**
@@ -47,7 +47,7 @@ public final class StateContext {
*
* @param state to be switched cluster state
*/
- public void switchState(final ClusterState state) {
- currentState.set(state);
+ public void switchCurrentClusterState(final ClusterState state) {
+ currentClusterState.set(state);
}
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index 2b3cf8af9f7..e2bcdd6f86d 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -40,7 +40,6 @@ import
org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import
org.apache.shardingsphere.infra.rule.attribute.datanode.MutableDataNodeRuleAttribute;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.infra.state.cluster.ClusterState;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.metadata.persist.service.database.DatabaseMetaDataPersistService;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
@@ -264,12 +263,6 @@ class ContextManagerTest {
assertTrue(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getResourceMetaData().getStorageUnits().containsKey("foo_ds"));
}
- @Test
- void assertUpdateClusterState() {
- contextManager.updateClusterState(ClusterState.READ_ONLY);
- assertThat(contextManager.getStateContext().getCurrentState(),
is(ClusterState.READ_ONLY));
- }
-
@Test
void assertClose() {
contextManager.close();
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 e9dd1884c98..21ba69898eb 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
@@ -29,14 +29,14 @@ class StateContextTest {
private final StateContext stateContext = new
StateContext(mock(StateService.class));
@Test
- void assertGetCurrentState() {
- assertThat(stateContext.getCurrentState(), is(ClusterState.OK));
+ void assertGetCurrentClusterState() {
+ assertThat(stateContext.getCurrentClusterState(), is(ClusterState.OK));
}
@Test
- void assertSwitchState() {
- assertThat(stateContext.getCurrentState(), is(ClusterState.OK));
- stateContext.switchState(ClusterState.UNAVAILABLE);
- assertThat(stateContext.getCurrentState(),
is(ClusterState.UNAVAILABLE));
+ void assertSwitchCurrentClusterState() {
+ assertThat(stateContext.getCurrentClusterState(), is(ClusterState.OK));
+ stateContext.switchCurrentClusterState(ClusterState.UNAVAILABLE);
+ assertThat(stateContext.getCurrentClusterState(),
is(ClusterState.UNAVAILABLE));
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 8a27e5ea0a5..79fd611638e 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -128,7 +128,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
StateService stateService =
contextManager.getStateContext().getStateService();
Optional<ClusterState> clusterState = stateService.load();
if (clusterState.isPresent()) {
- contextManager.updateClusterState(clusterState.get());
+
contextManager.getStateContext().switchCurrentClusterState(clusterState.get());
} else {
stateService.persist(ClusterState.OK);
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriber.java
index c288594dbe5..50bffbe54cf 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriber.java
@@ -88,7 +88,7 @@ public final class StateChangedSubscriber implements
EventSubscriber {
*/
@Subscribe
public synchronized void renew(final ClusterStateEvent event) {
- contextManager.updateClusterState(event.getClusterState());
+
contextManager.getStateContext().switchCurrentClusterState(event.getClusterState());
}
/**
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
index e21afb5cbfb..46c3c52e59e 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/StateChangedSubscriberTest.java
@@ -125,14 +125,14 @@ class StateChangedSubscriberTest {
void assertResetClusterState() {
ClusterLockDeletedEvent mockLockDeletedEvent = new
ClusterLockDeletedEvent(ClusterState.OK);
subscriber.renew(mockLockDeletedEvent);
- assertThat(contextManager.getStateContext().getCurrentState(),
is(ClusterState.OK));
+ assertThat(contextManager.getStateContext().getCurrentClusterState(),
is(ClusterState.OK));
}
@Test
void assertRenewClusterState() {
ClusterStateEvent mockClusterStateEvent = new
ClusterStateEvent(ClusterState.READ_ONLY);
subscriber.renew(mockClusterStateEvent);
- assertThat(contextManager.getStateContext().getCurrentState(),
is(ClusterState.READ_ONLY));
+ assertThat(contextManager.getStateContext().getCurrentClusterState(),
is(ClusterState.READ_ONLY));
}
@Test
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 ee684d2ff79..f428d090667 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
@@ -201,7 +201,7 @@ public final class ProxyBackendHandlerFactory {
}
private static void checkClusterState(final SQLStatement sqlStatement) {
- ClusterState clusterCurrentState =
ProxyContext.getInstance().getContextManager().getStateContext().getCurrentState();
+ ClusterState clusterCurrentState =
ProxyContext.getInstance().getContextManager().getStateContext().getCurrentClusterState();
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 6cdf32a369b..80c1188b16c 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
@@ -56,7 +56,7 @@ public final class LockClusterExecutor implements
DistSQLUpdateExecutor<LockClus
}
private void checkState(final ContextManager contextManager) {
- ShardingSpherePreconditions.checkState(ClusterState.OK ==
contextManager.getStateContext().getCurrentState(),
LockedClusterException::new);
+ ShardingSpherePreconditions.checkState(ClusterState.OK ==
contextManager.getStateContext().getCurrentClusterState(),
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 6150aa84b71..8ed42981911 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
@@ -53,7 +53,7 @@ public final class UnlockClusterExecutor implements
DistSQLUpdateExecutor<Unlock
}
private void checkState(final ContextManager contextManager) {
- ShardingSpherePreconditions.checkState(ClusterState.OK !=
contextManager.getStateContext().getCurrentState(),
NotLockedClusterException::new);
+ ShardingSpherePreconditions.checkState(ClusterState.OK !=
contextManager.getStateContext().getCurrentClusterState(),
NotLockedClusterException::new);
}
@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 52471fdb02a..c36c59fdeab 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
@@ -70,7 +70,7 @@ class ProxyContextTest {
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData());
ProxyContext.init(new ContextManager(metaDataContexts,
mock(ComputeNodeInstanceContext.class, RETURNS_DEEP_STUBS)));
assertThat(ProxyContext.getInstance().getContextManager().getStateContext(),
is(ProxyContext.getInstance().getContextManager().getStateContext()));
-
assertThat(ProxyContext.getInstance().getContextManager().getStateContext().getCurrentState(),
is(ClusterState.OK));
+
assertThat(ProxyContext.getInstance().getContextManager().getStateContext().getCurrentClusterState(),
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 4ead149e450..84f9968ae0c 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
@@ -97,7 +97,7 @@ class ProxyBackendHandlerFactoryTest {
when(databaseConnectionManager.getConnectionSession()).thenReturn(connectionSession);
when(connectionSession.getDatabaseConnectionManager()).thenReturn(databaseConnectionManager);
ContextManager contextManager = mockContextManager();
-
when(contextManager.getStateContext().getCurrentState()).thenReturn(ClusterState.OK);
+
when(contextManager.getStateContext().getCurrentClusterState()).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 5d3b8b346fd..711c4fb424c 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
@@ -45,14 +45,14 @@ class LockClusterExecutorTest {
@Test
void assertExecuteUpdateWithLockedCluster() {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
-
when(contextManager.getStateContext().getCurrentState()).thenReturn(ClusterState.UNAVAILABLE);
+
when(contextManager.getStateContext().getCurrentClusterState()).thenReturn(ClusterState.UNAVAILABLE);
assertThrows(LockedClusterException.class, () ->
executor.executeUpdate(new LockClusterStatement(new AlgorithmSegment("FOO", new
Properties())), contextManager));
}
@Test
void assertExecuteUpdateWithWrongAlgorithm() {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
-
when(contextManager.getStateContext().getCurrentState()).thenReturn(ClusterState.OK);
+
when(contextManager.getStateContext().getCurrentClusterState()).thenReturn(ClusterState.OK);
assertThrows(ServiceProviderNotFoundException.class, () ->
executor.executeUpdate(new LockClusterStatement(new AlgorithmSegment("FOO", new
Properties())), 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 958e08dc1d9..f0b50167aa2 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
@@ -41,7 +41,7 @@ class UnlockClusterExecutorTest {
@Test
void assertExecuteUpdateWithNotLockedCluster() {
ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
-
when(contextManager.getStateContext().getCurrentState()).thenReturn(ClusterState.OK);
+
when(contextManager.getStateContext().getCurrentClusterState()).thenReturn(ClusterState.OK);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
assertThrows(NotLockedClusterException.class, () ->
executor.executeUpdate(new UnlockClusterStatement(), contextManager));
}
