Don't try to open visibilitymap when analyzing a foreign table

hlinnaka · hlinnaka · commit 049ef3398d05 · 2023-12-08T09:16:21.000+02:00
It's harmless, visibilitymap_count() returns 0 if the file doesn't exist. But it's also very pointless. I noticed this when I added an assertion in smgropen() that the relnumber is valid. Discussion: https://www.postgresql.org/message-id/621a52fd-3cd8-4f5d-a561-d510b853bbaf@iki.fi
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
@@ -634,7 +634,10 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
 	{
 		BlockNumber relallvisible;
 
-		visibilitymap_count(onerel, &relallvisible, NULL);
+		if (RELKIND_HAS_STORAGE(onerel->rd_rel->relkind))
+			visibilitymap_count(onerel, &relallvisible, NULL);
+		else
+			relallvisible = 0;
 
 		/* Update pg_class for table relation */
 		vac_update_relstats(onerel,
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
@@ -153,6 +153,8 @@ smgropen(RelFileLocator rlocator, BackendId backend)
 	SMgrRelation reln;
 	bool		found;
 
+	Assert(RelFileNumberIsValid(rlocator.relNumber));
+
 	if (SMgrRelationHash == NULL)
 	{
 		/* First time through: initialize the hash table */

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,8 @@ smgropen(RelFileLocator rlocator, BackendId backend)`
`153`	`153`	`SMgrRelation reln;`
`154`	`154`	`bool found;`
`155`	`155`
	`156`	`+ Assert(RelFileNumberIsValid(rlocator.relNumber));`
	`157`	`+`
`156`	`158`	`if (SMgrRelationHash == NULL)`
`157`	`159`	`{`
`158`	`160`	`/* First time through: initialize the hash table */`