Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: bump up client-go to fix #52464 (#52844) #52871

Merged
merged 5 commits into from
Apr 25, 2024
Merged

*: bump up client-go to fix #52464 (#52844) #52871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e7e6a4
*: bump up client-go to fix #52464
zyguan Apr 23, 2024
100c3fe
fix ut
zyguan Apr 23, 2024
2abfad5
fix another ut
zyguan Apr 23, 2024
c23fda5
fix snapshot cache
zyguan Apr 24, 2024
d98c160
use [email protected]
zyguan Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions DEPS.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7080,13 +7080,13 @@ def go_deps():
name = "com_github_tikv_client_go_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/tikv/client-go/v2",
sha256 = "3a9d97649d1c917faebb2f7756e750213ab5fd34c070f17a38c9227b201862c9",
strip_prefix = "github.com/tikv/client-go/[email protected].20240409022718-714958ccd4d5",
sha256 = "401c279de8a754c7de7a59aafff07202ad07fcdad21a8553afccf8d44b4833ce",
strip_prefix = "github.com/tikv/client-go/[email protected].20240424065757-6b7d20069135",
urls = [
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240409022718-714958ccd4d5.zip",
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240409022718-714958ccd4d5.zip",
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240409022718-714958ccd4d5.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240409022718-714958ccd4d5.zip",
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240424065757-6b7d20069135.zip",
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240424065757-6b7d20069135.zip",
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240424065757-6b7d20069135.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20240424065757-6b7d20069135.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ require (
github.com/tdakkota/asciicheck v0.2.0
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
github.com/tidwall/btree v1.7.0
github.com/tikv/client-go/v2 v2.0.8-0.20240409022718-714958ccd4d5
github.com/tikv/client-go/v2 v2.0.8-0.20240424065757-6b7d20069135
github.com/tikv/pd/client v0.0.0-20240322051414-fb9e2d561b6e
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
github.com/twmb/murmur3 v1.1.6
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,8 +869,8 @@ github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
github.com/tikv/client-go/v2 v2.0.8-0.20240409022718-714958ccd4d5 h1:NIYXG5l8JrDyc7k0zO17ppKJkRlUfKMWFOnjIQT5Tc4=
github.com/tikv/client-go/v2 v2.0.8-0.20240409022718-714958ccd4d5/go.mod h1:+vXk4Aex17GnI8gfSMPxrL0SQLbBYgP3Db4FvHiImwM=
github.com/tikv/client-go/v2 v2.0.8-0.20240424065757-6b7d20069135 h1:mElNS+XLxZtRIpnlez15cK84WdnPG86iaLURANrF79w=
github.com/tikv/client-go/v2 v2.0.8-0.20240424065757-6b7d20069135/go.mod h1:+vXk4Aex17GnI8gfSMPxrL0SQLbBYgP3Db4FvHiImwM=
github.com/tikv/pd/client v0.0.0-20240322051414-fb9e2d561b6e h1:u2OoEvmh3qyjIiAKXUPRiFCOSwznByMINDx2fsorjAo=
github.com/tikv/pd/client v0.0.0-20240322051414-fb9e2d561b6e/go.mod h1:Z/QAgOt29zvwBTd0H6pdx45VO6KRNc/O/DzGkVmSyZg=
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
Expand Down
10 changes: 2 additions & 8 deletions pkg/executor/test/oomtest/oom_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,9 @@ func TestMemTracker4UpdateExec(t *testing.T) {

oom.SetTracker("")
oom.ClearMessageFilter()
oom.AddMessageFilter(
"expensive_query during bootstrap phase",
"schemaLeaseChecker is not set for this transaction")
oom.AddMessageFilter("expensive_query during bootstrap phase")

tk.MustExec("insert into t_MemTracker4UpdateExec values (1,1,1), (2,2,2), (3,3,3)")
require.Equal(t, "schemaLeaseChecker is not set for this transaction", oom.GetTracker())

tk.Session().GetSessionVars().MemQuotaQuery = 244
tk.MustExec("update t_MemTracker4UpdateExec set a = 4")
Expand All @@ -81,12 +78,9 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
log.SetLevel(zap.InfoLevel)

oom.SetTracker("")
oom.AddMessageFilter(
"schemaLeaseChecker is not set for this transaction",
"expensive_query during bootstrap phase")
oom.AddMessageFilter("expensive_query during bootstrap phase")

tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
require.Equal(t, "schemaLeaseChecker is not set for this transaction", oom.GetTracker())
tk.Session().GetSessionVars().MemQuotaQuery = 1
oom.ClearMessageFilter()
oom.AddMessageFilter("expensive_query during bootstrap phase")
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/conn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ func TestPrefetchPointKeys4Update(t *testing.T) {
require.True(t, txn.Valid())
snap := txn.GetSnapshot()
//nolint:forcetypeassert
require.Equal(t, 4, snap.(snapshotCache).SnapCacheHitCount())
require.Equal(t, 6, snap.(snapshotCache).SnapCacheHitCount())
tk.MustExec("commit")
tk.MustQuery("select * from prefetch").Check(testkit.Rows("1 1 2", "2 2 4", "3 3 4"))

Expand Down Expand Up @@ -888,7 +888,7 @@ func TestPrefetchPointKeys4Delete(t *testing.T) {
require.True(t, txn.Valid())
snap := txn.GetSnapshot()
//nolint:forcetypeassert
require.Equal(t, 4, snap.(snapshotCache).SnapCacheHitCount())
require.Equal(t, 6, snap.(snapshotCache).SnapCacheHitCount())
tk.MustExec("commit")
tk.MustQuery("select * from prefetch").Check(testkit.Rows("4 4 4", "5 5 5", "6 6 6"))

Expand Down