Skip to content

Commit

Permalink
fix format
Browse files Browse the repository at this point in the history
Signed-off-by: Wenqi Mou <[email protected]>
  • Loading branch information
Tristan1900 committed Nov 25, 2024
1 parent 5f43a48 commit 486b003
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 0 additions & 1 deletion br/pkg/task/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,6 @@ func adjustTablesToRestoreAndCreateFilter(
break
}
}

}
}
// store the filter into config
Expand Down
7 changes: 5 additions & 2 deletions br/pkg/task/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -1229,7 +1229,11 @@ func RunStreamRestore(
return errors.Trace(err)
}
defer logClient.Close(ctx)

ddlFiles, err := logClient.LoadDDLFilesAndCountDMLFiles(ctx)
if err != nil {
return errors.Trace(err)
}
logBackupTableHistory, err = logClient.LoadMetaKVFilesAndBuildTableRenameInfo(ctx, ddlFiles)
if err != nil {
return errors.Trace(err)
Expand Down Expand Up @@ -1315,10 +1319,10 @@ func restoreStream(
}

client, err := createLogClient(ctx, g, cfg, mgr)
defer client.Close(ctx)
if err != nil {
return errors.Annotate(err, "failed to create log client")
}
defer client.Close(ctx)

if checkpointTaskInfo != nil && checkpointTaskInfo.Metadata != nil {
// reuse the checkpoint task's rewrite ts
Expand Down Expand Up @@ -1897,7 +1901,6 @@ func isNewRestoreTask(checkpointTaskInfo *checkpoint.CheckpointTaskInfoForLogRes

func buildSchemaReplace(ctx context.Context, client *logclient.LogClient, cfg *RestoreConfig, isNewRestoreTask bool) (
*stream.SchemasReplace, error) {

// get full backup meta storage to generate rewrite rules.
fullBackupStorage, err := parseFullBackupTablesStorage(cfg)
if err != nil {
Expand Down

0 comments on commit 486b003

Please sign in to comment.