Add ResolveLocksDone for other call of ResolveLocks

Signed-off-by: longfangsong <longfangsong@icloud.com>

Author: longfangsong

txnkv/transaction/pessimistic.go

@@ -227,6 +227,7 @@ func (action actionPessimisticLock) handleSingleBatch(c *twoPhaseCommitter, bo *
 		// tikv default will wait 3s(also the maximum wait value) when lock error occurs
 		startTime = time.Now()
 		msBeforeTxnExpired, err := c.store.GetLockResolver().ResolveLocks(bo, 0, locks)
+		defer c.store.GetLockResolver().ResolveLocksDone(c.startTS)
 		if err != nil {
 			return err
 		}

txnkv/txnsnapshot/client_helper.go

@@ -97,6 +97,11 @@ func (ch *ClientHelper) ResolveLocks(bo *retry.Backoffer, callerStartTS uint64,
 	return msBeforeTxnExpired, nil
 }
 
+// ResolveLocksDone wraps the ResolveLocksDone function
+func (ch *ClientHelper) ResolveLocksDone(callerStartTS uint64) {
+	ch.lockResolver.ResolveLocksDone(callerStartTS)
+}
+
 // SendReqCtx wraps the SendReqCtx function and use the resolved lock result in the kvrpcpb.Context.
 func (ch *ClientHelper) SendReqCtx(bo *retry.Backoffer, req *tikvrpc.Request, regionID locate.RegionVerID, timeout time.Duration, et tikvrpc.EndpointType, directStoreAddr string, opts ...locate.StoreSelectorOption) (*tikvrpc.Response, *locate.RPCContext, string, error) {
 	sender := locate.NewRegionRequestSender(ch.regionCache, ch.client)

txnkv/txnsnapshot/scan.go

@@ -293,7 +293,8 @@ func (s *Scanner) getData(bo *retry.Backoffer) error {
 			if err != nil {
 				return err
 			}
-			msBeforeExpired, err := txnlock.NewLockResolver(s.snapshot.store).ResolveLocks(bo, s.snapshot.version, []*txnlock.Lock{lock})
+			msBeforeExpired, err := s.snapshot.store.GetLockResolver().ResolveLocks(bo, s.snapshot.version, []*txnlock.Lock{lock})
+			defer s.snapshot.store.GetLockResolver().ResolveLocksDone(s.snapshot.version)
 			if err != nil {
 				return err
 			}

txnkv/txnsnapshot/snapshot.go

@@ -451,6 +451,7 @@ func (s *KVSnapshot) batchGetSingleRegion(bo *retry.Backoffer, batch batchKeys,
 		}
 		if len(lockedKeys) > 0 {
 			msBeforeExpired, err := cli.ResolveLocks(bo, s.version, locks)
+			defer cli.ResolveLocksDone(s.version)
 			if err != nil {
 				return err
 			}
@@ -619,6 +620,7 @@ func (s *KVSnapshot) get(ctx context.Context, bo *retry.Backoffer, k []byte) ([]
 			}
 
 			msBeforeExpired, err := cli.ResolveLocks(bo, s.version, []*txnlock.Lock{lock})
+			defer cli.ResolveLocksDone(s.version)
 			if err != nil {
 				return nil, err
 			}