Use table/index_close() more consistently

michaelpq · michaelpq · commit 9d0f7996e58c · 2025-12-19T07:55:58.000+09:00
All the code paths updated here have been using relation_close() to close a relation that has already been opened with table_open() or index_open(), where a relkind check is enforced. table_close() and index_open() do the same thing as relation_close(), so there was no harm, but being inconsistent could lead to issues if the internals of these close() functions begin to introduce some logic specific to each relkind in the future. Author: Bertrand Drouvot <bertranddrouvot.pg@gmail.com> Discussion: https://postgr.es/m/aUKamYGiDKO6byp5@ip-10-97-1-34.eu-west-3.compute.internal
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c
@@ -1478,8 +1478,8 @@ brin_summarize_range(PG_FUNCTION_ARGS)
 	/* Restore userid and security context */
 	SetUserIdAndSecContext(save_userid, save_sec_context);
 
-	relation_close(indexRel, ShareUpdateExclusiveLock);
-	relation_close(heapRel, ShareUpdateExclusiveLock);
+	index_close(indexRel, ShareUpdateExclusiveLock);
+	table_close(heapRel, ShareUpdateExclusiveLock);
 
 	PG_RETURN_INT32((int32) numSummarized);
 }
@@ -1568,8 +1568,8 @@ brin_desummarize_range(PG_FUNCTION_ARGS)
 				 errmsg("index \"%s\" is not valid",
 						RelationGetRelationName(indexRel))));
 
-	relation_close(indexRel, ShareUpdateExclusiveLock);
-	relation_close(heapRel, ShareUpdateExclusiveLock);
+	index_close(indexRel, ShareUpdateExclusiveLock);
+	table_close(heapRel, ShareUpdateExclusiveLock);
 
 	PG_RETURN_VOID();
 }
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
@@ -2572,7 +2572,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 		}
 
 		/* Close the index relation but keep the lock */
-		relation_close(index_rel, NoLock);
+		index_close(index_rel, NoLock);
 
 		index->indexOid = index_oid;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2572,7 +2572,7 @@ transformIndexConstraint(Constraint constraint, CreateStmtContext cxt)`
`2572`	`2572`	`}`
`2573`	`2573`
`2574`	`2574`	`/* Close the index relation but keep the lock */`
`2575`		`- relation_close(index_rel, NoLock);`
	`2575`	`+ index_close(index_rel, NoLock);`
`2576`	`2576`
`2577`	`2577`	`index->indexOid = index_oid;`
`2578`	`2578`	`}`