Skip to content

Commit

Permalink
*: move mocktikv from tikv pkg (pingcap#5834)
Browse files Browse the repository at this point in the history
  • Loading branch information
@siddontang @coocood
siddontang authored and coocood committed Feb 8, 2018
1 parent 633d1b8 commit de9c192
Show file tree
Hide file tree
Showing 68 changed files with 469 additions and 329 deletions.
4 changes: 2 additions & 2 deletions bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"time"

"github.com/pingcap/tidb/ast"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
log "github.com/sirupsen/logrus"
goctx "golang.org/x/net/context"
)
Expand All @@ -29,7 +29,7 @@ var smallCount = 100
var bigCount = 10000

func prepareBenchSession() Session {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
if err != nil {
log.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions ddl/ddl_db_change_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/parser"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/util/testkit"
"github.com/pingcap/tidb/util/testleak"
goctx "golang.org/x/net/context"
Expand All @@ -48,7 +48,7 @@ type testStateChangeSuite struct {
func (s *testStateChangeSuite) SetUpSuite(c *C) {
s.lease = 200 * time.Millisecond
var err error
s.store, err = tikv.NewMockTikvStore()
s.store, err = mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
tidb.SetSchemaLease(s.lease)
s.dom, err = tidb.BootstrapSession(s.store)
Expand Down
4 changes: 2 additions & 2 deletions ddl/ddl_db_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/mysql"
tmysql "github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/table"
"github.com/pingcap/tidb/table/tables"
"github.com/pingcap/tidb/tablecodec"
Expand Down Expand Up @@ -82,7 +82,7 @@ func (s *testDBSuite) SetUpSuite(c *C) {
s.autoIDStep = autoid.GetStep()
autoid.SetStep(5000)

s.store, err = tikv.NewMockTikvStore()
s.store, err = mockstore.NewMockTikvStore()
c.Assert(err, IsNil)

s.dom, err = tidb.BootstrapSession(s.store)
Expand Down
4 changes: 2 additions & 2 deletions ddl/ddl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/meta"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/logutil"
"github.com/pingcap/tidb/util/mock"
Expand All @@ -44,7 +44,7 @@ func TestT(t *testing.T) {
}

func testCreateStore(c *C, name string) kv.Storage {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
return store
}
Expand Down
3 changes: 2 additions & 1 deletion ddl/table_split_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/pingcap/tidb"
"github.com/pingcap/tidb/ddl"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/tablecodec"
"golang.org/x/net/context"
Expand All @@ -28,7 +29,7 @@ type testDDLTableSplitSuite struct{}
var _ = Suite(&testDDLTableSplitSuite{})

func (s *testDDLTableSplitSuite) TestTableSplit(c *C) {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
tidb.SetSchemaLease(0)
tidb.SetStatsLease(0)
Expand Down
4 changes: 2 additions & 2 deletions domain/domain_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
. "github.com/pingcap/check"
"github.com/pingcap/tidb/ast"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/util/mock"
"github.com/pingcap/tidb/util/testleak"
)
Expand All @@ -47,7 +47,7 @@ func sysMockFactory(dom *Domain) (pools.Resource, error) {

func (*testSuite) TestT(c *C) {
defer testleak.AfterTest(c)()
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
ddlLease := 80 * time.Millisecond
dom := NewDomain(store, ddlLease, 0, mockFactory)
Expand Down
13 changes: 7 additions & 6 deletions executor/executor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ import (
"github.com/pingcap/tidb/parser"
"github.com/pingcap/tidb/plan"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/mockstore/mocktikv"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/tikv/mocktikv"
"github.com/pingcap/tidb/store/tikv/tikvrpc"
"github.com/pingcap/tidb/terror"
"github.com/pingcap/tidb/types"
Expand Down Expand Up @@ -85,9 +86,9 @@ func (s *testSuite) SetUpSuite(c *C) {
s.cluster = mocktikv.NewCluster()
mocktikv.BootstrapWithSingleStore(s.cluster)
s.mvccStore = mocktikv.NewMvccStore()
store, err := tikv.NewMockTikvStore(
tikv.WithCluster(s.cluster),
tikv.WithMVCCStore(s.mvccStore),
store, err := mockstore.NewMockTikvStore(
mockstore.WithCluster(s.cluster),
mockstore.WithMVCCStore(s.mvccStore),
)
c.Assert(err, IsNil)
s.store = store
Expand Down Expand Up @@ -2048,8 +2049,8 @@ func (s *testContextOptionSuite) SetUpSuite(c *C) {
s.cli = cli

var err error
s.store, err = tikv.NewMockTikvStore(
tikv.WithHijackClient(hijackClient),
s.store, err = mockstore.NewMockTikvStore(
mockstore.WithHijackClient(hijackClient),
)
c.Assert(err, IsNil)
s.dom, err = tidb.BootstrapSession(s.store)
Expand Down
4 changes: 2 additions & 2 deletions expression/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/table"
"github.com/pingcap/tidb/terror"
"github.com/pingcap/tidb/types"
Expand Down Expand Up @@ -3170,7 +3170,7 @@ func (s *testIntegrationSuite) TestIssues(c *C) {
}

func newStoreWithBootstrap() (kv.Storage, *domain.Domain, error) {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
if err != nil {
return nil, nil, errors.Trace(err)
}
Expand Down
8 changes: 4 additions & 4 deletions infoschema/infoschema_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/perfschema"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/testleak"
"github.com/pingcap/tidb/util/testutil"
Expand All @@ -43,7 +43,7 @@ type testSuite struct {

func (*testSuite) TestT(c *C) {
defer testleak.AfterTest(c)()
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
defer store.Close()

Expand Down Expand Up @@ -198,7 +198,7 @@ func (testSuite) TestConcurrent(c *C) {
storeCount := 5
stores := make([]kv.Storage, storeCount)
for i := 0; i < storeCount; i++ {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
stores[i] = store
}
Expand All @@ -221,7 +221,7 @@ func (testSuite) TestConcurrent(c *C) {
// TestInfoTables makes sure that all tables of information_schema could be found in infoschema handle.
func (*testSuite) TestInfoTables(c *C) {
defer testleak.AfterTest(c)()
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
defer store.Close()
handle := infoschema.NewHandle(store)
Expand Down
8 changes: 4 additions & 4 deletions meta/autoid/autoid_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pingcap/tidb/meta"
"github.com/pingcap/tidb/meta/autoid"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
)

func TestT(t *testing.T) {
Expand All @@ -39,7 +39,7 @@ type testSuite struct {
}

func (*testSuite) TestT(c *C) {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
defer store.Close()

Expand Down Expand Up @@ -132,7 +132,7 @@ func (*testSuite) TestT(c *C) {
// TestConcurrentAlloc is used for the test that
// multiple alloctors allocate ID with the same table ID concurrently.
func (*testSuite) TestConcurrentAlloc(c *C) {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
defer store.Close()
autoid.SetStep(100)
Expand Down Expand Up @@ -195,7 +195,7 @@ func (*testSuite) TestConcurrentAlloc(c *C) {
// TestRollbackAlloc tests that when the allocation transaction commit failed,
// the local variable base and end doesn't change.
func (*testSuite) TestRollbackAlloc(c *C) {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
defer store.Close()
dbID := int64(1)
Expand Down
8 changes: 4 additions & 4 deletions meta/meta_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
. "github.com/pingcap/check"
"github.com/pingcap/tidb/meta"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/util/testleak"
goctx "golang.org/x/net/context"
)
Expand All @@ -37,7 +37,7 @@ type testSuite struct {

func (s *testSuite) TestMeta(c *C) {
defer testleak.AfterTest(c)()
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
defer store.Close()

Expand Down Expand Up @@ -225,7 +225,7 @@ func (s *testSuite) TestMeta(c *C) {

func (s *testSuite) TestSnapshot(c *C) {
defer testleak.AfterTest(c)()
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
defer store.Close()

Expand Down Expand Up @@ -255,7 +255,7 @@ func (s *testSuite) TestSnapshot(c *C) {

func (s *testSuite) TestDDL(c *C) {
defer testleak.AfterTest(c)()
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)
defer store.Close()

Expand Down
10 changes: 5 additions & 5 deletions mysql/const_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/parser"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/tikv/mocktikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/mockstore/mocktikv"
"github.com/pingcap/tidb/util/testkit"
"github.com/pingcap/tidb/util/testleak"
goctx "golang.org/x/net/context"
Expand Down Expand Up @@ -53,9 +53,9 @@ func (s *testMySQLConstSuite) SetUpSuite(c *C) {
s.cluster = mocktikv.NewCluster()
mocktikv.BootstrapWithSingleStore(s.cluster)
s.mvccStore = mocktikv.NewMvccStore()
store, err := tikv.NewMockTikvStore(
tikv.WithCluster(s.cluster),
tikv.WithMVCCStore(s.mvccStore),
store, err := mockstore.NewMockTikvStore(
mockstore.WithCluster(s.cluster),
mockstore.WithMVCCStore(s.mvccStore),
)
c.Assert(err, IsNil)
s.store = store
Expand Down
16 changes: 8 additions & 8 deletions new_session_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/pingcap/tidb/parser"
"github.com/pingcap/tidb/privilege/privileges"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/tikv/mocktikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/store/mockstore/mocktikv"
"github.com/pingcap/tidb/table/tables"
"github.com/pingcap/tidb/terror"
"github.com/pingcap/tidb/types"
Expand All @@ -58,9 +58,9 @@ func (s *testSessionSuite) SetUpSuite(c *C) {
s.cluster = mocktikv.NewCluster()
mocktikv.BootstrapWithSingleStore(s.cluster)
s.mvccStore = mocktikv.NewMvccStore()
store, err := tikv.NewMockTikvStore(
tikv.WithCluster(s.cluster),
tikv.WithMVCCStore(s.mvccStore),
store, err := mockstore.NewMockTikvStore(
mockstore.WithCluster(s.cluster),
mockstore.WithMVCCStore(s.mvccStore),
)
c.Assert(err, IsNil)
s.store = store
Expand Down Expand Up @@ -1374,9 +1374,9 @@ func (s *testSchemaSuite) SetUpSuite(c *C) {
s.cluster = mocktikv.NewCluster()
mocktikv.BootstrapWithSingleStore(s.cluster)
s.mvccStore = mocktikv.NewMvccStore()
store, err := tikv.NewMockTikvStore(
tikv.WithCluster(s.cluster),
tikv.WithMVCCStore(s.mvccStore),
store, err := mockstore.NewMockTikvStore(
mockstore.WithCluster(s.cluster),
mockstore.WithMVCCStore(s.mvccStore),
)
c.Assert(err, IsNil)
s.store = store
Expand Down
4 changes: 2 additions & 2 deletions perfschema/virtual_tables_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/juju/errors"
. "github.com/pingcap/check"
"github.com/pingcap/tidb/perfschema"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/mock"
)
Expand All @@ -35,7 +35,7 @@ type testSuite struct {
}

func (*testSuite) TestSessionStatus(c *C) {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
c.Assert(err, IsNil)

ctx := mock.NewContext()
Expand Down
4 changes: 2 additions & 2 deletions plan/cbo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/plan"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
"github.com/pingcap/tidb/util/testkit"
"github.com/pingcap/tidb/util/testleak"
)
Expand Down Expand Up @@ -445,7 +445,7 @@ func (s *testAnalyzeSuite) TestPreparedNullParam(c *C) {
}

func newStoreWithBootstrap() (kv.Storage, *domain.Domain, error) {
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
if err != nil {
return nil, nil, errors.Trace(err)
}
Expand Down
6 changes: 3 additions & 3 deletions privilege/privileges/cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/privilege/privileges"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/mockstore"
)

var _ = Suite(&testCacheSuite{})
Expand All @@ -31,7 +31,7 @@ type testCacheSuite struct {

func (s *testCacheSuite) SetUpSuite(c *C) {
privileges.Enable = true
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
tidb.SetSchemaLease(0)
tidb.SetStatsLease(0)
c.Assert(err, IsNil)
Expand Down Expand Up @@ -185,7 +185,7 @@ func (s *testCacheSuite) TestCaseInsensitive(c *C) {

func (s *testCacheSuite) TestAbnormalMySQLTable(c *C) {
privileges.Enable = true
store, err := tikv.NewMockTikvStore()
store, err := mockstore.NewMockTikvStore()
tidb.SetSchemaLease(0)
tidb.SetStatsLease(0)
c.Assert(err, IsNil)
Expand Down
Loading

0 comments on commit de9c192

Please sign in to comment.