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

*: [WIP] Exchange partition support for global index #54682

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+479 −31
Draft

*: [WIP] Exchange partition support for global index #54682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a2a86e
First working commit, needs index cleanup and testing.
mjonss Jul 16, 2024
98a06d2
Updated test
mjonss Jul 16, 2024
9eab0af
Updated tests and fixed removing indexes from metadata
mjonss Jul 17, 2024
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
42 changes: 24 additions & 18 deletions pkg/ddl/ddl_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5334,10 +5334,10 @@ func checkTiFlashReplicaCompatible(source *model.TiFlashReplicaInfo, target *mod
return true
}

func checkTableDefCompatible(source *model.TableInfo, target *model.TableInfo) error {
func checkTableDefCompatible(source *model.TableInfo, target *model.TableInfo) (bool, error) {
// check temp table
if target.TempTableType != model.TempTableNone {
return errors.Trace(dbterror.ErrPartitionExchangeTempTable.FastGenByArgs(target.Name))
return false, errors.Trace(dbterror.ErrPartitionExchangeTempTable.FastGenByArgs(target.Name))
}

// check auto_random
Expand All @@ -5348,38 +5348,42 @@ func checkTableDefCompatible(source *model.TableInfo, target *model.TableInfo) e
source.ShardRowIDBits != target.ShardRowIDBits ||
source.MaxShardRowIDBits != target.MaxShardRowIDBits ||
!checkTiFlashReplicaCompatible(source.TiFlashReplica, target.TiFlashReplica) {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
if len(source.Cols()) != len(target.Cols()) {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
// Col compatible check
for i, sourceCol := range source.Cols() {
targetCol := target.Cols()[i]
if sourceCol.IsVirtualGenerated() != targetCol.IsVirtualGenerated() {
return dbterror.ErrUnsupportedOnGeneratedColumn.GenWithStackByArgs("Exchanging partitions for non-generated columns")
return false, dbterror.ErrUnsupportedOnGeneratedColumn.GenWithStackByArgs("Exchanging partitions for non-generated columns")
}
// It should strictyle compare expressions for generated columns
if sourceCol.Name.L != targetCol.Name.L ||
sourceCol.Hidden != targetCol.Hidden ||
!checkFieldTypeCompatible(&sourceCol.FieldType, &targetCol.FieldType) ||
sourceCol.GeneratedExprString != targetCol.GeneratedExprString {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
if sourceCol.State != model.StatePublic ||
targetCol.State != model.StatePublic {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
if sourceCol.ID != targetCol.ID {
return dbterror.ErrPartitionExchangeDifferentOption.GenWithStackByArgs(fmt.Sprintf("column: %s", sourceCol.Name))
return false, dbterror.ErrPartitionExchangeDifferentOption.GenWithStackByArgs(fmt.Sprintf("column: %s", sourceCol.Name))
}
}
if len(source.Indices) != len(target.Indices) {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
globalIndex := false
for _, sourceIdx := range source.Indices {
// TODO: Should we allow Exchange Partition without matching GLOBAL INDEX vs UNIQUE INDEX?
// Since then we don't need to drop the UNIQUE INDEX from the table->partition!
// But also there are bigger risk that there are duplicate rows...
if sourceIdx.Global {
return dbterror.ErrPartitionExchangeDifferentOption.GenWithStackByArgs(fmt.Sprintf("global index: %s", sourceIdx.Name))
globalIndex = true
}
var compatIdx *model.IndexInfo
for _, targetIdx := range target.Indices {
Expand All @@ -5389,31 +5393,32 @@ func checkTableDefCompatible(source *model.TableInfo, target *model.TableInfo) e
}
// No match index
if compatIdx == nil {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
// Index type is not compatible
if sourceIdx.Tp != compatIdx.Tp ||
sourceIdx.Unique != compatIdx.Unique ||
sourceIdx.Primary != compatIdx.Primary {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
// The index column
if len(sourceIdx.Columns) != len(compatIdx.Columns) {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
for i, sourceIdxCol := range sourceIdx.Columns {
compatIdxCol := compatIdx.Columns[i]
if sourceIdxCol.Length != compatIdxCol.Length ||
sourceIdxCol.Name.L != compatIdxCol.Name.L {
return errors.Trace(dbterror.ErrTablesDifferentMetadata)
return false, errors.Trace(dbterror.ErrTablesDifferentMetadata)
}
}
if sourceIdx.ID != compatIdx.ID {
return dbterror.ErrPartitionExchangeDifferentOption.GenWithStackByArgs(fmt.Sprintf("index: %s", sourceIdx.Name))
// TODO: We could allow Global Index ID mismatches, since they will be rewritten any way.
return false, dbterror.ErrPartitionExchangeDifferentOption.GenWithStackByArgs(fmt.Sprintf("index: %s", sourceIdx.Name))
}
}

return nil
return globalIndex, nil
}

func checkExchangePartition(pt *model.TableInfo, nt *model.TableInfo) error {
Expand Down Expand Up @@ -5471,7 +5476,7 @@ func (d *ddl) ExchangeTablePartition(ctx sessionctx.Context, ident ast.Ident, sp
return errors.Trace(err)
}

err = checkTableDefCompatible(ptMeta, ntMeta)
_, err = checkTableDefCompatible(ptMeta, ntMeta)
if err != nil {
return errors.Trace(err)
}
Expand All @@ -5490,7 +5495,8 @@ func (d *ddl) ExchangeTablePartition(ctx sessionctx.Context, ident ast.Ident, sp
{Database: ptSchema.Name.L, Table: ptMeta.Name.L},
{Database: ntSchema.Name.L, Table: ntMeta.Name.L},
},
SQLMode: ctx.GetSessionVars().SQLMode,
SQLMode: ctx.GetSessionVars().SQLMode,
ReorgMeta: NewDDLReorgMeta(ctx),
}

err = d.DoDDLJob(ctx, job)
Expand Down
Loading