diff options
Diffstat (limited to 'src/backend/utils')
37 files changed, 36 insertions, 201 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 0c87ce5a644..0a60e98a9f7 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.35 1999/07/15 15:20:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.36 1999/07/15 22:39:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,9 +21,6 @@ #endif #include "miscadmin.h" #include "utils/builtins.h" -#include "utils/nabstime.h" -#include "utils/datetime.h" -#include "access/xact.h" static int date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn); diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c index 1c774616d5c..84d33049c5f 100644 --- a/src/backend/utils/adt/datum.c +++ b/src/backend/utils/adt/datum.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.14 1999/07/15 15:20:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.15 1999/07/15 22:39:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ #include <string.h> #include "postgres.h" #include "utils/datum.h" -#include "catalog/pg_type.h" /*------------------------------------------------------------------------- * datumGetSize diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c index 4a246d705f9..ea81ebb23a7 100644 --- a/src/backend/utils/adt/geo_selfuncs.c +++ b/src/backend/utils/adt/geo_selfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.10 1999/07/15 15:20:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.11 1999/07/15 22:39:59 momjian Exp $ * * XXX These are totally bogus. * @@ -16,8 +16,6 @@ */ #include "postgres.h" -#include "access/attnum.h" -#include "utils/geo_decls.h" /* where function declarations go */ #include "utils/builtins.h" float64 diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index f26dc35a8ac..39776901af2 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.23 1999/07/15 15:20:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.24 1999/07/15 22:39:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,6 @@ #endif #include "postgres.h" -#include "fmgr.h" #include "utils/builtins.h" /* where the declarations go */ #ifndef SHRT_MAX diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c index 03a7a4e4790..ed2a86a954f 100644 --- a/src/backend/utils/adt/mac.c +++ b/src/backend/utils/adt/mac.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $Id: mac.c,v 1.10 1999/07/15 15:20:18 momjian Exp $ + * $Id: mac.c,v 1.11 1999/07/15 22:39:59 momjian Exp $ */ #include <stdio.h> @@ -9,7 +9,6 @@ #include <postgres.h> #include <utils/builtins.h> -#include <utils/inet.h> manufacturer manufacturers[] = { {0x00, 0x00, 0x0C, "Cisco"}, diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index d7651355cf3..dd26023b356 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.16 1999/02/13 23:19:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.17 1999/07/15 22:39:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,8 +15,6 @@ #include <sys/file.h> #include <time.h> #include "postgres.h" -#include "utils/datum.h" -#include "catalog/pg_type.h" #include "utils/builtins.h" /*------------------------------------------------------------------------- diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c index 1b56dfa4cb0..70ecd3d5c28 100644 --- a/src/backend/utils/adt/network.c +++ b/src/backend/utils/adt/network.c @@ -3,7 +3,7 @@ * is for IP V4 CIDR notation, but prepared for V6: just * add the necessary bits where the comments indicate. * - * $Id: network.c,v 1.12 1999/07/15 15:20:18 momjian Exp $ + * $Id: network.c,v 1.13 1999/07/15 22:40:00 momjian Exp $ * Jon Postel RIP 16 Oct 1998 */ @@ -19,7 +19,6 @@ #include <postgres.h> #include <utils/builtins.h> -#include <utils/inet.h> static int v4bitncmp(unsigned int a1, unsigned int a2, int bits); diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c index 7082b0d007e..2d26096634b 100644 --- a/src/backend/utils/adt/not_in.c +++ b/src/backend/utils/adt/not_in.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.16 1999/05/25 16:12:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.17 1999/07/15 22:40:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,6 @@ #include <string.h> #include "postgres.h" #include "access/heapam.h" -#include "access/relscan.h" #include "utils/builtins.h" /* where function decls go */ static int my_varattno(Relation rd, char *a); diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 5faaa5ddab4..fd09f386e8a 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.34 1999/07/10 17:03:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.35 1999/07/15 22:40:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,6 @@ #include "postgres.h" #include "utils/builtins.h" /* where the declarations go */ #ifndef HAVE_MEMMOVE -#include <regex/utils.h> #else #include <string.h> #endif diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 3a2a0323642..c0337b93fec 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.38 1999/07/15 15:20:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.39 1999/07/15 22:40:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,10 +16,6 @@ #include "miscadmin.h" #include "access/heapam.h" #include "access/genam.h" -#include "access/itup.h" -#include "access/relscan.h" -#include "storage/bufmgr.h" -#include "fmgr.h" #include "utils/syscache.h" #include "catalog/catname.h" diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 928705ef22e..53763414f44 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * out of it's tuple * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.19 1999/07/15 15:20:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.20 1999/07/15 22:40:00 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -43,18 +43,10 @@ #include <string.h> #include "executor/spi.h" -#include "commands/trigger.h" -#include "utils/builtins.h" -#include "nodes/nodes.h" #include "optimizer/clauses.h" -#include "utils/syscache.h" #include "utils/lsyscache.h" -#include "catalog/pg_class.h" -#include "catalog/pg_type.h" #include "catalog/pg_shadow.h" #include "catalog/pg_index.h" -#include "catalog/pg_opclass.h" -#include "fmgr.h" #define BUFSIZE 8192 diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 359267653b9..ade43a2be2c 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.31 1999/07/15 15:20:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.32 1999/07/15 22:40:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,6 @@ #include "postgres.h" #include "access/heapam.h" -#include "fmgr.h" #include "utils/builtins.h" /* for textout() prototype and where the * declarations go */ diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index 94b6a1157bb..20ec4921bff 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.21 1999/02/13 23:19:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.22 1999/07/15 22:40:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,17 +19,11 @@ #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 "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" extern CommandDest whereToSendOutput; /* defined in tcop/postgres.c */ diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 5a9bae512e8..621dcc53d03 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.8 1999/07/15 15:20:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.9 1999/07/15 22:40:01 momjian Exp $ * * NOTES * input routine largely stolen from boxin(). @@ -17,7 +17,6 @@ #include <stdio.h> /* for sprintf() */ #include <string.h> #include "postgres.h" -#include "storage/bufpage.h" #include "utils/builtins.h" /* where function declarations go */ diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 868412f46f8..0d746a3c64e 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.49 1999/07/15 15:20:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.50 1999/07/15 22:40:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,17 +15,13 @@ #include <string.h> #include "postgres.h" #include "access/htup.h" -#include "utils/array.h" #include "utils/builtins.h" #include "catalog/pg_type.h" -#include "storage/bufpage.h" -#include "utils/memutils.h" #ifdef CYR_RECODE char *convertstr(char *, int, int); #endif -#include "mb/pg_wchar.h" /* * CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR() diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index c4044158ea0..663eeb5f774 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.44 1999/07/15 15:20:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.45 1999/07/15 22:40:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,17 +15,11 @@ #include "postgres.h" #include "access/heapam.h" #include "access/genam.h" -#include "utils/tqual.h" #include "utils/builtins.h" -#include "utils/portal.h" #include "utils/catcache.h" -#include "utils/rel.h" -#include "storage/bufpage.h" #include "access/valid.h" #include "miscadmin.h" -#include "fmgr.h" /* for F_BOOLEQ, etc. DANGER */ #include "catalog/pg_type.h" /* for OID of int28 type */ -#include "lib/dllist.h" static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e); static Index CatalogCacheComputeHashIndex(struct catcache * cacheInP); diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c index c298de0a9e9..0e1eb945cb4 100644 --- a/src/backend/utils/cache/fcache.c +++ b/src/backend/utils/cache/fcache.c @@ -7,30 +7,21 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.22 1999/05/10 00:46:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.23 1999/07/15 22:40:03 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include <nodes/parsenodes.h> -#include <fmgr.h> -#include "access/htup.h" -#include "utils/catcache.h" #include "utils/syscache.h" #include "catalog/pg_type.h" #include "catalog/pg_proc.h" #include "catalog/pg_language.h" -#include "catalog/pg_class.h" #include "parser/parsetree.h" /* for getrelname() */ #include "utils/builtins.h" -#include "utils/fcache.h" #include "utils/fcache2.h" -#include "nodes/primnodes.h" -#include "nodes/execnodes.h" #ifndef HAVE_MEMMOVE -#include <regex/utils.h> #else #include <string.h> #endif diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 7cf66e22808..a356bb8cdd0 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.23 1999/05/25 16:12:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.24 1999/07/15 22:40:03 momjian Exp $ * * Note - this code is real crufty... * @@ -17,20 +17,13 @@ #include <miscadmin.h> -#include "access/heapam.h" /* XXX to support hacks below */ -#include "access/htup.h" #include "catalog/catalog.h" #include "catalog/heap.h" -#include "storage/bufpage.h" -#include "storage/buf.h" /* XXX for InvalidBuffer */ -#include "storage/ipc.h" #include "storage/sinval.h" #include "utils/catcache.h" #include "utils/inval.h" -#include "utils/rel.h" #include "utils/relcache.h" #include "catalog/catname.h" /* XXX to support hacks below */ -#include "utils/syscache.h" /* XXX to support the hacks below */ static InvalidationEntry InvalidationEntryAllocate(uint16 size); static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function) ()); diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index cb99900ea6a..61d96bc2f9d 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.28 1999/07/15 15:20:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -16,15 +16,9 @@ #include <string.h> #include "postgres.h" -#include "nodes/pg_list.h" #include "utils/syscache.h" #include "utils/lsyscache.h" -#include "access/tupmacs.h" -#include "utils/rel.h" -#include "access/attnum.h" -#include "access/heapam.h" -#include "catalog/pg_amop.h" #include "catalog/pg_operator.h" #include "catalog/pg_type.h" diff --git a/src/backend/utils/cache/rel.c b/src/backend/utils/cache/rel.c index f37a97b34f6..340562f05d4 100644 --- a/src/backend/utils/cache/rel.c +++ b/src/backend/utils/cache/rel.c @@ -7,18 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.5 1999/05/25 16:12:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.6 1999/07/15 22:40:04 momjian Exp $ * *------------------------------------------------------------------------- */ /* #define RELREFDEBUG 1 */ #include "postgres.h" -#include "miscadmin.h" #include "access/istrat.h" -#include "access/tupdesc.h" -#include "utils/rel.h" -#include "storage/fd.h" /* diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 7184f76985e..b2bfdf14f3a 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.63 1999/07/15 15:20:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.64 1999/07/15 22:40:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,43 +40,24 @@ #include "access/genam.h" #include "access/heapam.h" -#include "access/htup.h" #include "access/istrat.h" -#include "access/itup.h" -#include "access/skey.h" -#include "access/tupdesc.h" -#include "access/tupmacs.h" -#include "access/xact.h" #include "catalog/catalog.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 "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/memutils.h" -#include "utils/rel.h" #include "utils/relcache.h" -#include "utils/syscache.h" static void RelationFlushRelation(Relation *relationPtr, diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index d302a33d85e..fa57b86daf6 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.28 1999/07/07 16:09:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $ * * NOTES * These routines allow the parser/planner/executor to perform @@ -20,7 +20,6 @@ #include "postgres.h" #include "access/heapam.h" -#include "access/htup.h" #include "catalog/catname.h" #include "utils/catcache.h" #include <string.h> @@ -30,9 +29,7 @@ * hardwired attribute information comes from system catalog files. * ---------------- */ -#include "catalog/pg_am.h" #include "catalog/pg_amop.h" -#include "catalog/pg_attribute.h" #include "catalog/pg_group.h" #include "catalog/pg_index.h" #include "catalog/pg_inherits.h" @@ -40,12 +37,10 @@ #include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" -#include "catalog/pg_class.h" #include "catalog/pg_type.h" #include "catalog/pg_rewrite.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_shadow.h" -#include "storage/large_object.h" #include "catalog/pg_listener.h" extern bool AMI_OVERRIDE; /* XXX style */ diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c index 0d817ec012e..9dfe2289d9f 100644 --- a/src/backend/utils/cache/temprel.c +++ b/src/backend/utils/cache/temprel.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.7 1999/07/15 15:20:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.8 1999/07/15 22:40:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,15 +26,10 @@ #include <string.h> #include "postgres.h" -#include "miscadmin.h" -#include "nodes/pg_list.h" #include "utils/temprel.h" -#include "access/xact.h" -#include "access/htup.h" #include "access/heapam.h" #include "catalog/heap.h" #include "catalog/index.h" -#include "catalog/pg_class.h" GlobalMemory CacheCxt; diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c index 794b59bd7b2..0bb6785d62d 100644 --- a/src/backend/utils/error/assert.c +++ b/src/backend/utils/error/assert.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.13 1999/02/13 23:19:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.14 1999/07/15 22:40:05 momjian Exp $ * * NOTE * This should eventually work with elog(), dlog(), etc. @@ -18,7 +18,6 @@ #include <unistd.h> #include "postgres.h" /* where the declaration goes */ -#include "utils/module.h" #include "utils/exc.h" #include "utils/trace.h" diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index b5cf429e7f1..566a11aca83 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.27 1999/07/15 15:20:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.28 1999/07/15 22:40:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,17 +18,12 @@ #include "postgres.h" -#include "config.h" /* for MAXPATHLEN */ -#include "fmgr.h" /* generated by Gen_fmgrtab.sh */ -#include "utils/dynamic_loader.h" #include "utils/builtins.h" #include "access/heapam.h" -#include "nodes/pg_list.h" #include "dynloader.h" #ifdef __ultrix -#include <dl.h> #endif #include "catalog/catname.h" diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 8658da21a4e..fa3e2a6fd23 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.29 1999/07/15 15:20:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.30 1999/07/15 22:40:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,18 +18,14 @@ #include "postgres.h" /* these 2 files are generated by Gen_fmgrtab.sh; contain the declarations */ -#include "fmgr.h" #include "utils/fmgrtab.h" -#include "nodes/pg_list.h" #include "catalog/pg_proc.h" #include "catalog/pg_language.h" #include "utils/syscache.h" -#include "nodes/params.h" #include "utils/builtins.h" -#include "nodes/parsenodes.h" #include "commands/trigger.h" diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 1ef5a00fe45..97dee13053e 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.31 1999/07/15 15:20:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.32 1999/07/15 22:40:08 momjian Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -27,9 +27,6 @@ #include "miscadmin.h" /* where the declarations go */ #include <storage/backendid.h> -#include "access/heapam.h" -#include "storage/sinval.h" -#include "storage/sinvaladt.h" #include "storage/lmgr.h" #include "libpq/pqcomm.h" #include "catalog/catname.h" diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 53e98f3211f..55a6905707e 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.30 1999/07/15 15:20:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.31 1999/07/15 22:40:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,19 +23,13 @@ #include "postgres.h" -#include "utils/portal.h" /* for EnablePortalManager, etc. */ -#include "utils/exc.h" /* for EnableExceptionHandling, etc. */ -#include "utils/builtins.h" #include "miscadmin.h" /* where the declarations go */ #include "catalog/catname.h" #include "catalog/pg_shadow.h" -#include "catalog/pg_proc.h" #include "utils/syscache.h" -#include "storage/fd.h" /* for O_ */ -#include "storage/ipc.h" /* for proc_exit */ /* * EnableAbortEnvVarName diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 6a304ec3d1f..92532c9bad1 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.41 1999/07/15 15:20:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.42 1999/07/15 22:40:09 momjian Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -37,34 +37,24 @@ #include "postgres.h" #include "version.h" -#include <storage/ipc.h> #include <storage/backendid.h> -#include <storage/buf_internals.h> #include <storage/smgr.h> #include <storage/proc.h> #include <utils/relcache.h> #include "access/heapam.h" -#include "access/xact.h" -#include "storage/bufmgr.h" -#include "access/transam.h" /* XXX dependency problem */ #include "utils/syscache.h" #include "storage/bufpage.h" /* for page layout, for * InitMyDatabaseInfo() */ #include "storage/sinval.h" -#include "storage/sinvaladt.h" -#include "storage/lmgr.h" #include "miscadmin.h" /* for global decls */ #include "utils/portal.h" /* for EnablePortalManager, etc. */ -#include "utils/exc.h" /* for EnableExceptionHandling, etc. */ -#include "fmgr.h" /* for EnableDynamicFunctionManager, etc. */ #include "utils/inval.h" #include "catalog/catname.h" #ifdef MULTIBYTE -#include "mb/pg_wchar.h" #endif #include "libpq/libpq.h" diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c index 607dfcf46a3..397cc766fc4 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.25 1999/07/15 15:20:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.26 1999/07/15 22:40:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,20 +19,12 @@ #include "postgres.h" -#include "access/heapam.h" -#include "access/transam.h" #include "access/xact.h" -#include "catalog/catname.h" #include "catalog/pg_database.h" -#include "fmgr.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/bufpage.h" -#include "utils/builtins.h" #include "utils/syscache.h" #ifdef MULTIBYTE -#include "mb/pg_wchar.h" #endif #ifdef NOT_USED diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c index 9676ca570a0..229e373382c 100644 --- a/src/backend/utils/misc/trace.c +++ b/src/backend/utils/misc/trace.c @@ -26,7 +26,6 @@ #include "postgres.h" #include "miscadmin.h" #include "utils/trace.h" -#include "libpq/pqsignal.h" #ifdef USE_SYSLOG /* diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 1060f7b6def..5f8e4b4def6 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.16 1999/05/25 16:12:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.17 1999/07/15 22:40:12 momjian Exp $ * * NOTE: * This is a new (Feb. 05, 1999) implementation of the allocation set @@ -23,10 +23,8 @@ */ #include <stdio.h> #include "postgres.h" -#include "utils/excid.h" /* for ExhaustedMemory */ #include "utils/memutils.h" /* where funnction declarations go */ #ifndef HAVE_MEMMOVE -#include <regex/utils.h> #else #include <string.h> #endif diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 8143bc2c3e7..c3d272029b6 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.15 1999/07/15 15:20:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.16 1999/07/15 22:40:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,12 +15,10 @@ #include "postgres.h" -#include "utils/memutils.h" #include "utils/module.h" #include "utils/excid.h" #include "nodes/memnodes.h" -#include "nodes/nodes.h" diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 55512b1c950..a5768237152 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.24 1999/07/15 15:20:39 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.25 1999/07/15 22:40:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,13 +80,7 @@ #include "lib/hasht.h" #include "utils/module.h" -#include "utils/excid.h" /* for Unimplemented */ -#include "utils/hsearch.h" -#include "nodes/memnodes.h" -#include "nodes/nodes.h" -#include "nodes/pg_list.h" -#include "nodes/execnodes.h" /* for EState */ #include "utils/portal.h" diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c index ae10049b961..2b349f36866 100644 --- a/src/backend/utils/sort/lselect.c +++ b/src/backend/utils/sort/lselect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.16 1999/07/10 18:21:59 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.17 1999/07/15 22:40:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,13 +17,8 @@ #include "postgres.h" -#include "storage/buf.h" -#include "access/skey.h" #include "access/heapam.h" -#include "access/htup.h" -#include "utils/rel.h" -#include "utils/psort.h" #include "utils/lselect.h" /* diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c index d26785a9405..b0c6db77177 100644 --- a/src/backend/utils/sort/psort.c +++ b/src/backend/utils/sort/psort.c @@ -4,7 +4,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psort.c,v 1.53 1999/05/25 22:42:22 momjian Exp $ + * $Id: psort.c,v 1.54 1999/07/15 22:40:14 momjian Exp $ * * NOTES * Sorts the first relation into the second relation. @@ -40,19 +40,9 @@ #include "miscadmin.h" #include "access/heapam.h" -#include "access/htup.h" -#include "access/relscan.h" -#include "access/skey.h" #include "executor/execdebug.h" #include "executor/executor.h" -#include "nodes/execnodes.h" -#include "nodes/plannodes.h" -#include "storage/buf.h" -#include "storage/fd.h" -#include "utils/lselect.h" -#include "utils/portal.h" /* for {Start,End}PortalAllocMode */ #include "utils/psort.h" -#include "utils/rel.h" static bool createfirstrun(Sort *node); static bool createrun(Sort *node, BufFile *file); diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c index b89706638a9..3c2a9c71e8c 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.30 1999/07/15 15:20:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.31 1999/07/15 22:40:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,10 +16,6 @@ #include "postgres.h" -#include "access/htup.h" -#include "access/xact.h" -#include "storage/bufmgr.h" -#include "access/transam.h" #include "utils/tqual.h" extern bool PostgresIsInitialized; |