This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 bfc17ef Minor changes for refactor (#9552)
bfc17ef is described below
commit bfc17efc37c49f42f47850dc095e7aa8f3127dc9
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Mar 1 20:48:25 2021 +0800
Minor changes for refactor (#9552)
* Refactor AbstractShardingSphereLock
* Refactor AbstractShardingSphereLock
* Remove useless codes
* Remove useless codes
---
.../infra/lock/AbstractShardingSphereLock.java | 16 ++++++++--------
.../context/metadata/impl/StandardMetaDataContexts.java | 10 ----------
.../proxy/frontend/state/impl/LockProxyState.java | 2 --
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/AbstractShardingSphereLock.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/AbstractShardingSphereLock.java
index b61a553..6d7e569 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/AbstractShardingSphereLock.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/lock/AbstractShardingSphereLock.java
@@ -27,29 +27,29 @@ import java.util.concurrent.locks.ReentrantLock;
*/
public abstract class AbstractShardingSphereLock implements ShardingSphereLock
{
- private final Lock innerLock = new ReentrantLock();
+ private final Lock lock = new ReentrantLock();
- private final Condition innerCondition = innerLock.newCondition();
+ private final Condition condition = lock.newCondition();
@Override
public final boolean await(final Long timeoutMilliseconds) {
- innerLock.lock();
+ lock.lock();
try {
- return innerCondition.await(timeoutMilliseconds,
TimeUnit.MILLISECONDS);
+ return condition.await(timeoutMilliseconds, TimeUnit.MILLISECONDS);
} catch (final InterruptedException ignored) {
} finally {
- innerLock.unlock();
+ lock.unlock();
}
return false;
}
@Override
public final void signalAll() {
- innerLock.lock();
+ lock.lock();
try {
- innerCondition.signalAll();
+ condition.signalAll();
} finally {
- innerLock.unlock();
+ lock.unlock();
}
}
}
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 80d5abd..167594a 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
@@ -87,16 +87,6 @@ public final class StandardMetaDataContexts implements
MetaDataContexts {
}
@Override
- public ShardingSphereLock getLock() {
- return lock;
- }
-
- @Override
- public StateContext getStateContext() {
- return stateContext;
- }
-
- @Override
public void close() {
executorEngine.close();
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/LockProxyState.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/LockProxyState.java
index cdf5807..fd7b102 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/LockProxyState.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/LockProxyState.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.proxy.frontend.state.impl;
import io.netty.channel.ChannelHandlerContext;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import
org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
@@ -34,7 +33,6 @@ import java.util.Optional;
/**
* Lock proxy state.
*/
-@Slf4j
public final class LockProxyState implements ProxyState {
@Override
