First phase of project to use fixed OIDs for all system catalogs and

indexes.  Extend the macros in include/catalog/*.h to carry the info
about hand-assigned OIDs, and adjust the genbki script and bootstrap
code to make the relations actually get those OIDs.  Remove the small
number of RelOid_pg_foo macros that we had in favor of a complete
set named like the catname.h and indexing.h macros.  Next phase will
get rid of internal use of names for looking up catalogs and indexes;
but this completes the changes forcing an initdb, so it looks like a
good place to commit.
Along the way, I made the shared relations (pg_database etc) not be
'bootstrap' relations any more, so as to reduce the number of hardwired
entries and simplify changing those relations in future.  I'm not
sure whether they ever really needed to be handled as bootstrap
relations, but it seems to work fine to not do so now.

1 files changed, 0 insertions, 64 deletions

diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h
deleted file mode 100644
index 246e6f0512..0000000000
--- a/src/include/catalog/pg_version.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_version.h
- *	  definition of the system "version" relation (pg_version)
- *	  along with the relation's initial contents.
- *
- * NOTE: this table has nothing to do with the overall Postgres system
- * version or anything like that.  It is for defining individual relations
- * that have multiple concurrently-existing versions.  Yes, there used to
- * be such a feature in Postgres, but it's been broken for a long time
- * (see src/backend/commands/_deadcode/version.c).	The pg_version table
- * isn't even created at present.
- *
- *
- * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $PostgreSQL: pgsql/src/include/catalog/pg_version.h,v 1.20 2004/12/31 22:03:26 pgsql Exp $
- *
- * NOTES
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_VERSION_H
-#define PG_VERSION_H
-
-/* ----------------
- *		postgres.h contains the system type definitions and the
- *		CATALOG(), BOOTSTRAP and DATA() sugar words so this file
- *		can be read by both genbki.sh and the C compiler.
- * ----------------
- */
-
-/* ----------------
- *		pg_version definition.	cpp turns this into
- *		typedef struct FormData_pg_version
- * ----------------
- */
-CATALOG(pg_version)
-{
-	Oid			verrelid;
-	Oid			verbaseid;
-	int4		vertime;		/* really should be some abstime */
-} FormData_pg_version;
-
-/* ----------------
- *		Form_pg_version corresponds to a pointer to a tuple with
- *		the format of pg_version relation.
- * ----------------
- */
-typedef FormData_pg_version *Form_pg_version;
-
-/* ----------------
- *		compiler constants for pg_version
- * ----------------
- */
-#define Natts_pg_version				3
-#define Anum_pg_version_verrelid		1
-#define Anum_pg_version_verbaseid		2
-#define Anum_pg_version_vertime			3
-
-#endif   /* PG_VERSION_H */