Update CVS HEAD for 2007 copyright. Back branches are typically not

[postgresql] / src / include / utils / syscache.h

diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 2ec1986e671060ca3a00f1802fa5d3533be6040d..b8e55e57efa21ef6485d5116a9da361a82225a94 100644 (file)
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,17 +6,17 @@
  * See also lsyscache.h, which provides convenience routines for
  * common cache-lookup operations.
  *
- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.35 2001/10/28 06:26:09 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/utils/syscache.h,v 1.67 2007/01/05 22:19:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SYSCACHE_H
 #define SYSCACHE_H
 
-#include "access/htup.h"
+#include "utils/catcache.h"
 
 /*
  *             Declarations for util/syscache.c.
@@ -28,35 +28,45 @@
  *             Keep them in alphabetical order.
  */
 
-#define AGGNAME                        0
+#define AGGFNOID               0
 #define AMNAME                 1
-#define AMOPOPID               2
-#define AMOPSTRATEGY   3
-#define AMPROCNUM              4
-#define ATTNAME                        5
-#define ATTNUM                 6
-#define CLAAMNAME              7
-#define CLAOID                 8
-#define GRONAME                        9
-#define GROSYSID               10
-#define INDEXRELID             11
-#define INHRELID               12
-#define LANGNAME               13
-#define LANGOID                        14
-#define OPERNAME               15
-#define OPEROID                        16
-#define PROCNAME               17
-#define PROCOID                        18
-#define RELNAME                        19
-#define RELOID                 20
-#define RULENAME               21
-#define SHADOWNAME             22
-#define SHADOWSYSID            23
-#define STATRELATT             24
-#define TYPENAME               25
-#define TYPEOID                        26
+#define AMOID                  2
+#define AMOPOPID               3
+#define AMOPSTRATEGY   4
+#define AMPROCNUM              5
+#define ATTNAME                        6
+#define ATTNUM                 7
+#define AUTHMEMMEMROLE 8
+#define AUTHMEMROLEMEM 9
+#define AUTHNAME               10
+#define AUTHOID                        11
+#define CASTSOURCETARGET 12
+#define CLAAMNAMENSP   13
+#define CLAOID                 14
+#define CONDEFAULT             15
+#define CONNAMENSP             16
+#define CONOID                 17
+#define DATABASEOID            18
+#define INDEXRELID             19
+#define LANGNAME               20
+#define LANGOID                        21
+#define NAMESPACENAME  22
+#define NAMESPACEOID   23
+#define OPERNAMENSP            24
+#define OPEROID                        25
+#define OPFAMILYAMNAMENSP 26
+#define OPFAMILYOID            27
+#define PROCNAMEARGSNSP 28
+#define PROCOID                        29
+#define RELNAMENSP             30
+#define RELOID                 31
+#define RULERELNAME            32
+#define STATRELATT             33
+#define TYPENAMENSP            34
+#define TYPEOID                        35
 
 extern void InitCatalogCache(void);
+extern void InitCatalogCachePhase2(void);
 
 extern HeapTuple SearchSysCache(int cacheId,
                           Datum key1, Datum key2, Datum key3, Datum key4);
@@ -70,7 +80,17 @@ extern bool SearchSysCacheExists(int cacheId,
 extern Oid GetSysCacheOid(int cacheId,
                           Datum key1, Datum key2, Datum key3, Datum key4);
 
+extern HeapTuple SearchSysCacheAttName(Oid relid, const char *attname);
+extern HeapTuple SearchSysCacheCopyAttName(Oid relid, const char *attname);
+extern bool SearchSysCacheExistsAttName(Oid relid, const char *attname);
+
 extern Datum SysCacheGetAttr(int cacheId, HeapTuple tup,
                                AttrNumber attributeNumber, bool *isNull);
 
-#endif  /* SYSCACHE_H */
+/* list-search interface.  Users of this must import catcache.h too */
+extern struct catclist *SearchSysCacheList(int cacheId, int nkeys,
+                                  Datum key1, Datum key2, Datum key3, Datum key4);
+
+#define ReleaseSysCacheList(x) ReleaseCatCacheList(x)
+
+#endif   /* SYSCACHE_H */