Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddl: fix CREATE GLOBAL TEMPORARY TABLE ... LIKE creates a normal table #25644

Merged
merged 10 commits into from
Jun 24, 2021
Merged

ddl: fix CREATE GLOBAL TEMPORARY TABLE ... LIKE creates a normal table #25644

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3449680
fix issue#25613
Howie59 Jun 22, 2021
2f6509c
extract a func
Howie59 Jun 22, 2021
be4bdd8
Merge branch 'master' into issue-25613
Howie59 Jun 22, 2021
d1e0a76
modify
Howie59 Jun 22, 2021
85b4d2b
Merge branch 'master' into issue-25613
Howie59 Jun 22, 2021
6489a9f
fix err
Howie59 Jun 22, 2021
b6df923
format code
Howie59 Jun 23, 2021
4f32cdf
Merge branch 'master' into issue-25613
Howie59 Jun 23, 2021
ec1347c
add tests
Howie59 Jun 24, 2021
641bce1
Merge branch 'master' into issue-25613
Howie59 Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions ddl/ddl_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,9 +1731,9 @@ func buildTableInfoWithStmt(ctx sessionctx.Context, s *ast.CreateTableStmt, dbCh
if err != nil {
return nil, errors.Trace(err)
}
setTemporaryType(tbInfo, s.TemporaryKeyword)
switch s.TemporaryKeyword {
Howie59 marked this conversation as resolved.
Show resolved Hide resolved
case ast.TemporaryGlobal:
tbInfo.TempTableType = model.TempTableGlobal
if !ctx.GetSessionVars().EnableGlobalTemporaryTable {
return nil, errors.New("global temporary table is experimental and it is switched off by tidb_enable_global_temporary_table")
}
Expand All @@ -1742,11 +1742,8 @@ func buildTableInfoWithStmt(ctx sessionctx.Context, s *ast.CreateTableStmt, dbCh
return nil, errors.Trace(errUnsupportedOnCommitPreserve)
}
case ast.TemporaryLocal:
// TODO: set "tbInfo.TempTableType = model.TempTableLocal" after local temporary table is supported.
tbInfo.TempTableType = model.TempTableNone
ctx.GetSessionVars().StmtCtx.AppendWarning(errors.New("local TEMPORARY TABLE is not supported yet, TEMPORARY will be parsed but ignored"))
case ast.TemporaryNone:
tbInfo.TempTableType = model.TempTableNone
default:
}

if err = setTableAutoRandomBits(ctx, tbInfo, colDefs); err != nil {
Expand Down Expand Up @@ -1815,6 +1812,7 @@ func (d *ddl) CreateTable(ctx sessionctx.Context, s *ast.CreateTableStmt) (err e
if err != nil {
return errors.Trace(err)
}
setTemporaryType(tbInfo, s.TemporaryKeyword)

if err = checkTableInfoValidWithStmt(ctx, tbInfo, s); err != nil {
return err
Expand All @@ -1828,6 +1826,18 @@ func (d *ddl) CreateTable(ctx sessionctx.Context, s *ast.CreateTableStmt) (err e
return d.CreateTableWithInfo(ctx, schema.Name, tbInfo, onExist, false /*tryRetainID*/)
}

func setTemporaryType(tbInfo *model.TableInfo, temporaryWord ast.TemporaryKeyword) {
switch temporaryWord {
case ast.TemporaryGlobal:
tbInfo.TempTableType = model.TempTableGlobal
case ast.TemporaryLocal:
// TODO: set "tbInfo.TempTableType = model.TempTableLocal" after local temporary table is supported.
tbInfo.TempTableType = model.TempTableNone
default:
tbInfo.TempTableType = model.TempTableNone
}
}

func (d *ddl) CreateTableWithInfo(
ctx sessionctx.Context,
dbName model.CIStr,
Expand Down
17 changes: 17 additions & 0 deletions ddl/serial_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,23 @@ func (s *testSerialSuite) TestCreateTableWithLikeAtTemporaryMode(c *C) {
c.Assert(err, IsNil)
tableInfo := table.Meta()
c.Assert(len(tableInfo.ForeignKeys), Equals, 0)

// Issue 25613.
tk.MustExec("drop table if exists tb2, tb3")
tk.MustExec("create table tb2(id int);")
tk.MustExec("create global temporary table tb3 like tb2 on commit delete rows;")
Howie59 marked this conversation as resolved.
Show resolved Hide resolved
defer tk.MustExec("drop table if exists tb2, tb3")
tk.MustQuery("show create table tb3;").Check(testkit.Rows("tb3 CREATE GLOBAL TEMPORARY TABLE `tb3` (\n" +
" `id` int(11) DEFAULT NULL\n" +
") ENGINE=memory DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ON COMMIT DELETE ROWS"))

tk.MustExec("drop table if exists tb4, tb5")
tk.MustExec("create table tb4(id int);")
tk.MustExec("create table tb5 like tb4")
defer tk.MustExec("drop table if exists tb4, tb5")
tk.MustQuery("show create table tb5;").Check(testkit.Rows("tb5 CREATE TABLE `tb5` (\n" +
" `id` int(11) DEFAULT NULL\n" +
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
}

// TestCancelAddIndex1 tests canceling ddl job when the add index worker is not started.
Expand Down