Skip to content

Commit f63469e

Browse files
tangentati-chi-bot
tangenta
authored and
ti-chi-bot
committed
This is an automated cherry-pick of pingcap#60353
Signed-off-by: ti-chi-bot <[email protected]>
1 parent 1aead1c commit f63469e

File tree

4 files changed

+45
-10
lines changed

4 files changed

+45
-10
lines changed

‎DEPS.bzl‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5737,13 +5737,13 @@ def go_deps():
57375737
name = "com_github_pingcap_errors",
57385738
build_file_proto_mode = "disable_global",
57395739
importpath = "github.com/pingcap/errors",
5740-
sha256 = "99d36c5e5649442d9923d4b1cd7f1242faaf4071844c2e3c77497230b3f38cd7",
5741-
strip_prefix = "github.com/pingcap/[email protected].20240318064555-6bd07397691f",
5740+
sha256 = "1bb6a8df52d6fa2fdfda718c21fe8f9628d1c85d9c9ef91fa054b8663ae10048",
5741+
strip_prefix = "github.com/pingcap/[email protected].20241219054535-6b8c588c3122",
57425742
urls = [
5743-
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20240318064555-6bd07397691f.zip",
5744-
"http://ats.apps.svc/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20240318064555-6bd07397691f.zip",
5745-
"https://cache.hawkingrei.com/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20240318064555-6bd07397691f.zip",
5746-
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20240318064555-6bd07397691f.zip",
5743+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
5744+
"http://ats.apps.svc/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
5745+
"https://cache.hawkingrei.com/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
5746+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
57475747
],
57485748
)
57495749
go_repository(
@@ -6946,13 +6946,23 @@ def go_deps():
69466946
name = "com_github_tikv_client_go_v2",
69476947
build_file_proto_mode = "disable_global",
69486948
importpath = "github.com/tikv/client-go/v2",
6949+
<<<<<<< HEAD
69496950
sha256 = "cd2ca39152da37b75938830be5910efd7316d65b47eb95c14e2d49222c40d07e",
69506951
strip_prefix = "github.com/tikv/client-go/[email protected]",
69516952
urls = [
69526953
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250304121540-cc8b9491145b.zip",
69536954
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250304121540-cc8b9491145b.zip",
69546955
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250304121540-cc8b9491145b.zip",
69556956
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250304121540-cc8b9491145b.zip",
6957+
=======
6958+
sha256 = "0678b3ec66421528b0fd13fda236a3201b84f55b1f0867bbf9be80218856683f",
6959+
strip_prefix = "github.com/tikv/client-go/[email protected]",
6960+
urls = [
6961+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250402122658-2b8c6a77616c.zip",
6962+
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250402122658-2b8c6a77616c.zip",
6963+
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250402122658-2b8c6a77616c.zip",
6964+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250402122658-2b8c6a77616c.zip",
6965+
>>>>>>> 6ec0bd2c6f2 (go.mod: upgrade client-go to support redact log (#60353))
69566966
],
69576967
)
69586968
go_repository(

‎go.mod‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ require (
8383
github.com/otiai10/copy v1.2.0
8484
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
8585
github.com/pingcap/badger v1.5.1-0.20241015064302-38533b6cbf8d
86-
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f
86+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122
8787
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
8888
github.com/pingcap/fn v1.0.0
8989
github.com/pingcap/kvproto v0.0.0-20240924080114-4a3e17f5e62d
@@ -108,10 +108,16 @@ require (
108108
github.com/stretchr/testify v1.9.0
109109
github.com/tdakkota/asciicheck v0.2.0
110110
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
111+
<<<<<<< HEAD
111112
github.com/tidwall/btree v1.7.0
112113
github.com/tikv/client-go/v2 v2.0.8-0.20250304121540-cc8b9491145b
113114
github.com/tikv/pd/client v0.0.0-20250213080903-727c2086a763
114115
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
116+
=======
117+
github.com/tikv/client-go/v2 v2.0.8-0.20250402122658-2b8c6a77616c
118+
github.com/tikv/pd/client v0.0.0-20250327162546-07c19b1f2f9f
119+
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3
120+
>>>>>>> 6ec0bd2c6f2 (go.mod: upgrade client-go to support redact log (#60353))
115121
github.com/twmb/murmur3 v1.1.6
116122
github.com/uber/jaeger-client-go v2.22.1+incompatible
117123
github.com/vbauerster/mpb/v7 v7.5.3

‎go.sum‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,8 @@ github.com/pingcap/badger v1.5.1-0.20241015064302-38533b6cbf8d/go.mod h1:KiO2zum
663663
github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
664664
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
665665
github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
666-
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f h1:FxA+NgsdHNOv+/hZGxUh8Gb3WuZqgqmxDwztEOiA1v4=
667-
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
666+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 h1:jc1bYMk3a2uD0+yK6Y8sRDrqvRELf/u2foUu7IT40Dw=
667+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
668668
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 h1:tdMsjOqUR7YXHoBitzdebTvOjs/swniBTOLy5XiMtuE=
669669
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86/go.mod h1:exzhVYca3WRtd6gclGNErRWb1qEgff3LYta0LvRmON4=
670670
github.com/pingcap/fn v1.0.0 h1:CyA6AxcOZkQh52wIqYlAmaVmF6EvrcqFywP463pjA8g=
@@ -824,6 +824,7 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf
824824
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU=
825825
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
826826
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
827+
<<<<<<< HEAD
827828
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
828829
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
829830
github.com/tikv/client-go/v2 v2.0.8-0.20250304121540-cc8b9491145b h1:hJwL0g1JO36K5nCXrZQLWl4f9Edj1D4BxZ8HLs+9CNI=
@@ -832,6 +833,24 @@ github.com/tikv/pd/client v0.0.0-20250213080903-727c2086a763 h1:TOYf8ywksduKa6Ng
832833
github.com/tikv/pd/client v0.0.0-20250213080903-727c2086a763/go.mod h1:W5a0sDadwUpI9k8p7M77d3jo253ZHdmua+u4Ho4Xw8U=
833834
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
834835
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
836+
=======
837+
github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
838+
github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
839+
github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
840+
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
841+
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
842+
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
843+
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
844+
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
845+
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
846+
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
847+
github.com/tikv/client-go/v2 v2.0.8-0.20250402122658-2b8c6a77616c h1:iawcLPK9gj8Mpy3nhFrkHLNNA9JA+7ZwqWsEQV4WTac=
848+
github.com/tikv/client-go/v2 v2.0.8-0.20250402122658-2b8c6a77616c/go.mod h1:n6vvqQutq0LWvb7GdC5V01zcXso6S1adkfgCvF3jEgA=
849+
github.com/tikv/pd/client v0.0.0-20250327162546-07c19b1f2f9f h1:d4Y/r5snSDDRATZaKBkJrqmhynISgQRsMKyWzdwIorY=
850+
github.com/tikv/pd/client v0.0.0-20250327162546-07c19b1f2f9f/go.mod h1:6fHHp8ecZIIkGyjxKn/oZFqX5dzrRkcHjFJPlBpigzQ=
851+
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 h1:y4mJRFlM6fUyPhoXuFg/Yu02fg/nIPFMOY8tOqppoFg=
852+
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
853+
>>>>>>> 6ec0bd2c6f2 (go.mod: upgrade client-go to support redact log (#60353))
835854
github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
836855
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
837856
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=

‎pkg/parser/terror/terror_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func TestTraceAndLocation(t *testing.T) {
161161
sysStack++
162162
}
163163
}
164-
require.Equalf(t, 11, len(lines)-(2*sysStack), "stack =\n%s", stack)
164+
require.Equalf(t, 9, len(lines)-(2*sysStack), "stack =\n%s", stack)
165165
var containTerr bool
166166
for _, v := range lines {
167167
if strings.Contains(v, "terror_test.go") {

0 commit comments

Comments
 (0)