fix check_dev_2 faild

pingcap · Nov 17, 2021 · 9d2a390 · 9d2a390
1 parent d5e4a47
commit 9d2a390
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/store/driver/txn/batch_getter.go b/store/driver/txn/batch_getter.go
@@ -32,10 +32,6 @@ func (b tikvBatchGetter) BatchGet(ctx context.Context, keys [][]byte) (map[strin
 	// toTiDBKeys
 	kvKeys := *(*[]kv.Key)(unsafe.Pointer(&keys))
 	vals, err := b.tidbBatchGetter.BatchGet(ctx, kvKeys)
-	// TiDB err NotExist to TiKV err NotExist
-	if kv.IsErrNotFound(err) {
-		err = tikverr.ErrNotExist
-	}
 	return vals, err
 }
 
@@ -49,6 +45,9 @@ func (b tikvBatchBufferGetter) Get(k []byte) ([]byte, error) {
 	// Get from buffer
 	val, err := b.tidbBuffer.Get(context.TODO(), k)
 	if err == nil || !kv.IsErrNotFound(err) || b.tidbMiddleCache == nil {
+		if kv.IsErrNotFound(err) {
+			err = tikverr.ErrNotExist
+		}
 		return val, err
 	}
 	// Get from middle cache

diff --git a/store/driver/txn/txn_driver.go b/store/driver/txn/txn_driver.go
@@ -138,7 +138,7 @@ func (txn *tikvTxn) BatchGet(ctx context.Context, keys []kv.Key) (map[string][]b
 		defer span1.Finish()
 		ctx = opentracing.ContextWithSpan(ctx, span1)
 	}
-	return txn.KVTxn.BatchGet(ctx, toTiKVKeys(keys))
+	return NewBufferBatchGetter(txn.GetMemBuffer(), nil, txn.GetSnapshot()).BatchGet(ctx, keys)
 }
 
 func (txn *tikvTxn) Delete(k kv.Key) error {