aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/sets.c13
-rw-r--r--src/backend/utils/cache/relcache.c68
-rw-r--r--src/backend/utils/misc/database.c20
3 files changed, 47 insertions, 54 deletions
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index cfecc121ae3..ae12118d1c8 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.12 1998/01/15 19:45:09 pgsql Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.13 1998/04/27 04:07:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,18 +17,19 @@
#include <string.h>
#include "postgres.h"
+
#include "access/heapam.h"
#include "access/relscan.h"
#include "access/xact.h"
#include "catalog/pg_proc.h" /* for Form_pg_proc */
-#include "utils/syscache.h" /* for PROOID */
#include "catalog/catname.h" /* for ProcedureRelationName */
#include "catalog/indexing.h" /* for Num_pg_proc_indices */
+#include "fmgr.h"
#include "storage/lmgr.h"
+#include "tcop/dest.h"
#include "utils/sets.h" /* for GENERICSETNAME */
+#include "utils/syscache.h" /* for PROOID */
#include "utils/tqual.h"
-#include "tcop/dest.h"
-#include "fmgr.h"
extern CommandDest whereToSendOutput; /* defined in tcop/postgres.c */
@@ -60,7 +61,7 @@ SetDefine(char *querystr, char *typename)
ItemPointerData ipdata;
static ScanKeyData oidKey[1] = {
- {0, ObjectIdAttributeNumber, ObjectIdEqualRegProcedure}};
+ {0, ObjectIdAttributeNumber, F_OIDEQ}};
setoid = ProcedureCreate(procname, /* changed below, after oid known */
@@ -116,7 +117,7 @@ SetDefine(char *querystr, char *typename)
/* change the pg_proc tuple */
procrel = heap_openr(ProcedureRelationName);
RelationSetLockForWrite(procrel);
- fmgr_info(ObjectIdEqualRegProcedure,
+ fmgr_info(F_OIDEQ,
&oidKey[0].sk_func);
oidKey[0].sk_nargs = oidKey[0].sk_func.fn_nargs;
oidKey[0].sk_argument = ObjectIdGetDatum(setoid);
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 79056f34d46..9776bcd9bff 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.37 1998/02/26 04:37:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.38 1998/04/27 04:07:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,9 +37,6 @@
#include <string.h>
#include "postgres.h"
-#include "miscadmin.h"
-
-#include <storage/smgr.h>
#include "access/genam.h"
#include "access/heapam.h"
@@ -47,45 +44,42 @@
#include "access/istrat.h"
#include "access/itup.h"
#include "access/skey.h"
-#include "utils/builtins.h"
#include "access/tupdesc.h"
#include "access/tupmacs.h"
#include "access/xact.h"
-
-#include "storage/buf.h"
-#include "storage/fd.h" /* for SEEK_ */
-#include "storage/lmgr.h"
-#include "storage/bufmgr.h"
-
-#include "lib/hasht.h"
-
-#include "utils/memutils.h"
-#include "utils/mcxt.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
-#include "utils/hsearch.h"
-#include "utils/relcache.h"
-#include "utils/catcache.h"
-
-#include "catalog/catname.h"
#include "catalog/catalog.h"
-#include "utils/syscache.h"
-
-#include "catalog/pg_attribute.h"
+#include "catalog/catname.h"
+#include "catalog/index.h"
+#include "catalog/indexing.h"
#include "catalog/pg_aggregate.h"
+#include "catalog/pg_attrdef.h"
+#include "catalog/pg_attribute.h"
#include "catalog/pg_index.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_class.h"
+#include "catalog/pg_log.h"
+#include "catalog/pg_relcheck.h"
#include "catalog/pg_rewrite.h"
#include "catalog/pg_type.h"
-
#include "catalog/pg_variable.h"
-#include "catalog/pg_log.h"
-#include "catalog/pg_attrdef.h"
-#include "catalog/pg_relcheck.h"
-#include "catalog/indexing.h"
-#include "catalog/index.h"
#include "fmgr.h"
+#include "lib/hasht.h"
+#include "miscadmin.h"
+#include "storage/buf.h"
+#include "storage/bufmgr.h"
+#include "storage/fd.h" /* for SEEK_ */
+#include "storage/lmgr.h"
+#include "storage/smgr.h"
+#include "utils/builtins.h"
+#include "utils/catcache.h"
+#include "utils/hsearch.h"
+#include "utils/mcxt.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
+#include "utils/relcache.h"
+#include "utils/relcache.h"
+#include "utils/syscache.h"
+
static void
RelationFlushRelation(Relation *relationPtr,
@@ -360,14 +354,14 @@ scan_pg_rel_seq(RelationBuildDescInfo buildinfo)
case INFO_RELID:
ScanKeyEntryInitialize(&key, 0,
ObjectIdAttributeNumber,
- ObjectIdEqualRegProcedure,
+ F_OIDEQ,
ObjectIdGetDatum(buildinfo.i.info_id));
break;
case INFO_RELNAME:
ScanKeyEntryInitialize(&key, 0,
Anum_pg_class_relname,
- NameEqualRegProcedure,
+ F_NAMEEQ,
NameGetDatum(buildinfo.i.info_name));
break;
@@ -547,7 +541,7 @@ build_tupdesc_seq(RelationBuildDescInfo buildinfo,
*/
ScanKeyEntryInitialize(&key, 0,
Anum_pg_attribute_attrelid,
- ObjectIdEqualRegProcedure,
+ F_OIDEQ,
ObjectIdGetDatum(relation->rd_id));
/* ----------------
@@ -718,7 +712,7 @@ RelationBuildRuleLock(Relation relation)
*/
ScanKeyEntryInitialize(&key, 0,
Anum_pg_rewrite_ev_class,
- ObjectIdEqualRegProcedure,
+ F_OIDEQ,
ObjectIdGetDatum(relation->rd_id));
/* ----------------
@@ -1714,7 +1708,7 @@ AttrDefaultFetch(Relation relation)
ScanKeyEntryInitialize(&skey,
(bits16) 0x0,
(AttrNumber) 1,
- (RegProcedure) ObjectIdEqualRegProcedure,
+ (RegProcedure) F_OIDEQ,
ObjectIdGetDatum(relation->rd_id));
adrel = heap_openr(AttrDefaultRelationName);
@@ -1803,7 +1797,7 @@ RelCheckFetch(Relation relation)
ScanKeyEntryInitialize(&skey,
(bits16) 0x0,
(AttrNumber) 1,
- (RegProcedure) ObjectIdEqualRegProcedure,
+ (RegProcedure) F_OIDEQ,
ObjectIdGetDatum(relation->rd_id));
rcrel = heap_openr(RelCheckRelationName);
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index cec5b306671..24c6b1ee39d 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.7 1998/02/26 04:38:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.8 1998/04/27 04:07:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,20 +18,18 @@
#include <fcntl.h>
#include "postgres.h"
-#include "miscadmin.h"
-
-#include "utils/elog.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
#include "access/heapam.h"
-#include "storage/bufmgr.h"
+#include "access/xact.h"
#include "catalog/catname.h"
-#include "catalog/pg_proc.h"
#include "catalog/pg_database.h"
-
-#include "access/xact.h"
+#include "fmgr.h"
+#include "miscadmin.h"
+#include "storage/bufmgr.h"
#include "storage/bufpage.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
+
/* GetDatabaseInfo()
* Pull database information from pg_database.
@@ -57,7 +55,7 @@ GetDatabaseInfo(char *name, Oid *owner, char *path)
DatabaseRelationName);
ScanKeyEntryInitialize(&scanKey, 0, Anum_pg_database_datname,
- NameEqualRegProcedure, NameGetDatum(name));
+ F_NAMEEQ, NameGetDatum(name));
scan = heap_beginscan(dbrel, 0, false, 1, &scanKey);
if (!HeapScanIsValid(scan))
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 01:37:13 +0000