From 0b3cb80e03a54636354930d2a1fc0186e3ba092c Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Mon, 4 Nov 1996 11:51:27 +0000 Subject: [PATCH] finally, this directory is (should be!) totally clean --- src/include/utils/builtins.h | 6 +++--- src/include/utils/catcache.h | 8 ++++---- src/include/utils/excid.h | 3 +-- src/include/utils/fmgrtab.h | 3 +-- src/include/utils/inval.h | 6 +++--- src/include/utils/lselect.h | 5 +++-- src/include/utils/lsyscache.h | 5 +++-- src/include/utils/mcxt.h | 4 ++-- src/include/utils/portal.h | 13 +++++-------- src/include/utils/psort.h | 9 ++++----- src/include/utils/rel.h | 8 ++++---- src/include/utils/rel2.h | 4 ++-- src/include/utils/relcache.h | 6 ++---- src/include/utils/syscache.h | 6 +++--- 14 files changed, 40 insertions(+), 46 deletions(-) diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 3ebc076f2c..cabfa01773 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.5 1996/11/04 07:46:00 scrappy Exp $ + * $Id: builtins.h,v 1.6 1996/11/04 11:51:14 scrappy Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -19,9 +19,9 @@ #define BUILTINS_H #include -#include -#include #include +#include +#include /* * Defined in adt/ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 3eccd13609..98ad923099 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.3 1996/11/04 07:59:39 scrappy Exp $ + * $Id: catcache.h,v 1.4 1996/11/04 11:51:15 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,10 +15,10 @@ /* #define CACHEDEBUG turns DEBUG elogs on */ -#include -#include -#include #include +#include +#include +#include /* * struct catctup: tuples in the cache. diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h index 9d2f69d137..be41133414 100644 --- a/src/include/utils/excid.h +++ b/src/include/utils/excid.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: excid.h,v 1.2 1996/10/31 09:51:15 scrappy Exp $ + * $Id: excid.h,v 1.3 1996/11/04 11:51:16 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef EXCID_H #define EXCID_H -#include "utils/exc.h" /* for Exception */ extern Exception FailedAssertion; extern Exception BadState; diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h index b710fc3589..ed46c527cd 100644 --- a/src/include/utils/fmgrtab.h +++ b/src/include/utils/fmgrtab.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fmgrtab.h,v 1.2 1996/10/31 09:51:17 scrappy Exp $ + * $Id: fmgrtab.h,v 1.3 1996/11/04 11:51:17 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef FMGRTAB_H #define FMGRTAB_H -#include "fmgr.h" /* genearated by Gen_fmgrtab.sh */ typedef struct { Oid proid; diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index ac74012a75..d54d8c5ab6 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: inval.h,v 1.2 1996/10/31 09:51:21 scrappy Exp $ + * $Id: inval.h,v 1.3 1996/11/04 11:51:18 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef INVAL_H #define INVAL_H -#include "access/htup.h" -#include "utils/rel.h" +#include +#include extern void DiscardInvalid(void); diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h index 126a50cb05..7cb5f8d185 100644 --- a/src/include/utils/lselect.h +++ b/src/include/utils/lselect.h @@ -6,14 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lselect.h,v 1.2 1996/10/31 09:51:23 scrappy Exp $ + * $Id: lselect.h,v 1.3 1996/11/04 11:51:19 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef LSELECT_H #define LSELECT_H -#include "access/htup.h" +#include +#include struct leftist { short lt_dist; /* distance to leaf/empty node */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 2eb66f0bf5..7e1bf907b8 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,14 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.1 1996/08/28 01:59:08 scrappy Exp $ + * $Id: lsyscache.h,v 1.2 1996/11/04 11:51:20 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef LSYSCACHE_H #define LSYSCACHE_H -#include "access/htup.h" +#include +#include extern bool op_class(Oid opid, int32 opclass, Oid amopid); extern char *get_attname(Oid relid, AttrNumber attnum); diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h index bc405cd936..21d405bc88 100644 --- a/src/include/utils/mcxt.h +++ b/src/include/utils/mcxt.h @@ -6,14 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: mcxt.h,v 1.3 1996/11/03 08:17:34 scrappy Exp $ + * $Id: mcxt.h,v 1.4 1996/11/04 11:51:21 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef MCXT_H #define MCXT_H -#include "nodes/memnodes.h" +#include extern MemoryContext CurrentMemoryContext; extern MemoryContext TopMemoryContext; diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 6fc281fb01..b385097f19 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.2 1996/10/31 09:51:29 scrappy Exp $ + * $Id: portal.h,v 1.3 1996/11/04 11:51:22 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -25,13 +25,10 @@ #ifndef PORTAL_H #define PORTAL_H - -#include "nodes/execnodes.h" /* for EState */ -#include "nodes/memnodes.h" -#include "nodes/nodes.h" -#include "nodes/pg_list.h" -#include "nodes/plannodes.h" /* for Plan */ -#include "executor/execdesc.h" +#include +#include +#include +#include typedef struct PortalBlockData { AllocSetData setData; diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h index 45d5231981..a20d2cb759 100644 --- a/src/include/utils/psort.h +++ b/src/include/utils/psort.h @@ -6,13 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psort.h,v 1.1 1996/08/28 01:59:20 scrappy Exp $ + * $Id: psort.h,v 1.2 1996/11/04 11:51:23 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef PSORT_H #define PSORT_H +#include +#include + #define SORTMEM (1 << 18) /* 1/4 M - any static memory */ #define MAXTAPES 7 /* 7--See Fig. 70, p273 */ #define TAPEEXT "pg_psort.XXXXXX" /* TEMPDIR/TAPEEXT */ @@ -39,10 +42,6 @@ extern Relation SortRdesc; extern struct leftist *Tuples; #ifdef EBUG -#include -#include "utils/elog.h" -#include "storage/buf.h" -#include "storage/bufmgr.h" #define PDEBUG(PROC, S1)\ elog(DEBUG, "%s:%d>> PROC: %s.", __FILE__, __LINE__, S1) diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 8ea8ed4b75..7ca56bb759 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -6,18 +6,18 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.6 1996/11/04 07:46:06 scrappy Exp $ + * $Id: rel.h,v 1.7 1996/11/04 11:51:24 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef REL_H #define REL_H +#include +#include #include -#include #include -#include -#include +#include #include typedef struct RelationData { diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h index 8f2742457c..bee0c78b8f 100644 --- a/src/include/utils/rel2.h +++ b/src/include/utils/rel2.h @@ -6,14 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rel2.h,v 1.1 1996/08/28 01:59:22 scrappy Exp $ + * $Id: rel2.h,v 1.2 1996/11/04 11:51:25 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef TMP_REL2_H #define TMP_REL2_H -#include "access/istrat.h" +#include extern IndexStrategy RelationGetIndexStrategy(Relation relation); diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index b23269861b..0389578f04 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -6,16 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relcache.h,v 1.2 1996/10/31 09:51:30 scrappy Exp $ + * $Id: relcache.h,v 1.3 1996/11/04 11:51:26 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef RELCACHE_H #define RELCACHE_H -#include - -#include "utils/rel.h" +#include /* * relation lookup routines diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index efd223cdeb..9de2b9d40a 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: syscache.h,v 1.3 1996/10/31 05:58:01 momjian Exp $ + * $Id: syscache.h,v 1.4 1996/11/04 11:51:27 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef SYSCACHE_H #define SYSCACHE_H -#include "access/attnum.h" -#include "access/htup.h" +#include +#include /*#define CACHEDEBUG*/ /* turns DEBUG elogs on */ -- 2.40.0