*: fix show placement for v2 (#51577)

ref #50959
pingcap · Mar 7, 2024 · c128a2d · c128a2d
1 parent d9a3b73
commit c128a2d
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/pkg/executor/show_placement.go b/pkg/executor/show_placement.go
@@ -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
 		}
@@ -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
 			}
@@ -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
@@ -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 {