Skip to content

Commit 3936c00

Browse files
pingyupingyu
authored
[close #371] Upgrade client-go/tidb to release 7.5 (#372)
* upgrade client-go/tidb to release 7.5 Signed-off-by: Ping Yu <[email protected]> * try Signed-off-by: Ping Yu <[email protected]> * polish Signed-off-by: Ping Yu <[email protected]> * upgrade golangci v1.55.2 Signed-off-by: Ping Yu <[email protected]> * fix lint error Signed-off-by: Ping Yu <[email protected]> --------- Signed-off-by: Ping Yu <[email protected]>
1 parent e63537b commit 3936c00

File tree

12 files changed

+324
-295
lines changed

12 files changed

+324
-295
lines changed

‎cdc/cdc/kv/client_bench_test.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/pingcap/errors"
2525
"github.com/pingcap/kvproto/pkg/cdcpb"
2626
"github.com/pingcap/log"
27-
"github.com/pingcap/tidb/store/mockstore/mockcopr"
27+
"github.com/pingcap/tidb/pkg/store/mockstore/mockcopr"
2828
"github.com/tikv/client-go/v2/oracle"
2929
"github.com/tikv/client-go/v2/testutils"
3030
"github.com/tikv/client-go/v2/tikv"
@@ -71,6 +71,10 @@ func (s *mockChangeDataService2) EventFeed(server cdcpb.ChangeData_EventFeedServ
7171
return nil
7272
}
7373

74+
func (s *mockChangeDataService2) EventFeedV2(_server cdcpb.ChangeData_EventFeedV2Server) error {
75+
panic("unimplemented")
76+
}
77+
7478
func newMockService2(
7579
ctx context.Context,
7680
b *testing.B,

‎cdc/cdc/kv/client_test.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/pingcap/kvproto/pkg/errorpb"
3333
"github.com/pingcap/kvproto/pkg/metapb"
3434
"github.com/pingcap/log"
35-
"github.com/pingcap/tidb/store/mockstore/mockcopr"
35+
"github.com/pingcap/tidb/pkg/store/mockstore/mockcopr"
3636
"github.com/stretchr/testify/require"
3737
"github.com/tikv/client-go/v2/oracle"
3838
"github.com/tikv/client-go/v2/testutils"
@@ -274,6 +274,10 @@ loop:
274274
return nil
275275
}
276276

277+
func (s *mockChangeDataService) EventFeedV2(_server cdcpb.ChangeData_EventFeedV2Server) error {
278+
panic("unimplemented")
279+
}
280+
277281
func newMockService(
278282
ctx context.Context,
279283
c *check.C,

‎cdc/cdc/puller/puller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/pingcap/check"
2424
"github.com/pingcap/errors"
25-
"github.com/pingcap/tidb/store/mockstore"
25+
"github.com/pingcap/tidb/pkg/store/mockstore"
2626
"github.com/tikv/client-go/v2/tikv"
2727
"github.com/tikv/migration/cdc/cdc/kv"
2828
"github.com/tikv/migration/cdc/cdc/model"

‎cdc/cdc/sorter/unified/backend_pool.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/pingcap/errors"
2828
"github.com/pingcap/failpoint"
2929
"github.com/pingcap/log"
30-
"github.com/pingcap/tidb/util/memory"
30+
"github.com/pingcap/tidb/pkg/util/memory"
3131
"github.com/tikv/migration/cdc/cdc/sorter"
3232
sorterencoding "github.com/tikv/migration/cdc/cdc/sorter/encoding"
3333
"github.com/tikv/migration/cdc/pkg/config"

‎cdc/cdc/sorter/unified/backend_pool_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/pingcap/check"
2525
"github.com/pingcap/failpoint"
26-
"github.com/pingcap/tidb/util/memory"
26+
"github.com/pingcap/tidb/pkg/util/memory"
2727
"github.com/tikv/migration/cdc/pkg/config"
2828
"github.com/tikv/migration/cdc/pkg/fsutil"
2929
"github.com/tikv/migration/cdc/pkg/util/testleak"

‎cdc/go.mod

+66-58
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ module github.com/tikv/migration/cdc
33
go 1.21
44

55
require (
6-
github.com/BurntSushi/toml v1.2.1
6+
github.com/BurntSushi/toml v1.3.2
77
github.com/Shopify/sarama v1.34.1
88
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
99
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
10-
github.com/benbjohnson/clock v1.3.0
10+
github.com/benbjohnson/clock v1.3.5
1111
github.com/bradleyjkemp/grpc-tools v0.2.7
1212
github.com/chzyer/readline v1.5.0
13-
github.com/cockroachdb/pebble v0.0.0-20211124172904-3ca75111760c
14-
github.com/coreos/go-semver v0.3.0
13+
github.com/cockroachdb/pebble v0.0.0-20220415182917-06c9d3be25b3
14+
github.com/coreos/go-semver v0.3.1
1515
github.com/edwingeng/deque v0.0.0-20191220032131-8596380dee17
1616
github.com/fatih/color v1.15.0
1717
github.com/gin-gonic/gin v1.9.1
1818
github.com/gogo/protobuf v1.3.2
1919
github.com/golang/protobuf v1.5.3
2020
github.com/google/btree v1.1.2
2121
github.com/google/go-cmp v0.5.9
22-
github.com/google/uuid v1.3.0
22+
github.com/google/uuid v1.3.1
2323
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
2424
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2525
github.com/integralist/go-findroot v0.0.0-20160518114804-ac90681525dc
@@ -28,73 +28,76 @@ require (
2828
github.com/pingcap/check v0.0.0-20211026125417-57bd13f7b5f0
2929
github.com/pingcap/errors v0.11.5-0.20221009092201-b66cddb77c32
3030
github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c
31-
github.com/pingcap/kvproto v0.0.0-20231011074246-fa00d2b03372
31+
github.com/pingcap/kvproto v0.0.0-20231122054644-fb0f5c2a0a10
3232
github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22
33-
github.com/pingcap/tidb v1.1.0-beta.0.20230428082552-991d99c1e0b9
33+
github.com/pingcap/tidb v1.1.0-beta.0.20231124053542-069631e2ecfe
3434
github.com/pingcap/tidb-tools v6.0.1-0.20220516050036-b3ea358e374a+incompatible
3535
github.com/pkg/errors v0.9.1
36-
github.com/prometheus/client_golang v1.15.1
36+
github.com/prometheus/client_golang v1.17.0
3737
github.com/r3labs/diff v1.1.0
3838
github.com/soheilhy/cmux v0.1.5
39-
github.com/spf13/cobra v1.6.1
39+
github.com/spf13/cobra v1.7.0
4040
github.com/spf13/pflag v1.0.5
41-
github.com/stretchr/testify v1.8.3
41+
github.com/stretchr/testify v1.8.4
4242
github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2
4343
github.com/swaggo/gin-swagger v1.4.3
4444
github.com/swaggo/swag v1.8.3
4545
github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954
46-
github.com/tikv/client-go/v2 v2.0.8-0.20231018094816-44449c0526f2
46+
github.com/tikv/client-go/v2 v2.0.8-0.20231116065855-46811b6ac353
4747
github.com/tikv/pd v1.1.0-beta.0.20220725055910-7187a7ab72db
48-
github.com/tikv/pd/client v0.0.0-20230419153320-f1d1a80feb95
48+
github.com/tikv/pd/client v0.0.0-20231116062916-ef6ba8551e52
4949
github.com/tinylib/msgp v1.1.6
5050
github.com/twmb/murmur3 v1.1.6
5151
github.com/xdg/scram v1.0.5
52-
go.etcd.io/etcd/api/v3 v3.5.4
53-
go.etcd.io/etcd/client/pkg/v3 v3.5.4
54-
go.etcd.io/etcd/client/v3 v3.5.4
55-
go.etcd.io/etcd/server/v3 v3.5.4
52+
go.etcd.io/etcd/api/v3 v3.5.10
53+
go.etcd.io/etcd/client/pkg/v3 v3.5.10
54+
go.etcd.io/etcd/client/v3 v3.5.10
55+
go.etcd.io/etcd/server/v3 v3.5.10
5656
go.uber.org/atomic v1.11.0
5757
go.uber.org/goleak v1.2.1
58-
go.uber.org/zap v1.24.0
59-
golang.org/x/exp v0.0.0-20221023144134-a1e5550cf13e
58+
go.uber.org/zap v1.26.0
59+
golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4
6060
golang.org/x/net v0.17.0
61-
golang.org/x/sync v0.2.0
61+
golang.org/x/sync v0.3.0
6262
golang.org/x/time v0.3.0
63-
google.golang.org/grpc v1.54.0
63+
google.golang.org/grpc v1.59.0
6464
)
6565

6666
require (
67+
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
6768
github.com/DataDog/zstd v1.4.6-0.20210211175136-c6db21d202f4 // indirect
6869
github.com/KyleBanks/depth v1.2.1 // indirect
69-
github.com/aws/aws-sdk-go v1.44.239 // indirect
7070
github.com/beorn7/perks v1.0.1 // indirect
7171
github.com/bytedance/sonic v1.9.1 // indirect
7272
github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 // indirect
73+
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
7374
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7475
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
76+
github.com/cloudfoundry/gosigar v1.3.6 // indirect
7577
github.com/cockroachdb/errors v1.8.1 // indirect
7678
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
7779
github.com/cockroachdb/redact v1.0.8 // indirect
7880
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
7981
github.com/coocood/bbloom v0.0.0-20190830030839-58deb6228d64 // indirect
8082
github.com/coocood/freecache v1.2.1 // indirect
8183
github.com/coocood/rtutil v0.0.0-20190304133409-c84515f646f2 // indirect
82-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
84+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
8385
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
8486
github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 // indirect
8587
github.com/davecgh/go-spew v1.1.1 // indirect
8688
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
8789
github.com/dgraph-io/ristretto v0.1.1 // indirect
8890
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
91+
github.com/dolthub/maphash v0.1.0 // indirect
92+
github.com/dolthub/swiss v0.2.1 // indirect
8993
github.com/dustin/go-humanize v1.0.0 // indirect
9094
github.com/eapache/go-resiliency v1.2.0 // indirect
9195
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
9296
github.com/eapache/queue v1.1.0 // indirect
93-
github.com/elastic/gosigar v0.14.2 // indirect
94-
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
95-
github.com/fsnotify/fsnotify v1.5.4 // indirect
9697
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
9798
github.com/gin-contrib/sse v0.1.0 // indirect
99+
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
100+
github.com/go-ldap/ldap/v3 v3.4.4 // indirect
98101
github.com/go-ole/go-ole v1.2.6 // indirect
99102
github.com/go-openapi/jsonpointer v0.19.5 // indirect
100103
github.com/go-openapi/jsonreference v0.20.0 // indirect
@@ -104,7 +107,8 @@ require (
104107
github.com/go-playground/universal-translator v0.18.1 // indirect
105108
github.com/go-playground/validator/v10 v10.14.0 // indirect
106109
github.com/goccy/go-json v0.10.2 // indirect
107-
github.com/golang/glog v1.0.0 // indirect
110+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
111+
github.com/golang/glog v1.1.2 // indirect
108112
github.com/golang/snappy v0.0.4 // indirect
109113
github.com/google/pprof v0.0.0-20220520215854-d04f2422c8a1 // indirect
110114
github.com/gorilla/mux v1.8.0 // indirect
@@ -114,16 +118,18 @@ require (
114118
github.com/hashicorp/go-multierror v1.1.1 // indirect
115119
github.com/hashicorp/go-uuid v1.0.2 // indirect
116120
github.com/improbable-eng/grpc-web v0.13.0 // indirect
117-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
121+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
122+
github.com/influxdata/tdigest v0.0.1 // indirect
118123
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
119124
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
120125
github.com/jcmturner/gofork v1.0.0 // indirect
121126
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
122127
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
128+
github.com/jellydator/ttlcache/v3 v3.0.1 // indirect
123129
github.com/jonboulle/clockwork v0.3.0 // indirect
124130
github.com/josharian/intern v1.0.0 // indirect
125131
github.com/json-iterator/go v1.1.12 // indirect
126-
github.com/klauspost/compress v1.15.13 // indirect
132+
github.com/klauspost/compress v1.17.1 // indirect
127133
github.com/klauspost/cpuid v1.3.1 // indirect
128134
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
129135
github.com/kr/pretty v0.3.1 // indirect
@@ -148,21 +154,21 @@ require (
148154
github.com/pingcap/badger v1.5.1-0.20230103063557-828f39b09b6d // indirect
149155
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 // indirect
150156
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 // indirect
151-
github.com/pingcap/tidb/parser v0.0.0-20230321033041-8ba2035203f7 // indirect
152-
github.com/pingcap/tipb v0.0.0-20230427024529-aed92caf20b9 // indirect
157+
github.com/pingcap/tidb/pkg/parser v0.0.0-20231124053542-069631e2ecfe // indirect
158+
github.com/pingcap/tipb v0.0.0-20230919054518-dfd7d194838f // indirect
153159
github.com/pmezard/go-difflib v1.0.0 // indirect
154160
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
155-
github.com/prometheus/client_model v0.3.0 // indirect
156-
github.com/prometheus/common v0.42.0 // indirect
157-
github.com/prometheus/procfs v0.9.0 // indirect
161+
github.com/prometheus/client_model v0.5.0 // indirect
162+
github.com/prometheus/common v0.44.0 // indirect
163+
github.com/prometheus/procfs v0.11.1 // indirect
158164
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
159-
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
160-
github.com/rogpeppe/go-internal v1.9.0 // indirect
165+
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
166+
github.com/rogpeppe/go-internal v1.11.0 // indirect
161167
github.com/rs/cors v1.7.0 // indirect
162168
github.com/sasha-s/go-deadlock v0.2.0 // indirect
163-
github.com/shirou/gopsutil/v3 v3.23.3 // indirect
164-
github.com/shoenig/go-m1cpu v0.1.5 // indirect
165-
github.com/sirupsen/logrus v1.9.0 // indirect
169+
github.com/shirou/gopsutil/v3 v3.23.5 // indirect
170+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
171+
github.com/sirupsen/logrus v1.9.3 // indirect
166172
github.com/stretchr/objx v0.5.0 // indirect
167173
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
168174
github.com/tklauser/go-sysconf v0.3.11 // indirect
@@ -174,29 +180,28 @@ require (
174180
github.com/ugorji/go/codec v1.2.11 // indirect
175181
github.com/xdg/stringprep v1.0.3 // indirect
176182
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
177-
github.com/yusufpapurcu/wmi v1.2.2 // indirect
178-
go.etcd.io/bbolt v1.3.6 // indirect
179-
go.etcd.io/etcd/client/v2 v2.305.4 // indirect
180-
go.etcd.io/etcd/pkg/v3 v3.5.4 // indirect
181-
go.etcd.io/etcd/raft/v3 v3.5.4 // indirect
182-
go.opentelemetry.io/contrib v0.20.0 // indirect
183-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
184-
go.opentelemetry.io/otel v0.20.0 // indirect
185-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
186-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
187-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
188-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
189-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
190-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
191-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
183+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
184+
go.etcd.io/bbolt v1.3.8 // indirect
185+
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
186+
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
187+
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
188+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
189+
go.opentelemetry.io/otel v1.0.1 // indirect
190+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
191+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 // indirect
192+
go.opentelemetry.io/otel/sdk v1.0.1 // indirect
193+
go.opentelemetry.io/otel/trace v1.0.1 // indirect
194+
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
192195
go.uber.org/multierr v1.11.0 // indirect
193196
golang.org/x/arch v0.3.0 // indirect
194197
golang.org/x/crypto v0.14.0 // indirect
195198
golang.org/x/sys v0.13.0 // indirect
196199
golang.org/x/text v0.13.0 // indirect
197-
golang.org/x/tools v0.9.1 // indirect
198-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
199-
google.golang.org/protobuf v1.30.0 // indirect
200+
golang.org/x/tools v0.10.0 // indirect
201+
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
202+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
203+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
204+
google.golang.org/protobuf v1.31.0 // indirect
200205
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
201206
gopkg.in/yaml.v2 v2.4.0 // indirect
202207
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -205,7 +210,10 @@ require (
205210

206211
replace (
207212
github.com/benbjohnson/clock v1.3.0 => github.com/benbjohnson/clock v1.1.0
208-
github.com/dgrijalva/jwt-go v3.2.0+incompatible => github.com/golang-jwt/jwt v3.2.1+incompatible
209-
github.com/golang-jwt/jwt v3.2.1+incompatible => github.com/golang-jwt/jwt v3.2.0+incompatible
213+
214+
// Required by github.com/pingcap/tidb, see https://github.com/pingcap/tidb/blob/release-7.5/go.mod.
215+
github.com/dgrijalva/jwt-go => github.com/form3tech-oss/jwt-go v3.2.6-0.20210809144907-32ab6a8243d7+incompatible
216+
github.com/go-ldap/ldap/v3 => github.com/YangKeao/ldap/v3 v3.4.5-0.20230421065457-369a3bab1117
217+
210218
github.com/uber-go/atomic => go.uber.org/atomic v1.4.0
211219
)

0 commit comments

Comments
 (0)