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

Jump to bottom

*: Forbid add a partition with placement on a table which has tiflash replicas #31729

Merged
merged 9 commits into from
Jan 17, 2022
Merged

*: Forbid add a partition with placement on a table which has tiflash replicas #31729

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7391dc7
*: Forbid add a partition with placement on a table which has tiflash…
lcwangchao Jan 17, 2022
e09b721
Merge branch 'master' into tiflash_placement_add_partition
lcwangchao Jan 17, 2022
6b27d29
*: refine
xhebox Jan 17, 2022
61ec68b
*: mistake
xhebox Jan 17, 2022
9b1a329
Merge branch 'master' into tiflash_placement_add_partition
ti-chi-bot Jan 17, 2022
a67137a
Merge branch 'master' into tiflash_placement_add_partition
lcwangchao Jan 17, 2022
e291a34
fix break
lcwangchao Jan 17, 2022
16ed6f3
Merge branch 'master' into tiflash_placement_add_partition
lcwangchao Jan 17, 2022
37cfefd
Merge branch 'master' into tiflash_placement_add_partition
lcwangchao Jan 17, 2022
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
4 changes: 4 additions & 0 deletions ddl/partition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ func (w *worker) onAddTablePartition(d *ddlCtx, t *meta.Meta, job *model.Job) (v
return ver, err
}

if tblInfo.TiFlashReplica != nil && tblInfo.TiFlashReplica.Count > 0 {
return 0, errors.Trace(ErrIncompatibleTiFlashAndPlacement)
xhebox marked this conversation as resolved.
Show resolved Hide resolved
}

// In order to skip maintaining the state check in partitionDefinition, TiDB use addingDefinition instead of state field.
// So here using `job.SchemaState` to judge what the stage of this job is.
switch job.SchemaState {
Expand Down
2 changes: 2 additions & 0 deletions ddl/placement_sql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,8 @@ func (s *testDBSuite6) TestPlacementTiflashCheck(c *C) {
c.Assert(ddl.ErrIncompatibleTiFlashAndPlacement.Equal(err), IsTrue)
err = tk.ExecToErr("alter table tp partition p0 primary_region='r2' regions='r2'")
c.Assert(ddl.ErrIncompatibleTiFlashAndPlacement.Equal(err), IsTrue)
err = tk.ExecToErr("alter table tp add partition(partition p2 VALUES LESS THAN (10000) placement policy p1)")
c.Assert(ddl.ErrIncompatibleTiFlashAndPlacement.Equal(err), IsTrue)
tk.MustQuery("show create table tp").Check(testkit.Rows("" +
"tp CREATE TABLE `tp` (\n" +
" `id` int(11) DEFAULT NULL\n" +
Expand Down