You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/11/04 14:48:50 UTC
[shardingsphere] branch master updated: Rename ClusterLockPersistService to GlobalLockPersistService (#21967)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 83d88bbe612 Rename ClusterLockPersistService to GlobalLockPersistService (#21967)
83d88bbe612 is described below
commit 83d88bbe612a5410750001f7146a771850150a42
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Nov 4 22:48:42 2022 +0800
Rename ClusterLockPersistService to GlobalLockPersistService (#21967)
---
.../org/apache/shardingsphere/infra/lock/LockContext.java | 8 +++++---
...{ShardingSphereLockContext.java => GlobalLockContext.java} | 10 +++++-----
...gSphereLockContextTest.java => GlobalLockContextTest.java} | 11 +++++------
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 4 ++--
...rLockPersistService.java => GlobalLockPersistService.java} | 4 ++--
.../mode/manager/cluster/coordinator/RegistryCenter.java | 5 ++---
.../manager/standalone/StandaloneContextManagerBuilder.java | 4 ++--
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
index 4a0957c6927..47fb6ddfeea 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
@@ -19,8 +19,10 @@ package org.apache.shardingsphere.infra.lock;
/**
* Lock context.
+ *
+ * @param <T> type of lock definition
*/
-public interface LockContext {
+public interface LockContext<T extends LockDefinition> {
/**
* Try Lock.
@@ -29,14 +31,14 @@ public interface LockContext {
* @param timeoutMillis timeout milliseconds
* @return is locked or not
*/
- boolean tryLock(LockDefinition lockDefinition, long timeoutMillis);
+ boolean tryLock(T lockDefinition, long timeoutMillis);
/**
* Unlock.
*
* @param lockDefinition lock definition
*/
- void unlock(LockDefinition lockDefinition);
+ void unlock(T lockDefinition);
/**
* Is locked.
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContext.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/GlobalLockContext.java
similarity index 80%
rename from mode/core/src/main/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContext.java
rename to mode/core/src/main/java/org/apache/shardingsphere/mode/lock/GlobalLockContext.java
index 3b0bcd395fe..ad4d9a2b052 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContext.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/lock/GlobalLockContext.java
@@ -23,20 +23,20 @@ import org.apache.shardingsphere.infra.lock.LockDefinition;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
/**
- * Lock context of ShardingSphere.
+ * Global lock context.
*/
@RequiredArgsConstructor
-public final class ShardingSphereLockContext implements LockContext {
+public final class GlobalLockContext implements LockContext<GlobalLockDefinition> {
- private final LockPersistService lockPersistService;
+ private final LockPersistService<GlobalLockDefinition> lockPersistService;
@Override
- public boolean tryLock(final LockDefinition lockDefinition, final long timeoutMillis) {
+ public boolean tryLock(final GlobalLockDefinition lockDefinition, final long timeoutMillis) {
return lockPersistService.tryLock(lockDefinition, timeoutMillis);
}
@Override
- public void unlock(final LockDefinition lockDefinition) {
+ public void unlock(final GlobalLockDefinition lockDefinition) {
lockPersistService.unlock(lockDefinition);
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContextTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/lock/GlobalLockContextTest.java
similarity index 83%
rename from mode/core/src/test/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContextTest.java
rename to mode/core/src/test/java/org/apache/shardingsphere/mode/lock/GlobalLockContextTest.java
index eb2390e77c8..b089df93ba1 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/lock/ShardingSphereLockContextTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/lock/GlobalLockContextTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mode.lock;
-import org.apache.shardingsphere.infra.lock.LockDefinition;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.junit.Before;
import org.junit.Test;
@@ -30,18 +29,18 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public final class ShardingSphereLockContextTest {
+public final class GlobalLockContextTest {
- private final LockDefinition lockDefinition = new GlobalLockDefinition("foo_lock");
+ private final GlobalLockDefinition lockDefinition = new GlobalLockDefinition("foo_lock");
@Mock
- private LockPersistService lockPersistService;
+ private LockPersistService<GlobalLockDefinition> lockPersistService;
- private ShardingSphereLockContext lockContext;
+ private GlobalLockContext lockContext;
@Before
public void init() {
- lockContext = new ShardingSphereLockContext(lockPersistService);
+ lockContext = new GlobalLockContext(lockPersistService);
}
@Test
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 15c0d6f282f..5db88afa790 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
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.instance.InstanceContextAware;
import org.apache.shardingsphere.infra.metadata.data.ShardingSphereDatabaseData;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.mode.lock.ShardingSphereLockContext;
+import org.apache.shardingsphere.mode.lock.GlobalLockContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilder;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
@@ -71,7 +71,7 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
private InstanceContext buildInstanceContext(final RegistryCenter registryCenter, final ContextManagerBuilderParameter parameter) {
return new InstanceContext(new ComputeNodeInstance(parameter.getInstanceMetaData()), new ClusterWorkerIdGenerator(registryCenter, parameter.getInstanceMetaData()),
- parameter.getModeConfiguration(), new ShardingSphereLockContext(registryCenter.getLockPersistService()), registryCenter.getEventBusContext());
+ parameter.getModeConfiguration(), new GlobalLockContext(registryCenter.getGlobalLockPersistService()), registryCenter.getEventBusContext());
}
private void persistMetaData(final MetaDataContexts metaDataContexts) {
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterLockPersistService.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/GlobalLockPersistService.java
similarity index 92%
rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterLockPersistService.java
rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/GlobalLockPersistService.java
index 0bed9956378..1c8cc141f2d 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterLockPersistService.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/GlobalLockPersistService.java
@@ -23,10 +23,10 @@ import org.apache.shardingsphere.mode.lock.LockPersistService;
import org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
/**
- * Cluster lock persist service.
+ * Global lock persist service.
*/
@RequiredArgsConstructor
-public final class ClusterLockPersistService implements LockPersistService<GlobalLockDefinition> {
+public final class GlobalLockPersistService implements LockPersistService<GlobalLockDefinition> {
private final DistributedLockHolder distributedLockHolder;
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
index 2aa113a0320..0ee81a1e84b 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import org.apache.shardingsphere.infra.instance.metadata.jdbc.JDBCInstanceMetaData;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.mode.lock.LockPersistService;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcherFactory;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.subscriber.SchemaMetaDataRegistrySubscriber;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.subscriber.ShardingSphereSchemaDataRegistrySubscriber;
@@ -51,7 +50,7 @@ public final class RegistryCenter {
private final ComputeNodeStatusService computeNodeStatusService;
@Getter
- private final LockPersistService lockPersistService;
+ private final GlobalLockPersistService globalLockPersistService;
@Getter
private final EventBusContext eventBusContext;
@@ -70,7 +69,7 @@ public final class RegistryCenter {
this.databaseConfigs = databaseConfigs;
storageNodeStatusService = new StorageNodeStatusService(repository);
computeNodeStatusService = new ComputeNodeStatusService(repository);
- lockPersistService = new ClusterLockPersistService(repository.getDistributedLockHolder());
+ globalLockPersistService = new GlobalLockPersistService(repository.getDistributedLockHolder());
listenerFactory = new GovernanceWatcherFactory(repository, eventBusContext, getJDBCDatabaseName());
createSubscribers(repository);
}
diff --git a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 638ff390275..a2ee6f34aab 100644
--- a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++ b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.mode.manager.standalone;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import org.apache.shardingsphere.mode.lock.ShardingSphereLockContext;
+import org.apache.shardingsphere.mode.lock.GlobalLockContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilder;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
@@ -58,7 +58,7 @@ public final class StandaloneContextManagerBuilder implements ContextManagerBuil
private InstanceContext buildInstanceContext(final ContextManagerBuilderParameter parameter) {
return new InstanceContext(new ComputeNodeInstance(parameter.getInstanceMetaData()),
- new StandaloneWorkerIdGenerator(), parameter.getModeConfiguration(), new ShardingSphereLockContext(null), new EventBusContext());
+ new StandaloneWorkerIdGenerator(), parameter.getModeConfiguration(), new GlobalLockContext(null), new EventBusContext());
}
@Override