From 37506fe091279b5dddfb98b9b6b824d18a044209 Mon Sep 17 00:00:00 2001 From: Rahil Date: Wed, 22 Sep 2021 08:22:18 +0530 Subject: [PATCH] Simplified condition (#273) Signed-off-by: Rahil --- src/main/java/org/tikv/cdc/CDCEvent.java | 7 +-- .../java/org/tikv/cdc/RegionCDCClient.java | 2 +- .../java/org/tikv/common/MetricsServer.java | 23 ++++---- src/main/java/org/tikv/common/PDClient.java | 8 +-- .../java/org/tikv/common/TiConfiguration.java | 6 +- src/main/java/org/tikv/common/TiSession.java | 2 +- .../RangeColumnPartitionPruner.java | 2 +- .../org/tikv/common/parser/AstBuilder.java | 14 ++--- .../org/tikv/common/policy/RetryPolicy.java | 4 +- .../org/tikv/common/region/RegionManager.java | 4 +- .../common/region/StoreHealthyChecker.java | 17 ++---- .../java/org/tikv/common/region/TiStore.java | 10 ++-- .../common/streaming/StreamingResponse.java | 4 +- src/main/java/org/tikv/raw/RawKVClient.java | 6 +- .../org/tikv/txn/LockResolverClientV4.java | 2 +- .../java/org/tikv/common/PDClientTest.java | 59 +++++++++++-------- .../org/tikv/common/RegionManagerTest.java | 10 ++-- .../tikv/common/RegionStoreClientTest.java | 18 +++--- .../java/org/tikv/common/codec/CodecTest.java | 6 +- .../org/tikv/common/codec/MyDecimalTest.java | 21 +++---- .../common/importer/SwitchTiKVModeTest.java | 2 +- .../tikv/common/importer/TxnKVIngestTest.java | 2 +- .../java/org/tikv/common/key/KeyTest.java | 2 +- src/test/java/org/tikv/raw/MetricsTest.java | 7 +-- .../java/org/tikv/util/ReflectionWrapper.java | 2 +- 25 files changed, 117 insertions(+), 123 deletions(-) diff --git a/src/main/java/org/tikv/cdc/CDCEvent.java b/src/main/java/org/tikv/cdc/CDCEvent.java index 52013af2fe..f6b10c1179 100644 --- a/src/main/java/org/tikv/cdc/CDCEvent.java +++ b/src/main/java/org/tikv/cdc/CDCEvent.java @@ -1,14 +1,13 @@ package org.tikv.cdc; -import java.util.Objects; import org.tikv.kvproto.Cdcpb.Event.Row; class CDCEvent { enum CDCEventType { ROW, RESOLVED_TS, - ERROR; - }; + ERROR + } public final long regionId; @@ -57,7 +56,7 @@ class CDCEvent { builder.append("resolvedTs=").append(resolvedTs); break; case ROW: - builder.append("row=").append(Objects.toString(row)); + builder.append("row=").append(row); break; } return builder.append("}").toString(); diff --git a/src/main/java/org/tikv/cdc/RegionCDCClient.java b/src/main/java/org/tikv/cdc/RegionCDCClient.java index 52d27550fe..d118c7793b 100644 --- a/src/main/java/org/tikv/cdc/RegionCDCClient.java +++ b/src/main/java/org/tikv/cdc/RegionCDCClient.java @@ -42,7 +42,7 @@ class RegionCDCClient implements AutoCloseable, StreamObserver private final AtomicBoolean running = new AtomicBoolean(false); - private boolean started = false; + private final boolean started = false; public RegionCDCClient( final TiRegion region, diff --git a/src/main/java/org/tikv/common/MetricsServer.java b/src/main/java/org/tikv/common/MetricsServer.java index a06aeec908..2e3ae1e355 100644 --- a/src/main/java/org/tikv/common/MetricsServer.java +++ b/src/main/java/org/tikv/common/MetricsServer.java @@ -30,9 +30,8 @@ public class MetricsServer { private static MetricsServer METRICS_SERVER_INSTANCE = null; private static int metricsServerRefCount = 0; - private int port; - private HTTPServer server; - private CollectorRegistry collectorRegistry; + private final int port; + private final HTTPServer server; public static MetricsServer getInstance(TiConfiguration conf) { if (!conf.isMetricsEnable()) { @@ -58,16 +57,16 @@ public class MetricsServer { private MetricsServer(int port) { try { - this.collectorRegistry = new CollectorRegistry(); - this.collectorRegistry.register(RawKVClient.RAW_REQUEST_LATENCY); - this.collectorRegistry.register(RawKVClient.RAW_REQUEST_FAILURE); - this.collectorRegistry.register(RawKVClient.RAW_REQUEST_SUCCESS); - this.collectorRegistry.register(RegionStoreClient.GRPC_RAW_REQUEST_LATENCY); - this.collectorRegistry.register(RetryPolicy.GRPC_SINGLE_REQUEST_LATENCY); - this.collectorRegistry.register(RegionManager.GET_REGION_BY_KEY_REQUEST_LATENCY); - this.collectorRegistry.register(PDClient.PD_GET_REGION_BY_KEY_REQUEST_LATENCY); + CollectorRegistry collectorRegistry = new CollectorRegistry(); + collectorRegistry.register(RawKVClient.RAW_REQUEST_LATENCY); + collectorRegistry.register(RawKVClient.RAW_REQUEST_FAILURE); + collectorRegistry.register(RawKVClient.RAW_REQUEST_SUCCESS); + collectorRegistry.register(RegionStoreClient.GRPC_RAW_REQUEST_LATENCY); + collectorRegistry.register(RetryPolicy.GRPC_SINGLE_REQUEST_LATENCY); + collectorRegistry.register(RegionManager.GET_REGION_BY_KEY_REQUEST_LATENCY); + collectorRegistry.register(PDClient.PD_GET_REGION_BY_KEY_REQUEST_LATENCY); this.port = port; - this.server = new HTTPServer(new InetSocketAddress(port), this.collectorRegistry, true); + this.server = new HTTPServer(new InetSocketAddress(port), collectorRegistry, true); logger.info("http server is up " + this.server.getPort()); } catch (Exception e) { logger.error("http server not up"); diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index e89f1b51fa..0c0b0180fe 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -188,7 +188,7 @@ public class PDClient extends AbstractGRPCClient "wait scatter region %d at key %s is %s", region.getId(), KeyUtils.formatBytes(resp.getDesc().toByteArray()), - resp.getStatus().toString())); + resp.getStatus())); } } } @@ -422,11 +422,9 @@ public class PDClient extends AbstractGRPCClient logger.info(String.format("can not switch to new leader, try follower forward")); List members = resp.getMembersList(); - boolean hasReachNextMember = false; // If we have not used follower forward, try the first follower. - if (pdClientWrapper != null && pdClientWrapper.getStoreAddress().equals(leaderUrlStr)) { - hasReachNextMember = true; - } + boolean hasReachNextMember = + pdClientWrapper != null && pdClientWrapper.getStoreAddress().equals(leaderUrlStr); for (int i = 0; i < members.size() * 2; i++) { Pdpb.Member member = members.get(i % members.size()); diff --git a/src/main/java/org/tikv/common/TiConfiguration.java b/src/main/java/org/tikv/common/TiConfiguration.java index 15b814dc36..eb3e64d80e 100644 --- a/src/main/java/org/tikv/common/TiConfiguration.java +++ b/src/main/java/org/tikv/common/TiConfiguration.java @@ -266,7 +266,7 @@ public class TiConfiguration implements Serializable { private boolean showRowId = getBoolean(TIKV_SHOW_ROWID); private String dbPrefix = get(TIKV_DB_PREFIX); private KVMode kvMode = getKvMode(TIKV_KV_MODE); - private boolean enableGrpcForward = getBoolean(TIKV_ENABLE_GRPC_FORWARD); + private final boolean enableGrpcForward = getBoolean(TIKV_ENABLE_GRPC_FORWARD); private int kvClientConcurrency = getInt(TIKV_KV_CLIENT_CONCURRENCY); private ReplicaRead replicaRead = getReplicaRead(TIKV_REPLICA_READ); @@ -275,8 +275,8 @@ public class TiConfiguration implements Serializable { private boolean metricsEnable = getBoolean(TIKV_METRICS_ENABLE); private int metricsPort = getInt(TIKV_METRICS_PORT); - private int grpcHealthCheckTimeout = getInt(TIKV_GRPC_HEALTH_CHECK_TIMEOUT); - private int healthCheckPeriodDuration = getInt(TIKV_HEALTH_CHECK_PERIOD_DURATION); + private final int grpcHealthCheckTimeout = getInt(TIKV_GRPC_HEALTH_CHECK_TIMEOUT); + private final int healthCheckPeriodDuration = getInt(TIKV_HEALTH_CHECK_PERIOD_DURATION); private final String networkMappingName = get(TIKV_NETWORK_MAPPING_NAME); private HostMapping hostMapping = null; diff --git a/src/main/java/org/tikv/common/TiSession.java b/src/main/java/org/tikv/common/TiSession.java index 72000d3367..3866cb50e2 100644 --- a/src/main/java/org/tikv/common/TiSession.java +++ b/src/main/java/org/tikv/common/TiSession.java @@ -73,7 +73,7 @@ public class TiSession implements AutoCloseable { private volatile ImporterStoreClient.ImporterStoreClientBuilder importerClientBuilder; private volatile boolean isClosed = false; private volatile SwitchTiKVModeClient switchTiKVModeClient; - private MetricsServer metricsServer; + private final MetricsServer metricsServer; private static final int MAX_SPLIT_REGION_STACK_DEPTH = 6; public TiSession(TiConfiguration conf) { diff --git a/src/main/java/org/tikv/common/expression/RangeColumnPartitionPruner.java b/src/main/java/org/tikv/common/expression/RangeColumnPartitionPruner.java index 632d157330..d647ccccf9 100644 --- a/src/main/java/org/tikv/common/expression/RangeColumnPartitionPruner.java +++ b/src/main/java/org/tikv/common/expression/RangeColumnPartitionPruner.java @@ -79,7 +79,7 @@ public class RangeColumnPartitionPruner NormalizedPredicate predicate = node.normalize(); if (predicate == null) { throw new UnsupportedOperationException( - String.format("ComparisonBinaryExpression %s cannot be normalized", node.toString())); + String.format("ComparisonBinaryExpression %s cannot be normalized", node)); } String colRefName = predicate.getColumnRef().getName(); List partExprs = partExprsPerColumnRef.get(colRefName); diff --git a/src/main/java/org/tikv/common/parser/AstBuilder.java b/src/main/java/org/tikv/common/parser/AstBuilder.java index 449951672f..1e0f4157b4 100644 --- a/src/main/java/org/tikv/common/parser/AstBuilder.java +++ b/src/main/java/org/tikv/common/parser/AstBuilder.java @@ -117,7 +117,7 @@ public class AstBuilder extends MySqlParserBaseVisitor { return parseIntOrLongOrDec(val); } - throw new UnsupportedSyntaxException(ctx.toString() + ": it is not supported."); + throw new UnsupportedSyntaxException(ctx + ": it is not supported."); } @Override @@ -135,7 +135,7 @@ public class AstBuilder extends MySqlParserBaseVisitor { } return Constant.create(sb.toString().replace("\"", "")); } - throw new UnsupportedSyntaxException(ctx.toString() + " is not supported yet"); + throw new UnsupportedSyntaxException(ctx + " is not supported yet"); } @Override @@ -161,7 +161,7 @@ public class AstBuilder extends MySqlParserBaseVisitor { Doubles.tryParse(ctx.REAL_LITERAL().getSymbol().getText()), RealType.REAL); } - throw new UnsupportedSyntaxException(ctx.toString() + "not supported constant"); + throw new UnsupportedSyntaxException(ctx + "not supported constant"); } @Override @@ -187,8 +187,7 @@ public class AstBuilder extends MySqlParserBaseVisitor { return ComparisonBinaryExpression.greaterEqual(left, right); } - throw new UnsupportedSyntaxException( - ctx.toString() + ": it is not possible reach to this line of code"); + throw new UnsupportedSyntaxException(ctx + ": it is not possible reach to this line of code"); } public Expression visitLogicalExpression(MySqlParser.LogicalExpressionContext ctx) { @@ -203,8 +202,7 @@ public class AstBuilder extends MySqlParserBaseVisitor { return LogicalBinaryExpression.xor(visitChildren(left), visitChildren(right)); } - throw new UnsupportedSyntaxException( - ctx.toString() + ": it is not possible reach to this line of code"); + throw new UnsupportedSyntaxException(ctx + ": it is not possible reach to this line of code"); } @Override @@ -222,6 +220,6 @@ public class AstBuilder extends MySqlParserBaseVisitor { case "div": return ArithmeticBinaryExpression.divide(left, right); } - throw new UnsupportedSyntaxException(ctx.toString() + ": it is not supported right now"); + throw new UnsupportedSyntaxException(ctx + ": it is not supported right now"); } } diff --git a/src/main/java/org/tikv/common/policy/RetryPolicy.java b/src/main/java/org/tikv/common/policy/RetryPolicy.java index 27d8558c7b..082b424345 100644 --- a/src/main/java/org/tikv/common/policy/RetryPolicy.java +++ b/src/main/java/org/tikv/common/policy/RetryPolicy.java @@ -41,9 +41,9 @@ public abstract class RetryPolicy { .register(); // handles PD and TiKV's error. - private ErrorHandler handler; + private final ErrorHandler handler; - private ImmutableSet unrecoverableStatus = + private final ImmutableSet unrecoverableStatus = ImmutableSet.of( Status.Code.ALREADY_EXISTS, Status.Code.PERMISSION_DENIED, Status.Code.INVALID_ARGUMENT, Status.Code.NOT_FOUND, diff --git a/src/main/java/org/tikv/common/region/RegionManager.java b/src/main/java/org/tikv/common/region/RegionManager.java index 8bbff1cf32..ada9bb7305 100644 --- a/src/main/java/org/tikv/common/region/RegionManager.java +++ b/src/main/java/org/tikv/common/region/RegionManager.java @@ -151,7 +151,7 @@ public class RegionManager { ByteString key, TiStoreType storeType, BackOffer backOffer) { TiRegion region = getRegionByKey(key, backOffer); if (!region.isValid()) { - throw new TiClientInternalException("Region invalid: " + region.toString()); + throw new TiClientInternalException("Region invalid: " + region); } TiStore store = null; @@ -181,7 +181,7 @@ public class RegionManager { if (store == null) { throw new TiClientInternalException( - "Cannot find valid store on " + storeType + " for region " + region.toString()); + "Cannot find valid store on " + storeType + " for region " + region); } return Pair.create(region, store); diff --git a/src/main/java/org/tikv/common/region/StoreHealthyChecker.java b/src/main/java/org/tikv/common/region/StoreHealthyChecker.java index fbc75cb534..c87cefd7b0 100644 --- a/src/main/java/org/tikv/common/region/StoreHealthyChecker.java +++ b/src/main/java/org/tikv/common/region/StoreHealthyChecker.java @@ -19,12 +19,12 @@ import org.tikv.kvproto.Metapb; public class StoreHealthyChecker implements Runnable { private static final Logger logger = LoggerFactory.getLogger(StoreHealthyChecker.class); private static final long MAX_CHECK_STORE_TOMBSTONE_TICK = 60; - private BlockingQueue taskQueue; + private final BlockingQueue taskQueue; private final ChannelFactory channelFactory; private final ReadOnlyPDClient pdClient; private final RegionCache cache; private long checkTombstoneTick; - private long timeout; + private final long timeout; public StoreHealthyChecker( ChannelFactory channelFactory, ReadOnlyPDClient pdClient, RegionCache cache, long timeout) { @@ -37,11 +37,8 @@ public class StoreHealthyChecker implements Runnable { } public boolean scheduleStoreHealthCheck(TiStore store) { - if (!this.taskQueue.add(store)) { - // add queue false, mark it reachable so that it can be put again. - return false; - } - return true; + // add queue false, mark it reachable so that it can be put again. + return this.taskQueue.add(store); } private List getValidStores() { @@ -68,11 +65,7 @@ public class StoreHealthyChecker implements Runnable { HealthGrpc.newBlockingStub(channel).withDeadlineAfter(timeout, TimeUnit.MILLISECONDS); HealthCheckRequest req = HealthCheckRequest.newBuilder().build(); HealthCheckResponse resp = stub.check(req); - if (resp.getStatus() == HealthCheckResponse.ServingStatus.SERVING) { - return true; - } else { - return false; - } + return resp.getStatus() == HealthCheckResponse.ServingStatus.SERVING; } catch (Exception e) { return false; } diff --git a/src/main/java/org/tikv/common/region/TiStore.java b/src/main/java/org/tikv/common/region/TiStore.java index 71d1e7649b..8beacaa021 100644 --- a/src/main/java/org/tikv/common/region/TiStore.java +++ b/src/main/java/org/tikv/common/region/TiStore.java @@ -6,13 +6,13 @@ import java.util.concurrent.atomic.AtomicLong; import org.tikv.kvproto.Metapb; public class TiStore implements Serializable { - private static long MAX_FAIL_FORWARD_TIMES = 4; + private static final long MAX_FAIL_FORWARD_TIMES = 4; private final Metapb.Store store; private final Metapb.Store proxyStore; - private AtomicBoolean reachable; - private AtomicBoolean valid; - private AtomicLong failForwardCount; - private AtomicBoolean canForward; + private final AtomicBoolean reachable; + private final AtomicBoolean valid; + private final AtomicLong failForwardCount; + private final AtomicBoolean canForward; public TiStore(Metapb.Store store) { this.store = store; diff --git a/src/main/java/org/tikv/common/streaming/StreamingResponse.java b/src/main/java/org/tikv/common/streaming/StreamingResponse.java index 936e144840..d7b721b86a 100644 --- a/src/main/java/org/tikv/common/streaming/StreamingResponse.java +++ b/src/main/java/org/tikv/common/streaming/StreamingResponse.java @@ -25,8 +25,8 @@ import org.tikv.kvproto.Coprocessor; import org.tikv.kvproto.Errorpb; public class StreamingResponse implements Iterable { - private Iterator resultIterator; - private List responseList; + private final Iterator resultIterator; + private final List responseList; @SuppressWarnings("unchecked") public StreamingResponse(Iterator resultIterator) { diff --git a/src/main/java/org/tikv/raw/RawKVClient.java b/src/main/java/org/tikv/raw/RawKVClient.java index af502d8672..bef0fae4f1 100644 --- a/src/main/java/org/tikv/raw/RawKVClient.java +++ b/src/main/java/org/tikv/raw/RawKVClient.java @@ -1097,9 +1097,9 @@ public class RawKVClient implements AutoCloseable { private Iterator iterator; - private ByteString startKey; - private ByteString endKey; - private boolean keyOnly; + private final ByteString startKey; + private final ByteString endKey; + private final boolean keyOnly; private KvPair last; diff --git a/src/main/java/org/tikv/txn/LockResolverClientV4.java b/src/main/java/org/tikv/txn/LockResolverClientV4.java index 07a5552f0f..09b28d67b3 100644 --- a/src/main/java/org/tikv/txn/LockResolverClientV4.java +++ b/src/main/java/org/tikv/txn/LockResolverClientV4.java @@ -244,7 +244,7 @@ public class LockResolverClientV4 extends AbstractRegionStoreClient logger.warn( String.format( "lock txn not found, lock has expired, CallerStartTs=%d lock str=%s", - callerStartTS, lock.toString())); + callerStartTS, lock)); if (lock.getLockType() == Kvrpcpb.Op.PessimisticLock) { return new TxnStatus(); } diff --git a/src/test/java/org/tikv/common/PDClientTest.java b/src/test/java/org/tikv/common/PDClientTest.java index d26f09e436..f22d646564 100644 --- a/src/test/java/org/tikv/common/PDClientTest.java +++ b/src/test/java/org/tikv/common/PDClientTest.java @@ -15,11 +15,18 @@ package org.tikv.common; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.tikv.common.GrpcUtils.encodeKey; import com.google.protobuf.ByteString; -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import org.junit.Test; import org.tikv.common.exception.GrpcException; import org.tikv.common.meta.TiTimestamp; @@ -31,31 +38,33 @@ import org.tikv.kvproto.Metapb.Store; import org.tikv.kvproto.Metapb.StoreState; public class PDClientTest extends PDMockServerTest { + private static final String LOCAL_ADDR_IPV6 = "[::]"; + public static final String HTTP = "http://"; @Test public void testCreate() throws Exception { try (PDClient client = session.getPDClient()) { - assertEquals(client.getPdClientWrapper().getLeaderInfo(), LOCAL_ADDR + ":" + pdServer.port); - assertEquals(client.getHeader().getClusterId(), CLUSTER_ID); + assertEquals(LOCAL_ADDR + ":" + pdServer.port, client.getPdClientWrapper().getLeaderInfo()); + assertEquals(CLUSTER_ID, client.getHeader().getClusterId()); } } @Test public void testSwitchLeader() throws Exception { try (PDClient client = session.getPDClient()) { - client.trySwitchLeader("http://" + LOCAL_ADDR + ":" + (pdServer.port + 1)); + client.trySwitchLeader(HTTP + LOCAL_ADDR + ":" + (pdServer.port + 1)); assertEquals( client.getPdClientWrapper().getLeaderInfo(), - "http://" + LOCAL_ADDR + ":" + (pdServer.port + 1)); + HTTP + LOCAL_ADDR + ":" + (pdServer.port + 1)); } tearDown(); setUp(LOCAL_ADDR_IPV6); try (PDClient client = session.getPDClient()) { - client.trySwitchLeader("http://" + LOCAL_ADDR_IPV6 + ":" + (pdServer.port + 2)); + client.trySwitchLeader(HTTP + LOCAL_ADDR_IPV6 + ":" + (pdServer.port + 2)); assertEquals( client.getPdClientWrapper().getLeaderInfo(), - "http://" + LOCAL_ADDR_IPV6 + ":" + (pdServer.port + 2)); + HTTP + LOCAL_ADDR_IPV6 + ":" + (pdServer.port + 2)); } } @@ -93,8 +102,8 @@ public class PDClientTest extends PDMockServerTest { assertEquals(r.getEndKey(), ByteString.copyFrom(endKey)); assertEquals(r.getRegionEpoch().getConfVer(), confVer); assertEquals(r.getRegionEpoch().getVersion(), ver); - assertEquals(l.getId(), 1); - assertEquals(l.getStoreId(), 10); + assertEquals(1, l.getId()); + assertEquals(10, l.getStoreId()); } } @@ -119,12 +128,12 @@ public class PDClientTest extends PDMockServerTest { Pair rl = client.getRegionByID(defaultBackOff(), 0); Metapb.Region r = rl.first; Metapb.Peer l = rl.second; - assertEquals(r.getStartKey(), ByteString.copyFrom(startKey)); - assertEquals(r.getEndKey(), ByteString.copyFrom(endKey)); - assertEquals(r.getRegionEpoch().getConfVer(), confVer); - assertEquals(r.getRegionEpoch().getVersion(), ver); - assertEquals(l.getId(), 1); - assertEquals(l.getStoreId(), 10); + assertEquals(ByteString.copyFrom(startKey), r.getStartKey()); + assertEquals(ByteString.copyFrom(endKey), r.getEndKey()); + assertEquals(confVer, r.getRegionEpoch().getConfVer()); + assertEquals(ver, r.getRegionEpoch().getVersion()); + assertEquals(1, l.getId()); + assertEquals(10, l.getStoreId()); } } @@ -142,20 +151,20 @@ public class PDClientTest extends PDMockServerTest { GrpcUtils.makeStoreLabel("k1", "v1"), GrpcUtils.makeStoreLabel("k2", "v2")))); try (PDClient client = session.getPDClient()) { - Store r = client.getStore(defaultBackOff(), 0); - assertEquals(r.getId(), storeId); - assertEquals(r.getAddress(), testAddress); - assertEquals(r.getState(), Metapb.StoreState.Up); - assertEquals(r.getLabels(0).getKey(), "k1"); - assertEquals(r.getLabels(1).getKey(), "k2"); - assertEquals(r.getLabels(0).getValue(), "v1"); - assertEquals(r.getLabels(1).getValue(), "v2"); + Store r = client.getStore(defaultBackOff(), storeId); + assertEquals(storeId, r.getId()); + assertEquals(testAddress, r.getAddress()); + assertEquals(Metapb.StoreState.Up, r.getState()); + assertEquals("k1", r.getLabels(0).getKey()); + assertEquals("k2", r.getLabels(1).getKey()); + assertEquals("v1", r.getLabels(0).getValue()); + assertEquals("v2", r.getLabels(1).getValue()); pdServer.addGetStoreResp( GrpcUtils.makeGetStoreResponse( pdServer.getClusterId(), GrpcUtils.makeStore(storeId, testAddress, Metapb.StoreState.Tombstone))); - assertEquals(StoreState.Tombstone, client.getStore(defaultBackOff(), 0).getState()); + assertEquals(StoreState.Tombstone, client.getStore(defaultBackOff(), storeId).getState()); } } diff --git a/src/test/java/org/tikv/common/RegionManagerTest.java b/src/test/java/org/tikv/common/RegionManagerTest.java index b808bf6325..07e41c01f7 100644 --- a/src/test/java/org/tikv/common/RegionManagerTest.java +++ b/src/test/java/org/tikv/common/RegionManagerTest.java @@ -15,7 +15,9 @@ package org.tikv.common; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; import com.google.common.collect.RangeMap; import com.google.common.collect.TreeRangeMap; @@ -53,7 +55,7 @@ public class RegionManagerTest extends PDMockServerTest { } @Test - public void getRegionByKey() throws Exception { + public void getRegionByKey() { ByteString startKey = ByteString.copyFrom(new byte[] {1}); ByteString endKey = ByteString.copyFrom(new byte[] {10}); ByteString searchKey = ByteString.copyFrom(new byte[] {5}); @@ -96,7 +98,7 @@ public class RegionManagerTest extends PDMockServerTest { } @Test - public void getStoreByKey() throws Exception { + public void getStoreByKey() { ByteString startKey = ByteString.copyFrom(new byte[] {1}); ByteString endKey = ByteString.copyFrom(new byte[] {10}); ByteString searchKey = ByteString.copyFrom(new byte[] {5}); @@ -133,7 +135,7 @@ public class RegionManagerTest extends PDMockServerTest { } @Test - public void getStoreById() throws Exception { + public void getStoreById() { long storeId = 234; String testAddress = "testAddress"; pdServer.addGetStoreResp( diff --git a/src/test/java/org/tikv/common/RegionStoreClientTest.java b/src/test/java/org/tikv/common/RegionStoreClientTest.java index e767847976..9e5d823e3b 100644 --- a/src/test/java/org/tikv/common/RegionStoreClientTest.java +++ b/src/test/java/org/tikv/common/RegionStoreClientTest.java @@ -15,7 +15,9 @@ package org.tikv.common; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.protobuf.ByteString; @@ -62,11 +64,11 @@ public class RegionStoreClientTest extends MockServerTest { } @Test - public void rawGetTest() throws Exception { + public void rawGetTest() { doRawGetTest(createClientV3()); } - public void doRawGetTest(RegionStoreClient client) throws Exception { + public void doRawGetTest(RegionStoreClient client) { server.put("key1", "value1"); Optional value = client.rawGet(defaultBackOff(), ByteString.copyFromUtf8("key1")); assertEquals(ByteString.copyFromUtf8("value1"), value.get()); @@ -93,7 +95,7 @@ public class RegionStoreClientTest extends MockServerTest { doGetTest(createClientV3()); } - public void doGetTest(RegionStoreClient client) throws Exception { + public void doGetTest(RegionStoreClient client) { server.put("key1", "value1"); ByteString value = client.get(defaultBackOff(), ByteString.copyFromUtf8("key1"), 1); assertEquals(ByteString.copyFromUtf8("value1"), value); @@ -110,11 +112,11 @@ public class RegionStoreClientTest extends MockServerTest { } @Test - public void batchGetTest() throws Exception { + public void batchGetTest() { doBatchGetTest(createClientV3()); } - public void doBatchGetTest(RegionStoreClient client) throws Exception { + public void doBatchGetTest(RegionStoreClient client) { server.put("key1", "value1"); server.put("key2", "value2"); server.put("key4", "value4"); @@ -145,11 +147,11 @@ public class RegionStoreClientTest extends MockServerTest { } @Test - public void scanTest() throws Exception { + public void scanTest() { doScanTest(createClientV3()); } - public void doScanTest(RegionStoreClient client) throws Exception { + public void doScanTest(RegionStoreClient client) { server.put("key1", "value1"); server.put("key2", "value2"); server.put("key4", "value4"); diff --git a/src/test/java/org/tikv/common/codec/CodecTest.java b/src/test/java/org/tikv/common/codec/CodecTest.java index ee474b69aa..2d782da074 100644 --- a/src/test/java/org/tikv/common/codec/CodecTest.java +++ b/src/test/java/org/tikv/common/codec/CodecTest.java @@ -23,7 +23,7 @@ import org.tikv.common.codec.Codec.*; public class CodecTest { @Test - public void readNWriteLongTest() throws Exception { + public void readNWriteLongTest() { CodecDataOutput cdo = new CodecDataOutput(); IntegerCodec.writeLongFully(cdo, 9999L, true); IntegerCodec.writeLongFully(cdo, -2333L, false); @@ -62,7 +62,7 @@ public class CodecTest { } @Test - public void readNWriteUnsignedLongTest() throws Exception { + public void readNWriteUnsignedLongTest() { CodecDataOutput cdo = new CodecDataOutput(); IntegerCodec.writeULongFully(cdo, 0xffffffffffffffffL, true); IntegerCodec.writeULongFully(cdo, Long.MIN_VALUE, false); @@ -156,7 +156,7 @@ public class CodecTest { } @Test - public void writeBytesTest() throws Exception { + public void writeBytesTest() { CodecDataOutput cdo = new CodecDataOutput(); Codec.BytesCodec.writeBytes(cdo, "abcdefghijk".getBytes()); byte[] result = cdo.toBytes(); diff --git a/src/test/java/org/tikv/common/codec/MyDecimalTest.java b/src/test/java/org/tikv/common/codec/MyDecimalTest.java index ffd611855b..4e152eec76 100644 --- a/src/test/java/org/tikv/common/codec/MyDecimalTest.java +++ b/src/test/java/org/tikv/common/codec/MyDecimalTest.java @@ -57,17 +57,17 @@ public class MyDecimalTest { @Test public void readWordTest() { - assertEquals(MyDecimal.readWord(new int[] {250}, 1, 0), -6); - assertEquals(MyDecimal.readWord(new int[] {50}, 1, 0), 50); + assertEquals(-6, MyDecimal.readWord(new int[] {250}, 1, 0)); + assertEquals(50, MyDecimal.readWord(new int[] {50}, 1, 0)); - assertEquals(MyDecimal.readWord(new int[] {250, 250}, 2, 0), -1286); - assertEquals(MyDecimal.readWord(new int[] {50, 50}, 2, 0), 12850); + assertEquals(-1286, MyDecimal.readWord(new int[] {250, 250}, 2, 0)); + assertEquals(12850, MyDecimal.readWord(new int[] {50, 50}, 2, 0)); - assertEquals(MyDecimal.readWord(new int[] {250, 250, 250}, 3, 0), -328966); - assertEquals(MyDecimal.readWord(new int[] {50, 50, 50}, 3, 0), 3289650); + assertEquals(-328966, MyDecimal.readWord(new int[] {250, 250, 250}, 3, 0)); + assertEquals(3289650, MyDecimal.readWord(new int[] {50, 50, 50}, 3, 0)); - assertEquals(MyDecimal.readWord(new int[] {250, 250, 250, 250}, 4, 0), -84215046); - assertEquals(MyDecimal.readWord(new int[] {50, 50, 50, 50}, 4, 0), 842150450); + assertEquals(-84215046, MyDecimal.readWord(new int[] {250, 250, 250, 250}, 4, 0)); + assertEquals(842150450, MyDecimal.readWord(new int[] {50, 50, 50, 50}, 4, 0)); } @Test @@ -113,11 +113,6 @@ public class MyDecimalTest { int precision; int frac; - MyDecimalTestStruct(String in, String out) { - this.in = in; - this.out = out; - } - MyDecimalTestStruct(String in, String out, int precision, int frac) { this.in = in; this.out = out; diff --git a/src/test/java/org/tikv/common/importer/SwitchTiKVModeTest.java b/src/test/java/org/tikv/common/importer/SwitchTiKVModeTest.java index d84cce5b19..ad5a8a69cb 100644 --- a/src/test/java/org/tikv/common/importer/SwitchTiKVModeTest.java +++ b/src/test/java/org/tikv/common/importer/SwitchTiKVModeTest.java @@ -24,7 +24,7 @@ public class SwitchTiKVModeTest { } @Test - public void swithTiKVModeTest() throws InterruptedException { + public void switchTiKVModeTest() throws InterruptedException { SwitchTiKVModeClient switchTiKVModeClient = session.getSwitchTiKVModeClient(); switchTiKVModeClient.keepTiKVToImportMode(); Thread.sleep(6000); diff --git a/src/test/java/org/tikv/common/importer/TxnKVIngestTest.java b/src/test/java/org/tikv/common/importer/TxnKVIngestTest.java index 5e912dced9..a1d9a5c838 100644 --- a/src/test/java/org/tikv/common/importer/TxnKVIngestTest.java +++ b/src/test/java/org/tikv/common/importer/TxnKVIngestTest.java @@ -38,7 +38,7 @@ public class TxnKVIngestTest { } @Ignore - public void txnIngestTest() throws InterruptedException { + public void txnIngestTest() { KVClient client = session.createKVClient(); // gen test data diff --git a/src/test/java/org/tikv/common/key/KeyTest.java b/src/test/java/org/tikv/common/key/KeyTest.java index d8ab4df9f3..49fef209ce 100644 --- a/src/test/java/org/tikv/common/key/KeyTest.java +++ b/src/test/java/org/tikv/common/key/KeyTest.java @@ -24,7 +24,7 @@ import org.junit.Test; public class KeyTest { @Test - public void nextPrefixTest() throws Exception { + public void nextPrefixTest() { Key k1 = toRawKey(new byte[] {1, 2, 3}); assertEquals(toRawKey(new byte[] {1, 2, 4}), k1.nextPrefix()); diff --git a/src/test/java/org/tikv/raw/MetricsTest.java b/src/test/java/org/tikv/raw/MetricsTest.java index 673048256d..2daf4e0960 100644 --- a/src/test/java/org/tikv/raw/MetricsTest.java +++ b/src/test/java/org/tikv/raw/MetricsTest.java @@ -13,7 +13,7 @@ import org.tikv.common.TiConfiguration; import org.tikv.common.TiSession; public class MetricsTest { - private List sessionList = new ArrayList<>(); + private final List sessionList = new ArrayList<>(); @After public void tearDown() throws Exception { @@ -35,7 +35,7 @@ public class MetricsTest { client.put(ByteString.copyFromUtf8("k"), ByteString.copyFromUtf8("v")); Optional result = client.get(ByteString.copyFromUtf8("k")); assertTrue(result.isPresent()); - assertEquals(result.get().toStringUtf8(), "v"); + assertEquals("v", result.get().toStringUtf8()); client.close(); session.close(); } @@ -61,7 +61,7 @@ public class MetricsTest { Optional result = client2.get(ByteString.copyFromUtf8("k2")); assertTrue(result.isPresent()); - assertEquals(result.get().toStringUtf8(), "v2"); + assertEquals("v2", result.get().toStringUtf8()); client2.close(); session2.close(); @@ -82,7 +82,6 @@ public class MetricsTest { conf2.setMetricsPort(54321); try { TiSession.create(conf2); - assertEquals(1, 2); } catch (IllegalArgumentException e) { assertEquals( "Do dot support multiple tikv.metrics.port, which are 54321 and 12345", e.getMessage()); diff --git a/src/test/java/org/tikv/util/ReflectionWrapper.java b/src/test/java/org/tikv/util/ReflectionWrapper.java index 981895bc5e..e6c0efc689 100644 --- a/src/test/java/org/tikv/util/ReflectionWrapper.java +++ b/src/test/java/org/tikv/util/ReflectionWrapper.java @@ -22,7 +22,7 @@ public class ReflectionWrapper { this.obj = obj; } - private Object obj; + private final Object obj; public Object call(String methodName, Object... args) { try {