diff --git a/DEPS.bzl b/DEPS.bzl index 9d0c62a8ca6b2..9e258eacc1fa1 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -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/v2@v2.0.8-0.20240409022718-714958ccd4d5", + sha256 = "401c279de8a754c7de7a59aafff07202ad07fcdad21a8553afccf8d44b4833ce", + strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.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( diff --git a/go.mod b/go.mod index 29d6eacfac4a5..b50d3751f1616 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index a52f596efafa3..a997d4ff15b1c 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/executor/test/oomtest/oom_test.go b/pkg/executor/test/oomtest/oom_test.go index 203de6af4b084..30cb654841457 100644 --- a/pkg/executor/test/oomtest/oom_test.go +++ b/pkg/executor/test/oomtest/oom_test.go @@ -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") @@ -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") diff --git a/pkg/server/conn_test.go b/pkg/server/conn_test.go index 20c501294bd04..e0f7b19d0d62d 100644 --- a/pkg/server/conn_test.go +++ b/pkg/server/conn_test.go @@ -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")) @@ -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"))