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

br: add integration test for pitr (#47740) #47908

Merged
merged 15 commits into from
Nov 1, 2023
Merged

br: add integration test for pitr (#47740) #47908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ddd5234
draft
Leavrth Oct 17, 2023
6b21726
draft
Leavrth Oct 17, 2023
1b43637
draft
Leavrth Oct 18, 2023
8297ced
add integration test
Leavrth Oct 18, 2023
bb6bda9
make bazel_prepare
Leavrth Oct 18, 2023
1f43bef
make bazel happy
Leavrth Oct 18, 2023
cddfbc4
make test happy
Leavrth Oct 18, 2023
8a0d33c
commit some suggestions
Leavrth Oct 20, 2023
b9e3593
make bazel happy
Leavrth Oct 20, 2023
4026128
fix integration test br_pitr
Leavrth Oct 23, 2023
86c7ce4
resolve conflicts
Leavrth Oct 26, 2023
67b6e90
fix integration test br_pitr
Leavrth Oct 26, 2023
478b023
fix unit test
Leavrth Oct 26, 2023
72fa4f5
Merge remote-tracking branch 'upstream/release-7.5' into cherry-pick-…
Leavrth Oct 27, 2023
9132887
fix integration test br_full
Leavrth Oct 27, 2023
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
2 changes: 1 addition & 1 deletion br/pkg/restore/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2799,7 +2799,7 @@ func (rc *Client) InitSchemasReplaceForDDL(
dbReplace.TableMap[t.Info.ID] = &stream.TableReplace{
Name: newTableInfo.Name.O,
TableID: newTableInfo.ID,
PartitionMap: getTableIDMap(newTableInfo, t.Info),
PartitionMap: getPartitionIDMap(newTableInfo, t.Info),
IndexMap: getIndexIDMap(newTableInfo, t.Info),
}
}
Expand Down
10 changes: 8 additions & 2 deletions br/pkg/restore/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ type AppliedFile interface {
GetEndKey() []byte
}

// getTableIDMap creates a map maping old tableID to new tableID.
func getTableIDMap(newTable, oldTable *model.TableInfo) map[int64]int64 {
// getPartitionIDMap creates a map maping old physical ID to new physical ID.
func getPartitionIDMap(newTable, oldTable *model.TableInfo) map[int64]int64 {
tableIDMap := make(map[int64]int64)

if oldTable.Partition != nil && newTable.Partition != nil {
Expand All @@ -60,6 +60,12 @@ func getTableIDMap(newTable, oldTable *model.TableInfo) map[int64]int64 {
}
}

return tableIDMap
}

// getTableIDMap creates a map maping old tableID to new tableID.
func getTableIDMap(newTable, oldTable *model.TableInfo) map[int64]int64 {
tableIDMap := getPartitionIDMap(newTable, oldTable)
tableIDMap[oldTable.ID] = newTable.ID
return tableIDMap
}
Expand Down
Loading
Loading