infoschema_v2: remove schemaTableInfos call of fetchAllTablePlacements (

pingcap#55958) ref pingcap#55394
qw4990 · Sep 25, 2024 · 165c4a5 · 165c4a5
1 parent bf455f5
commit 165c4a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/pkg/executor/show_placement.go b/pkg/executor/show_placement.go
@@ -361,19 +361,16 @@ func (e *ShowExec) fetchAllTablePlacements(ctx context.Context, scheduleState ma
 	dbs := e.is.AllSchemaNames()
 	slices.SortFunc(dbs, func(i, j pmodel.CIStr) int { return cmp.Compare(i.O, j.O) })
 
-	for _, dbName := range dbs {
+	tbls := e.is.ListTablesWithSpecialAttribute(infoschema.AllSpecialAttribute)
+	for _, db := range tbls {
 		tableRowSets := make([]tableRowSet, 0)
-		tblInfos, err := e.is.SchemaTableInfos(ctx, dbName)
-		if err != nil {
-			return errors.Trace(err)
-		}
-		for _, tblInfo := range tblInfos {
-			if checker != nil && !checker.RequestVerification(activeRoles, dbName.O, tblInfo.Name.O, "", mysql.AllPrivMask) {
+		for _, tblInfo := range db.TableInfos {
+			if checker != nil && !checker.RequestVerification(activeRoles, db.DBName.O, tblInfo.Name.O, "", mysql.AllPrivMask) {
 				continue
 			}
 
 			var rows [][]any
-			ident := ast.Ident{Schema: dbName, Name: tblInfo.Name}
+			ident := ast.Ident{Schema: db.DBName, Name: tblInfo.Name}
 			tblPlacement, err := e.getTablePlacement(tblInfo)
 			if err != nil {
 				return err

diff --git a/pkg/executor/show_placement_test.go b/pkg/executor/show_placement_test.go
@@ -175,9 +175,9 @@ func TestShowPlacementPrivilege(t *testing.T) {
 	tk1.MustQuery("show placement").Check(testkit.Rows(
 		"POLICY p1 PRIMARY_REGION=\"cn-east-1\" REGIONS=\"cn-east-1,cn-east-2\" SCHEDULE=\"EVEN\" NULL",
 		"DATABASE db2 PRIMARY_REGION=\"cn-east-1\" REGIONS=\"cn-east-1,cn-east-2\" SCHEDULE=\"EVEN\" PENDING",
-		"TABLE db2.t1 PRIMARY_REGION=\"cn-east-1\" REGIONS=\"cn-east-1,cn-east-2\" SCHEDULE=\"EVEN\" PENDING",
 		"TABLE test.t1 PRIMARY_REGION=\"cn-east-1\" REGIONS=\"cn-east-1,cn-east-2\" SCHEDULE=\"EVEN\" PENDING",
 		"TABLE test.t3 PARTITION p1 PRIMARY_REGION=\"cn-east-1\" REGIONS=\"cn-east-1,cn-east-2\" SCHEDULE=\"EVEN\" PENDING",
+		"TABLE db2.t1 PRIMARY_REGION=\"cn-east-1\" REGIONS=\"cn-east-1,cn-east-2\" SCHEDULE=\"EVEN\" PENDING",
 	))
 }