Skip to content

Commit 0204e41

Browse files
xzhangxian1008xzhangxian1008
committed
merge master
2 parents 5d90000 + 1a0daf3 commit 0204e41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1907
-920
lines changed

‎config/config.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@ func DefaultPDClient() PDClient {
124124
}
125125
}
126126

127+
// Valid returns true if the configuration is valid.
128+
func (p *PDClient) Valid() error {
129+
if p.PDServerTimeout == 0 {
130+
return fmt.Errorf("pd-server-timeout can not be 0")
131+
}
132+
return nil
133+
}
134+
127135
// TxnLocalLatches is the TxnLocalLatches section of the config.
128136
type TxnLocalLatches struct {
129137
Enabled bool `toml:"-" json:"-"`

‎examples/gcworker/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
2424
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
26-
github.com/pingcap/kvproto v0.0.0-20250605100108-dc99a8f6e348 // indirect
26+
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3 // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
2929
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/prometheus/procfs v0.15.1 // indirect
3333
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
3434
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
35-
github.com/tikv/pd/client v0.0.0-20250528071146-6cd8a77df2fa // indirect
35+
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 // indirect
3636
github.com/twmb/murmur3 v1.1.3 // indirect
3737
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3838
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

‎examples/rawkv/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
2424
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
26-
github.com/pingcap/kvproto v0.0.0-20250605100108-dc99a8f6e348 // indirect
26+
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3 // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
2929
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/prometheus/procfs v0.15.1 // indirect
3333
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
3434
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
35-
github.com/tikv/pd/client v0.0.0-20250528071146-6cd8a77df2fa // indirect
35+
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 // indirect
3636
github.com/twmb/murmur3 v1.1.3 // indirect
3737
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3838
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
2424
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
26-
github.com/pingcap/kvproto v0.0.0-20250605100108-dc99a8f6e348 // indirect
26+
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3 // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
2929
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/prometheus/procfs v0.15.1 // indirect
3333
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
3434
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
35-
github.com/tikv/pd/client v0.0.0-20250528071146-6cd8a77df2fa // indirect
35+
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 // indirect
3636
github.com/twmb/murmur3 v1.1.3 // indirect
3737
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3838
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

‎examples/txnkv/async_commit/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
2424
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
26-
github.com/pingcap/kvproto v0.0.0-20250605100108-dc99a8f6e348 // indirect
26+
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3 // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
2929
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/prometheus/procfs v0.15.1 // indirect
3333
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
3434
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
35-
github.com/tikv/pd/client v0.0.0-20250528071146-6cd8a77df2fa // indirect
35+
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 // indirect
3636
github.com/twmb/murmur3 v1.1.3 // indirect
3737
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3838
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

‎examples/txnkv/delete_range/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
2424
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
26-
github.com/pingcap/kvproto v0.0.0-20250605100108-dc99a8f6e348 // indirect
26+
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3 // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
2929
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/prometheus/procfs v0.15.1 // indirect
3333
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
3434
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
35-
github.com/tikv/pd/client v0.0.0-20250528071146-6cd8a77df2fa // indirect
35+
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 // indirect
3636
github.com/twmb/murmur3 v1.1.3 // indirect
3737
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3838
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

‎examples/txnkv/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
2424
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
26-
github.com/pingcap/kvproto v0.0.0-20250605100108-dc99a8f6e348 // indirect
26+
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3 // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
2929
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/prometheus/procfs v0.15.1 // indirect
3333
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
3434
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
35-
github.com/tikv/pd/client v0.0.0-20250528071146-6cd8a77df2fa // indirect
35+
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 // indirect
3636
github.com/twmb/murmur3 v1.1.3 // indirect
3737
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3838
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

‎examples/txnkv/pessimistic_txn/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
2424
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
26-
github.com/pingcap/kvproto v0.0.0-20250605100108-dc99a8f6e348 // indirect
26+
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3 // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
2929
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/prometheus/procfs v0.15.1 // indirect
3333
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
3434
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
35-
github.com/tikv/pd/client v0.0.0-20250528071146-6cd8a77df2fa // indirect
35+
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 // indirect
3636
github.com/twmb/murmur3 v1.1.3 // indirect
3737
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3838
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

‎examples/txnkv/unsafedestoryrange/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
2424
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
26-
github.com/pingcap/kvproto v0.0.0-20250605100108-dc99a8f6e348 // indirect
26+
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3 // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
2929
github.com/prometheus/client_golang v1.20.5 // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/prometheus/procfs v0.15.1 // indirect
3333
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
3434
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
35-
github.com/tikv/pd/client v0.0.0-20250528071146-6cd8a77df2fa // indirect
35+
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 // indirect
3636
github.com/twmb/murmur3 v1.1.3 // indirect
3737
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
3838
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122
1717
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
1818
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989
19-
github.com/pingcap/kvproto v0.0.0-20250616075548-d951fb623bb3
19+
github.com/pingcap/kvproto v0.0.0-20250728031536-f08901d17bf4
2020
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
2121
github.com/pkg/errors v0.9.1
2222
github.com/prometheus/client_golang v1.20.5

0 commit comments

Comments
 (0)