Skip to content

Commit

Permalink
dep(*): update tidb to include a change (#8192)
Browse files Browse the repository at this point in the history
ref #4287
  • Loading branch information
lance6716 authored Feb 8, 2023
1 parent ae12f82 commit cf9655f
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 491 deletions.
20 changes: 16 additions & 4 deletions dm/master/scheduler/scheduler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1866,7 +1866,10 @@ func (t *testSchedulerSuite) TestWorkerHasDiffRelayAndBound() {
keepAlive = int64(3)
)

workerInfo := ha.WorkerInfo{Name: workerName1}
workerInfo := ha.WorkerInfo{
Name: workerName1,
Addr: "workerinfo.addr",
}
bound := ha.SourceBound{
Source: sourceID1,
Worker: workerName1,
Expand Down Expand Up @@ -1922,8 +1925,14 @@ func (t *testSchedulerSuite) TestUpgradeCauseConflictRelayType() {
keepAlive = int64(3)
)

workerInfo1 := ha.WorkerInfo{Name: workerName1}
workerInfo2 := ha.WorkerInfo{Name: workerName2}
workerInfo1 := ha.WorkerInfo{
Name: workerName1,
Addr: "workerinfo.addr",
}
workerInfo2 := ha.WorkerInfo{
Name: workerName2,
Addr: "workerinfo.addr",
}
bound := ha.SourceBound{
Source: sourceID1,
Worker: workerName1,
Expand Down Expand Up @@ -1990,7 +1999,10 @@ func (t *testSchedulerSuite) TestOperateValidatorTask() {
subtaskCfg.ValidatorCfg = config.ValidatorConfig{Mode: config.ValidationNone}
require.NoError(t.T(), subtaskCfg.Adjust(true))

workerInfo1 := ha.WorkerInfo{Name: workerName1}
workerInfo1 := ha.WorkerInfo{
Name: workerName1,
Addr: "workerinfo.addr",
}
bound := ha.SourceBound{
Source: sourceID1,
Worker: workerName1,
Expand Down
26 changes: 13 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ require (
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
github.com/pingcap/check v0.0.0-20211026125417-57bd13f7b5f0
github.com/pingcap/errors v0.11.5-0.20221009092201-b66cddb77c32
github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3
github.com/pingcap/kvproto v0.0.0-20230201112839-2b853bed8125
github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c
github.com/pingcap/kvproto v0.0.0-20230206112125-0561adc37543
github.com/pingcap/log v1.1.1-0.20221116035753-734d527bc87c
github.com/pingcap/tidb v1.1.0-beta.0.20230206024556-76f1c526c4a2
github.com/pingcap/tidb-tools v6.1.1-0.20220715000306-1d2f00da8c3e+incompatible
github.com/pingcap/tidb/parser v0.0.0-20230206024556-76f1c526c4a2
github.com/pingcap/tidb v1.1.0-beta.0.20230208042158-8398f0fe098e
github.com/pingcap/tidb-tools v6.5.1-0.20230208065359-62b90e1e24a7+incompatible
github.com/pingcap/tidb/parser v0.0.0-20230208042158-8398f0fe098e
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0
github.com/r3labs/diff v1.1.0
Expand All @@ -74,9 +74,9 @@ require (
github.com/swaggo/gin-swagger v1.2.0
github.com/swaggo/swag v1.8.3
github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954
github.com/tikv/client-go/v2 v2.0.5-0.20230202101145-8fd09cd88cce
github.com/tikv/client-go/v2 v2.0.6-0.20230207090754-29dfcc272912
github.com/tikv/pd v1.1.0-beta.0.20230203015356-248b3f0be132
github.com/tikv/pd/client v0.0.0-20230203015356-248b3f0be132
github.com/tikv/pd/client v0.0.0-20230206191557-2a7c8d4c9676
github.com/tinylib/msgp v1.1.6
github.com/uber-go/atomic v1.4.0
github.com/vmihailenco/msgpack/v5 v5.3.5
Expand All @@ -97,11 +97,11 @@ require (
golang.org/x/exp v0.0.0-20221023144134-a1e5550cf13e
golang.org/x/net v0.5.0
golang.org/x/sync v0.1.0
golang.org/x/sys v0.4.0
golang.org/x/sys v0.5.0
golang.org/x/text v0.6.0
golang.org/x/time v0.3.0
google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd
google.golang.org/grpc v1.51.0
google.golang.org/genproto v0.0.0-20230202175211-008b39050e57
google.golang.org/grpc v1.52.3
google.golang.org/protobuf v1.28.1
gopkg.in/yaml.v2 v2.4.0
gorm.io/driver/mysql v1.3.3
Expand All @@ -113,7 +113,7 @@ require (
cloud.google.com/go v0.105.0 // indirect
cloud.google.com/go/compute v1.13.0 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
cloud.google.com/go/iam v0.7.0 // indirect
cloud.google.com/go/iam v0.8.0 // indirect
cloud.google.com/go/storage v1.27.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0 // indirect
Expand All @@ -133,7 +133,7 @@ require (
github.com/carlmjohnson/flagext v0.21.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cheggaaa/pb/v3 v3.0.8 // indirect
github.com/cloudfoundry/gosigar v1.3.4 // indirect
github.com/cloudfoundry/gosigar v1.3.6 // indirect
github.com/cockroachdb/errors v1.8.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
github.com/cockroachdb/redact v1.0.8 // indirect
Expand Down Expand Up @@ -285,7 +285,7 @@ require (
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apimachinery v0.26.0 // indirect
modernc.org/libc v1.16.8 // indirect
Expand Down
Loading

0 comments on commit cf9655f

Please sign in to comment.