From 162bd08b3f2e6783d1d75ae79f86fc444d34a28d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 14 Apr 2005 20:03:27 +0000 Subject: Completion of project to use fixed OIDs for all system catalogs and indexes. Replace all heap_openr and index_openr calls by heap_open and index_open. Remove runtime lookups of catalog OID numbers in various places. Remove relcache's support for looking up system catalogs by name. Bulky but mostly very boring patch ... --- contrib/dblink/dblink.c | 3 +-- contrib/intagg/int_aggregate.c | 1 - contrib/miscutil/misc_utils.c | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 75ce4c440d..f832573000 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -36,7 +36,6 @@ #include "funcapi.h" #include "access/tupdesc.h" #include "access/heapam.h" -#include "catalog/catname.h" #include "catalog/namespace.h" #include "catalog/pg_index.h" #include "catalog/pg_type.h" @@ -1538,7 +1537,7 @@ get_pkey_attnames(Oid relid, int16 *numatts) *numatts = 0; /* use relid to get all related indexes */ - indexRelation = heap_openr(IndexRelationName, AccessShareLock); + indexRelation = heap_open(IndexRelationId, AccessShareLock); ScanKeyInit(&entry, Anum_pg_index_indrelid, BTEqualStrategyNumber, F_OIDEQ, diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c index 35c883642b..1c95d64af6 100644 --- a/contrib/intagg/int_aggregate.c +++ b/contrib/intagg/int_aggregate.c @@ -18,7 +18,6 @@ #include #include "access/heapam.h" -#include "catalog/catname.h" #include "catalog/indexing.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" diff --git a/contrib/miscutil/misc_utils.c b/contrib/miscutil/misc_utils.c index 855addb48e..d595474862 100644 --- a/contrib/miscutil/misc_utils.c +++ b/contrib/miscutil/misc_utils.c @@ -19,7 +19,6 @@ #include "access/relscan.h" #include "access/skey.h" #include "access/tupdesc.h" -#include "catalog/catname.h" #include "catalog/pg_listener.h" #include "commands/async.h" #include "fmgr.h" @@ -75,7 +74,7 @@ active_listeners(text *relname) int ourpid = getpid(); char listen_name[NAMEDATALEN]; - lRel = heap_openr(ListenerRelationName, AccessShareLock); + lRel = heap_open(ListenerRelationId, AccessShareLock); tdesc = RelationGetDescr(lRel); if (relname && (VARSIZE(relname) > VARHDRSZ)) -- cgit v1.2.1