fixup

pingcap · Dec 27, 2022 · c1bd408 · c1bd408
1 parent 20bb046
commit c1bd408
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/cmd/explaintest/r/explain_complex.result b/cmd/explaintest/r/explain_complex.result
@@ -243,6 +243,7 @@ created_on datetime DEFAULT NULL,
 updated_on datetime DEFAULT NULL,
 UNIQUE KEY org_employee_position_pk (hotel_id,user_id,position_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+set tidb_cost_model_version=2;
 explain format = 'brief' SELECT d.id, d.ctx, d.name, d.left_value, d.right_value, d.depth, d.leader_id, d.status, d.created_on, d.updated_on FROM org_department AS d LEFT JOIN org_position AS p ON p.department_id = d.id AND p.status = 1000 LEFT JOIN org_employee_position AS ep ON ep.position_id = p.id AND ep.status = 1000 WHERE (d.ctx = 1 AND (ep.user_id = 62 OR d.id = 20 OR d.id = 20) AND d.status = 1000) GROUP BY d.id ORDER BY d.left_value;
 id	estRows	task	access object	operator info
 Sort	1.00	root		test.org_department.left_value
@@ -262,6 +263,7 @@ Sort	1.00	root		test.org_department.left_value
       └─TableReader(Probe)	9.99	root		data:Selection
         └─Selection	9.99	cop[tikv]		eq(test.org_employee_position.status, 1000), not(isnull(test.org_employee_position.position_id))
           └─TableFullScan	10000.00	cop[tikv]	table:ep	keep order:false, stats:pseudo
+set tidb_cost_model_version=1;
 create table test.Tab_A (id int primary key,bid int,cid int,name varchar(20),type varchar(20),num int,amt decimal(11,2));
 create table test.Tab_B (id int primary key,name varchar(20));
 create table test.Tab_C (id int primary key,name varchar(20),amt decimal(11,2));

diff --git a/cmd/explaintest/t/explain_complex.test b/cmd/explaintest/t/explain_complex.test
@@ -174,7 +174,9 @@ CREATE TABLE org_position (
   UNIQUE KEY org_employee_position_pk (hotel_id,user_id,position_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+set tidb_cost_model_version=2;
 explain format = 'brief' SELECT d.id, d.ctx, d.name, d.left_value, d.right_value, d.depth, d.leader_id, d.status, d.created_on, d.updated_on FROM org_department AS d LEFT JOIN org_position AS p ON p.department_id = d.id AND p.status = 1000 LEFT JOIN org_employee_position AS ep ON ep.position_id = p.id AND ep.status = 1000 WHERE (d.ctx = 1 AND (ep.user_id = 62 OR d.id = 20 OR d.id = 20) AND d.status = 1000) GROUP BY d.id ORDER BY d.left_value;
+set tidb_cost_model_version=1;
 
 create table test.Tab_A (id int primary key,bid int,cid int,name varchar(20),type varchar(20),num int,amt decimal(11,2));
 create table test.Tab_B (id int primary key,name varchar(20));