Skip to content

Commit 599b19c

Browse files
tenfyzhongtenfyzhong
committed
chore(deps): Update TiDB and other dependencies
- Update `github.com/pingcap/tidb` to the latest version to incorporate recent fixes and features. - Adapt to `tidb` API changes, including: - Moving `infosync` package to `serverinfo`. - Relocating `ddl.JobTableID` and `ddl.HistoryTableID` to `metadef`. - Shifting `session.SetSchemaLease` to `vardef.SetSchemaLease`. - Update various other Go module dependencies to their latest compatible versions. Signed-off-by: tenfyzhong <[email protected]>
1 parent beb93bc commit 599b19c

File tree

8 files changed

+125
-48
lines changed

8 files changed

+125
-48
lines changed

‎api/middleware/authenticate_middleware.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ import (
3232
"github.com/pingcap/ticdc/pkg/sink/mysql"
3333
"github.com/pingcap/ticdc/pkg/util"
3434
"github.com/pingcap/tidb-dashboard/util/distro"
35-
"github.com/pingcap/tidb/pkg/domain/infosync"
35+
"github.com/pingcap/tidb/pkg/domain/serverinfo"
3636
clientv3 "go.etcd.io/etcd/client/v3"
3737
"go.uber.org/zap"
3838
)
3939

4040
const (
4141
// Refer to https://github.com/pingcap/tidb/blob/release-7.5/pkg/domain/infosync/info.go#L78-L79.
42-
topologyTiDB = infosync.TopologyInformationPath
43-
topologyTiDBTTL = infosync.TopologySessionTTL
42+
topologyTiDB = serverinfo.TopologyInformationPath
43+
topologyTiDBTTL = serverinfo.TopologySessionTTL
4444
// defaultTimeout is the default timeout for etcd and mysql operations.
4545
defaultTimeout = time.Second * 2
4646
)

‎go.mod

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -47,48 +47,48 @@ require (
4747
github.com/mailru/easyjson v0.7.7
4848
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
4949
github.com/pierrec/lz4/v4 v4.1.18
50-
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f
50+
github.com/pingcap/errors v0.11.5-0.20250523034308-74f78ae071ee
5151
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
52-
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d
53-
github.com/pingcap/log v1.1.1-0.20241212030209-7e3ff8601a2a
54-
github.com/pingcap/tidb v1.1.0-beta.0.20250415053443-ea52376d91c8
52+
github.com/pingcap/kvproto v0.0.0-20250728031536-f08901d17bf4
53+
github.com/pingcap/log v1.1.1-0.20250514022801-14f3b4ca066e
54+
github.com/pingcap/tidb v1.1.0-beta.0.20250901173104-9695b09e847c
5555
github.com/pingcap/tidb-dashboard v0.0.0-20240326110213-9768844ff5d7
56-
github.com/pingcap/tidb/pkg/parser v0.0.0-20250415053443-ea52376d91c8
57-
github.com/pingcap/tiflow v0.0.0-20250707050724-ac2fcf466cf3
56+
github.com/pingcap/tidb/pkg/parser v0.0.0-20250901065358-9bcae5eff736
57+
github.com/pingcap/tiflow v0.0.0-20250826025010-33ea0edd95ce
5858
github.com/prometheus/client_golang v1.22.0
5959
github.com/r3labs/diff v1.1.0
6060
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
6161
github.com/robfig/cron v1.2.0
6262
github.com/shirou/gopsutil/v3 v3.24.5
6363
github.com/soheilhy/cmux v0.1.5
6464
github.com/spf13/cobra v1.9.1
65-
github.com/spf13/pflag v1.0.6
65+
github.com/spf13/pflag v1.0.7
6666
github.com/stretchr/testify v1.10.0
6767
github.com/thanhpk/randstr v1.0.6
68-
github.com/tikv/client-go/v2 v2.0.8-0.20250327030528-1906b778d741
68+
github.com/tikv/client-go/v2 v2.0.8-0.20250828075934-b794d681774f
6969
github.com/tikv/pd v1.1.0-beta.0.20240407022249-7179657d129b
70-
github.com/tikv/pd/client v0.0.0-20250327162546-07c19b1f2f9f
70+
github.com/tikv/pd/client v0.0.0-20250901035025-22b7ce6d4993
7171
github.com/tinylib/msgp v1.1.6
7272
github.com/uber-go/atomic v1.4.0
7373
github.com/xdg/scram v1.0.5
7474
github.com/zeebo/assert v1.3.0
75-
go.etcd.io/etcd/api/v3 v3.5.12
76-
go.etcd.io/etcd/client/pkg/v3 v3.5.12
77-
go.etcd.io/etcd/client/v3 v3.5.12
78-
go.etcd.io/etcd/pkg/v3 v3.5.12
79-
go.etcd.io/etcd/server/v3 v3.5.12
75+
go.etcd.io/etcd/api/v3 v3.5.15
76+
go.etcd.io/etcd/client/pkg/v3 v3.5.15
77+
go.etcd.io/etcd/client/v3 v3.5.15
78+
go.etcd.io/etcd/pkg/v3 v3.5.15
79+
go.etcd.io/etcd/server/v3 v3.5.15
8080
go.uber.org/atomic v1.11.0
8181
go.uber.org/goleak v1.3.0
82-
go.uber.org/mock v0.5.1
82+
go.uber.org/mock v0.5.2
8383
go.uber.org/multierr v1.11.0
8484
go.uber.org/zap v1.27.0
85-
golang.org/x/net v0.39.0
86-
golang.org/x/oauth2 v0.29.0
87-
golang.org/x/sync v0.13.0
88-
golang.org/x/sys v0.32.0
89-
golang.org/x/term v0.31.0
90-
golang.org/x/text v0.24.0
91-
golang.org/x/time v0.11.0
85+
golang.org/x/net v0.42.0
86+
golang.org/x/oauth2 v0.30.0
87+
golang.org/x/sync v0.16.0
88+
golang.org/x/sys v0.34.0
89+
golang.org/x/term v0.33.0
90+
golang.org/x/text v0.27.0
91+
golang.org/x/time v0.12.0
9292
google.golang.org/grpc v1.65.0
9393
google.golang.org/protobuf v1.36.6
9494
)
@@ -228,7 +228,7 @@ require (
228228
github.com/josharian/intern v1.0.0 // indirect
229229
github.com/klauspost/asmfmt v1.3.2 // indirect
230230
github.com/klauspost/cpuid v1.3.1 // indirect
231-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
231+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
232232
github.com/kr/pretty v0.3.1 // indirect
233233
github.com/kr/text v0.2.0 // indirect
234234
github.com/ks3sdklib/aws-sdk-go v1.2.9 // indirect
@@ -259,22 +259,22 @@ require (
259259
github.com/opentracing/opentracing-go v1.2.0 // indirect
260260
github.com/otiai10/copy v1.14.0 // indirect
261261
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
262-
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
262+
github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe // indirect
263263
github.com/philhofer/fwd v1.1.1 // indirect
264264
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
265265
github.com/pingcap/badger v1.5.1-0.20241015064302-38533b6cbf8d // indirect
266266
github.com/pingcap/check v0.0.0-20211026125417-57bd13f7b5f0 // indirect
267267
github.com/pingcap/fn v1.0.0 // indirect
268268
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 // indirect
269269
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5 // indirect
270-
github.com/pingcap/tipb v0.0.0-20250331100511-d2c561dad347 // indirect
270+
github.com/pingcap/tipb v0.0.0-20250605054300-07d1c2a671ee // indirect
271271
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
272272
github.com/pkg/errors v0.9.1 // indirect
273273
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
274274
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
275275
github.com/prometheus/client_model v0.6.2 // indirect
276276
github.com/prometheus/common v0.63.0 // indirect
277-
github.com/prometheus/procfs v0.16.0 // indirect
277+
github.com/prometheus/procfs v0.16.1 // indirect
278278
github.com/qri-io/jsonpointer v0.1.1 // indirect
279279
github.com/qri-io/jsonschema v0.2.1 // indirect
280280
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
@@ -326,9 +326,9 @@ require (
326326
github.com/yusufpapurcu/wmi v1.2.4 // indirect
327327
github.com/zeebo/xxh3 v1.0.2 // indirect
328328
github.com/zyedidia/generic v1.2.1 // indirect
329-
go.etcd.io/bbolt v1.3.9 // indirect
330-
go.etcd.io/etcd/client/v2 v2.305.12 // indirect
331-
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
329+
go.etcd.io/bbolt v1.3.10 // indirect
330+
go.etcd.io/etcd/client/v2 v2.305.15 // indirect
331+
go.etcd.io/etcd/raft/v3 v3.5.15 // indirect
332332
go.opencensus.io v0.24.0 // indirect
333333
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
334334
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
@@ -340,10 +340,10 @@ require (
340340
go.opentelemetry.io/otel/trace v1.24.0 // indirect
341341
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
342342
golang.org/x/arch v0.3.0 // indirect
343-
golang.org/x/crypto v0.37.0 // indirect
343+
golang.org/x/crypto v0.40.0 // indirect
344344
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
345-
golang.org/x/mod v0.24.0 // indirect
346-
golang.org/x/tools v0.32.0 // indirect
345+
golang.org/x/mod v0.26.0 // indirect
346+
golang.org/x/tools v0.35.0 // indirect
347347
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
348348
google.golang.org/api v0.170.0 // indirect
349349
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
@@ -353,7 +353,7 @@ require (
353353
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
354354
gopkg.in/yaml.v2 v2.4.0 // indirect
355355
gopkg.in/yaml.v3 v3.0.1 // indirect
356-
gorm.io/gorm v1.25.11 // indirect
356+
gorm.io/gorm v1.25.12 // indirect
357357
k8s.io/api v0.29.11 // indirect
358358
k8s.io/apimachinery v0.29.11 // indirect
359359
k8s.io/klog/v2 v2.120.1 // indirect
@@ -369,3 +369,6 @@ require (
369369
replace github.com/go-ldap/ldap/v3 v3.4.4 => github.com/yangkeao/ldap/v3 v3.4.5-0.20230421065457-369a3bab1117
370370

371371
replace github.com/IBM/sarama v1.41.2 => github.com/pingcap/sarama v1.41.2-pingcap-20250416
372+
373+
// TODO tenfyzhong 2025-09-02 10:28:03 remove this replace before merge to master
374+
replace github.com/pingcap/tiflow => github.com/tenfyzhong/tiflow v0.0.0-20250902015837-94c9f6372559

0 commit comments

Comments
 (0)