Skip to content

schemastore: fix rename partition table #4446

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

Merged
ti-chi-bot merged 4 commits into from
Mar 12, 2026
Merged

schemastore: fix rename partition table #4446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ed00c6
add integration test
lidezhu Mar 12, 2026
b27f291
add test
lidezhu Mar 12, 2026
e7f0794
f
lidezhu Mar 12, 2026
324e73f
r
lidezhu Mar 12, 2026
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: 2 additions & 2 deletions logservice/schemastore/persist_storage_ddl_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2692,8 +2692,8 @@ func buildDDLEventForRenameTables(rawEvent *PersistedDDLEvent, tableFilter filte
continue
}
allFiltered = false
if isPartitionTable(rawEvent.TableInfo) {
allPhysicalIDs := getAllPartitionIDs(rawEvent.TableInfo)
if isPartitionTable(tableInfo) {
allPhysicalIDs := getAllPartitionIDs(tableInfo)
if !ignorePrevTable {
if !notSyncPrevTable {
// only when the previous table is not filtered and not NotSync, we add the query and table info
Expand Down
121 changes: 121 additions & 0 deletions logservice/schemastore/persist_storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3459,6 +3459,127 @@ func TestBuildPersistedDDLEventEscapesIdentifiers(t *testing.T) {
})
}

func TestBuildDDLEventForRenameTablesForPartitionTable(t *testing.T) {
normalInfo := newEligibleTableInfoForTest(200, "normal_new")
partitionInfo := newEligiblePartitionTableInfoForTest(300, "partition_new", []model.PartitionDefinition{
{ID: 301},
{ID: 302},
})
partitionInfo2 := newEligiblePartitionTableInfoForTest(400, "partition_new_2", []model.PartitionDefinition{
{ID: 401},
{ID: 402},
})

t.Run("normal table then partition table", func(t *testing.T) {
rawEvent := &PersistedDDLEvent{
Type: byte(model.ActionRenameTables),
SchemaID: 110,
SchemaName: "target_normal",
TableName: normalInfo.Name.O,
TableInfo: normalInfo,
Query: "RENAME TABLE `source_normal`.`normal_old` TO `target_normal`.`normal_new`;" +
"RENAME TABLE `source_partition`.`partition_old` TO `target_partition`.`partition_new`;",
FinishedTs: 1010,
SchemaIDs: []int64{110, 111},
SchemaNames: []string{"target_normal", "target_partition"},
ExtraSchemaIDs: []int64{100, 101},
ExtraSchemaNames: []string{"source_normal", "source_partition"},
ExtraTableNames: []string{"normal_old", "partition_old"},
MultipleTableInfos: []*model.TableInfo{
normalInfo,
partitionInfo,
},
}

ddlEvent, ok, err := buildDDLEventForRenameTables(rawEvent, nil, 301)
require.NoError(t, err)
require.True(t, ok)
require.Equal(t, []int64{common.DDLSpanTableID, 200, 301, 302}, ddlEvent.BlockedTables.TableIDs)
require.Equal(t, []commonEvent.SchemaIDChange{
{TableID: 200, OldSchemaID: 100, NewSchemaID: 110},
{TableID: 301, OldSchemaID: 101, NewSchemaID: 111},
{TableID: 302, OldSchemaID: 101, NewSchemaID: 111},
}, ddlEvent.UpdatedSchemas)
require.NotNil(t, ddlEvent.TableInfo)
require.Equal(t, int64(300), ddlEvent.GetTableID())
require.Equal(t, "target_partition", ddlEvent.TableInfo.GetSchemaName())
require.Equal(t, "partition_new", ddlEvent.TableInfo.GetTableName())
})

t.Run("partition table then normal table", func(t *testing.T) {
rawEvent := &PersistedDDLEvent{
Type: byte(model.ActionRenameTables),
SchemaID: 111,
SchemaName: "target_partition",
TableName: partitionInfo.Name.O,
TableInfo: partitionInfo,
Query: "RENAME TABLE `source_partition`.`partition_old` TO `target_partition`.`partition_new`;" +
"RENAME TABLE `source_normal`.`normal_old` TO `target_normal`.`normal_new`;",
FinishedTs: 1010,
SchemaIDs: []int64{111, 110},
SchemaNames: []string{"target_partition", "target_normal"},
ExtraSchemaIDs: []int64{101, 100},
ExtraSchemaNames: []string{"source_partition", "source_normal"},
ExtraTableNames: []string{"partition_old", "normal_old"},
MultipleTableInfos: []*model.TableInfo{
partitionInfo,
normalInfo,
},
}

ddlEvent, ok, err := buildDDLEventForRenameTables(rawEvent, nil, 200)
require.NoError(t, err)
require.True(t, ok)
require.Equal(t, []int64{common.DDLSpanTableID, 301, 302, 200}, ddlEvent.BlockedTables.TableIDs)
require.Equal(t, []commonEvent.SchemaIDChange{
{TableID: 301, OldSchemaID: 101, NewSchemaID: 111},
{TableID: 302, OldSchemaID: 101, NewSchemaID: 111},
{TableID: 200, OldSchemaID: 100, NewSchemaID: 110},
}, ddlEvent.UpdatedSchemas)
require.NotNil(t, ddlEvent.TableInfo)
require.Equal(t, int64(200), ddlEvent.GetTableID())
require.Equal(t, "target_normal", ddlEvent.TableInfo.GetSchemaName())
require.Equal(t, "normal_new", ddlEvent.TableInfo.GetTableName())
})

t.Run("multiple partition tables", func(t *testing.T) {
rawEvent := &PersistedDDLEvent{
Type: byte(model.ActionRenameTables),
SchemaID: 111,
SchemaName: "target_partition",
TableName: partitionInfo.Name.O,
TableInfo: partitionInfo,
Query: "RENAME TABLE `source_partition`.`partition_old` TO `target_partition`.`partition_new`;" +
"RENAME TABLE `source_partition_2`.`partition_old_2` TO `target_partition_2`.`partition_new_2`;",
FinishedTs: 1010,
SchemaIDs: []int64{111, 121},
SchemaNames: []string{"target_partition", "target_partition_2"},
ExtraSchemaIDs: []int64{101, 120},
ExtraSchemaNames: []string{"source_partition", "source_partition_2"},
ExtraTableNames: []string{"partition_old", "partition_old_2"},
MultipleTableInfos: []*model.TableInfo{
partitionInfo,
partitionInfo2,
},
}

ddlEvent, ok, err := buildDDLEventForRenameTables(rawEvent, nil, 402)
require.NoError(t, err)
require.True(t, ok)
require.Equal(t, []int64{common.DDLSpanTableID, 301, 302, 401, 402}, ddlEvent.BlockedTables.TableIDs)
require.Equal(t, []commonEvent.SchemaIDChange{
{TableID: 301, OldSchemaID: 101, NewSchemaID: 111},
{TableID: 302, OldSchemaID: 101, NewSchemaID: 111},
{TableID: 401, OldSchemaID: 120, NewSchemaID: 121},
{TableID: 402, OldSchemaID: 120, NewSchemaID: 121},
}, ddlEvent.UpdatedSchemas)
require.NotNil(t, ddlEvent.TableInfo)
require.Equal(t, int64(400), ddlEvent.GetTableID())
require.Equal(t, "target_partition_2", ddlEvent.TableInfo.GetSchemaName())
require.Equal(t, "partition_new_2", ddlEvent.TableInfo.GetTableName())
})
}

func TestParseRenameTablesQueryInfos(t *testing.T) {
cases := []struct {
name string
Expand Down
9 changes: 8 additions & 1 deletion tests/integration_tests/csv_storage_multi_tables_ddl/conf/diff_config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ check-struct-only = false

target-instance = "mysql1"

target-check-tables = ["multi_tables_ddl_test.t1_7", "multi_tables_ddl_test.t2_7"]
target-check-tables = [
"multi_tables_ddl_test.t1_7",
"multi_tables_ddl_test.t2_7",
"multi_tables_ddl_test.rename_mix_normal_1_done",
"multi_tables_ddl_test.rename_mix_part_1_done",
"multi_tables_ddl_test.rename_mix_normal_2_done",
"multi_tables_ddl_test.rename_mix_part_2_done",
]

[data-sources]
[data-sources.tidb0]
Expand Down
20 changes: 18 additions & 2 deletions tests/integration_tests/csv_storage_multi_tables_ddl/conf/normal.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
[filter]
rules = ["multi_tables_ddl_test.t1", "multi_tables_ddl_test.t2", "multi_tables_ddl_test.t3", "multi_tables_ddl_test.t4" ,"multi_tables_ddl_test.t1_7","multi_tables_ddl_test.t2_7", "multi_tables_ddl_test.finish_mark"]
rules = [
"multi_tables_ddl_test.t1",
"multi_tables_ddl_test.t2",
"multi_tables_ddl_test.t3",
"multi_tables_ddl_test.t4",
"multi_tables_ddl_test.t1_7",
"multi_tables_ddl_test.t2_7",
"multi_tables_ddl_test.rename_mix_normal_1",
"multi_tables_ddl_test.rename_mix_part_1",
"multi_tables_ddl_test.rename_mix_normal_1_done",
"multi_tables_ddl_test.rename_mix_part_1_done",
"multi_tables_ddl_test.rename_mix_normal_2",
"multi_tables_ddl_test.rename_mix_part_2",
"multi_tables_ddl_test.rename_mix_normal_2_done",
"multi_tables_ddl_test.rename_mix_part_2_done",
"multi_tables_ddl_test.finish_mark",
]

[sink.csv]
include-commit-ts = true
include-commit-ts = true
40 changes: 40 additions & 0 deletions tests/integration_tests/csv_storage_multi_tables_ddl/data/test.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,46 @@ insert into t1_7 values(685477580, 6);
insert into t2_7 values(1715679991826145, 7);
insert into t2_7 values(2036854775807, 8);

create table rename_mix_normal_1 (
id int not null,
value32 int not null,
primary key(id)
);

create table rename_mix_part_1 (
id int not null,
value32 int not null,
primary key(id)
) partition by hash(id) partitions 2;

insert into rename_mix_normal_1 values(1, 10), (2, 20);
insert into rename_mix_part_1 values(11, 110), (12, 120);

rename table rename_mix_normal_1 to rename_mix_normal_1_done, rename_mix_part_1 to rename_mix_part_1_done;

insert into rename_mix_normal_1_done values(3, 30);
insert into rename_mix_part_1_done values(13, 130);

create table rename_mix_part_2 (
id int not null,
value32 int not null,
primary key(id)
) partition by hash(id) partitions 2;

create table rename_mix_normal_2 (
id int not null,
value32 int not null,
primary key(id)
);

insert into rename_mix_part_2 values(21, 210), (22, 220);
insert into rename_mix_normal_2 values(31, 310), (32, 320);

rename table rename_mix_part_2 to rename_mix_part_2_done, rename_mix_normal_2 to rename_mix_normal_2_done;

insert into rename_mix_part_2_done values(23, 230);
insert into rename_mix_normal_2_done values(33, 330);

insert into t3 select * from t1_7;
insert into t4 select * from t2_7;
drop table t3, t4;
Expand Down
4 changes: 4 additions & 0 deletions tests/integration_tests/csv_storage_multi_tables_ddl/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ function run() {
check_table_exists multi_tables_ddl_test.t66 ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.t7 ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.t88 ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.rename_mix_normal_1_done ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.rename_mix_part_1_done ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.rename_mix_normal_2_done ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.rename_mix_part_2_done ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
# sync_diff can't check non-exist table, so we check expected tables are created in downstream first
check_table_exists multi_tables_ddl_test.finish_mark ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
echo "check table exists success"
Expand Down
9 changes: 8 additions & 1 deletion tests/integration_tests/multi_tables_ddl/conf/diff_config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ check-struct-only = false

target-instance = "mysql1"

target-check-tables = ["multi_tables_ddl_test.t1_7", "multi_tables_ddl_test.t2_7"]
target-check-tables = [
"multi_tables_ddl_test.t1_7",
"multi_tables_ddl_test.t2_7",
"multi_tables_ddl_test.rename_mix_normal_1_done",
"multi_tables_ddl_test.rename_mix_part_1_done",
"multi_tables_ddl_test.rename_mix_normal_2_done",
"multi_tables_ddl_test.rename_mix_part_2_done",
]

[data-sources]
[data-sources.tidb0]
Expand Down
20 changes: 18 additions & 2 deletions tests/integration_tests/multi_tables_ddl/conf/normal.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
[filter]
rules = ["multi_tables_ddl_test.t1", "multi_tables_ddl_test.t2", "multi_tables_ddl_test.t3", "multi_tables_ddl_test.t4" ,"multi_tables_ddl_test.t1_7","multi_tables_ddl_test.t2_7", "multi_tables_ddl_test.finish_mark"]
rules = [
"multi_tables_ddl_test.t1",
"multi_tables_ddl_test.t2",
"multi_tables_ddl_test.t3",
"multi_tables_ddl_test.t4",
"multi_tables_ddl_test.t1_7",
"multi_tables_ddl_test.t2_7",
"multi_tables_ddl_test.rename_mix_normal_1",
"multi_tables_ddl_test.rename_mix_part_1",
"multi_tables_ddl_test.rename_mix_normal_1_done",
"multi_tables_ddl_test.rename_mix_part_1_done",
"multi_tables_ddl_test.rename_mix_normal_2",
"multi_tables_ddl_test.rename_mix_part_2",
"multi_tables_ddl_test.rename_mix_normal_2_done",
"multi_tables_ddl_test.rename_mix_part_2_done",
"multi_tables_ddl_test.finish_mark",
]

[sink.csv]
include-commit-ts = true
include-commit-ts = true
40 changes: 40 additions & 0 deletions tests/integration_tests/multi_tables_ddl/data/test.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,46 @@ insert into t1_7 values(685477580, 6);
insert into t2_7 values(1715679991826145, 7);
insert into t2_7 values(2036854775807, 8);

create table rename_mix_normal_1 (
id int not null,
value32 int not null,
primary key(id)
);

create table rename_mix_part_1 (
id int not null,
value32 int not null,
primary key(id)
) partition by hash(id) partitions 2;

insert into rename_mix_normal_1 values(1, 10), (2, 20);
insert into rename_mix_part_1 values(11, 110), (12, 120);

rename table rename_mix_normal_1 to rename_mix_normal_1_done, rename_mix_part_1 to rename_mix_part_1_done;

insert into rename_mix_normal_1_done values(3, 30);
insert into rename_mix_part_1_done values(13, 130);

create table rename_mix_part_2 (
id int not null,
value32 int not null,
primary key(id)
) partition by hash(id) partitions 2;

create table rename_mix_normal_2 (
id int not null,
value32 int not null,
primary key(id)
);

insert into rename_mix_part_2 values(21, 210), (22, 220);
insert into rename_mix_normal_2 values(31, 310), (32, 320);

rename table rename_mix_part_2 to rename_mix_part_2_done, rename_mix_normal_2 to rename_mix_normal_2_done;

insert into rename_mix_part_2_done values(23, 230);
insert into rename_mix_normal_2_done values(33, 330);

insert into t3 select * from t1_7;
insert into t4 select * from t2_7;
drop table t3, t4;
Expand Down
4 changes: 4 additions & 0 deletions tests/integration_tests/multi_tables_ddl/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ function run() {
check_table_exists multi_tables_ddl_test.t66 ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.t7 ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.t88 ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.rename_mix_normal_1_done ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.rename_mix_part_1_done ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.rename_mix_normal_2_done ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
check_table_exists multi_tables_ddl_test.rename_mix_part_2_done ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
# sync_diff can't check non-exist table, so we check expected tables are created in downstream first
check_table_exists multi_tables_ddl_test.finish_mark ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT}
echo "check table exists success"
Expand Down
Loading