Skip to content

Commit eaf4bc8

Browse files
lcwangchaolcwangchao
committed
This is an automated cherry-pick of tikv#2025
ref tidbcloud/cloud-storage-engine#5480 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
1 parent 4f117a4 commit eaf4bc8

16 files changed

Lines changed: 962 additions & 49 deletions

File tree

‎examples/gcworker/go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module gcworker
22

3-
go 1.25.8
3+
go 1.25.10
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

@@ -22,7 +22,11 @@ require (
2222
github.com/opentracing/opentracing-go v1.2.0 // indirect
2323
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2424
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
25+
<<<<<<< HEAD
2526
github.com/pingcap/kvproto v0.0.0-20260408021215-335c5c64af53 // indirect
27+
=======
28+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 // indirect
29+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
2630
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2731
github.com/pkg/errors v0.9.1 // indirect
2832
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -31,7 +35,11 @@ require (
3135
github.com/prometheus/procfs v0.15.1 // indirect
3236
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
3337
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
38+
<<<<<<< HEAD
3439
github.com/tikv/pd/client v0.0.0-20260401072359-048f0d8f6f71 // indirect
40+
=======
41+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 // indirect
42+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
3543
github.com/twmb/murmur3 v1.1.3 // indirect
3644
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3745
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -43,10 +51,10 @@ require (
4351
golang.org/x/sync v0.19.0 // indirect
4452
golang.org/x/sys v0.41.0 // indirect
4553
golang.org/x/text v0.34.0 // indirect
46-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
48-
google.golang.org/grpc v1.75.1 // indirect
49-
google.golang.org/protobuf v1.36.6 // indirect
54+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
56+
google.golang.org/grpc v1.79.3 // indirect
57+
google.golang.org/protobuf v1.36.10 // indirect
5058
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5159
modernc.org/mathutil v1.7.1 // indirect
5260
)

‎examples/rawkv/go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module rawkv
22

3-
go 1.25.8
3+
go 1.25.10
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

@@ -22,7 +22,11 @@ require (
2222
github.com/opentracing/opentracing-go v1.2.0 // indirect
2323
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2424
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
25+
<<<<<<< HEAD
2526
github.com/pingcap/kvproto v0.0.0-20260408021215-335c5c64af53 // indirect
27+
=======
28+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 // indirect
29+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
2630
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2731
github.com/pkg/errors v0.9.1 // indirect
2832
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -31,7 +35,11 @@ require (
3135
github.com/prometheus/procfs v0.15.1 // indirect
3236
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
3337
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
38+
<<<<<<< HEAD
3439
github.com/tikv/pd/client v0.0.0-20260401072359-048f0d8f6f71 // indirect
40+
=======
41+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 // indirect
42+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
3543
github.com/twmb/murmur3 v1.1.3 // indirect
3644
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3745
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -43,10 +51,10 @@ require (
4351
golang.org/x/sync v0.19.0 // indirect
4452
golang.org/x/sys v0.41.0 // indirect
4553
golang.org/x/text v0.34.0 // indirect
46-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
48-
google.golang.org/grpc v1.75.1 // indirect
49-
google.golang.org/protobuf v1.36.6 // indirect
54+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
56+
google.golang.org/grpc v1.79.3 // indirect
57+
google.golang.org/protobuf v1.36.10 // indirect
5058
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5159
modernc.org/mathutil v1.7.1 // indirect
5260
)

‎examples/txnkv/1pc_txn/go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module 1pc_txn
22

3-
go 1.25.8
3+
go 1.25.10
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

@@ -22,7 +22,11 @@ require (
2222
github.com/opentracing/opentracing-go v1.2.0 // indirect
2323
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2424
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
25+
<<<<<<< HEAD
2526
github.com/pingcap/kvproto v0.0.0-20260408021215-335c5c64af53 // indirect
27+
=======
28+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 // indirect
29+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
2630
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2731
github.com/pkg/errors v0.9.1 // indirect
2832
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -31,7 +35,11 @@ require (
3135
github.com/prometheus/procfs v0.15.1 // indirect
3236
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
3337
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
38+
<<<<<<< HEAD
3439
github.com/tikv/pd/client v0.0.0-20260401072359-048f0d8f6f71 // indirect
40+
=======
41+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 // indirect
42+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
3543
github.com/twmb/murmur3 v1.1.3 // indirect
3644
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3745
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -43,10 +51,10 @@ require (
4351
golang.org/x/sync v0.19.0 // indirect
4452
golang.org/x/sys v0.41.0 // indirect
4553
golang.org/x/text v0.34.0 // indirect
46-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
48-
google.golang.org/grpc v1.75.1 // indirect
49-
google.golang.org/protobuf v1.36.6 // indirect
54+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
56+
google.golang.org/grpc v1.79.3 // indirect
57+
google.golang.org/protobuf v1.36.10 // indirect
5058
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5159
modernc.org/mathutil v1.7.1 // indirect
5260
)

‎examples/txnkv/async_commit/go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module async_commit
22

3-
go 1.25.8
3+
go 1.25.10
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

@@ -22,7 +22,11 @@ require (
2222
github.com/opentracing/opentracing-go v1.2.0 // indirect
2323
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2424
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
25+
<<<<<<< HEAD
2526
github.com/pingcap/kvproto v0.0.0-20260408021215-335c5c64af53 // indirect
27+
=======
28+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 // indirect
29+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
2630
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2731
github.com/pkg/errors v0.9.1 // indirect
2832
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -31,7 +35,11 @@ require (
3135
github.com/prometheus/procfs v0.15.1 // indirect
3236
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
3337
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
38+
<<<<<<< HEAD
3439
github.com/tikv/pd/client v0.0.0-20260401072359-048f0d8f6f71 // indirect
40+
=======
41+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 // indirect
42+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
3543
github.com/twmb/murmur3 v1.1.3 // indirect
3644
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3745
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -43,10 +51,10 @@ require (
4351
golang.org/x/sync v0.19.0 // indirect
4452
golang.org/x/sys v0.41.0 // indirect
4553
golang.org/x/text v0.34.0 // indirect
46-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
48-
google.golang.org/grpc v1.75.1 // indirect
49-
google.golang.org/protobuf v1.36.6 // indirect
54+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
56+
google.golang.org/grpc v1.79.3 // indirect
57+
google.golang.org/protobuf v1.36.10 // indirect
5058
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5159
modernc.org/mathutil v1.7.1 // indirect
5260
)

‎examples/txnkv/delete_range/go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module delete_range
22

3-
go 1.25.8
3+
go 1.25.10
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

@@ -22,7 +22,11 @@ require (
2222
github.com/opentracing/opentracing-go v1.2.0 // indirect
2323
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2424
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
25+
<<<<<<< HEAD
2526
github.com/pingcap/kvproto v0.0.0-20260408021215-335c5c64af53 // indirect
27+
=======
28+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 // indirect
29+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
2630
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2731
github.com/pkg/errors v0.9.1 // indirect
2832
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -31,7 +35,11 @@ require (
3135
github.com/prometheus/procfs v0.15.1 // indirect
3236
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
3337
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
38+
<<<<<<< HEAD
3439
github.com/tikv/pd/client v0.0.0-20260401072359-048f0d8f6f71 // indirect
40+
=======
41+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 // indirect
42+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
3543
github.com/twmb/murmur3 v1.1.3 // indirect
3644
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3745
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -43,10 +51,10 @@ require (
4351
golang.org/x/sync v0.19.0 // indirect
4452
golang.org/x/sys v0.41.0 // indirect
4553
golang.org/x/text v0.34.0 // indirect
46-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
48-
google.golang.org/grpc v1.75.1 // indirect
49-
google.golang.org/protobuf v1.36.6 // indirect
54+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
56+
google.golang.org/grpc v1.79.3 // indirect
57+
google.golang.org/protobuf v1.36.10 // indirect
5058
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5159
modernc.org/mathutil v1.7.1 // indirect
5260
)

‎examples/txnkv/go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
module txnkv
22

3-
go 1.25.8
3+
go 1.25.10
44

55
require (
6+
<<<<<<< HEAD
67
github.com/pingcap/kvproto v0.0.0-20260408021215-335c5c64af53
8+
=======
9+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368
10+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
711
github.com/tikv/client-go/v2 v2.0.0
812
)
913

@@ -33,7 +37,11 @@ require (
3337
github.com/prometheus/procfs v0.15.1 // indirect
3438
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
3539
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
40+
<<<<<<< HEAD
3641
github.com/tikv/pd/client v0.0.0-20260401072359-048f0d8f6f71 // indirect
42+
=======
43+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 // indirect
44+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
3745
github.com/twmb/murmur3 v1.1.3 // indirect
3846
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3947
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -45,10 +53,10 @@ require (
4553
golang.org/x/sync v0.19.0 // indirect
4654
golang.org/x/sys v0.41.0 // indirect
4755
golang.org/x/text v0.34.0 // indirect
48-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
49-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
50-
google.golang.org/grpc v1.75.1 // indirect
51-
google.golang.org/protobuf v1.36.6 // indirect
56+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
57+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
58+
google.golang.org/grpc v1.79.3 // indirect
59+
google.golang.org/protobuf v1.36.10 // indirect
5260
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5361
modernc.org/mathutil v1.7.1 // indirect
5462
)

‎examples/txnkv/pessimistic_txn/go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module pessimistic_txn
22

3-
go 1.25.8
3+
go 1.25.10
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

@@ -22,7 +22,11 @@ require (
2222
github.com/opentracing/opentracing-go v1.2.0 // indirect
2323
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2424
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
25+
<<<<<<< HEAD
2526
github.com/pingcap/kvproto v0.0.0-20260408021215-335c5c64af53 // indirect
27+
=======
28+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 // indirect
29+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
2630
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2731
github.com/pkg/errors v0.9.1 // indirect
2832
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -31,7 +35,11 @@ require (
3135
github.com/prometheus/procfs v0.15.1 // indirect
3236
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
3337
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
38+
<<<<<<< HEAD
3439
github.com/tikv/pd/client v0.0.0-20260401072359-048f0d8f6f71 // indirect
40+
=======
41+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 // indirect
42+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
3543
github.com/twmb/murmur3 v1.1.3 // indirect
3644
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3745
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -43,10 +51,10 @@ require (
4351
golang.org/x/sync v0.19.0 // indirect
4452
golang.org/x/sys v0.41.0 // indirect
4553
golang.org/x/text v0.34.0 // indirect
46-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
48-
google.golang.org/grpc v1.75.1 // indirect
49-
google.golang.org/protobuf v1.36.6 // indirect
54+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
56+
google.golang.org/grpc v1.79.3 // indirect
57+
google.golang.org/protobuf v1.36.10 // indirect
5058
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5159
modernc.org/mathutil v1.7.1 // indirect
5260
)

‎examples/txnkv/unsafedestoryrange/go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module unsafedestoryrange
22

3-
go 1.25.8
3+
go 1.25.10
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

@@ -22,7 +22,11 @@ require (
2222
github.com/opentracing/opentracing-go v1.2.0 // indirect
2323
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2424
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
25+
<<<<<<< HEAD
2526
github.com/pingcap/kvproto v0.0.0-20260408021215-335c5c64af53 // indirect
27+
=======
28+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 // indirect
29+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
2630
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2731
github.com/pkg/errors v0.9.1 // indirect
2832
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -31,7 +35,11 @@ require (
3135
github.com/prometheus/procfs v0.15.1 // indirect
3236
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
3337
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
38+
<<<<<<< HEAD
3439
github.com/tikv/pd/client v0.0.0-20260401072359-048f0d8f6f71 // indirect
40+
=======
41+
github.com/tikv/pd/client v0.0.0-20260708075407-4e05b9d2c2d3 // indirect
42+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
3543
github.com/twmb/murmur3 v1.1.3 // indirect
3644
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3745
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -43,10 +51,10 @@ require (
4351
golang.org/x/sync v0.19.0 // indirect
4452
golang.org/x/sys v0.41.0 // indirect
4553
golang.org/x/text v0.34.0 // indirect
46-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
47-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
48-
google.golang.org/grpc v1.75.1 // indirect
49-
google.golang.org/protobuf v1.36.6 // indirect
54+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
55+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
56+
google.golang.org/grpc v1.79.3 // indirect
57+
google.golang.org/protobuf v1.36.10 // indirect
5058
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5159
modernc.org/mathutil v1.7.1 // indirect
5260
)

‎go.mod‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ require (
1515
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122
1616
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
1717
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989
18+
<<<<<<< HEAD
1819
github.com/pingcap/kvproto v0.0.0-20260703015547-e800f9e5a427
20+
=======
21+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368
22+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
1923
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
2024
github.com/pkg/errors v0.9.1
2125
github.com/prometheus/client_golang v1.20.5

‎go.sum‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,13 @@ github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 h1:tdMsjOqUR7YXH
8383
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86/go.mod h1:exzhVYca3WRtd6gclGNErRWb1qEgff3LYta0LvRmON4=
8484
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
8585
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
86+
<<<<<<< HEAD
8687
github.com/pingcap/kvproto v0.0.0-20260703015547-e800f9e5a427 h1:fnagXtVQTLmi2sLH7QgvH1vHlFohDeQtRASxzXVk2ss=
8788
github.com/pingcap/kvproto v0.0.0-20260703015547-e800f9e5a427/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
89+
=======
90+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368 h1:qW0gHsqY3X3qmyiEfESqpYSF3Vu7agUiAyBnPWQXtm8=
91+
github.com/pingcap/kvproto v0.0.0-20260721064811-683dad8fa368/go.mod h1:z6+aAHB7dBkA+LyinEX+48/ImRJ3jag0Hg0c7wkhEvE=
92+
>>>>>>> 61ecd7c1 (txnkv: add readPoolTaskDetails to SnapshotRuntimeStats (#2025))
8893
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8IDP+SZrdhV1Kibl9KrHxJ9eciw=
8994
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
9095
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

0 commit comments

Comments
 (0)