diff --git a/pkg/ccr/job.go b/pkg/ccr/job.go index ae52cbb5..6fecf41c 100644 --- a/pkg/ccr/job.go +++ b/pkg/ccr/job.go @@ -2580,19 +2580,12 @@ func (j *Job) handleRecoverInfo(binlog *festruct.TBinlog) error { return j.handleRecoverInfoRecord(binlog.GetCommitSeq(), recoverInfo) } -func isRecoverTable(recoverInfo *record.RecoverInfo) bool { - if recoverInfo.PartitionName == "" || recoverInfo.PartitionId == -1 { - return true - } - return false -} - func (j *Job) handleRecoverInfoRecord(commitSeq int64, recoverInfo *record.RecoverInfo) error { if j.isBinlogCommitted(recoverInfo.TableId, commitSeq) { return nil } - if isRecoverTable(recoverInfo) { + if recoverInfo.IsRecoverTable() { var tableName string if recoverInfo.NewTableName != "" { tableName = recoverInfo.NewTableName diff --git a/pkg/ccr/record/recover_info.go b/pkg/ccr/record/recover_info.go index 8e97c81e..6325dbd7 100644 --- a/pkg/ccr/record/recover_info.go +++ b/pkg/ccr/record/recover_info.go @@ -36,6 +36,13 @@ func NewRecoverInfoFromJson(data string) (*RecoverInfo, error) { return &recoverInfo, nil } +func (c *RecoverInfo) IsRecoverTable() bool { + if c.PartitionName == "" || c.PartitionId == -1 { + return true + } + return false +} + // String func (c *RecoverInfo) String() string { return fmt.Sprintf("RecoverInfo: DbId: %d, NewDbName: %s, TableId: %d, TableName: %s, NewTableName: %s, PartitionId: %d, PartitionName: %s, NewPartitionName: %s", diff --git a/pkg/rpc/kitex_gen/frontendservice/FrontendService.go b/pkg/rpc/kitex_gen/frontendservice/FrontendService.go index dd8cca03..159b689c 100644 --- a/pkg/rpc/kitex_gen/frontendservice/FrontendService.go +++ b/pkg/rpc/kitex_gen/frontendservice/FrontendService.go @@ -1023,7 +1023,7 @@ func TBinlogTypeFromString(s string) (TBinlogType, error) { case "DROP_ROLLUP": return TBinlogType_DROP_ROLLUP, nil case "RECOVER_INFO": - return TBinlogType_RECOVER_INFO, nil + return TBinlogType_RECOVER_INFO, nil case "MIN_UNKNOWN": return TBinlogType_MIN_UNKNOWN, nil case "UNKNOWN_10":