Skip to content

Commit d0d3233

Browse files
committed
update kvproto
Signed-off-by: lhy1024 <admin@liudos.us>
1 parent d9310e1 commit d0d3233

File tree

9 files changed

+35
-5028
lines changed

9 files changed

+35
-5028
lines changed

client/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module github.com/tikv/pd/client
22

33
go 1.25.6
44

5-
replace github.com/pingcap/kvproto => github.com/lhy1024/kvproto v0.0.0-20260120125427-b27f7093ef5f
6-
75
require (
86
github.com/BurntSushi/toml v0.3.1
97
github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5
@@ -12,7 +10,7 @@ require (
1210
github.com/opentracing/opentracing-go v1.2.0
1311
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
1412
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
15-
github.com/pingcap/kvproto v0.0.0-20260106110113-438649d89ee7
13+
github.com/pingcap/kvproto v0.0.0-20260211115010-c5ab144dc6c7
1614
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
1715
github.com/prometheus/client_golang v1.20.5
1816
github.com/stretchr/testify v1.9.0

client/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3x
3838
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
3939
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
4040
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
41-
github.com/lhy1024/kvproto v0.0.0-20260120125427-b27f7093ef5f h1:ypjBA1tn4HsOz4omCy7XthbMue3+jTL+qjiDk+ETtaY=
42-
github.com/lhy1024/kvproto v0.0.0-20260120125427-b27f7093ef5f/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
4341
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
4442
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
4543
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
@@ -55,6 +53,8 @@ github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c h1:xpW9bvK+HuuTm
5553
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
5654
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 h1:tdMsjOqUR7YXHoBitzdebTvOjs/swniBTOLy5XiMtuE=
5755
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86/go.mod h1:exzhVYca3WRtd6gclGNErRWb1qEgff3LYta0LvRmON4=
56+
github.com/pingcap/kvproto v0.0.0-20260211115010-c5ab144dc6c7 h1:XAA5w7+S7aFXZ9GEt2CwZJq8Z06yyJE+dUSqvjQ/Q4c=
57+
github.com/pingcap/kvproto v0.0.0-20260211115010-c5ab144dc6c7/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
5858
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8IDP+SZrdhV1Kibl9KrHxJ9eciw=
5959
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
6060
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ go 1.25.6
55
// When you modify PD cooperatively with kvproto, this will be useful to submit the PR to PD and the PR to
66
// kvproto at the same time. You can run `go mod tidy` to make it replaced with go-mod style specification.
77
// After the PR to kvproto is merged, remember to comment this out and run `go mod tidy`.
8-
replace github.com/pingcap/kvproto => github.com/lhy1024/kvproto v0.0.0-20260120125427-b27f7093ef5f
9-
8+
// replace github.com/pingcap/kvproto => github.com/$YourPrivateRepo $YourPrivateBranch
109
require (
1110
github.com/AlekSi/gocov-xml v1.0.0
1211
github.com/BurntSushi/toml v1.5.0
@@ -35,7 +34,7 @@ require (
3534
github.com/pingcap/errcode v0.3.0
3635
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
3736
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
38-
github.com/pingcap/kvproto v0.0.0-20260106110113-438649d89ee7
37+
github.com/pingcap/kvproto v0.0.0-20260211115010-c5ab144dc6c7
3938
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
4039
github.com/pingcap/metering_sdk v0.0.0-20250918015914-468cd6feb1dc
4140
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21

go.sum

Lines changed: 9 additions & 1669 deletions
Large diffs are not rendered by default.

pkg/core/region.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ func RegionFromHeartbeat(heartbeat RegionHeartbeatRequest, flowRoundDivisor uint
258258
region.approximateKvSize = int64(h.GetApproximateKvSize() / units.MiB)
259259
region.approximateColumnarKvSize = int64(h.GetApproximateColumnarKvSize() / units.MiB)
260260
region.replicationStatus = h.GetReplicationStatus()
261-
region.cpuUsage = h.GetCpuUsage()
261+
region.cpuUsage = h.GetCpuUsage() //nolint:staticcheck
262262
region.cpuStats = h.GetCpuStats()
263263
}
264264

tests/integrations/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/tikv/pd/tests/integrations
33
go 1.25.6
44

55
replace (
6-
github.com/pingcap/kvproto => github.com/lhy1024/kvproto v0.0.0-20260120125427-b27f7093ef5f
76
github.com/tikv/pd => ../../
87
github.com/tikv/pd/client => ../../client
98
github.com/tikv/pd/tests/integrations/mcs => ./mcs
@@ -15,7 +14,7 @@ require (
1514
github.com/go-sql-driver/mysql v1.7.0
1615
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
1716
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
18-
github.com/pingcap/kvproto v0.0.0-20260106110113-438649d89ee7
17+
github.com/pingcap/kvproto v0.0.0-20260211115010-c5ab144dc6c7
1918
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
2019
github.com/prometheus/client_golang v1.20.5
2120
github.com/prometheus/client_model v0.6.1

0 commit comments

Comments
 (0)