Skip to content

*: fix show placement for v2 #51577

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
merged 1 commit into from
Mar 7, 2024
Merged

*: fix show placement for v2 #51577

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
35 changes: 18 additions & 17 deletions pkg/executor/show_placement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (e *ShowExec) fetchShowPlacementForDB(ctx context.Context) (err error) {
}

if placement != nil {
state, err := fetchDBScheduleState(ctx, nil, dbInfo)
state, err := e.fetchDBScheduleState(ctx, nil, dbInfo)
if err != nil {
return err
}
Expand Down Expand Up @@ -332,7 +332,7 @@ func (e *ShowExec) fetchAllDBPlacements(ctx context.Context, scheduleState map[i
}

if placement != nil {
state, err := fetchDBScheduleState(ctx, scheduleState, dbInfo)
state, err := e.fetchDBScheduleState(ctx, scheduleState, dbInfo)
if err != nil {
return err
}
Expand All @@ -343,6 +343,22 @@ func (e *ShowExec) fetchAllDBPlacements(ctx context.Context, scheduleState map[i
return nil
}

func (e *ShowExec) fetchDBScheduleState(ctx context.Context, scheduleState map[int64]infosync.PlacementScheduleState, db *model.DBInfo) (infosync.PlacementScheduleState, error) {
state := infosync.PlacementScheduleStateScheduled
for _, table := range e.is.SchemaTables(db.Name) {
tbl := table.Meta()
schedule, err := fetchTableScheduleState(ctx, scheduleState, tbl)
if err != nil {
return state, err
}
state = accumulateState(state, schedule)
if state != infosync.PlacementScheduleStateScheduled {
break
}
}
return state, nil
}

type tableRowSet struct {
name string
rows [][]any
Expand Down Expand Up @@ -501,21 +517,6 @@ func fetchTableScheduleState(ctx context.Context, scheduleState map[int64]infosy
return schedule, nil
}

func fetchDBScheduleState(ctx context.Context, scheduleState map[int64]infosync.PlacementScheduleState, db *model.DBInfo) (infosync.PlacementScheduleState, error) {
state := infosync.PlacementScheduleStateScheduled
for _, table := range db.Tables {
schedule, err := fetchTableScheduleState(ctx, scheduleState, table)
if err != nil {
return state, err
}
state = accumulateState(state, schedule)
if state != infosync.PlacementScheduleStateScheduled {
break
}
}
return state, nil
}

func accumulateState(curr, news infosync.PlacementScheduleState) infosync.PlacementScheduleState {
a, b := int(curr), int(news)
if a > b {
Expand Down