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 ...

Author: tglsfdc

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,

contrib/intagg/int_aggregate.c

@@ -18,7 +18,6 @@
 #include <sys/types.h>
 
 #include "access/heapam.h"
-#include "catalog/catname.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"

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))

src/backend/access/heap/heapam.c

@@ -8,17 +8,15 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.186 2005/03/28 01:50:32 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.187 2005/04/14 20:03:22 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
  *		relation_open	- open any relation by relation OID
  *		relation_openrv - open any relation specified by a RangeVar
- *		relation_openr	- open a system relation by name
  *		relation_close	- close any relation
  *		heap_open		- open a heap relation by relation OID
  *		heap_openrv		- open a heap relation specified by a RangeVar
- *		heap_openr		- open a system heap relation by name
  *		heap_close		- (now just a macro for relation_close)
  *		heap_beginscan	- begin relation scan
  *		heap_rescan		- restart a relation scan
@@ -502,15 +500,6 @@ relation_openrv(const RangeVar *relation, LOCKMODE lockmode)
 {
 	Oid			relOid;
 
-	/*
-	 * In bootstrap mode, don't do any namespace processing.
-	 */
-	if (IsBootstrapProcessingMode())
-	{
-		Assert(relation->schemaname == NULL);
-		return relation_openr(relation->relname, lockmode);
-	}
-
 	/*
 	 * Check for shared-cache-inval messages before trying to open the
 	 * relation.  This is needed to cover the case where the name
@@ -533,37 +522,6 @@ relation_openrv(const RangeVar *relation, LOCKMODE lockmode)
 	return relation_open(relOid, lockmode);
 }
 
-/* ----------------
- *		relation_openr - open a system relation specified by name.
- *
- *		As above, but the relation is specified by an unqualified name;
- *		it is assumed to live in the system catalog namespace.
- * ----------------
- */
-Relation
-relation_openr(const char *sysRelationName, LOCKMODE lockmode)
-{
-	Relation	r;
-
-	Assert(lockmode >= NoLock && lockmode < MAX_LOCKMODES);
-
-	/*
-	 * We assume we should not need to worry about the rel's OID changing,
-	 * hence no need for AcceptInvalidationMessages here.
-	 */
-
-	/* The relcache does all the real work... */
-	r = RelationSysNameGetRelation(sysRelationName);
-
-	if (!RelationIsValid(r))
-		elog(ERROR, "could not open relation \"%s\"", sysRelationName);
-
-	if (lockmode != NoLock)
-		LockRelation(r, lockmode);
-
-	return r;
-}
-
 /* ----------------
  *		relation_close - close any relation
  *
@@ -657,41 +615,6 @@ heap_openrv(const RangeVar *relation, LOCKMODE lockmode)
 	return r;
 }
 
-/* ----------------
- *		heap_openr - open a system heap relation specified by name.
- *
- *		As above, but the relation is specified by an unqualified name;
- *		it is assumed to live in the system catalog namespace.
- * ----------------
- */
-Relation
-heap_openr(const char *sysRelationName, LOCKMODE lockmode)
-{
-	Relation	r;
-
-	r = relation_openr(sysRelationName, lockmode);
-
-	if (r->rd_rel->relkind == RELKIND_INDEX)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is an index",
-						RelationGetRelationName(r))));
-	else if (r->rd_rel->relkind == RELKIND_SPECIAL)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is a special relation",
-						RelationGetRelationName(r))));
-	else if (r->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is a composite type",
-						RelationGetRelationName(r))));
-
-	pgstat_initstats(&r->pgstat_info, r);
-
-	return r;
-}
-
 
 /* ----------------
  *		heap_beginscan	- begin relation scan

src/backend/access/index/genam.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.46 2005/03/29 00:16:51 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.47 2005/04/14 20:03:23 tgl Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -162,7 +162,7 @@ IndexScanEnd(IndexScanDesc scan)
  * systable_beginscan --- set up for heap-or-index scan
  *
  *	rel: catalog to scan, already opened and suitably locked
- *	indexRelname: name of index to conditionally use
+ *	indexId: OID of index to conditionally use
  *	indexOK: if false, forces a heap scan (see notes below)
  *	snapshot: time qual to use (usually should be SnapshotNow)
  *	nkeys, key: scan keys
@@ -179,26 +179,18 @@ IndexScanEnd(IndexScanDesc scan)
  */
 SysScanDesc
 systable_beginscan(Relation heapRelation,
-				   const char *indexRelname,
+				   Oid indexId,
 				   bool indexOK,
 				   Snapshot snapshot,
 				   int nkeys, ScanKey key)
 {
 	SysScanDesc sysscan;
 	Relation	irel;
 
-	if (indexOK && !IsIgnoringSystemIndexes())
-	{
-		/* We assume it's a system index, so index_openr is OK */
-		irel = index_openr(indexRelname);
-
-		if (ReindexIsProcessingIndex(RelationGetRelid(irel)))
-		{
-			/* oops, can't use index that's being rebuilt */
-			index_close(irel);
-			irel = NULL;
-		}
-	}
+	if (indexOK &&
+		!IsIgnoringSystemIndexes() &&
+		!ReindexIsProcessingIndex(indexId))
+		irel = index_open(indexId);
 	else
 		irel = NULL;
 

src/backend/access/index/indexam.c

@@ -8,12 +8,11 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.79 2005/03/27 23:52:59 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.80 2005/04/14 20:03:23 tgl Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relation OID
  *		index_openrv	- open an index relation specified by a RangeVar
- *		index_openr		- open a system index relation by name
  *		index_close		- close an index relation
  *		index_beginscan - start a scan of an index with amgettuple
  *		index_beginscan_multi - start a scan of an index with amgetmulti
@@ -172,31 +171,6 @@ index_openrv(const RangeVar *relation)
 	return r;
 }
 
-/* ----------------
- *		index_openr - open a system index relation specified by name.
- *
- *		As above, but the relation is specified by an unqualified name;
- *		it is assumed to live in the system catalog namespace.
- * ----------------
- */
-Relation
-index_openr(const char *sysRelationName)
-{
-	Relation	r;
-
-	r = relation_openr(sysRelationName, NoLock);
-
-	if (r->rd_rel->relkind != RELKIND_INDEX)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not an index",
-						RelationGetRelationName(r))));
-
-	pgstat_initstats(&r->pgstat_info, r);
-
-	return r;
-}
-
 /* ----------------
  *		index_close - close a index relation
  *

src/backend/bootstrap/bootstrap.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.201 2005/03/29 19:44:22 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.202 2005/04/14 20:03:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,12 +26,12 @@
 #include "access/heapam.h"
 #include "access/xlog.h"
 #include "bootstrap/bootstrap.h"
-#include "catalog/catname.h"
 #include "catalog/index.h"
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
+#include "nodes/makefuncs.h"
 #include "postmaster/bgwriter.h"
 #include "storage/freespace.h"
 #include "storage/ipc.h"
@@ -46,10 +46,14 @@
 #include "utils/ps_status.h"
 #include "utils/relcache.h"
 
+extern int	optind;
+extern char *optarg;
+
 
 #define ALLOC(t, c)		((t *) calloc((unsigned)(c), sizeof(t)))
 
 extern int	Int_yyparse(void);
+
 static void usage(void);
 static void bootstrap_signals(void);
 static hashnode *AddStr(char *str, int strlength, int mderef);
@@ -169,17 +173,12 @@ static struct typmap *Ap = NULL;
 static int	Warnings = 0;
 static char Blanks[MAXATTR];
 
-static char *relname;			/* current relation name */
-
 Form_pg_attribute attrtypes[MAXATTR];	/* points to attribute info */
 static Datum values[MAXATTR];	/* corresponding attribute values */
 int			numattr;			/* number of attributes for cur. rel */
 
 static MemoryContext nogc = NULL;		/* special no-gc mem context */
 
-extern int	optind;
-extern char *optarg;
-
 /*
  *	At bootstrap time, we first declare all the indices to be built, and
  *	then build them.  The IndexList structure stores enough information
@@ -572,12 +571,12 @@ boot_openrel(char *relname)
 	HeapScanDesc scan;
 	HeapTuple	tup;
 
-	if (strlen(relname) >= NAMEDATALEN - 1)
+	if (strlen(relname) >= NAMEDATALEN)
 		relname[NAMEDATALEN - 1] = '\0';
 
 	if (Typ == NULL)
 	{
-		rel = heap_openr(TypeRelationName, NoLock);
+		rel = heap_open(TypeRelationId, NoLock);
 		scan = heap_beginscan(rel, SnapshotNow, 0, NULL);
 		i = 0;
 		while ((tup = heap_getnext(scan, ForwardScanDirection)) != NULL)
@@ -605,10 +604,9 @@ boot_openrel(char *relname)
 		closerel(NULL);
 
 	elog(DEBUG4, "open relation %s, attrsize %d",
-		 relname ? relname : "(null)",
-		 (int) ATTRIBUTE_TUPLE_SIZE);
+		 relname, (int) ATTRIBUTE_TUPLE_SIZE);
 
-	boot_reldesc = heap_openr(relname, NoLock);
+	boot_reldesc = heap_openrv(makeRangeVar(NULL, relname), NoLock);
 	numattr = boot_reldesc->rd_rel->relnatts;
 	for (i = 0; i < numattr; i++)
 	{
@@ -641,7 +639,7 @@ closerel(char *name)
 		{
 			if (strcmp(RelationGetRelationName(boot_reldesc), name) != 0)
 				elog(ERROR, "close of %s when %s was expected",
-					 name, relname ? relname : "(null)");
+					 name, RelationGetRelationName(boot_reldesc));
 		}
 		else
 			elog(ERROR, "close of %s before any relation was opened",
@@ -652,7 +650,8 @@ closerel(char *name)
 		elog(ERROR, "no open relation to close");
 	else
 	{
-		elog(DEBUG4, "close relation %s", relname ? relname : "(null)");
+		elog(DEBUG4, "close relation %s",
+			 RelationGetRelationName(boot_reldesc));
 		heap_close(boot_reldesc, NoLock);
 		boot_reldesc = NULL;
 	}
@@ -676,7 +675,7 @@ DefineAttr(char *name, char *type, int attnum)
 	if (boot_reldesc != NULL)
 	{
 		elog(WARNING, "no open relations allowed with CREATE command");
-		closerel(relname);
+		closerel(NULL);
 	}
 
 	if (attrtypes[attnum] == NULL)
@@ -933,7 +932,7 @@ gettype(char *type)
 				return i;
 		}
 		elog(DEBUG4, "external type: %s", type);
-		rel = heap_openr(TypeRelationName, NoLock);
+		rel = heap_open(TypeRelationId, NoLock);
 		scan = heap_beginscan(rel, SnapshotNow, 0, NULL);
 		i = 0;
 		while ((tup = heap_getnext(scan, ForwardScanDirection)) != NULL)