Skip to content

fix(restore): eliminate O(N^2) linear scan in getTableListByPatternLocal #1430

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

Open
ruslanen wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −2
Open

fix(restore): eliminate O(N^2) linear scan in getTableListByPatternLocal #1430

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions pkg/backup/table_pattern.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ func addTableToListIfNotExistsOrEnrichQueryAndParts(tables ListOfTables, table m

func (b *Backuper) getTableListByPatternLocal(ctx context.Context, metadataPath string, tablePattern string, dropTable bool, partitions []string) (ListOfTables, map[metadata.TableTitle][]string, error) {
result := ListOfTables{}
tableIndex := make(map[metadata.TableTitle]int)
resultPartitionNames := map[metadata.TableTitle][]string{}
tablePatterns := []string{"*"}
if tablePattern != "" {
Expand All @@ -67,6 +68,21 @@ func (b *Backuper) getTableListByPatternLocal(ctx context.Context, metadataPath
// https://github.com/Altinity/clickhouse-backup/issues/1091
replacer := strings.NewReplacer(`/`, "_", `\`, "_")

addToResult := func(t metadata.TableMetadata) {
key := metadata.TableTitle{Database: t.Database, Table: t.Table}
if idx, exists := tableIndex[key]; exists {
if result[idx].Query == "" && t.Query != "" {
result[idx].Query = t.Query
}
if len(result[idx].Parts) == 0 && len(t.Parts) > 0 {
result[idx].Parts = t.Parts
}
} else {
tableIndex[key] = len(result)
result = append(result, &t)
}
}

if err := filepath.Walk(metadataPath, func(filePath string, info os.FileInfo, err error) error {
if err != nil {
return err
Expand Down Expand Up @@ -106,7 +122,7 @@ func (b *Backuper) getTableListByPatternLocal(ctx context.Context, metadataPath
// .sql file will enrich Query
partitionsIdMap, _ := partition.ConvertPartitionsToIdsMapAndNamesList(ctx, b.ch, nil, ListOfTables{&t}, partitions)
filterPartsAndFilesByPartitionsFilter(t, partitionsIdMap[metadata.TableTitle{Database: t.Database, Table: t.Table}])
result = addTableToListIfNotExistsOrEnrichQueryAndParts(result, t)
addToResult(t)
return nil
}
var t metadata.TableMetadata
Expand All @@ -115,7 +131,7 @@ func (b *Backuper) getTableListByPatternLocal(ctx context.Context, metadataPath
}
partitionsIdMap, partitionsNameList := partition.ConvertPartitionsToIdsMapAndNamesList(ctx, b.ch, nil, ListOfTables{&t}, partitions)
filterPartsAndFilesByPartitionsFilter(t, partitionsIdMap[metadata.TableTitle{Database: t.Database, Table: t.Table}])
result = addTableToListIfNotExistsOrEnrichQueryAndParts(result, t)
addToResult(t)
for tt := range partitionsNameList {
if _, exists := resultPartitionNames[tt]; !exists {
resultPartitionNames[tt] = []string{}
Expand Down