Skip to content

Commit 5e171e5

Browse files
authored
Add test cases on ClusterStateContext (#34940)
* Add test cases on ClusterStateContext * Rename packages mode.node and mode.state * Rename packages mode.node and mode.state
1 parent 9715c29 commit 5e171e5

File tree

30 files changed

+64
-31
lines changed

30 files changed

+64
-31
lines changed

jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
2424
import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode;
2525
import org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
26-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
26+
import org.apache.shardingsphere.mode.state.ClusterState;
2727
import org.apache.shardingsphere.infra.state.instance.InstanceState;
2828
import org.apache.shardingsphere.mode.manager.ContextManager;
2929
import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration;

mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.apache.shardingsphere.mode.metadata.manager.resource.SwitchingResource;
4848
import org.apache.shardingsphere.mode.persist.PersistServiceFacade;
4949
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
50-
import org.apache.shardingsphere.mode.state.cluster.ClusterStateContext;
50+
import org.apache.shardingsphere.mode.state.ClusterStateContext;
5151

5252
import java.sql.SQLException;
5353
import java.util.Collection;

mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/ComputeNodePersistService.java mode/core/src/main/java/org/apache/shardingsphere/mode/node/ComputeNodePersistService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.node;
18+
package org.apache.shardingsphere.mode.node;
1919

2020
import com.google.common.base.Strings;
2121
import lombok.RequiredArgsConstructor;

mode/core/src/main/java/org/apache/shardingsphere/mode/state/node/QualifiedDataSourceStatePersistService.java mode/core/src/main/java/org/apache/shardingsphere/mode/node/QualifiedDataSourceStatePersistService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.node;
18+
package org.apache.shardingsphere.mode.node;
1919

2020
import com.google.common.base.Strings;
2121
import lombok.RequiredArgsConstructor;

mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
2828
import org.apache.shardingsphere.mode.persist.service.ProcessPersistService;
2929
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
30-
import org.apache.shardingsphere.mode.state.cluster.ClusterStatePersistService;
31-
import org.apache.shardingsphere.mode.state.node.ComputeNodePersistService;
32-
import org.apache.shardingsphere.mode.state.node.QualifiedDataSourceStatePersistService;
30+
import org.apache.shardingsphere.mode.state.ClusterStatePersistService;
31+
import org.apache.shardingsphere.mode.node.ComputeNodePersistService;
32+
import org.apache.shardingsphere.mode.node.QualifiedDataSourceStatePersistService;
3333

3434
/**
3535
* Persist service facade.

mode/core/src/main/java/org/apache/shardingsphere/mode/state/cluster/ClusterState.java mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterState.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.cluster;
18+
package org.apache.shardingsphere.mode.state;
1919

2020
import com.google.common.base.Strings;
2121

mode/core/src/main/java/org/apache/shardingsphere/mode/state/cluster/ClusterStateContext.java mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStateContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.cluster;
18+
package org.apache.shardingsphere.mode.state;
1919

2020
import java.util.concurrent.atomic.AtomicReference;
2121

mode/core/src/main/java/org/apache/shardingsphere/mode/state/cluster/ClusterStatePersistService.java mode/core/src/main/java/org/apache/shardingsphere/mode/state/ClusterStatePersistService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.cluster;
18+
package org.apache.shardingsphere.mode.state;
1919

2020
import lombok.RequiredArgsConstructor;
2121
import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;

mode/core/src/test/java/org/apache/shardingsphere/mode/state/node/ComputeNodePersistServiceTest.java mode/core/src/test/java/org/apache/shardingsphere/mode/node/ComputeNodePersistServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.node;
18+
package org.apache.shardingsphere.mode.node;
1919

2020
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
2121
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;

mode/core/src/test/java/org/apache/shardingsphere/mode/state/node/QualifiedDataSourceStatePersistServiceTest.java mode/core/src/test/java/org/apache/shardingsphere/mode/node/QualifiedDataSourceStatePersistServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.node;
18+
package org.apache.shardingsphere.mode.node;
1919

2020
import org.apache.shardingsphere.infra.state.datasource.DataSourceState;
2121
import org.apache.shardingsphere.infra.state.datasource.qualified.QualifiedDataSourceState;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
package org.apache.shardingsphere.mode.state;
19+
20+
import org.junit.jupiter.api.Test;
21+
22+
import static org.hamcrest.CoreMatchers.is;
23+
import static org.hamcrest.MatcherAssert.assertThat;
24+
25+
class ClusterStateContextTest {
26+
27+
@Test
28+
void assertSwitchState() {
29+
ClusterStateContext clusterStateContext = new ClusterStateContext(ClusterState.OK);
30+
clusterStateContext.switchState(ClusterState.READ_ONLY);
31+
assertThat(clusterStateContext.getState(), is(ClusterState.READ_ONLY));
32+
}
33+
}

mode/core/src/test/java/org/apache/shardingsphere/mode/state/cluster/ClusterStatePersistServiceTest.java mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStatePersistServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.cluster;
18+
package org.apache.shardingsphere.mode.state;
1919

2020
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
2121
import org.junit.jupiter.api.BeforeEach;

mode/core/src/test/java/org/apache/shardingsphere/mode/state/cluster/ClusterStateTest.java mode/core/src/test/java/org/apache/shardingsphere/mode/state/ClusterStateTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.cluster;
18+
package org.apache.shardingsphere.mode.state;
1919

2020
import org.junit.jupiter.api.Test;
2121

mode/core/src/test/java/org/apache/shardingsphere/mode/state/cluster/StateContextTest.java mode/core/src/test/java/org/apache/shardingsphere/mode/state/StateContextTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.shardingsphere.mode.state.cluster;
18+
package org.apache.shardingsphere.mode.state;
1919

2020
import org.junit.jupiter.api.Test;
2121

mode/core/src/test/resources/logback-test.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
2727
<appender-ref ref="console" />
2828
</logger>
29-
<logger name="org.apache.shardingsphere.mode.state.node.ComputeNodePersistService" level="off" />
29+
<logger name="org.apache.shardingsphere.mode.node.ComputeNodePersistService" level="off" />
3030

3131
<root>
3232
<level value="error" />

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/ClusterStateChangedHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler;
2424
import org.apache.shardingsphere.mode.node.path.NodePath;
2525
import org.apache.shardingsphere.mode.node.path.type.global.state.ClusterNodePath;
26-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
26+
import org.apache.shardingsphere.mode.state.ClusterState;
2727

2828
import java.util.Arrays;
2929
import java.util.Collection;

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
2323
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdAssignedException;
2424
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdGenerator;
25-
import org.apache.shardingsphere.mode.state.node.ComputeNodePersistService;
25+
import org.apache.shardingsphere.mode.node.ComputeNodePersistService;
2626
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
2727

2828
import java.util.Collection;

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/state/ClusterStateChangedHandlerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.shardingsphere.mode.manager.ContextManager;
2424
import org.apache.shardingsphere.mode.manager.cluster.dispatch.handler.global.GlobalDataChangedEventHandler;
2525
import org.apache.shardingsphere.mode.node.path.engine.generator.NodePathGenerator;
26-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
26+
import org.apache.shardingsphere.mode.state.ClusterState;
2727
import org.junit.jupiter.api.BeforeEach;
2828
import org.junit.jupiter.api.Test;
2929
import org.junit.jupiter.api.extension.ExtendWith;

mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGeneratorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import lombok.SneakyThrows;
2121
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdAssignedException;
2222
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdGenerator;
23-
import org.apache.shardingsphere.mode.state.node.ComputeNodePersistService;
23+
import org.apache.shardingsphere.mode.node.ComputeNodePersistService;
2424
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
2525
import org.apache.shardingsphere.test.util.PropertiesBuilder;
2626
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;

mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionReconnectListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.curator.framework.state.ConnectionStateListener;
2525
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
2626
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
27-
import org.apache.shardingsphere.mode.state.node.ComputeNodePersistService;
27+
import org.apache.shardingsphere.mode.node.ComputeNodePersistService;
2828

2929
import java.util.Properties;
3030

mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionReconnectListenerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.curator.framework.CuratorFramework;
2222
import org.apache.curator.framework.state.ConnectionState;
2323
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
24-
import org.apache.shardingsphere.mode.state.node.ComputeNodePersistService;
24+
import org.apache.shardingsphere.mode.node.ComputeNodePersistService;
2525
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
2626
import org.junit.jupiter.api.Test;
2727
import org.junit.jupiter.api.extension.ExtendWith;

proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.apache.shardingsphere.infra.session.query.QueryContext;
3939
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
4040
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
41-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
41+
import org.apache.shardingsphere.mode.state.ClusterState;
4242
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
4343
import org.apache.shardingsphere.proxy.backend.distsql.DistSQLStatementContext;
4444
import org.apache.shardingsphere.proxy.backend.handler.admin.DatabaseAdminBackendHandlerFactory;

proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.apache.shardingsphere.infra.exception.core.external.sql.identifier.SQLExceptionIdentifier;
2626
import org.apache.shardingsphere.infra.lock.LockContext;
2727
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
28-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
28+
import org.apache.shardingsphere.mode.state.ClusterState;
2929
import org.apache.shardingsphere.mode.lock.exception.LockedClusterException;
3030
import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
3131
import org.apache.shardingsphere.mode.manager.ContextManager;

proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
2323
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
2424
import org.apache.shardingsphere.infra.lock.LockContext;
25-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
25+
import org.apache.shardingsphere.mode.state.ClusterState;
2626
import org.apache.shardingsphere.mode.lock.exception.NotLockedClusterException;
2727
import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
2828
import org.apache.shardingsphere.mode.manager.ContextManager;

proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterReadWriteLockStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.shardingsphere.proxy.backend.lock.impl;
1919

20-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
20+
import org.apache.shardingsphere.mode.state.ClusterState;
2121
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
2222
import org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy;
2323

proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/lock/impl/ClusterWriteLockStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.shardingsphere.proxy.backend.lock.impl;
1919

20-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
20+
import org.apache.shardingsphere.mode.state.ClusterState;
2121
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
2222
import org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy;
2323

proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/context/ProxyContextTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.shardingsphere.mode.manager.ContextManager;
3131
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
3232
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
33-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
33+
import org.apache.shardingsphere.mode.state.ClusterState;
3434
import org.junit.jupiter.api.AfterEach;
3535
import org.junit.jupiter.api.BeforeEach;
3636
import org.junit.jupiter.api.Test;

proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
3131
import org.apache.shardingsphere.infra.session.connection.transaction.TransactionConnectionContext;
3232
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
33-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
33+
import org.apache.shardingsphere.mode.state.ClusterState;
3434
import org.apache.shardingsphere.mode.manager.ContextManager;
3535
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
3636
import org.apache.shardingsphere.parser.rule.SQLParserRule;

proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.shardingsphere.distsql.segment.AlgorithmSegment;
2121
import org.apache.shardingsphere.distsql.statement.ral.updatable.LockClusterStatement;
2222
import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException;
23-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
23+
import org.apache.shardingsphere.mode.state.ClusterState;
2424
import org.apache.shardingsphere.mode.lock.exception.LockedClusterException;
2525
import org.apache.shardingsphere.mode.manager.ContextManager;
2626
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;

proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
1919

2020
import org.apache.shardingsphere.distsql.statement.ral.updatable.UnlockClusterStatement;
21-
import org.apache.shardingsphere.mode.state.cluster.ClusterState;
21+
import org.apache.shardingsphere.mode.state.ClusterState;
2222
import org.apache.shardingsphere.mode.lock.exception.NotLockedClusterException;
2323
import org.apache.shardingsphere.mode.manager.ContextManager;
2424
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;

0 commit comments

Comments
 (0)