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

Commit

Permalink
*: update pd deps to v4 (#184)
Browse files Browse the repository at this point in the history 
Co-authored-by: 3pointer <luancheng@pingcap.com>
  • Loading branch information
@kennytm @3pointer
kennytm and 3pointer authored Mar 12, 2020
1 parent 3419d8a commit e476c82
Show file tree
Hide file tree
Showing 19 changed files with 161 additions and 62 deletions.
2 changes: 1 addition & 1 deletion cmd/validate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/pingcap/kvproto/pkg/import_sstpb"
"github.com/pingcap/log"
"github.com/pingcap/parser/model"
"github.com/pingcap/pd/pkg/mock/mockid"
"github.com/pingcap/pd/v4/pkg/mock/mockid"
"github.com/spf13/cobra"
"go.uber.org/zap"

Expand Down
13 changes: 5 additions & 8 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ require (
github.com/onsi/gomega v1.8.1 // indirect
github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011
github.com/pingcap/kvproto v0.0.0-20200221125103-35b65c96516e
github.com/pingcap/kvproto v0.0.0-20200228095611-2cf9a243b8d5
github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd
github.com/pingcap/parser v0.0.0-20200301092054-bfc519c0a57f
github.com/pingcap/pd v1.1.0-beta.0.20200106144140-f5a7aa985497
github.com/pingcap/tidb v1.1.0-beta.0.20200305113516-ac15dd336c93
github.com/pingcap/tidb-tools v4.0.0-beta+incompatible
github.com/pingcap/parser v0.0.0-20200305120128-bde9faa0df84
github.com/pingcap/pd/v4 v4.0.0-beta.1.0.20200305072537-61d9f9cc35d3
github.com/pingcap/tidb v1.1.0-beta.0.20200310133602-7c39e5e5e0bc
github.com/pingcap/tidb-tools v4.0.0-beta.1.0.20200306084441-875bd09aa3d5+incompatible
github.com/pingcap/tipb v0.0.0-20200212061130-c4d518eb1d60
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/common v0.4.1
Expand All @@ -37,10 +37,7 @@ require (
go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
go.opencensus.io v0.22.2 // indirect
go.uber.org/zap v1.14.0
golang.org/x/net v0.0.0-20191011234655-491137f69257 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/tools v0.0.0-20200226224502-204d844ad48d // indirect
google.golang.org/api v0.14.0
google.golang.org/grpc v1.25.1
gopkg.in/yaml.v2 v2.2.7 // indirect
)
168 changes: 135 additions & 33 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/backup/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/pingcap/log"
"github.com/pingcap/parser/model"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb-tools/pkg/filter"
"github.com/pingcap/tidb/distsql"
"github.com/pingcap/tidb/domain"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backup/safe_point.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/pingcap/errors"
"github.com/pingcap/log"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/backup/safe_point_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sync"

. "github.com/pingcap/check"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb/util/testleak"

"github.com/pingcap/br/pkg/mock"
Expand Down
2 changes: 1 addition & 1 deletion pkg/conn/conn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/pingcap/kvproto/pkg/backup"
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/pingcap/log"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/util/codec"
Expand Down
4 changes: 2 additions & 2 deletions pkg/conn/conn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
. "github.com/pingcap/check"
"github.com/pingcap/errors"
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/pingcap/pd/server/core"
"github.com/pingcap/pd/server/statistics"
"github.com/pingcap/pd/v4/server/core"
"github.com/pingcap/pd/v4/server/statistics"
"github.com/pingcap/tidb/util/codec"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/glue/glue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"

"github.com/pingcap/parser/model"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/meta/autoid"
Expand Down
2 changes: 1 addition & 1 deletion pkg/gluetidb/glue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"context"

"github.com/pingcap/parser/model"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb/config"
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/executor"
Expand Down
4 changes: 2 additions & 2 deletions pkg/mock/mock_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (

"github.com/go-sql-driver/mysql"
"github.com/pingcap/log"
pd "github.com/pingcap/pd/client"
"github.com/pingcap/pd/pkg/tempurl"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/pd/v4/pkg/tempurl"
"github.com/pingcap/tidb/config"
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/kv"
Expand Down
2 changes: 1 addition & 1 deletion pkg/restore/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/pingcap/kvproto/pkg/import_sstpb"
"github.com/pingcap/log"
"github.com/pingcap/parser/model"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/store/tikv/oracle"
Expand Down
2 changes: 1 addition & 1 deletion pkg/restore/import.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/pingcap/kvproto/pkg/import_sstpb"
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/log"
"github.com/pingcap/pd/pkg/codec"
"github.com/pingcap/pd/v4/pkg/codec"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
4 changes: 2 additions & 2 deletions pkg/restore/split_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/pingcap/kvproto/pkg/pdpb"
"github.com/pingcap/kvproto/pkg/tikvpb"
pd "github.com/pingcap/pd/client"
"github.com/pingcap/pd/server/schedule/placement"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/pd/v4/server/schedule/placement"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/restore/split_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/pingcap/kvproto/pkg/import_sstpb"
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/pingcap/kvproto/pkg/pdpb"
"github.com/pingcap/pd/server/core"
"github.com/pingcap/pd/server/schedule/placement"
"github.com/pingcap/pd/v4/server/core"
"github.com/pingcap/pd/v4/server/schedule/placement"
"github.com/pingcap/tidb/util/codec"

"github.com/pingcap/br/pkg/rtree"
Expand Down
2 changes: 1 addition & 1 deletion pkg/task/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/gogo/protobuf/proto"
"github.com/pingcap/errors"
"github.com/pingcap/kvproto/pkg/backup"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb-tools/pkg/filter"
"github.com/pingcap/tidb/store/tikv"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion tests/br_key_locked/codec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/pingcap/errors"
"github.com/pingcap/kvproto/pkg/metapb"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb/util/codec"
)

Expand Down
2 changes: 1 addition & 1 deletion tests/br_key_locked/locker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/pingcap/kvproto/pkg/kvrpcpb"
"github.com/pingcap/log"
"github.com/pingcap/parser/model"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb/store/tikv"
"github.com/pingcap/tidb/store/tikv/oracle"
"github.com/pingcap/tidb/store/tikv/tikvrpc"
Expand Down
2 changes: 1 addition & 1 deletion tests/br_z_gc_safepoint/gc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"time"

"github.com/pingcap/log"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v4/client"
"github.com/pingcap/tidb/store/tikv/oracle"
"go.uber.org/zap"
)
Expand Down

0 comments on commit e476c82

Please sign in to comment.