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.

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: add region and split compatibility for temporary table #24684

Merged
merged 31 commits into from
May 25, 2021
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e0469fc
Merge pull request #1 from pingcap/master
Howie59 Mar 15, 2021
7d60de6
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Mar 18, 2021
0297c4a
Merge branch 'master' of https://github.com.cnpmjs.org/Pingcap/tidb
Howie59 Apr 1, 2021
d4aa60c
Merge branch 'master' of https://github.com.cnpmjs.org/Pingcap/tidb
Howie59 Apr 5, 2021
0362a4b
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 8, 2021
382f2ce
Merge branch 'master' of https://github.com/pingcap/tidb
Howie59 Apr 15, 2021
1108209
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 16, 2021
bf43b07
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 17, 2021
9e41542
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 19, 2021
dfc62d3
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 20, 2021
27572fa
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 23, 2021
b74d2d5
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 23, 2021
9f13862
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 27, 2021
6a86dcd
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 Apr 28, 2021
ce12242
Merge branch 'master' of https://github.com.cnpmjs.org/pingcap/tidb
Howie59 May 2, 2021
c93d3cd
Merge branch 'master' of https://github.com.cnpmjs.org/Pingcap/tidb
Howie59 May 17, 2021
10533ff
show table regions and split table
Howie59 May 17, 2021
9f3a184
pre_split
Howie59 May 17, 2021
b816921
Merge branch 'master' into show-table-region
Howie59 May 17, 2021
777f898
remove unrelated
Howie59 May 18, 2021
317f597
Merge branch 'show-table-region' of https://github.com.cnpmjs.org/How…
Howie59 May 18, 2021
6e839da
add one check
Howie59 May 21, 2021
7166254
Merge branch 'master' into show-table-region
Howie59 May 21, 2021
2585e8b
fmt
Howie59 May 21, 2021
be56ca6
Merge branch 'master' into show-table-region
Howie59 May 22, 2021
b5659ed
check create table like
Howie59 May 22, 2021
6ed7fb1
Merge branch 'master' into show-table-region
ti-chi-bot May 25, 2021
25ef189
Merge branch 'master' into show-table-region
ti-chi-bot May 25, 2021
e794b25
Merge branch 'master' into show-table-region
ti-chi-bot May 25, 2021
8fc551e
Merge branch 'master' into show-table-region
Howie59 May 25, 2021
e07069c
Merge branch 'master' into show-table-region
ti-chi-bot May 25, 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
3 changes: 3 additions & 0 deletions ddl/ddl_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -1925,6 +1925,9 @@ func (d *ddl) CreateTableWithInfo(
// preSplitAndScatter performs pre-split and scatter of the table's regions.
// If `pi` is not nil, will only split region for `pi`, this is used when add partition.
func (d *ddl) preSplitAndScatter(ctx sessionctx.Context, tbInfo *model.TableInfo, pi *model.PartitionInfo) {
if tbInfo.TempTableType != model.TempTableNone {
return
Howie59 marked this conversation as resolved.
Show resolved Hide resolved
}
sp, ok := d.store.(kv.SplittableStore)
if !ok || atomic.LoadUint32(&EnableSplitTableRegion) == 0 {
return
Expand Down
1 change: 1 addition & 0 deletions errno/errcode.go
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,7 @@ const (
ErrAdminCheckTable = 8003
ErrTxnTooLarge = 8004
ErrWriteConflictInTiDB = 8005
ErrOptOnTemporaryTable = 8006
ErrUnsupportedReloadPlugin = 8018
ErrUnsupportedReloadPluginVar = 8019
ErrTableLocked = 8020
Expand Down
1 change: 1 addition & 0 deletions errno/errname.go
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,7 @@ var MySQLErrName = map[uint16]*mysql.ErrMessage{
ErrMemExceedThreshold: mysql.Message("%s holds %dB memory, exceeds threshold %dB.%s", nil),
ErrForUpdateCantRetry: mysql.Message("[%d] can not retry select for update statement", nil),
ErrAdminCheckTable: mysql.Message("TiDB admin check table failed.", nil),
ErrOptOnTemporaryTable: mysql.Message("TiDB %s failed on temporary table.", nil),
ErrTxnTooLarge: mysql.Message("Transaction is too large, size: %d", nil),
ErrWriteConflictInTiDB: mysql.Message("Write conflict, txnStartTS %d is stale", nil),
ErrInvalidPluginID: mysql.Message("Wrong plugin id: %s, valid plugin id is [name]-[version], both name and version should not contain '-'", nil),
Expand Down
5 changes: 5 additions & 0 deletions errors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,11 @@ error = '''
Variable '%s' cannot be set using SET_VAR hint.
'''

["planner:8006"]
error = '''
TiDB %s failed on temporary table.
Howie59 marked this conversation as resolved.
Show resolved Hide resolved
'''

["planner:8108"]
error = '''
Unsupported type %T
Expand Down
14 changes: 14 additions & 0 deletions executor/executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5195,6 +5195,20 @@ func (s *testSplitTable) TestShowTableRegion(c *C) {
// Test show table regions.
tk.MustQuery(`split table t_regions between (-10000) and (10000) regions 4;`).Check(testkit.Rows("4 1"))
re := tk.MustQuery("show table t_regions regions")

// Test show table regions and split table on temporary table.
tk.MustExec("drop table if exists t_regions_temporary_table")
tk.MustExec("create global temporary table t_regions_temporary_table (a int key, b int, c int, index idx(b), index idx2(c)) ON COMMIT DELETE ROWS;")
// Test show table regions.
_, err = tk.Exec("show table t_regions_temporary_table regions")
c.Assert(err.Error(), Equals, plannercore.ErrOptOnTemporaryTable.GenWithStackByArgs("show table regions").Error())
// Test split table.
_, err = tk.Exec("split table t_regions_temporary_table between (-10000) and (10000) regions 4;")
c.Assert(err.Error(), Equals, plannercore.ErrOptOnTemporaryTable.GenWithStackByArgs("split table").Error())
_, err = tk.Exec("split partition table t_regions_temporary_table partition (p1,p2) index idx between (0) and (20000) regions 2;")
c.Assert(err.Error(), Equals, plannercore.ErrOptOnTemporaryTable.GenWithStackByArgs("split table").Error())
tk.MustExec("drop table if exists t_regions_temporary_table")

rows := re.Rows()
// Table t_regions should have 5 regions now.
// 4 regions to store record data.
Expand Down
1 change: 1 addition & 0 deletions planner/core/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,5 @@ var (
ErrAccessDenied = dbterror.ClassOptimizer.NewStdErr(mysql.ErrAccessDenied, mysql.MySQLErrName[mysql.ErrAccessDeniedNoPassword])
ErrBadNull = dbterror.ClassOptimizer.NewStd(mysql.ErrBadNull)
ErrNotSupportedWithSem = dbterror.ClassOptimizer.NewStd(mysql.ErrNotSupportedWithSem)
ErrOptOnTemporaryTable = dbterror.ClassOptimizer.NewStd(mysql.ErrOptOnTemporaryTable)
)
11 changes: 11 additions & 0 deletions planner/core/planbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -2205,6 +2205,14 @@ func (b *PlanBuilder) buildShow(ctx context.Context, show *ast.ShowStmt) (Plan,
err = ErrDBaccessDenied.GenWithStackByArgs(user.AuthUsername, user.AuthHostname, mysql.SystemDB)
}
b.visitInfo = appendVisitInfo(b.visitInfo, mysql.SelectPriv, mysql.SystemDB, "", "", err)
case ast.ShowRegions:
tableInfo, err := b.is.TableByName(show.Table.Schema, show.Table.Name)
if err != nil {
return nil, err
}
if tableInfo.Meta().TempTableType != model.TempTableNone {
return nil, ErrOptOnTemporaryTable.GenWithStackByArgs("show table regions")
}
}
schema, names := buildShowSchema(show, isView, isSequence)
p.SetSchema(schema)
Expand Down Expand Up @@ -3069,6 +3077,9 @@ func (b *PlanBuilder) buildIndexAdvise(node *ast.IndexAdviseStmt) Plan {
}

func (b *PlanBuilder) buildSplitRegion(node *ast.SplitRegionStmt) (Plan, error) {
if node.SplitSyntaxOpt != nil && node.Table.TableInfo.TempTableType != model.TempTableNone {
Howie59 marked this conversation as resolved.
Show resolved Hide resolved
return nil, ErrOptOnTemporaryTable.GenWithStackByArgs("split table")
}
if node.SplitSyntaxOpt != nil && node.SplitSyntaxOpt.HasPartition && node.Table.TableInfo.Partition == nil {
return nil, ErrPartitionClauseOnNonpartitioned
}
Expand Down