From 36971fc1516e3336f0bc2596531263ffb1ae3f09 Mon Sep 17 00:00:00 2001
From: disksing <i@disksing.com>
Date: Tue, 30 Mar 2021 15:31:23 +0800
Subject: [PATCH] store/tikv: move scan test to /tests (#23642)

---
 store/tikv/{ => tests}/scan_mock_test.go | 17 ++++++++---------
 store/tikv/{ => tests}/scan_test.go      |  9 ++++++---
 2 files changed, 14 insertions(+), 12 deletions(-)
 rename store/tikv/{ => tests}/scan_mock_test.go (82%)
 rename store/tikv/{ => tests}/scan_test.go (96%)

diff --git a/store/tikv/scan_mock_test.go b/store/tikv/tests/scan_mock_test.go
similarity index 82%
rename from store/tikv/scan_mock_test.go
rename to store/tikv/tests/scan_mock_test.go
index 4f184e5c55..20d9a730c8 100644
--- a/store/tikv/scan_mock_test.go
+++ b/store/tikv/tests/scan_mock_test.go
@@ -11,12 +11,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tikv
+package tikv_test
 
 import (
 	"context"
 
 	. "github.com/pingcap/check"
+	"github.com/pingcap/tidb/store/tikv"
 )
 
 type testScanMockSuite struct {
@@ -26,7 +27,7 @@ type testScanMockSuite struct {
 var _ = Suite(&testScanMockSuite{})
 
 func (s *testScanMockSuite) TestScanMultipleRegions(c *C) {
-	store := NewTestStore(c)
+	store := tikv.StoreProbe{KVStore: NewTestStore(c)}
 	defer store.Close()
 
 	txn, err := store.Begin()
@@ -40,8 +41,7 @@ func (s *testScanMockSuite) TestScanMultipleRegions(c *C) {
 
 	txn, err = store.Begin()
 	c.Assert(err, IsNil)
-	snapshot := newTiKVSnapshot(store, txn.StartTS(), 0)
-	scanner, err := newScanner(snapshot, []byte("a"), nil, 10, false)
+	scanner, err := txn.NewScanner([]byte("a"), nil, 10, false)
 	c.Assert(err, IsNil)
 	for ch := byte('a'); ch <= byte('z'); ch++ {
 		c.Assert([]byte{ch}, BytesEquals, []byte(scanner.Key()))
@@ -49,7 +49,7 @@ func (s *testScanMockSuite) TestScanMultipleRegions(c *C) {
 	}
 	c.Assert(scanner.Valid(), IsFalse)
 
-	scanner, err = newScanner(snapshot, []byte("a"), []byte("i"), 10, false)
+	scanner, err = txn.NewScanner([]byte("a"), []byte("i"), 10, false)
 	c.Assert(err, IsNil)
 	for ch := byte('a'); ch <= byte('h'); ch++ {
 		c.Assert([]byte{ch}, BytesEquals, []byte(scanner.Key()))
@@ -59,7 +59,7 @@ func (s *testScanMockSuite) TestScanMultipleRegions(c *C) {
 }
 
 func (s *testScanMockSuite) TestReverseScan(c *C) {
-	store := NewTestStore(c)
+	store := tikv.StoreProbe{KVStore: NewTestStore(c)}
 	defer store.Close()
 
 	txn, err := store.Begin()
@@ -73,8 +73,7 @@ func (s *testScanMockSuite) TestReverseScan(c *C) {
 
 	txn, err = store.Begin()
 	c.Assert(err, IsNil)
-	snapshot := newTiKVSnapshot(store, txn.StartTS(), 0)
-	scanner, err := newScanner(snapshot, nil, []byte("z"), 10, true)
+	scanner, err := txn.NewScanner(nil, []byte("z"), 10, true)
 	c.Assert(err, IsNil)
 	for ch := byte('y'); ch >= byte('a'); ch-- {
 		c.Assert(string([]byte{ch}), Equals, string(scanner.Key()))
@@ -82,7 +81,7 @@ func (s *testScanMockSuite) TestReverseScan(c *C) {
 	}
 	c.Assert(scanner.Valid(), IsFalse)
 
-	scanner, err = newScanner(snapshot, []byte("a"), []byte("i"), 10, true)
+	scanner, err = txn.NewScanner([]byte("a"), []byte("i"), 10, true)
 	c.Assert(err, IsNil)
 	for ch := byte('h'); ch >= byte('a'); ch-- {
 		c.Assert(string([]byte{ch}), Equals, string(scanner.Key()))
diff --git a/store/tikv/scan_test.go b/store/tikv/tests/scan_test.go
similarity index 96%
rename from store/tikv/scan_test.go
rename to store/tikv/tests/scan_test.go
index f85f4c1634..6356c46414 100644
--- a/store/tikv/scan_test.go
+++ b/store/tikv/tests/scan_test.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tikv
+package tikv_test
 
 import (
 	"bytes"
@@ -20,6 +20,7 @@ import (
 
 	. "github.com/pingcap/check"
 	tidbkv "github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/store/tikv"
 	"github.com/pingcap/tidb/store/tikv/kv"
 	"github.com/pingcap/tidb/store/tikv/logutil"
 	"github.com/pingcap/tidb/store/tikv/util"
@@ -28,9 +29,11 @@ import (
 	"go.uber.org/zap"
 )
 
+var scanBatchSize = tikv.ConfigProbe{}.GetScanBatchSize()
+
 type testScanSuite struct {
 	OneByOneSuite
-	store        *KVStore
+	store        *tikv.KVStore
 	recordPrefix []byte
 	rowNums      []int
 	ctx          context.Context
@@ -65,7 +68,7 @@ func (s *testScanSuite) TearDownSuite(c *C) {
 	s.OneByOneSuite.TearDownSuite(c)
 }
 
-func (s *testScanSuite) beginTxn(c *C) *KVTxn {
+func (s *testScanSuite) beginTxn(c *C) *tikv.KVTxn {
 	txn, err := s.store.Begin()
 	c.Assert(err, IsNil)
 	return txn