Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

Commit

Permalink
dep: update pingcap/pd to tikv/pd (#931)
Browse files Browse the repository at this point in the history 
* dep: update pingcap/pd to tikv/pd

* update more dep
  • Loading branch information
@lance6716
lance6716 authored Aug 25, 2020
1 parent 3966d17 commit 3ddf0c2
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 29 deletions.
4 changes: 2 additions & 2 deletions checker/checker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (c *Checker) Init(ctx context.Context) (err error) {
dbs[instance.cfg.SourceID] = instance.sourceDB.DB

if checkSchema {
c.checkList = append(c.checkList, check.NewTablesChecker(instance.sourceDB.DB, instance.sourceDBinfo, checkTables, c.enableANSIQuotes))
c.checkList = append(c.checkList, check.NewTablesChecker(instance.sourceDB.DB, instance.sourceDBinfo, checkTables))
}
}

Expand All @@ -224,7 +224,7 @@ func (c *Checker) Init(ctx context.Context) (err error) {
continue
}

c.checkList = append(c.checkList, check.NewShardingTablesCheck(name, dbs, shardingSet, columnMapping, checkingShardID, c.enableANSIQuotes))
c.checkList = append(c.checkList, check.NewShardingTablesCheck(name, dbs, shardingSet, columnMapping, checkingShardID))
}
}

Expand Down
2 changes: 1 addition & 1 deletion dm/master/election_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/pingcap/check"
"github.com/pingcap/failpoint"
"github.com/pingcap/pd/v4/pkg/tempurl"
"github.com/tikv/pd/pkg/tempurl"

"github.com/pingcap/dm/pkg/etcdutil"
"github.com/pingcap/dm/pkg/utils"
Expand Down
2 changes: 1 addition & 1 deletion dm/master/etcd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"time"

"github.com/pingcap/check"
"github.com/pingcap/pd/v4/pkg/tempurl"
"github.com/tikv/pd/pkg/tempurl"
"go.etcd.io/etcd/embed"

"github.com/pingcap/dm/pkg/log"
Expand Down
2 changes: 1 addition & 1 deletion dm/master/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ import (
"github.com/pingcap/parser"
"github.com/pingcap/parser/ast"
"github.com/pingcap/parser/model"
"github.com/pingcap/pd/v4/pkg/tempurl"
tiddl "github.com/pingcap/tidb/ddl"
"github.com/pingcap/tidb/sessionctx"
tidbmock "github.com/pingcap/tidb/util/mock"
"github.com/tikv/pd/pkg/tempurl"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/integration"

Expand Down
2 changes: 1 addition & 1 deletion dm/worker/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"time"

. "github.com/pingcap/check"
"github.com/pingcap/pd/v4/pkg/tempurl"
"github.com/siddontang/go-mysql/mysql"
"github.com/tikv/pd/pkg/tempurl"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/embed"
v3rpc "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
Expand Down
2 changes: 1 addition & 1 deletion dm/worker/worker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

. "github.com/pingcap/check"
"github.com/pingcap/failpoint"
"github.com/pingcap/pd/v4/pkg/tempurl"
"github.com/tikv/pd/pkg/tempurl"
"go.etcd.io/etcd/clientv3"

"github.com/pingcap/dm/dm/config"
Expand Down
14 changes: 7 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@ require (
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
github.com/pingcap/dumpling v0.0.0-20200821062544-fd4568290bec
github.com/pingcap/dumpling v0.0.0-20200825093428-8e00b826f68d
github.com/pingcap/errcode v0.3.0 // indirect
github.com/pingcap/errors v0.11.5-0.20200729012136-4e113ddee29e
github.com/pingcap/errors v0.11.5-0.20200820035142-66eb5bf1d1cd
github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce
github.com/pingcap/log v0.0.0-20200511115504-543df19646ad
github.com/pingcap/parser v0.0.0-20200810083003-f0edf4170630
github.com/pingcap/pd/v4 v4.0.0-rc.2.0.20200730093003-dc8c75cf7ca0
github.com/pingcap/tidb v1.1.0-beta.0.20200812070147-92bf05fb0901
github.com/pingcap/tidb-tools v4.0.5-0.20200819060105-3ac93f6b99d4+incompatible
github.com/pingcap/parser v0.0.0-20200821073936-cf85e80665c4
github.com/pingcap/tidb v1.1.0-beta.0.20200825092018-e52cb3714e24
github.com/pingcap/tidb-tools v4.0.5-0.20200825080126-fdf2b064677c+incompatible
github.com/prometheus/client_golang v1.5.1
github.com/rakyll/statik v0.1.6
github.com/satori/go.uuid v1.2.0
Expand All @@ -41,11 +40,12 @@ require (
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285
github.com/tikv/pd v1.1.0-beta.0.20200825090122-aeda6d60f107
github.com/uber-go/atomic v1.4.0 // indirect
github.com/unrolled/render v1.0.1
go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
go.uber.org/zap v1.15.0
golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed
golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb
google.golang.org/grpc v1.26.0
Expand Down
50 changes: 36 additions & 14 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/election/election_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

. "github.com/pingcap/check"
"github.com/pingcap/failpoint"
"github.com/pingcap/pd/v4/pkg/tempurl"
"github.com/tikv/pd/pkg/tempurl"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/embed"

Expand Down

0 comments on commit 3ddf0c2

Please sign in to comment.