From 28b3c453be3620399d7a72250c8b1a4463a24fc1 Mon Sep 17 00:00:00 2001 From: shiyuhang <1136742008@qq.com> Date: Mon, 27 Feb 2023 20:45:26 +0800 Subject: [PATCH] fix pair Signed-off-by: shiyuhang <1136742008@qq.com> --- src/main/java/org/tikv/common/util/Pair.java | 18 +++++ .../java/org/tikv/common/util/PairTest.java | 74 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 src/test/java/org/tikv/common/util/PairTest.java diff --git a/src/main/java/org/tikv/common/util/Pair.java b/src/main/java/org/tikv/common/util/Pair.java index 803880a9d14..65ae082e788 100644 --- a/src/main/java/org/tikv/common/util/Pair.java +++ b/src/main/java/org/tikv/common/util/Pair.java @@ -18,6 +18,7 @@ package org.tikv.common.util; import java.io.Serializable; +import java.util.Objects; public class Pair implements Serializable { public final F first; @@ -36,4 +37,21 @@ public static Pair create(F f, S s) { public String toString() { return String.format("[%s:%s]", first, second); } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pair pair = (Pair) o; + return Objects.equals(first, pair.first) && Objects.equals(second, pair.second); + } + + @Override + public int hashCode() { + return Objects.hash(first, second); + } } diff --git a/src/test/java/org/tikv/common/util/PairTest.java b/src/test/java/org/tikv/common/util/PairTest.java new file mode 100644 index 00000000000..b1fd0c6bc98 --- /dev/null +++ b/src/test/java/org/tikv/common/util/PairTest.java @@ -0,0 +1,74 @@ +/* + * Copyright 2023 TiKV Project Authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.tikv.common.util; + +import com.google.common.collect.ImmutableList; +import com.google.protobuf.ByteString; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import org.junit.Test; +import org.tikv.common.PDMockServerTest; +import org.tikv.common.region.TiRegion; +import org.tikv.common.region.TiStore; +import org.tikv.kvproto.Metapb; +import org.tikv.kvproto.Metapb.Peer; + +public class PairTest extends PDMockServerTest { + + @Test + public void testPair() { + Metapb.Region r = + Metapb.Region.newBuilder() + .setRegionEpoch(Metapb.RegionEpoch.newBuilder().setConfVer(1).setVersion(2)) + .setId(233) + .setStartKey(ByteString.EMPTY) + .setEndKey(ByteString.EMPTY) + .addPeers(Peer.getDefaultInstance()) + .build(); + List s = + ImmutableList.of( + Metapb.Store.newBuilder() + .setAddress(LOCAL_ADDR + ":" + 4000) + .setVersion("5.0.0") + .setId(1) + .build()); + + TiRegion region = + new TiRegion( + session.getConf(), + r, + r.getPeers(0), + r.getPeersList(), + s.stream().map(TiStore::new).collect(Collectors.toList())); + TiStore store = new TiStore(s.get(0)); + + Map, List> groupKeyMap = new HashMap<>(); + + for (int i = 0; i < 10; i++) { + Pair pair = Pair.create(region, store); + groupKeyMap + .computeIfAbsent(pair, e -> new ArrayList<>()) + .add(ByteString.copyFromUtf8("test")); + } + Pair pair = Pair.create(region, store); + assert (groupKeyMap.get(pair).size() == 10); + } +}