You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/01/30 15:56:35 UTC
[shardingsphere] branch master updated: Revise #9225 (#9230)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 9b268cc Revise #9225 (#9230)
9b268cc is described below
commit 9b268cc7e37a371d8228ec8521dbea177e523862
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Jan 30 23:56:02 2021 +0800
Revise #9225 (#9230)
---
.../governance/core/lock/GovernanceLockContext.java | 2 +-
.../org/apache/shardingsphere/infra/lock/AbstractLockContext.java | 8 +++-----
.../java/org/apache/shardingsphere/infra/lock/LockContext.java | 6 +++---
.../org/apache/shardingsphere/infra/lock/StandardLockContext.java | 4 +---
.../infra/context/metadata/impl/StandardMetaDataContexts.java | 4 ++--
5 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/GovernanceLockContext.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/GovernanceLockContext.java
index ef2e276..d40a0f1 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/GovernanceLockContext.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/GovernanceLockContext.java
@@ -74,7 +74,7 @@ public final class GovernanceLockContext extends AbstractLockContext {
}
/**
- * unlock instance.
+ * Unlock instance.
*
* @param event unlock event
*/
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/AbstractLockContext.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/AbstractLockContext.java
index 86324fd..4b537a9 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/AbstractLockContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/AbstractLockContext.java
@@ -32,13 +32,11 @@ public abstract class AbstractLockContext implements LockContext {
private final Condition innerCondition = innerLock.newCondition();
@Override
- public boolean await(final Long timeout, final TimeUnit timeUnit) {
+ public final boolean await(final Long timeout, final TimeUnit timeUnit) {
innerLock.lock();
try {
return innerCondition.await(timeout, TimeUnit.MILLISECONDS);
- // CHECKSTYLE:OFF
- } catch (InterruptedException e) {
- // CHECKSTYLE:ON
+ } catch (final InterruptedException ignored) {
} finally {
innerLock.unlock();
}
@@ -46,7 +44,7 @@ public abstract class AbstractLockContext implements LockContext {
}
@Override
- public void signalAll() {
+ public final void signalAll() {
innerLock.lock();
try {
innerCondition.signalAll();
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
index 8197a28..ef6f283 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
@@ -27,7 +27,7 @@ public interface LockContext {
/**
* Try to get lock.
*
- * @param timeout the maximum time in milliseconds to acquire lock
+ * @param timeout time out to acquire lock
* @param timeUnit time unit
* @return true if get the lock, false if not
*/
@@ -39,9 +39,9 @@ public interface LockContext {
void releaseGlobalLock();
/**
- * await.
+ * Await.
*
- * @param timeout time out
+ * @param timeout time out to await lock
* @param timeUnit time unit
* @return true if no exception
*/
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/StandardLockContext.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/StandardLockContext.java
index 571faf8..7596334 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/StandardLockContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/StandardLockContext.java
@@ -36,9 +36,7 @@ public final class StandardLockContext extends AbstractLockContext {
boolean result = false;
try {
result = lock.tryLock(timeout, timeUnit);
- // CHECKSTYLE:OFF
- } catch (final InterruptedException e) {
- // CHECKSTYLE:ON
+ } catch (final InterruptedException ignored) {
}
if (result) {
StateContext.switchState(new StateEvent(StateType.LOCK, true));
diff --git a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
index 30b7d85..1e9adf33 100644
--- a/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
+++ b/shardingsphere-infra/shardingsphere-infra-context/src/main/java/org/apache/shardingsphere/infra/context/metadata/impl/StandardMetaDataContexts.java
@@ -64,7 +64,7 @@ public final class StandardMetaDataContexts implements MetaDataContexts {
calciteContextFactory = new CalciteContextFactory(metaDataMap);
this.authentication = AuthenticationEngine.findSPIAuthentication().orElse(authentication);
this.props = props;
- this.lockContext = new StandardLockContext();
+ lockContext = new StandardLockContext();
}
@Override
@@ -84,7 +84,7 @@ public final class StandardMetaDataContexts implements MetaDataContexts {
@Override
public LockContext getLockContext() {
- return this.lockContext;
+ return lockContext;
}
@Override