Merge branch 'master' into phyicalplanexplain

pingcap · Jul 1, 2022 · c949d4c · c949d4c
2 parents cc59699 + f121896
commit c949d4c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/ConcreteScanIterator.java b/tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/ConcreteScanIterator.java
@@ -66,6 +66,11 @@ TiRegion loadCurrentRegionToCache() throws GrpcException {
           try {
             int scanSize = Math.min(limit, conf.getScanBatchSize());
             currentCache = client.scan(backOffer, startKey, scanSize, version);
+            // If we get region before scan, we will use region from cache which
+            // may have wrong end key. This may miss some regions that split from old region.
+            // Client will get the newest region during scan. So we need to
+            // update region after scan.
+            region = client.getRegion();
           } catch (final TiKVException e) {
             backOffer.doBackOff(BackOffFunction.BackOffFuncType.BoRegionMiss, e);
             continue;