From 8feabccd7b614bea1488ae03fa18d0e41cbe5ed4 Mon Sep 17 00:00:00 2001 From: Yuanjia Zhang Date: Mon, 11 Sep 2023 19:26:06 +0800 Subject: [PATCH] planner: fix the unstable test `TestFixControl45132` (#46849) close pingcap/tidb#46663 --- planner/core/casetest/integration_test.go | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/planner/core/casetest/integration_test.go b/planner/core/casetest/integration_test.go index a0b74f212a..0873802653 100644 --- a/planner/core/casetest/integration_test.go +++ b/planner/core/casetest/integration_test.go @@ -1230,28 +1230,16 @@ func TestFixControl45132(t *testing.T) { } tk.MustExec(`analyze table t`) // the cost model prefers to use TableScan instead of IndexLookup to avoid double requests. - tk.MustQuery(`explain select * from t where a=2`).Check(testkit.Rows( - `TableReader_7 128.00 root data:Selection_6`, - `└─Selection_6 128.00 cop[tikv] eq(test.t.a, 2)`, - ` └─TableFullScan_5 12928.00 cop[tikv] table:t keep order:false`)) + require.True(t, tk.HasPlan(`select * from t where a=2`, `TableFullScan`)) tk.MustExec(`set @@tidb_opt_fix_control = "45132:99"`) - tk.MustQuery(`explain select * from t where a=2`).Check(testkit.Rows( - `IndexLookUp_7 128.00 root `, - `├─IndexRangeScan_5(Build) 128.00 cop[tikv] table:t, index:a(a) range:[2,2], keep order:false`, - `└─TableRowIDScan_6(Probe) 128.00 cop[tikv] table:t keep order:false`)) + tk.MustIndexLookup(`select * from t where a=2`) // index lookup tk.MustExec(`set @@tidb_opt_fix_control = "45132:500"`) - tk.MustQuery(`explain select * from t where a=2`).Check(testkit.Rows( - `TableReader_7 128.00 root data:Selection_6`, - `└─Selection_6 128.00 cop[tikv] eq(test.t.a, 2)`, - ` └─TableFullScan_5 12928.00 cop[tikv] table:t keep order:false`)) + require.True(t, tk.HasPlan(`select * from t where a=2`, `TableFullScan`)) tk.MustExec(`set @@tidb_opt_fix_control = "45132:0"`) - tk.MustQuery(`explain select * from t where a=2`).Check(testkit.Rows( - `TableReader_7 128.00 root data:Selection_6`, - `└─Selection_6 128.00 cop[tikv] eq(test.t.a, 2)`, - ` └─TableFullScan_5 12928.00 cop[tikv] table:t keep order:false`)) + require.True(t, tk.HasPlan(`select * from t where a=2`, `TableFullScan`)) } func TestFixControl44262(t *testing.T) {