Skip to content

Commit fb38d15

Browse files
lhy1024ti-chi-bot
authored andcommitted
This is an automated cherry-pick of pingcap#65044
Signed-off-by: ti-chi-bot <[email protected]>
1 parent 08abb83 commit fb38d15

File tree

4 files changed

+360
-0
lines changed

4 files changed

+360
-0
lines changed

DEPS.bzl

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5646,13 +5646,23 @@ def go_deps():
56465646
name = "com_github_pingcap_kvproto",
56475647
build_file_proto_mode = "disable_global",
56485648
importpath = "github.com/pingcap/kvproto",
5649+
<<<<<<< HEAD
56495650
sha256 = "8cf19c0749b5207e97d7e1476fcbc523fe291c0badb02b112f5431d803521a4a",
56505651
strip_prefix = "github.com/pingcap/[email protected]",
56515652
urls = [
56525653
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20251205034844-90db5eaa107c.zip",
56535654
"http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20251205034844-90db5eaa107c.zip",
56545655
"https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20251205034844-90db5eaa107c.zip",
56555656
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20251205034844-90db5eaa107c.zip",
5657+
=======
5658+
sha256 = "1b34ec8988fce59af2523f2b7f3da992484ac0692deb16e0a4d78954a92548fa",
5659+
strip_prefix = "github.com/pingcap/[email protected]",
5660+
urls = [
5661+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20251202064041-b6fd818387cd.zip",
5662+
"http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20251202064041-b6fd818387cd.zip",
5663+
"https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20251202064041-b6fd818387cd.zip",
5664+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20251202064041-b6fd818387cd.zip",
5665+
>>>>>>> 524a282a213 (*: update pd client and client go (#65044))
56565666
],
56575667
)
56585668
go_repository(
@@ -6894,26 +6904,46 @@ def go_deps():
68946904
name = "com_github_tikv_client_go_v2",
68956905
build_file_proto_mode = "disable_global",
68966906
importpath = "github.com/tikv/client-go/v2",
6907+
<<<<<<< HEAD
68976908
sha256 = "198b5fda0ca7f841a2a3f57627eafc0eec59445261211f729415d4f3286a7679",
68986909
strip_prefix = "github.com/tikv/client-go/[email protected]",
68996910
urls = [
69006911
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251215033232-e642d8e8bf0e.zip",
69016912
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251215033232-e642d8e8bf0e.zip",
69026913
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251215033232-e642d8e8bf0e.zip",
69036914
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251215033232-e642d8e8bf0e.zip",
6915+
=======
6916+
sha256 = "246d893464ad7340a9aad7c8305e025b4eed4b1ea663976268b44ef39ef9888a",
6917+
strip_prefix = "github.com/tikv/client-go/[email protected]",
6918+
urls = [
6919+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251215121014-01758810e841.zip",
6920+
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251215121014-01758810e841.zip",
6921+
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251215121014-01758810e841.zip",
6922+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20251215121014-01758810e841.zip",
6923+
>>>>>>> 524a282a213 (*: update pd client and client go (#65044))
69046924
],
69056925
)
69066926
go_repository(
69076927
name = "com_github_tikv_pd_client",
69086928
build_file_proto_mode = "disable_global",
69096929
importpath = "github.com/tikv/pd/client",
6930+
<<<<<<< HEAD
69106931
sha256 = "eccb8dab31077423e7dc7bacf95f350c9584bb166b5641b98322c88bfd85d891",
69116932
strip_prefix = "github.com/tikv/pd/[email protected]",
69126933
urls = [
69136934
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20251211090623-d08fd48c229d.zip",
69146935
"http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20251211090623-d08fd48c229d.zip",
69156936
"https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20251211090623-d08fd48c229d.zip",
69166937
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20251211090623-d08fd48c229d.zip",
6938+
=======
6939+
sha256 = "616114c4dbf3ee07997d70f08bb99394a0ab253e281c6949a1f75701fdd721a1",
6940+
strip_prefix = "github.com/tikv/pd/[email protected]",
6941+
urls = [
6942+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20251216162211-a0bf0e9fc204.zip",
6943+
"http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20251216162211-a0bf0e9fc204.zip",
6944+
"https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20251216162211-a0bf0e9fc204.zip",
6945+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20251216162211-a0bf0e9fc204.zip",
6946+
>>>>>>> 524a282a213 (*: update pd client and client go (#65044))
69176947
],
69186948
)
69196949
go_repository(

go.mod

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ require (
8787
github.com/pingcap/errors v0.11.5-0.20250523034308-74f78ae071ee
8888
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
8989
github.com/pingcap/fn v1.0.0
90+
<<<<<<< HEAD
9091
github.com/pingcap/kvproto v0.0.0-20251205034844-90db5eaa107c
92+
=======
93+
github.com/pingcap/kvproto v0.0.0-20251202064041-b6fd818387cd
94+
>>>>>>> 524a282a213 (*: update pd client and client go (#65044))
9195
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9
9296
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5
9397
github.com/pingcap/tidb/pkg/parser v0.0.0-20211011031125-9b13dc409c5e
@@ -110,9 +114,15 @@ require (
110114
github.com/stretchr/testify v1.10.0
111115
github.com/tdakkota/asciicheck v0.2.0
112116
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
117+
<<<<<<< HEAD
113118
github.com/tikv/client-go/v2 v2.0.8-0.20251215033232-e642d8e8bf0e
114119
github.com/tikv/pd/client v0.0.0-20251211090623-d08fd48c229d
115120
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
121+
=======
122+
github.com/tikv/client-go/v2 v2.0.8-0.20251215121014-01758810e841
123+
github.com/tikv/pd/client v0.0.0-20251216162211-a0bf0e9fc204
124+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67
125+
>>>>>>> 524a282a213 (*: update pd client and client go (#65044))
116126
github.com/twmb/murmur3 v1.1.6
117127
github.com/uber/jaeger-client-go v2.22.1+incompatible
118128
github.com/vbauerster/mpb/v7 v7.5.3

go.sum

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,13 @@ github.com/pingcap/fn v1.0.0/go.mod h1:u9WZ1ZiOD1RpNhcI42RucFh/lBuzTu6rw88a+oF2Z
611611
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
612612
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
613613
github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w=
614+
<<<<<<< HEAD
614615
github.com/pingcap/kvproto v0.0.0-20251205034844-90db5eaa107c h1:jM8Xzey1Gky+UlQ6HtQMmqL7U8dpmjxYVrjAxoFNmOc=
615616
github.com/pingcap/kvproto v0.0.0-20251205034844-90db5eaa107c/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
617+
=======
618+
github.com/pingcap/kvproto v0.0.0-20251202064041-b6fd818387cd h1:YIaqKi3jAjllidGYDXlfKrEmGNGJNSR+H6PFDXN46xc=
619+
github.com/pingcap/kvproto v0.0.0-20251202064041-b6fd818387cd/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
620+
>>>>>>> 524a282a213 (*: update pd client and client go (#65044))
616621
github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuRurdGxZXBz0At+9avep+ub7U1AGYLIMM=
617622
github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
618623
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9 h1:qG9BSvlWFEE5otQGamuWedx9LRm0nrHvsQRQiW8SxEs=
@@ -760,12 +765,34 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf
760765
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU=
761766
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
762767
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
768+
<<<<<<< HEAD
763769
github.com/tikv/client-go/v2 v2.0.8-0.20251215033232-e642d8e8bf0e h1:EfwLfQB9dEsvEYD0vVaC73mMQeosVzC6g1h8wsI1Lgw=
764770
github.com/tikv/client-go/v2 v2.0.8-0.20251215033232-e642d8e8bf0e/go.mod h1:gipu6QUanLH6VCf15eTVrGpkI3fqmdqmlRIyk4PSKyU=
765771
github.com/tikv/pd/client v0.0.0-20251211090623-d08fd48c229d h1:bQGUYqYNn8vW9/3Oh/3RvpqX5HKXO+9ii32cfy/Uh8o=
766772
github.com/tikv/pd/client v0.0.0-20251211090623-d08fd48c229d/go.mod h1:WnwkeHrbTE0a44TtmTY6jZZ1dx8eU4O5uSqLeXjXrOc=
767773
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
768774
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
775+
=======
776+
github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
777+
github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
778+
github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
779+
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
780+
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
781+
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
782+
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
783+
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
784+
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
785+
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
786+
github.com/tikv/client-go/v2 v2.0.8-0.20251215121014-01758810e841 h1:NddMeGZEiqjFWpLYDOxsbsK0YJsoB1kTLepmEfy7BNk=
787+
github.com/tikv/client-go/v2 v2.0.8-0.20251215121014-01758810e841/go.mod h1:KnEweZyz0raWXCYPsbz3iUo3dwCQdiRhksyk7QW7TgQ=
788+
github.com/tikv/pd/client v0.0.0-20251216162211-a0bf0e9fc204 h1:t/oEO32jtmPZxsf6m2qNQ87yiVjT2ky12psLmHtrh18=
789+
github.com/tikv/pd/client v0.0.0-20251216162211-a0bf0e9fc204/go.mod h1:mHrSJy/3WsbxjTtTbK5glvoSLjix0qN6Ndh48p6jD4E=
790+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 h1:9LPGD+jzxMlnk5r6+hJnar67cgpDIz/iyD+rfl5r2Vk=
791+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
792+
github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=
793+
github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho=
794+
github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE=
795+
>>>>>>> 524a282a213 (*: update pd client and client go (#65044))
769796
github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
770797
github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
771798
github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=

0 commit comments

Comments
 (0)