Skip to content

Commit a06be66

Browse files
add missing keyToRegionIdCache
Signed-off-by: marsishandsome <marsishandsome@gmail.com>
1 parent e4d6603 commit a06be66

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

src/main/java/org/tikv/common/operation/RegionErrorHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public boolean handleRegionError(BackOffer backOffer, Errorpb.Error error) {
180180
// TiKV's due to slow appling.
181181
private boolean onRegionEpochNotMatch(BackOffer backOffer, List<Metapb.Region> currentRegions) {
182182
if (currentRegions.size() == 0) {
183-
logger.warn("currentRegions.size() == 0");
183+
// logger.warn("currentRegions.size() == 0");
184184
this.regionManager.onRegionStale(recv.getRegion());
185185
return false;
186186
}
@@ -213,12 +213,12 @@ private boolean onRegionEpochNotMatch(BackOffer backOffer, List<Metapb.Region> c
213213
}
214214

215215
if (needInvalidateOld) {
216-
logger.warn("needInvalidateOld, region=" + recv.getRegion());
216+
// logger.warn("needInvalidateOld, region=" + recv.getRegion());
217217
this.regionManager.onRegionStale(recv.getRegion());
218218
}
219219

220220
for (TiRegion region : newRegions) {
221-
logger.warn("insertRegionToCache, region=" + region);
221+
// logger.warn("insertRegionToCache, region=" + region);
222222
regionManager.insertRegionToCache(region);
223223
}
224224

src/main/java/org/tikv/common/region/RegionCache.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public synchronized void insertRegionToCache(TiRegion region) {
9999
keyToRegionIdCache.remove(makeRange(oldRegion.getStartKey(), oldRegion.getEndKey()));
100100
}
101101
regionCache.put(region.getId(), region);
102+
keyToRegionIdCache.put(makeRange(region.getStartKey(), region.getEndKey()), region.getId());
102103
} catch (Exception ignore) {
103104
}
104105
}

src/main/java/org/tikv/common/region/RegionManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public TiRegion getRegionByKey(ByteString key, BackOffer backOffer) {
100100
if (region == null) {
101101
logger.debug("Key not found in keyToRegionIdCache:" + formatBytesUTF8(key));
102102
Pair<Metapb.Region, Metapb.Peer> regionAndLeader = pdClient.getRegionByKey(backOffer, key);
103-
logger.warn("getRegionByKey: regionAndLeader=" + regionAndLeader);
103+
// logger.warn("getRegionByKey: regionAndLeader=" + regionAndLeader);
104104
region =
105105
cache.putRegion(createRegion(regionAndLeader.first, regionAndLeader.second, backOffer));
106106
}

src/main/java/org/tikv/raw/RawKVClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private void put(ByteString key, ByteString value, long ttl, boolean atomic) {
133133
BackOffer backOffer = ConcreteBackOffer.newDeadlineBackOff(conf.getRawKVWriteTimeoutInMS());
134134
while (true) {
135135
RegionStoreClient client = clientBuilder.build(key, backOffer);
136-
logger.warn("put region: " + client.getRegion().toString());
136+
// logger.warn("put region: " + client.getRegion().toString());
137137
try {
138138
client.rawPut(backOffer, key, value, ttl, atomic);
139139
RAW_REQUEST_SUCCESS.labels(label).inc();
@@ -179,7 +179,7 @@ public ByteString putIfAbsent(ByteString key, ByteString value, long ttl) {
179179
BackOffer backOffer = ConcreteBackOffer.newDeadlineBackOff(conf.getRawKVWriteTimeoutInMS());
180180
while (true) {
181181
RegionStoreClient client = clientBuilder.build(key, backOffer);
182-
logger.warn("putIfAbsent region: " + client.getRegion().toString());
182+
// logger.warn("putIfAbsent region: " + client.getRegion().toString());
183183
try {
184184
ByteString result = client.rawPutIfAbsent(backOffer, key, value, ttl);
185185
RAW_REQUEST_SUCCESS.labels(label).inc();
@@ -265,7 +265,7 @@ public ByteString get(ByteString key) {
265265
BackOffer backOffer = ConcreteBackOffer.newDeadlineBackOff(conf.getRawKVReadTimeoutInMS());
266266
while (true) {
267267
RegionStoreClient client = clientBuilder.build(key, backOffer);
268-
logger.warn("get region: " + client.getRegion().toString());
268+
// logger.warn("get region: " + client.getRegion().toString());
269269
try {
270270
ByteString result = client.rawGet(backOffer, key);
271271
RAW_REQUEST_SUCCESS.labels(label).inc();

0 commit comments

Comments
 (0)