Skip to content

Commit 6ec0bd2

Browse files
tangentatangenta
authored
go.mod: upgrade client-go to support redact log (pingcap#60353)
close pingcap#59279
1 parent ea52376 commit 6ec0bd2

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎DEPS.bzl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5828,13 +5828,13 @@ def go_deps():
58285828
name = "com_github_pingcap_errors",
58295829
build_file_proto_mode = "disable_global",
58305830
importpath = "github.com/pingcap/errors",
5831-
sha256 = "99d36c5e5649442d9923d4b1cd7f1242faaf4071844c2e3c77497230b3f38cd7",
5832-
strip_prefix = "github.com/pingcap/errors@v0.11.5-0.20240318064555-6bd07397691f",
5831+
sha256 = "1bb6a8df52d6fa2fdfda718c21fe8f9628d1c85d9c9ef91fa054b8663ae10048",
5832+
strip_prefix = "github.com/pingcap/errors@v0.11.5-0.20241219054535-6b8c588c3122",
58335833
urls = [
5834-
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20240318064555-6bd07397691f.zip",
5835-
"http://ats.apps.svc/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20240318064555-6bd07397691f.zip",
5836-
"https://cache.hawkingrei.com/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20240318064555-6bd07397691f.zip",
5837-
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20240318064555-6bd07397691f.zip",
5834+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
5835+
"http://ats.apps.svc/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
5836+
"https://cache.hawkingrei.com/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
5837+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
58385838
],
58395839
)
58405840
go_repository(
@@ -7089,13 +7089,13 @@ def go_deps():
70897089
name = "com_github_tikv_client_go_v2",
70907090
build_file_proto_mode = "disable_global",
70917091
importpath = "github.com/tikv/client-go/v2",
7092-
sha256 = "d020353e23be470833fdd3ba14a4dc64440618b71bfd86579f74dd4f019b04e9",
7093-
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20250327030528-1906b778d741",
7092+
sha256 = "0678b3ec66421528b0fd13fda236a3201b84f55b1f0867bbf9be80218856683f",
7093+
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20250402122658-2b8c6a77616c",
70947094
urls = [
7095-
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250327030528-1906b778d741.zip",
7096-
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250327030528-1906b778d741.zip",
7097-
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250327030528-1906b778d741.zip",
7098-
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250327030528-1906b778d741.zip",
7095+
"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",
7096+
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250402122658-2b8c6a77616c.zip",
7097+
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250402122658-2b8c6a77616c.zip",
7098+
"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",
70997099
],
71007100
)
71017101
go_repository(

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ require (
8585
github.com/otiai10/copy v1.14.0
8686
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
8787
github.com/pingcap/badger v1.5.1-0.20241015064302-38533b6cbf8d
88-
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f
88+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122
8989
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
9090
github.com/pingcap/fn v1.0.0
9191
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d
@@ -110,7 +110,7 @@ require (
110110
github.com/stretchr/testify v1.10.0
111111
github.com/tdakkota/asciicheck v0.4.1
112112
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
113-
github.com/tikv/client-go/v2 v2.0.8-0.20250327030528-1906b778d741
113+
github.com/tikv/client-go/v2 v2.0.8-0.20250402122658-2b8c6a77616c
114114
github.com/tikv/pd/client v0.0.0-20250327162546-07c19b1f2f9f
115115
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3
116116
github.com/twmb/murmur3 v1.1.6

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,8 @@ github.com/pingcap/badger v1.5.1-0.20241015064302-38533b6cbf8d/go.mod h1:KiO2zum
672672
github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
673673
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
674674
github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
675-
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f h1:FxA+NgsdHNOv+/hZGxUh8Gb3WuZqgqmxDwztEOiA1v4=
676-
github.com/pingcap/errors v0.11.5-0.20240318064555-6bd07397691f/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
675+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 h1:jc1bYMk3a2uD0+yK6Y8sRDrqvRELf/u2foUu7IT40Dw=
676+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
677677
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 h1:tdMsjOqUR7YXHoBitzdebTvOjs/swniBTOLy5XiMtuE=
678678
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86/go.mod h1:exzhVYca3WRtd6gclGNErRWb1qEgff3LYta0LvRmON4=
679679
github.com/pingcap/fn v1.0.0 h1:CyA6AxcOZkQh52wIqYlAmaVmF6EvrcqFywP463pjA8g=
@@ -846,8 +846,8 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
846846
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
847847
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
848848
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
849-
github.com/tikv/client-go/v2 v2.0.8-0.20250327030528-1906b778d741 h1:7OlBX1pzsPybrZpSGiB/gkWkK/Bl5hgGM4bpNu3yct0=
850-
github.com/tikv/client-go/v2 v2.0.8-0.20250327030528-1906b778d741/go.mod h1:tGglkQLtkh1gJxBY38jV8YuGViR8UkneHY7a9ZQ5clA=
849+
github.com/tikv/client-go/v2 v2.0.8-0.20250402122658-2b8c6a77616c h1:iawcLPK9gj8Mpy3nhFrkHLNNA9JA+7ZwqWsEQV4WTac=
850+
github.com/tikv/client-go/v2 v2.0.8-0.20250402122658-2b8c6a77616c/go.mod h1:n6vvqQutq0LWvb7GdC5V01zcXso6S1adkfgCvF3jEgA=
851851
github.com/tikv/pd/client v0.0.0-20250327162546-07c19b1f2f9f h1:d4Y/r5snSDDRATZaKBkJrqmhynISgQRsMKyWzdwIorY=
852852
github.com/tikv/pd/client v0.0.0-20250327162546-07c19b1f2f9f/go.mod h1:6fHHp8ecZIIkGyjxKn/oZFqX5dzrRkcHjFJPlBpigzQ=
853853
github.com/timakin/bodyclose v0.0.0-20241017074812-ed6a65f985e3 h1:y4mJRFlM6fUyPhoXuFg/Yu02fg/nIPFMOY8tOqppoFg=

‎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)