ddl: fix alter table exchange partition does not work if table has tiflash replica

ddl/ddl_api.go

@@ -2917,7 +2917,7 @@ func (d *ddl) ExchangeTablePartition(ctx sessionctx.Context, ident ast.Ident, sp
 
 	// NOTE: if pt is subPartitioned, it should be checked
 
-	_, err = tables.FindPartitionByName(ptMeta, partName)
+	defID, err := tables.FindPartitionByName(ptMeta, partName)
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -2933,7 +2933,7 @@ func (d *ddl) ExchangeTablePartition(ctx sessionctx.Context, ident ast.Ident, sp
 		SchemaName: ntSchema.Name.L,
 		Type:       model.ActionExchangeTablePartition,
 		BinlogInfo: &model.HistoryInfo{},
-		Args:       []interface{}{ptSchema.ID, ptMeta.ID, partName, spec.WithValidation},
+		Args:       []interface{}{defID, ptSchema.ID, ptMeta.ID, partName, spec.WithValidation},
 	}
 
 	err = d.doDDLJob(ctx, job)

ddl/ddl_worker.go

@@ -835,6 +835,12 @@ func updateSchemaVersion(t *meta.Meta, job *model.Job) (int64, error) {
 			return 0, errors.Trace(err)
 		}
 		diff.TableID = job.TableID
+	case model.ActionExchangeTablePartition:
+		err = job.DecodeArgs(&diff.TableID, &diff.PtSchemaID, &diff.PtTableID)
+		if err != nil {
+			return 0, errors.Trace(err)
+		}
+		diff.OldTableID = job.TableID
 	default:
 		diff.TableID = job.TableID
 	}

ddl/ddl_worker_test.go

@@ -997,7 +997,8 @@ func (s *testDDLSuite) TestCancelJob(c *C) {
 	testCreateTable(c, ctx, d, dbInfo, nt)
 
 	updateTest(&tests[43])
-	exchangeTablePartition := []interface{}{dbInfo.ID, pt.ID, "p0", true}
+	defID := pt.Partition.Definitions[0].ID
+	exchangeTablePartition := []interface{}{defID, dbInfo.ID, pt.ID, "p0", true}
 	doDDLJobErrWithSchemaState(ctx, d, c, dbInfo.ID, nt.ID, test.act, exchangeTablePartition, &test.cancelState)
 	c.Check(checkErr, IsNil)
 	changedNtTable := testGetTable(c, d, dbInfo.ID, nt.ID)

ddl/partition.go

@@ -712,18 +712,20 @@ func onTruncateTablePartition(d *ddlCtx, t *meta.Meta, job *model.Job) (int64, e
 // onExchangeTablePartition exchange partition data
 func (w *worker) onExchangeTablePartition(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64, _ error) {
 	var (
+		//defID only for updateSchemaVersion
+		defID          int64
 		ptSchemaID     int64
 		ptID           int64
 		partName       string
 		withValidation bool
 	)
 
-	if err := job.DecodeArgs(&ptSchemaID, &ptID, &partName, &withValidation); err != nil {
+	if err := job.DecodeArgs(&defID, &ptSchemaID, &ptID, &partName, &withValidation); err != nil {
 		job.State = model.JobStateCancelled
 		return ver, errors.Trace(err)
 	}
 
-	ntDbInfo, err := t.GetDatabase(job.SchemaID)
+	ntDbInfo, err := checkSchemaExistAndCancelNotExistJob(t, job)
 	if err != nil {
 		job.State = model.JobStateCancelled
 		return ver, errors.Trace(err)
@@ -754,8 +756,13 @@ func (w *worker) onExchangeTablePartition(d *ddlCtx, t *meta.Meta, job *model.Jo
 		return ver, errors.Trace(err)
 	}
 
+	index, _, err := getPartitionDef(pt, partName)
+	if err != nil {
+		return ver, errors.Trace(err)
+	}
+
 	if withValidation {
-		err = checkExchangePartitionRecordValidation(w, pt, partName, ntDbInfo.Name, nt.Name)
+		err = checkExchangePartitionRecordValidation(w, pt, index, ntDbInfo.Name, nt.Name)
 		if err != nil {
 			job.State = model.JobStateCancelled
 			return ver, errors.Trace(err)
@@ -866,14 +873,10 @@ func (w *worker) onExchangeTablePartition(d *ddlCtx, t *meta.Meta, job *model.Jo
 	return ver, nil
 }
 
-func checkExchangePartitionRecordValidation(w *worker, pt *model.TableInfo, partName string, schemaName, tableName model.CIStr) error {
+func checkExchangePartitionRecordValidation(w *worker, pt *model.TableInfo, index int, schemaName, tableName model.CIStr) error {
 	var sql string
 
 	pi := pt.Partition
-	index, _, err := getPartitionDef(pt, partName)
-	if err != nil {
-		return errors.Trace(err)
-	}
 
 	switch pi.Type {
 	case model.PartitionTypeHash:
@@ -882,9 +885,6 @@ func checkExchangePartitionRecordValidation(w *worker, pt *model.TableInfo, part
 		}
 		sql = fmt.Sprintf("select 1 from `%s`.`%s` where mod(%s, %d) != %d limit 1", schemaName.L, tableName.L, pi.Expr, pi.Num, index)
 	case model.PartitionTypeRange:
-		if err != nil {
-			return errors.Trace(err)
-		}
 		// Table has only one partition and has the maximum value
 		if len(pi.Definitions) == 1 && strings.EqualFold(pi.Definitions[index].LessThan[0], partitionMaxValue) {
 			return nil
@@ -900,7 +900,7 @@ func checkExchangePartitionRecordValidation(w *worker, pt *model.TableInfo, part
 	}
 
 	var ctx sessionctx.Context
-	ctx, err = w.sessPool.get()
+	ctx, err := w.sessPool.get()
 	if err != nil {
 		return errors.Trace(err)
 	}

go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989
 	github.com/pingcap/kvproto v0.0.0-20200518112156-d4aeb467de29
 	github.com/pingcap/log v0.0.0-20200511115504-543df19646ad
-	github.com/pingcap/parser v0.0.0-20200522094936-3b720a0512a6
+	github.com/pingcap/parser v0.0.0-20200601053017-87d29a820b2d
 	github.com/pingcap/pd/v4 v4.0.0-rc.2.0.20200520083007-2c251bd8f181
 	github.com/pingcap/sysutil v0.0.0-20200408114249-ed3bd6f7fdb1
 	github.com/pingcap/tidb-tools v4.0.0-rc.1.0.20200514040632-f76b3e428e19+incompatible
@@ -63,3 +63,5 @@ require (
 )
 
 go 1.13
+
+replace github.com/pingcap/parser => github.com/zhaox1n/parser v0.0.0-20200601191909-048d6ec9eef1

go.sum

@@ -601,6 +601,10 @@ github.com/yookoala/realpath v1.0.0/go.mod h1:gJJMA9wuX7AcqLy1+ffPatSCySA1FQ2S8Y
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zhangjinpeng1987/raft v0.0.0-20190624145930-deeb32d6553d h1:rGkexfPDxNuTCObUwTbsRUlti+evR/Ksb4dKy6esXW0=
 github.com/zhangjinpeng1987/raft v0.0.0-20190624145930-deeb32d6553d/go.mod h1:1KDQ09J8MRHEtHze4at7BJZDW/doUAgkJ8w9KjEUhSo=
+github.com/zhaox1n/parser v0.0.0-20200601184100-acd1a1774f3b h1:ztkWO3u6NFlSkV3vr3vOdeOlh8owOpHx9t5qZvFO5IM=
+github.com/zhaox1n/parser v0.0.0-20200601184100-acd1a1774f3b/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0=
+github.com/zhaox1n/parser v0.0.0-20200601191909-048d6ec9eef1 h1:f4Qcit4fJibpvNmFSYMDS/O6KHOxQTnwFnfD1gvZ/O4=
+github.com/zhaox1n/parser v0.0.0-20200601191909-048d6ec9eef1/go.mod h1:vQdbJqobJAgFyiRNNtXahpMoGWwPEuWciVEK5A20NS0=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=

infoschema/builder.go

@@ -60,7 +60,7 @@ func (b *Builder) ApplyDiff(m *meta.Meta, diff *model.SchemaDiff) ([]int64, erro
 		newTableID = diff.TableID
 	case model.ActionDropTable, model.ActionDropView, model.ActionDropSequence:
 		oldTableID = diff.TableID
-	case model.ActionTruncateTable, model.ActionCreateView:
+	case model.ActionTruncateTable, model.ActionCreateView, model.ActionExchangeTablePartition:
 		oldTableID = diff.OldTableID
 		newTableID = diff.TableID
 	default:
@@ -74,7 +74,8 @@ func (b *Builder) ApplyDiff(m *meta.Meta, diff *model.SchemaDiff) ([]int64, erro
 	// We try to reuse the old allocator, so the cached auto ID can be reused.
 	var allocs autoid.Allocators
 	if tableIDIsValid(oldTableID) {
-		if oldTableID == newTableID && diff.Type != model.ActionRenameTable {
+		if oldTableID == newTableID && diff.Type != model.ActionRenameTable &&
+			diff.Type != model.ActionExchangeTablePartition {
 			oldAllocs, _ := b.is.AllocByID(oldTableID)
 			allocs = filterAllocators(diff, oldAllocs)
 		}
@@ -106,6 +107,13 @@ func (b *Builder) ApplyDiff(m *meta.Meta, diff *model.SchemaDiff) ([]int64, erro
 			return nil, errors.Trace(err)
 		}
 	}
+	if diff.Type == model.ActionExchangeTablePartition {
+		var err error
+		tblIDs, err = b.applyExchangePartition(m, diff, tblIDs)
+		if err != nil {
+			return nil, errors.Trace(err)
+		}
+	}
 	return tblIDs, nil
 }
 
@@ -155,6 +163,22 @@ func (b *Builder) copySortedTables(oldTableID, newTableID int64) {
 	}
 }
 
+func (b *Builder) applyExchangePartition(m *meta.Meta, diff *model.SchemaDiff, affected []int64) ([]int64, error) {
+	ptDi, err := m.GetDatabase(diff.PtSchemaID)
+	if err != nil {
+		return affected, errors.Trace(err)
+	}
+	if tableIDIsValid(diff.PtTableID) {
+		affected = b.applyDropTable(ptDi, diff.PtTableID, affected)
+		var allocs autoid.Allocators
+		affected, err = b.applyCreateTable(m, ptDi, diff.PtTableID, allocs, diff.Type, affected)
+		if err != nil {
+			return affected, errors.Trace(err)
+		}
+	}
+	return affected, nil
+}
+
 func (b *Builder) applyCreateSchema(m *meta.Meta, diff *model.SchemaDiff) error {
 	di, err := m.GetDatabase(diff.SchemaID)
 	if err != nil {