From 89ec3d38b2c26b45b32208ef73b57461ea59908e Mon Sep 17 00:00:00 2001 From: xzhangxian1008 Date: Wed, 8 Nov 2023 15:56:27 +0800 Subject: [PATCH] executor: fix `TestSortSpillDisk` in ut (#48402) close pingcap/tidb#48401 --- pkg/executor/cte_test.go | 4 ++-- pkg/executor/executor_pkg_test.go | 4 ++-- pkg/executor/sortexec/sort_test.go | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/executor/cte_test.go b/pkg/executor/cte_test.go index a8499402ab43e..20295b4085034 100644 --- a/pkg/executor/cte_test.go +++ b/pkg/executor/cte_test.go @@ -40,9 +40,9 @@ func TestSpillToDisk(t *testing.T) { require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/testCTEStorageSpill")) tk.MustExec("set tidb_mem_quota_query = 1073741824;") }() - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/testSortedRowContainerSpill", "return(true)")) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/sortexec/testSortedRowContainerSpill", "return(true)")) defer func() { - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/testSortedRowContainerSpill")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/sortexec/testSortedRowContainerSpill")) }() // Use duplicated rows to test UNION DISTINCT. diff --git a/pkg/executor/executor_pkg_test.go b/pkg/executor/executor_pkg_test.go index 896f38a4211a7..5e4fe027952a2 100644 --- a/pkg/executor/executor_pkg_test.go +++ b/pkg/executor/executor_pkg_test.go @@ -272,9 +272,9 @@ func TestFilterTemporaryTableKeys(t *testing.T) { } func TestSortSpillDisk(t *testing.T) { - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/testSortedRowContainerSpill", "return(true)")) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/sortexec/testSortedRowContainerSpill", "return(true)")) defer func() { - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/testSortedRowContainerSpill")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/sortexec/testSortedRowContainerSpill")) }() ctx := mock.NewContext() ctx.GetSessionVars().MemQuota.MemQuotaQuery = 1 diff --git a/pkg/executor/sortexec/sort_test.go b/pkg/executor/sortexec/sort_test.go index 29742415e1b75..1b2d0fa2a118b 100644 --- a/pkg/executor/sortexec/sort_test.go +++ b/pkg/executor/sortexec/sort_test.go @@ -41,9 +41,9 @@ func testSortInDisk(t *testing.T, removeDir bool) { conf.TempStoragePath = t.TempDir() conf.Performance.EnableStatsCacheMemQuota = true }) - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/testSortedRowContainerSpill", "return(true)")) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/sortexec/testSortedRowContainerSpill", "return(true)")) defer func() { - require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/testSortedRowContainerSpill")) + require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/sortexec/testSortedRowContainerSpill")) }() store, dom := testkit.CreateMockStoreAndDomain(t) tk := testkit.NewTestKit(t, store) @@ -104,8 +104,8 @@ func TestIssue16696(t *testing.T) { variable.MemoryUsageAlarmRatio.Store(0.0) defer variable.MemoryUsageAlarmRatio.Store(alarmRatio) - require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/testSortedRowContainerSpill", "return(true)")) - defer require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/testSortedRowContainerSpill")) + require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/sortexec/testSortedRowContainerSpill", "return(true)")) + defer require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/sortexec/testSortedRowContainerSpill")) require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/executor/testRowContainerSpill", "return(true)")) defer require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/executor/testRowContainerSpill")) store := testkit.CreateMockStore(t)