From 43493cceda2fb75e07a63cec46000407661d505d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 24 Jan 2025 22:58:13 +0100 Subject: Add get_opfamily_name() function This refactors and simplifies various existing code to make use of the new function. Reviewed-by: Mark Dilger Discussion: https://www.postgresql.org/message-id/flat/E72EAA49-354D-4C2E-8EB9-255197F55330@enterprisedb.com --- src/backend/access/gist/gistvalidate.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/backend/access/gist/gistvalidate.c') diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c index bb86b559486..ffefa12d97a 100644 --- a/src/backend/access/gist/gistvalidate.c +++ b/src/backend/access/gist/gistvalidate.c @@ -19,7 +19,6 @@ #include "catalog/pg_amop.h" #include "catalog/pg_amproc.h" #include "catalog/pg_opclass.h" -#include "catalog/pg_opfamily.h" #include "catalog/pg_type.h" #include "utils/lsyscache.h" #include "utils/regproc.h" @@ -39,8 +38,6 @@ gistvalidate(Oid opclassoid) Oid opcintype; Oid opckeytype; char *opclassname; - HeapTuple familytup; - Form_pg_opfamily familyform; char *opfamilyname; CatCList *proclist, *oprlist; @@ -63,12 +60,7 @@ gistvalidate(Oid opclassoid) opclassname = NameStr(classform->opcname); /* Fetch opfamily information */ - familytup = SearchSysCache1(OPFAMILYOID, ObjectIdGetDatum(opfamilyoid)); - if (!HeapTupleIsValid(familytup)) - elog(ERROR, "cache lookup failed for operator family %u", opfamilyoid); - familyform = (Form_pg_opfamily) GETSTRUCT(familytup); - - opfamilyname = NameStr(familyform->opfname); + opfamilyname = get_opfamily_name(opfamilyoid, false); /* Fetch all operators and support functions of the opfamily */ oprlist = SearchSysCacheList1(AMOPSTRATEGY, ObjectIdGetDatum(opfamilyoid)); @@ -282,7 +274,6 @@ gistvalidate(Oid opclassoid) ReleaseCatCacheList(proclist); ReleaseCatCacheList(oprlist); - ReleaseSysCache(familytup); ReleaseSysCache(classtup); return result; -- cgit v1.2.3