From 762e5708f9297b828b87c43909d52a778a46b0a0 Mon Sep 17 00:00:00 2001 From: Ashutosh Bapat Date: Thu, 19 Feb 2026 12:07:29 +0530 Subject: [PATCH v20260219 3/3] Rename validate_relation_kind() There are three static definitions of validate_relation_kind() in the codebase, one each in table.c, indexam.c and sequence.c, validating that the given relation is a table, an index or a sequence respectively. Compiler knows which definition to use where because they are static. But this could be confusing to a reader. Rename these functions so that their names reflect the kind of relation they are validating. While at it, also update the comments in table.c to clarify the definition of table-like relkinds so that we don't have to maintain the exclusion list as the set of relkinds undergoes changes. Author: Ashutosh Bapat --- src/backend/access/index/indexam.c | 10 +++++----- src/backend/access/sequence/sequence.c | 8 ++++---- src/backend/access/table/table.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 4ed0508c605..43f64a0e721 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -107,7 +107,7 @@ do { \ static IndexScanDesc index_beginscan_internal(Relation indexRelation, int nkeys, int norderbys, Snapshot snapshot, ParallelIndexScanDesc pscan, bool temp_snap); -static inline void validate_relation_kind(Relation r); +static inline void validate_relation_as_index(Relation r); /* ---------------------------------------------------------------- @@ -136,7 +136,7 @@ index_open(Oid relationId, LOCKMODE lockmode) r = relation_open(relationId, lockmode); - validate_relation_kind(r); + validate_relation_as_index(r); return r; } @@ -159,7 +159,7 @@ try_index_open(Oid relationId, LOCKMODE lockmode) if (!r) return NULL; - validate_relation_kind(r); + validate_relation_as_index(r); return r; } @@ -188,13 +188,13 @@ index_close(Relation relation, LOCKMODE lockmode) } /* ---------------- - * validate_relation_kind - check the relation's kind + * validate_relation_as_index * * Make sure relkind is an index or a partitioned index. * ---------------- */ static inline void -validate_relation_kind(Relation r) +validate_relation_as_index(Relation r) { if (r->rd_rel->relkind != RELKIND_INDEX && r->rd_rel->relkind != RELKIND_PARTITIONED_INDEX) diff --git a/src/backend/access/sequence/sequence.c b/src/backend/access/sequence/sequence.c index 6897f8432d6..81f46163749 100644 --- a/src/backend/access/sequence/sequence.c +++ b/src/backend/access/sequence/sequence.c @@ -24,7 +24,7 @@ #include "access/sequence.h" #include "utils/rel.h" -static inline void validate_relation_kind(Relation r); +static inline void validate_relation_as_sequence(Relation r); /* ---------------- * sequence_open - open a sequence relation by relation OID @@ -40,7 +40,7 @@ sequence_open(Oid relationId, LOCKMODE lockmode) r = relation_open(relationId, lockmode); - validate_relation_kind(r); + validate_relation_as_sequence(r); return r; } @@ -61,13 +61,13 @@ sequence_close(Relation relation, LOCKMODE lockmode) } /* ---------------- - * validate_relation_kind - check the relation's kind + * validate_relation_as_sequence * * Make sure relkind is a sequence. * ---------------- */ static inline void -validate_relation_kind(Relation r) +validate_relation_as_sequence(Relation r) { if (r->rd_rel->relkind != RELKIND_SEQUENCE) ereport(ERROR, diff --git a/src/backend/access/table/table.c b/src/backend/access/table/table.c index 0d8662a1452..00288ac9c70 100644 --- a/src/backend/access/table/table.c +++ b/src/backend/access/table/table.c @@ -25,7 +25,7 @@ #include "access/table.h" #include "utils/rel.h" -static inline void validate_relation_kind(Relation r); +static inline void validate_relation_as_table(Relation r); /* ---------------- * table_open - open a table relation by relation OID @@ -43,7 +43,7 @@ table_open(Oid relationId, LOCKMODE lockmode) r = relation_open(relationId, lockmode); - validate_relation_kind(r); + validate_relation_as_table(r); return r; } @@ -67,7 +67,7 @@ try_table_open(Oid relationId, LOCKMODE lockmode) if (!r) return NULL; - validate_relation_kind(r); + validate_relation_as_table(r); return r; } @@ -86,7 +86,7 @@ table_openrv(const RangeVar *relation, LOCKMODE lockmode) r = relation_openrv(relation, lockmode); - validate_relation_kind(r); + validate_relation_as_table(r); return r; } @@ -108,7 +108,7 @@ table_openrv_extended(const RangeVar *relation, LOCKMODE lockmode, r = relation_openrv_extended(relation, lockmode, missing_ok); if (r) - validate_relation_kind(r); + validate_relation_as_table(r); return r; } @@ -129,14 +129,14 @@ table_close(Relation relation, LOCKMODE lockmode) } /* ---------------- - * validate_relation_kind - check the relation's kind + * validate_relation_as_table * - * Make sure relkind is table-like. In particular, this excludes indexes - * and composite types, which cannot be read from in a query. + * Make sure relkind is table-like i.e. something which can be referenced + * directly in the query. * ---------------- */ static inline void -validate_relation_kind(Relation r) +validate_relation_as_table(Relation r) { if (r->rd_rel->relkind != RELKIND_RELATION && r->rd_rel->relkind != RELKIND_SEQUENCE && -- 2.34.1