planner: fix a panic during column pruning (#47883)

close #47331
pingcap · Nov 22, 2023 · 3ed7732 · 3ed7732
1 parent a84ac1c
commit 3ed7732
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 1 deletion.
diff --git a/pkg/executor/explain_test.go b/pkg/executor/explain_test.go
@@ -83,6 +83,57 @@ func checkMemoryInfo(t *testing.T, tk *testkit.TestKit, sql string) {
 	}
 }
 
+func TestIssue47331(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t1")
+	tk.MustExec(`create table t1(
+		id1 varchar(2) DEFAULT '00',
+		id2 varchar(30) NOT NULL,
+		id3 datetime DEFAULT NULL,
+		id4 varchar(100) NOT NULL DEFAULT 'ecifdata',
+		id5 datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+		id6 int(11) DEFAULT NULL,
+		id7 int(11) DEFAULT NULL,
+		UNIQUE KEY UI_id2 (id2),
+		KEY ix_id1 (id1)
+	)`)
+	tk.MustExec("drop table if exists t2")
+	tk.MustExec(`create table t2(
+		id10 varchar(40) NOT NULL,
+		id2 varchar(30) NOT NULL,
+		KEY IX_id2 (id2),
+		PRIMARY KEY (id10)
+	)`)
+	tk.MustExec("drop table if exists t3")
+	tk.MustExec(`create table t3(
+		id20 varchar(40) DEFAULT NULL,
+		UNIQUE KEY IX_id20 (id20)
+	)`)
+	tk.MustExec(`
+		explain
+		UPDATE t1 a
+		SET a.id1 = '04',
+			a.id3 = CURRENT_TIMESTAMP,
+			a.id4 = SUBSTRING_INDEX(USER(), '@', 1),
+			a.id5 = CURRENT_TIMESTAMP
+		WHERE a.id1 = '03'
+			AND a.id6 - IFNULL(a.id7, 0) =
+				(
+					SELECT COUNT(1)
+					FROM t2 b, t3 c
+					WHERE b.id10 = c.id20
+						AND b.id2 = a.id2
+						AND b.id2 in (
+							SELECT rn.id2
+							FROM t1 rn
+							WHERE rn.id1 = '03'
+						)
+				);
+	`)
+}
+
 func TestMemoryAndDiskUsageAfterClose(t *testing.T) {
 	store := testkit.CreateMockStore(t)
 	tk := testkit.NewTestKit(t, store)

diff --git a/pkg/planner/core/rule_join_reorder.go b/pkg/planner/core/rule_join_reorder.go
@@ -316,7 +316,8 @@ func (s *joinReOrderSolver) optimizeRecursive(ctx sessionctx.Context, p LogicalP
 			proj := LogicalProjection{
 				Exprs: expression.Column2Exprs(originalSchema.Columns),
 			}.Init(p.SCtx(), p.SelectBlockOffset())
-			proj.SetSchema(originalSchema)
+			// Clone the schema here, because the schema may be changed by column pruning rules.
+			proj.SetSchema(originalSchema.Clone())
 			proj.SetChildren(p)
 			p = proj
 		}