From f933766ba7c5446a28d714904ae0c46d8b21b86a Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 21 Aug 2001 16:36:06 +0000
Subject: Restructure pg_opclass, pg_amop, and pg_amproc per previous
 discussions in pgsql-hackers.  pg_opclass now has a row for each opclass
 supported by each index AM, not a row for each opclass name.  This allows
 pg_opclass to show directly whether an AM supports an opclass, and
 furthermore makes it possible to store additional information about an
 opclass that might be AM-dependent. pg_opclass and pg_amop now store "lossy"
 and "haskeytype" information that we previously expected the user to remember
 to provide in CREATE INDEX commands. Lossiness is no longer an index-level
 property, but is associated with the use of a particular operator in a
 particular index opclass.

Along the way, IndexSupportInitialize now uses the syscaches to retrieve
pg_amop and pg_amproc entries.  I find this reduces backend launch time by
about ten percent, at the cost of a couple more special cases in catcache.c's
IndexScanOK.

Initial work by Oleg Bartunov and Teodor Sigaev, further hacking by Tom Lane.

initdb forced.
---
 src/backend/utils/cache/syscache.c | 39 ++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

(limited to 'src/backend/utils/cache/syscache.c')

diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index a407d39f5d0..6020597f2a3 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.64 2001/08/10 18:57:37 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.65 2001/08/21 16:36:05 tgl Exp $
  *
  * NOTES
  *	  These routines allow the parser/planner/executor to perform
@@ -27,6 +27,7 @@
 #include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_amop.h"
+#include "catalog/pg_amproc.h"
 #include "catalog/pg_group.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_inherits.h"
@@ -113,23 +114,33 @@ static struct cachedesc cacheinfo[] = {
 			0
 	}},
 	{AccessMethodOperatorRelationName,	/* AMOPOPID */
-		AccessMethodOpidIndex,
+		AccessMethodOperatorIndex,
 		0,
-		3,
+		2,
 		{
 			Anum_pg_amop_amopclaid,
 			Anum_pg_amop_amopopr,
-			Anum_pg_amop_amopid,
+			0,
 			0
 	}},
 	{AccessMethodOperatorRelationName,	/* AMOPSTRATEGY */
 		AccessMethodStrategyIndex,
 		0,
-		3,
+		2,
 		{
-			Anum_pg_amop_amopid,
 			Anum_pg_amop_amopclaid,
 			Anum_pg_amop_amopstrategy,
+			0,
+			0
+	}},
+	{AccessMethodProcedureRelationName,	/* AMPROCNUM */
+		AccessMethodProcedureIndex,
+		0,
+		2,
+		{
+			Anum_pg_amproc_amopclaid,
+			Anum_pg_amproc_amprocnum,
+			0,
 			0
 	}},
 	{AttributeRelationName,		/* ATTNAME */
@@ -152,22 +163,22 @@ static struct cachedesc cacheinfo[] = {
 			0,
 			0
 	}},
-	{OperatorClassRelationName, /* CLADEFTYPE */
-		OpclassDeftypeIndex,
+	{OperatorClassRelationName, /* CLAAMNAME */
+		OpclassAmNameIndex,
 		0,
-		1,
+		2,
 		{
-			Anum_pg_opclass_opcdeftype,
-			0,
+			Anum_pg_opclass_opcamid,
+			Anum_pg_opclass_opcname,
 			0,
 			0
 	}},
-	{OperatorClassRelationName, /* CLANAME */
-		OpclassNameIndex,
+	{OperatorClassRelationName, /* CLAOID */
+		OpclassOidIndex,
 		0,
 		1,
 		{
-			Anum_pg_opclass_opcname,
+			ObjectIdAttributeNumber,
 			0,
 			0,
 			0
-- 
cgit v1.2.3