Merge remote-tracking branch 'upstream/master' into point-get-backoff

Signed-off-by: Yilin Chen <sticnarf@gmail.com>

store/tikv/snapshot.go

@@ -403,21 +403,14 @@ func (s *tikvSnapshot) get(ctx context.Context, bo *Backoffer, k kv.Key) ([]byte
 		}
 	})
 
-	cli := clientHelper{
-		LockResolver:      s.store.lockResolver,
-		RegionCache:       s.store.regionCache,
-		minCommitTSPushed: &s.minCommitTSPushed,
-		Client:            s.store.client,
-		resolveLite:       true,
-	}
+	cli := NewClientHelper(s.store, s.resolvedLocks)
 
 	// Secondary locks or async commit locks cannot be ignored when getting using the max version.
 	// So we concurrently get a TS from PD and use it in retries to avoid unnecessary blocking.
 	var tsFuture oracle.Future
 	if s.version == kv.MaxVersion {
 		tsFuture = s.store.oracle.GetTimestampAsync(ctx, &oracle.Option{TxnScope: s.txnScope})
 	}
-
 	failpoint.Inject("snapshotGetTSAsync", nil)
 
 	s.mu.RLock()