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 reassigned partition id in truncate table does not take effect #7919

Merged
merged 6 commits into from
Oct 23, 2018
Merged

ddl: fix reassigned partition id in truncate table does not take effect #7919

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45bf86b
fix reassigned partition id in truncate table does not take effect
ciscoxll Oct 16, 2018
2fa6b5d
Address comment
ciscoxll Oct 17, 2018
09b6b23
Address comment
ciscoxll Oct 18, 2018
ff5da6b
Address comment
ciscoxll Oct 23, 2018
50de52c
Merge branch 'master' into truncate-table-improve
ciscoxll Oct 23, 2018
63c4cd0
Merge branch 'master' into truncate-table-improve
ciscoxll Oct 23, 2018
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
27 changes: 27 additions & 0 deletions ddl/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3008,6 +3008,33 @@ func (s *testDBSuite) TestTruncatePartitionAndDropTable(c *C) {
hasOldPartitionData = checkPartitionDelRangeDone(c, s, partitionPrefix)
c.Assert(hasOldPartitionData, IsFalse)
s.testErrorCode(c, "select * from t4;", tmysql.ErrNoSuchTable)

// Test truncate table partition reassign a new partitionIDs.
s.tk.MustExec("drop table if exists t5;")
s.tk.MustExec("set @@session.tidb_enable_table_partition=1;")
s.tk.MustExec(`create table t5(
id int, name varchar(50),
purchased date
)
partition by range( year(purchased) ) (
partition p0 values less than (1990),
partition p1 values less than (1995),
partition p2 values less than (2000),
partition p3 values less than (2005),
partition p4 values less than (2010),
partition p5 values less than (2015)
);`)
is = domain.GetDomain(ctx).InfoSchema()
oldTblInfo, err = is.TableByName(model.NewCIStr("test"), model.NewCIStr("t5"))
c.Assert(err, IsNil)
oldPID = oldTblInfo.Meta().Partition.Definitions[0].ID

s.tk.MustExec("truncate table t5;")
is = domain.GetDomain(ctx).InfoSchema()
c.Assert(err, IsNil)
newTblInfo, err := is.TableByName(model.NewCIStr("test"), model.NewCIStr("t5"))
newPID := newTblInfo.Meta().Partition.Definitions[0].ID
c.Assert(oldPID != newPID, IsTrue)
}

func (s *testDBSuite) TestPartitionUniqueKeyNeedAllFieldsInPf(c *C) {
Expand Down
13 changes: 13 additions & 0 deletions ddl/partition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,3 +417,16 @@ func isRangePartitionColUnsignedBigint(cols []*table.Column, pi *model.Partition
}
return false
}

// truncateTableFromReassignPartitionIDs reassign a new partition ids.
func truncateTableFromReassignPartitionIDs(job *model.Job, t *meta.Meta, tblInfo *model.TableInfo) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

truncateTableFromReassignPartitionIDs ---> truncateTableByReassignPartitionIDs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

truncateTableFromReassignPartitionIDs ---> truncateTableByReassignPartitionIDs

for i := range tblInfo.Partition.Definitions {
pid, err := t.GenGlobalID()
if err != nil {
job.State = model.JobStateCancelled
return errors.Trace(err)
}
tblInfo.Partition.Definitions[i].ID = pid
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, if an error occur and DDL rollback, model.TableInfo.Partition is partially changed, some id is new and the old ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tiancaiamao This is executed in a transaction. All changes will not take effect until the transaction is successfully committed.

Copy link
Contributor Author

@ciscoxll ciscoxll Oct 19, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tiancaiamao Only one updateSchemaVersion was executed in onTruncateTable, so if an error occurs and DDL rollback will not be a problem.

}
return nil
}
13 changes: 4 additions & 9 deletions ddl/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,18 +209,13 @@ func onTruncateTable(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64, _ erro
return ver, errors.Trace(err)
}

// We use the new partition ID because all the old data is encoded with the old partition ID, it can not be accessed anymore.
var oldPartitionIDs []int64
if tblInfo.GetPartitionInfo() != nil {
oldPartitionIDs = getPartitionIDs(tblInfo)
for _, def := range tblInfo.Partition.Definitions {
var pid int64
pid, err = t.GenGlobalID()
if err != nil {
job.State = model.JobStateCancelled
return ver, errors.Trace(err)
}
def.ID = pid
// We use the new partition ID because all the old data is encoded with the old partition ID, it can not be accessed anymore.
err = truncateTableFromReassignPartitionIDs(job, t, tblInfo)
if err != nil {
return ver, errors.Trace(err)
}
}

Expand Down