planner: DML queries might panic when CTE exists (#46092) (#46097)

close #46083
pingcap · Oct 12, 2023 · 2fd7d66 · 2fd7d66
1 parent b653cf0
commit 2fd7d66
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/planner/core/issuetest/planner_issue_test.go b/planner/core/issuetest/planner_issue_test.go
@@ -108,12 +108,10 @@ func TestIssue45036(t *testing.T) {
  " └─TableRangeScan_8 10000.00 cop[tikv] table:s range:[1,100000], keep order:false, stats:pseudo"))
 }
 
-func TestIssue45758(t *testing.T) {
+func TestIssue46083(t *testing.T) {
  store := testkit.CreateMockStore(t)
  tk := testkit.NewTestKit(t, store)
  tk.MustExec("use test")
- tk.MustExec("CREATE TABLE tb1 (cid INT, code INT, class VARCHAR(10))")
- tk.MustExec("CREATE TABLE tb2 (cid INT, code INT, class VARCHAR(10))")
- // result ok
- tk.MustExec("UPDATE tb1, (SELECT code AS cid, code, MAX(class) AS class FROM tb2 GROUP BY code) tb3 SET tb1.cid = tb3.cid, tb1.code = tb3.code, tb1.class = tb3.class")
+ tk.MustExec("CREATE TEMPORARY TABLE v0(v1 int)")
+ tk.MustExec("INSERT INTO v0 WITH ta2 AS (TABLE v0) TABLE ta2 FOR UPDATE OF ta2;")
 }
diff --git a/planner/core/logical_plan_builder.go b/planner/core/logical_plan_builder.go
@@ -4187,6 +4187,10 @@ func (b *PlanBuilder) buildSelect(ctx context.Context, sel *ast.SelectStmt) (p L
  b.ctx.GetSessionVars().StmtCtx.AppendWarning(err)
  }
  for _, tName := range l.Tables {
+ // CTE has no *model.TableInfo, we need to skip it.
+ if tName.TableInfo == nil {
+ continue
+ }
  b.ctx.GetSessionVars().StmtCtx.LockTableIDs[tName.TableInfo.ID] = struct{}{}
  }
  p, err = b.buildSelectLock(p, l)