Skip to content

Commit 0175881

Browse files
lhy1024lhy1024
authored
update pd client and kvproto (#1821)
 Signed-off-by: lhy1024 <[email protected]>
1 parent 9dd1b8e commit 0175881

File tree

7 files changed

+150
-115
lines changed

7 files changed

+150
-115
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/tikv/client-go/v2
22

3-
go 1.23.0
3+
go 1.23.12
44

55
require (
66
github.com/VividCortex/ewma v1.2.0
@@ -15,14 +15,14 @@ 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-
github.com/pingcap/kvproto v0.0.0-20251109100001-1907922fbd18
18+
github.com/pingcap/kvproto v0.0.0-20251121073615-744c58d5a5f1
1919
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
2020
github.com/pkg/errors v0.9.1
2121
github.com/prometheus/client_golang v1.20.5
2222
github.com/prometheus/client_model v0.6.1
2323
github.com/stretchr/testify v1.9.0
2424
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a
25-
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3
25+
github.com/tikv/pd/client v0.0.0-20251211035544-6cebb3314abe
2626
github.com/twmb/murmur3 v1.1.3
2727
go.etcd.io/etcd/api/v3 v3.5.10
2828
go.etcd.io/etcd/client/v3 v3.5.10

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 h1:tdMsjOqUR7YXH
7777
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86/go.mod h1:exzhVYca3WRtd6gclGNErRWb1qEgff3LYta0LvRmON4=
7878
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
7979
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
80-
github.com/pingcap/kvproto v0.0.0-20251109100001-1907922fbd18 h1:ZgebBNwgma8INCfexAX8dfqZo7TWQrvMXHGABEmAY2Y=
81-
github.com/pingcap/kvproto v0.0.0-20251109100001-1907922fbd18/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
80+
github.com/pingcap/kvproto v0.0.0-20251121073615-744c58d5a5f1 h1:zSM+1a6ugIcttizSWBe1v9Go/Ko5C74u+52Umm8+VaE=
81+
github.com/pingcap/kvproto v0.0.0-20251121073615-744c58d5a5f1/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
8282
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8IDP+SZrdhV1Kibl9KrHxJ9eciw=
8383
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
8484
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -111,8 +111,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
111111
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
112112
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
113113
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
114-
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3 h1:lAuYtEVeJQ+FaD1WrYEJhnMHl5YeREq39QSqCXGDk6s=
115-
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3/go.mod h1:SicyvcZE0fzrGGWW3AEtZWWPRzGw/h5img4/6qiSYws=
114+
github.com/tikv/pd/client v0.0.0-20251211035544-6cebb3314abe h1:/+tUEVyWXtqT33vdm4XL0/noZFYDDWjD/y0Q+EfwQoQ=
115+
github.com/tikv/pd/client v0.0.0-20251211035544-6cebb3314abe/go.mod h1:tuGAcfoW8GsTCLyHgXAhLDbDY+o3tznvzpMfc4TkpEA=
116116
github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA=
117117
github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
118118
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

‎integration_tests/gc_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@ func (c *hookedGCStatesClient) GetGCState(ctx context.Context) (pdgc.GCState, er
4646
return c.inner.GetGCState(ctx)
4747
}
4848

49+
func (c *hookedGCStatesClient) SetGlobalGCBarrier(ctx context.Context, barrierID string, barrierTS uint64, ttl time.Duration) (*pdgc.GlobalGCBarrierInfo, error) {
50+
panic("unimplemented")
51+
}
52+
53+
func (c *hookedGCStatesClient) DeleteGlobalGCBarrier(ctx context.Context, barrierID string) (*pdgc.GlobalGCBarrierInfo, error) {
54+
panic("unimplemented")
55+
}
56+
57+
func (c *hookedGCStatesClient) GetAllKeyspacesGCStates(ctx context.Context) (pdgc.ClusterGCStates, error) {
58+
panic("unimplemented")
59+
}
60+
4961
func hookGCStatesClientForStore(store *tikv.StoreProbe, getGCStatesHook func(inner pdgc.GCStatesClient, ctx context.Context) (pdgc.GCState, error)) {
5062
store.ReplaceGCStatesClient(&hookedGCStatesClient{
5163
inner: store.GetGCStatesClient(),

‎integration_tests/go.mod‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
module integration_tests
22

3-
go 1.24.1
3+
go 1.25.5
44

55
require (
66
github.com/google/uuid v1.6.0
77
github.com/ninedraft/israce v0.0.3
88
github.com/pingcap/errors v0.11.5-0.20250523034308-74f78ae071ee
99
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
10-
github.com/pingcap/kvproto v0.0.0-20251109100001-1907922fbd18
10+
github.com/pingcap/kvproto v0.0.0-20251202064041-b6fd818387cd
1111
github.com/pingcap/tidb v1.1.0-beta.0.20250609033843-a165d9fd7c01
1212
github.com/pkg/errors v0.9.1
1313
github.com/stretchr/testify v1.10.0
1414
github.com/tidwall/gjson v1.14.4
15-
github.com/tikv/client-go/v2 v2.0.8-0.20250528090949-e84f1a780fa6
16-
github.com/tikv/pd/client v0.0.0-20250625073039-fb496b371ff3
15+
github.com/tikv/client-go/v2 v2.0.8-0.20251204034052-9dd1b8e41dbf
16+
github.com/tikv/pd/client v0.0.0-20251212114356-09f1b5d39d79
1717
go.uber.org/goleak v1.3.0
1818
google.golang.org/grpc v1.63.2
1919
)
2020

2121
require (
22+
cloud.google.com/go v0.112.2 // indirect
23+
cloud.google.com/go/iam v1.1.7 // indirect
24+
cloud.google.com/go/storage v1.39.1 // indirect
2225
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
2326
github.com/BurntSushi/toml v1.5.0 // indirect
2427
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
@@ -45,6 +48,7 @@ require (
4548
github.com/golang/protobuf v1.5.4 // indirect
4649
github.com/golang/snappy v0.0.4 // indirect
4750
github.com/google/btree v1.1.2 // indirect
51+
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
4852
github.com/gorilla/mux v1.8.1 // indirect
4953
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
5054
github.com/influxdata/tdigest v0.0.1 // indirect
@@ -60,51 +64,55 @@ require (
6064
github.com/ngaut/sync2 v0.0.0-20141008032647-7a24ed77b2ef // indirect
6165
github.com/opentracing/basictracer-go v1.1.0 // indirect
6266
github.com/opentracing/opentracing-go v1.2.0 // indirect
63-
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
67+
github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe // indirect
6468
github.com/pingcap/badger v1.5.1-0.20241015064302-38533b6cbf8d // indirect
6569
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 // indirect
66-
github.com/pingcap/log v1.1.1-0.20250514022801-14f3b4ca066e // indirect
70+
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9 // indirect
6771
github.com/pingcap/sysutil v1.0.1-0.20241113070546-23b50de46fd3 // indirect
6872
github.com/pingcap/tidb/pkg/parser v0.0.0-20250604120526-b159f56cd452 // indirect
69-
github.com/pingcap/tipb v0.0.0-20250529123214-bb8180a479ec // indirect
73+
github.com/pingcap/tipb v0.0.0-20250928030846-9fd33ded6f2c // indirect
7074
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7175
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
72-
github.com/prometheus/client_golang v1.22.0 // indirect
76+
github.com/prometheus/client_golang v1.23.0 // indirect
7377
github.com/prometheus/client_model v0.6.2 // indirect
74-
github.com/prometheus/common v0.63.0 // indirect
75-
github.com/prometheus/procfs v0.16.1 // indirect
78+
github.com/prometheus/common v0.65.0 // indirect
79+
github.com/prometheus/procfs v0.19.2 // indirect
7680
github.com/qri-io/jsonpointer v0.1.1 // indirect
7781
github.com/qri-io/jsonschema v0.2.1 // indirect
7882
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
79-
github.com/sasha-s/go-deadlock v0.3.5 // indirect
83+
github.com/sasha-s/go-deadlock v0.3.6 // indirect
8084
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
81-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
85+
github.com/shoenig/go-m1cpu v0.1.7 // indirect
86+
github.com/spf13/pflag v1.0.7 // indirect
8287
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
8388
github.com/tidwall/match v1.1.1 // indirect
8489
github.com/tidwall/pretty v1.2.1 // indirect
85-
github.com/tklauser/go-sysconf v0.3.12 // indirect
86-
github.com/tklauser/numcpus v0.6.1 // indirect
90+
github.com/tklauser/go-sysconf v0.3.15 // indirect
91+
github.com/tklauser/numcpus v0.10.0 // indirect
8792
github.com/twmb/murmur3 v1.1.6 // indirect
8893
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
8994
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
9095
github.com/yusufpapurcu/wmi v1.2.4 // indirect
91-
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
92-
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
93-
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
96+
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
97+
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
98+
go.etcd.io/etcd/client/v3 v3.5.15 // indirect
9499
go.uber.org/atomic v1.11.0 // indirect
95100
go.uber.org/multierr v1.11.0 // indirect
96-
go.uber.org/zap v1.27.0 // indirect
97-
golang.org/x/crypto v0.38.0 // indirect
101+
go.uber.org/zap v1.27.1 // indirect
102+
golang.org/x/crypto v0.46.0 // indirect
98103
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
99-
golang.org/x/net v0.40.0 // indirect
100-
golang.org/x/sync v0.14.0 // indirect
101-
golang.org/x/sys v0.33.0 // indirect
102-
golang.org/x/text v0.25.0 // indirect
103-
golang.org/x/time v0.11.0 // indirect
104-
golang.org/x/tools v0.33.0 // indirect
105-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
106-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
107-
google.golang.org/protobuf v1.36.6 // indirect
104+
golang.org/x/net v0.47.0 // indirect
105+
golang.org/x/oauth2 v0.33.0 // indirect
106+
golang.org/x/sync v0.19.0 // indirect
107+
golang.org/x/sys v0.39.0 // indirect
108+
golang.org/x/text v0.32.0 // indirect
109+
golang.org/x/time v0.14.0 // indirect
110+
golang.org/x/tools v0.39.0 // indirect
111+
google.golang.org/api v0.170.0 // indirect
112+
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
113+
google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect
114+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
115+
google.golang.org/protobuf v1.36.10 // indirect
108116
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
109117
gopkg.in/yaml.v2 v2.4.0 // indirect
110118
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -113,6 +121,6 @@ require (
113121

114122
replace (
115123
github.com/go-ldap/ldap/v3 => github.com/YangKeao/ldap/v3 v3.4.5-0.20230421065457-369a3bab1117
116-
124+
github.com/pingcap/tidb => github.com/lhy1024/tidb v1.1.0-beta.0.20251215110526-59e2c3c2eab3
117125
github.com/tikv/client-go/v2 => ../
118126
)

0 commit comments

Comments
 (0)