TestPlannerIssueRegressions merge conflict

Author: terry1purcell

pkg/planner/core/issuetest/planner_issue_test.go

@@ -583,30 +583,30 @@ HAVING EXISTS (SELECT 1 FROM t_panic WHERE x IS NULL);`).Check(testkit.Rows("<ni
 		tk.MustExec("create table t1(vkey integer, c10 integer);")
 		tk.MustExec("create table t2(c12 integer, c13 integer, c14 varchar(0), c15 double);")
 		tk.MustExec("create table t3(vkey varchar(0), c20 integer);")
-		tk.MustQuery("explain format='brief' select 0 from t2 join(t3 join t0 a on 0) left join(t1 b left join t1 c on 0) on(c20 = b.vkey) on(c13 = a.vkey) join(select c14 d from(t2 join t3 on c12 = vkey)) e on(c3 = d) where nullif(c15, case when(c.c10) then 0 end);").Check(testkit.Rows(
-			"Projection 0.00 root  0->Column#33",
-			"└─HashJoin 0.00 root  inner join, equal:[eq(Column#23, Column#40)]",
-			"  ├─HashJoin(Build) 0.00 root  inner join, equal:[eq(test.t0.c3, test.t2.c14)]",
-			"  │ ├─Selection(Build) 0.00 root  if(eq(test.t2.c15, cast(case(test.t1.c10, 0), double BINARY)), NULL, test.t2.c15)",
-			"  │ │ └─HashJoin 0.00 root  left outer join, left side:HashJoin, equal:[eq(test.t3.c20, test.t1.vkey)]",
-			"  │ │   ├─HashJoin(Build) 0.00 root  inner join, equal:[eq(test.t0.vkey, test.t2.c13)]",
-			"  │ │   │ ├─TableDual(Build) 0.00 root  rows:0",
-			"  │ │   │ └─TableReader(Probe) 9990.00 root  data:Selection",
-			"  │ │   │   └─Selection 9990.00 cop[tikv]  not(isnull(test.t2.c13))",
-			"  │ │   │     └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo",
-			"  │ │   └─HashJoin(Probe) 9990.00 root  CARTESIAN left outer join, left side:TableReader",
-			"  │ │     ├─TableDual(Build) 0.00 root  rows:0",
-			"  │ │     └─TableReader(Probe) 9990.00 root  data:Selection",
-			"  │ │       └─Selection 9990.00 cop[tikv]  not(isnull(test.t1.vkey))",
-			"  │ │         └─TableFullScan 10000.00 cop[tikv] table:b keep order:false, stats:pseudo",
-			"  │ └─Projection(Probe) 9990.00 root  test.t2.c12, test.t2.c14, test.t2.c12->Column#23",
-			"  │   └─TableReader 9990.00 root  data:Selection",
-			"  │     └─Selection 9990.00 cop[tikv]  not(isnull(test.t2.c14))",
-			"  │       └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo",
-			"  └─Projection(Probe) 8000.00 root  cast(test.t3.vkey, bigint(0) BINARY)->Column#40",
-			"    └─Selection 8000.00 root  eq(cast(cast(test.t3.vkey, bigint(0) BINARY), double BINARY), cast(test.t3.vkey, double BINARY))",
-			"      └─TableReader 10000.00 root  data:TableFullScan",
-			"        └─TableFullScan 10000.00 cop[tikv] table:t3 keep order:false, stats:pseudo"))
+		tk.MustQuery("explain format='plan_tree' select 0 from t2 join(t3 join t0 a on 0) left join(t1 b left join t1 c on 0) on(c20 = b.vkey) on(c13 = a.vkey) join(select c14 d from(t2 join t3 on c12 = vkey)) e on(c3 = d) where nullif(c15, case when(c.c10) then 0 end);").Check(testkit.Rows(
+			"Projection root  0->Column",
+			"└─HashJoin root  inner join, equal:[eq(Column, Column)]",
+			"  ├─HashJoin(Build) root  inner join, equal:[eq(test.t0.c3, test.t2.c14)]",
+			"  │ ├─Selection(Build) root  if(eq(test.t2.c15, cast(case(test.t1.c10, 0), double BINARY)), NULL, test.t2.c15)",
+			"  │ │ └─HashJoin root  left outer join, left side:HashJoin, equal:[eq(test.t3.c20, test.t1.vkey)]",
+			"  │ │   ├─HashJoin(Build) root  inner join, equal:[eq(test.t0.vkey, test.t2.c13)]",
+			"  │ │   │ ├─TableDual(Build) root  rows:0",
+			"  │ │   │ └─TableReader(Probe) root  data:Selection",
+			"  │ │   │   └─Selection cop[tikv]  not(isnull(test.t2.c13))",
+			"  │ │   │     └─TableFullScan cop[tikv] table:t2 keep order:false, stats:pseudo",
+			"  │ │   └─HashJoin(Probe) root  CARTESIAN left outer join, left side:TableReader",
+			"  │ │     ├─TableDual(Build) root  rows:0",
+			"  │ │     └─TableReader(Probe) root  data:Selection",
+			"  │ │       └─Selection cop[tikv]  not(isnull(test.t1.vkey))",
+			"  │ │         └─TableFullScan cop[tikv] table:b keep order:false, stats:pseudo",
+			"  │ └─Projection(Probe) root  test.t2.c12, test.t2.c14, test.t2.c12->Column",
+			"  │   └─TableReader root  data:Selection",
+			"  │     └─Selection cop[tikv]  not(isnull(test.t2.c14))",
+			"  │       └─TableFullScan cop[tikv] table:t2 keep order:false, stats:pseudo",
+			"  └─Projection(Probe) root  cast(test.t3.vkey, bigint(0) BINARY)->Column",
+			"    └─Selection root  eq(cast(cast(test.t3.vkey, bigint(0) BINARY), double BINARY), cast(test.t3.vkey, double BINARY))",
+			"      └─TableReader root  data:TableFullScan",
+			"        └─TableFullScan cop[tikv] table:t3 keep order:false, stats:pseudo"))
 	}
 
 	// issue-58999-view-equality-expression-join-key-panic