This is an automated email from the ASF dual-hosted git repository. jianglongtao 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 86ae3abdadd Remove useless ShardingSphereLockContext.tryLock() (#21630) 86ae3abdadd is described below commit 86ae3abdadd973f8c9e0fea8acca19d9be60db20 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Tue Oct 18 19:56:00 2022 +0800 Remove useless ShardingSphereLockContext.tryLock() (#21630) --- .../java/org/apache/shardingsphere/infra/lock/LockContext.java | 8 -------- .../shardingsphere/mode/lock/ShardingSphereLockContext.java | 7 ------- .../shardingsphere/mode/lock/ShardingSphereLockContextTest.java | 5 ----- 3 files changed, 20 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 0a7d64e9cf5..4a0957c6927 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 @@ -22,14 +22,6 @@ package org.apache.shardingsphere.infra.lock; */ public interface LockContext { - /** - * Try lock. - * - * @param lockDefinition lock definition - * @return is locked or not - */ - boolean tryLock(LockDefinition lockDefinition); - /** * Try Lock. * 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/ShardingSphereLockContext.java index a6cb2beb2b0..3b0bcd395fe 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/ShardingSphereLockContext.java @@ -28,15 +28,8 @@ import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic. @RequiredArgsConstructor public final class ShardingSphereLockContext implements LockContext { - public static final long MAX_TIMEOUT_MILLIS_OF_TRY_LOCK = 3 * 60 * 1000L; - private final LockPersistService lockPersistService; - @Override - public boolean tryLock(final LockDefinition lockDefinition) { - return tryLock(lockDefinition, MAX_TIMEOUT_MILLIS_OF_TRY_LOCK); - } - @Override public boolean tryLock(final LockDefinition lockDefinition, final long timeoutMillis) { return lockPersistService.tryLock(lockDefinition, timeoutMillis); 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/ShardingSphereLockContextTest.java index f5b72740b80..e25341155e9 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/ShardingSphereLockContextTest.java @@ -48,11 +48,6 @@ public final class ShardingSphereLockContextTest { lockContext = new ShardingSphereLockContext(lockPersistService); } - @Test - public void assertTryLock() { - assertTrue(lockContext.tryLock(lockDefinition)); - } - @Test public void assertTryLockTimeout() { assertTrue(lockContext.tryLock(lockDefinition, 3000));