diff options
Diffstat (limited to 'src/backend/storage')
-rw-r--r-- | src/backend/storage/buffer/buf_table.c | 6 | ||||
-rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 14 | ||||
-rw-r--r-- | src/backend/storage/buffer/freelist.c | 4 | ||||
-rw-r--r-- | src/backend/storage/buffer/localbuf.c | 17 | ||||
-rw-r--r-- | src/backend/storage/ipc/ipci.c | 6 | ||||
-rw-r--r-- | src/backend/storage/ipc/shmem.c | 9 | ||||
-rw-r--r-- | src/backend/storage/ipc/sinval.c | 3 | ||||
-rw-r--r-- | src/backend/storage/ipc/sinvaladt.c | 5 | ||||
-rw-r--r-- | src/backend/storage/ipc/spin.c | 6 | ||||
-rw-r--r-- | src/backend/storage/large_object/inv_api.c | 16 | ||||
-rw-r--r-- | src/backend/storage/lmgr/lmgr.c | 18 | ||||
-rw-r--r-- | src/backend/storage/lmgr/lock.c | 9 | ||||
-rw-r--r-- | src/backend/storage/lmgr/proc.c | 11 | ||||
-rw-r--r-- | src/backend/storage/page/bufpage.c | 6 | ||||
-rw-r--r-- | src/backend/storage/page/itemptr.c | 5 | ||||
-rw-r--r-- | src/backend/storage/smgr/md.c | 5 | ||||
-rw-r--r-- | src/backend/storage/smgr/mm.c | 12 | ||||
-rw-r--r-- | src/backend/storage/smgr/smgr.c | 5 | ||||
-rw-r--r-- | src/backend/storage/smgr/smgrtype.c | 3 |
19 files changed, 22 insertions, 138 deletions
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index 0b4e0ea58fb..5cab2e4e24d 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.14 1999/02/13 23:17:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.15 1999/07/15 22:39:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,10 +29,6 @@ #include "postgres.h" #include "storage/bufmgr.h" -#include "storage/buf_internals.h" /* where the declarations go */ -#include "storage/shmem.h" -#include "storage/spin.h" -#include "utils/hsearch.h" static HTAB *SharedBufHash; diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index fa3914b61c0..6acccfb2872 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.57 1999/07/15 15:19:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.58 1999/07/15 22:39:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,24 +50,12 @@ #include "postgres.h" /* declarations split between these three files */ -#include "storage/buf.h" -#include "storage/buf_internals.h" -#include "storage/bufmgr.h" -#include "storage/fd.h" -#include "storage/ipc.h" #include "storage/s_lock.h" -#include "storage/shmem.h" -#include "storage/spin.h" #include "storage/smgr.h" -#include "storage/lmgr.h" #include "miscadmin.h" -#include "utils/builtins.h" -#include "utils/hsearch.h" -#include "utils/memutils.h" #include "utils/relcache.h" #include "executor/execdebug.h" /* for NDirectFileRead */ -#include "catalog/catalog.h" extern SPINLOCK BufMgrLock; extern long int ReadBufferCount; diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 2b007b85e08..13f79377b52 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.15 1999/05/25 16:10:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.16 1999/07/15 22:39:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,8 +28,6 @@ #include "postgres.h" #include "storage/bufmgr.h" -#include "storage/buf_internals.h" /* where declarations go */ -#include "storage/spin.h" static BufferDesc *SharedFreeList; diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index c9fcf506bc5..6162052f8fd 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.22 1999/05/10 00:45:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.23 1999/07/15 22:39:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,23 +29,10 @@ #include "postgres.h" /* declarations split between these three files */ -#include "storage/buf.h" -#include "storage/buf_internals.h" -#include "storage/bufmgr.h" - -#include "storage/fd.h" -#include "storage/ipc.h" -#include "storage/shmem.h" -#include "storage/spin.h" + #include "storage/smgr.h" -#include "storage/lmgr.h" -#include "miscadmin.h" -#include "utils/builtins.h" -#include "utils/hsearch.h" -#include "utils/memutils.h" #include "utils/relcache.h" #include "executor/execdebug.h" /* for NDirectFileRead */ -#include "catalog/catalog.h" extern long int LocalBufferFlushCount; diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index b32c7f91ea2..89af501ff98 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.26 1999/05/31 18:28:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.27 1999/07/15 22:39:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,12 +16,8 @@ #include "postgres.h" -#include "storage/ipc.h" #include "storage/sinval.h" #include "storage/bufmgr.h" -#include "storage/proc.h" -#include "storage/smgr.h" -#include "storage/lock.h" #include "miscadmin.h" /* for DebugLvl */ /* diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 8213a84c145..2b785251c59 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.43 1999/07/15 15:19:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.44 1999/07/15 22:39:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,15 +61,8 @@ #include <string.h> #include "postgres.h" -#include "storage/ipc.h" -#include "storage/shmem.h" -#include "storage/spin.h" #include "storage/proc.h" -#include "utils/hsearch.h" -#include "utils/memutils.h" -#include "access/xact.h" #include "utils/tqual.h" -#include "access/transam.h" /* shared memory global variables */ diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c index 220607ac050..21585cc2406 100644 --- a/src/backend/storage/ipc/sinval.c +++ b/src/backend/storage/ipc/sinval.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.15 1999/05/28 17:03:29 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.16 1999/07/15 22:39:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,6 @@ #include "storage/backendid.h" #include "storage/sinval.h" #include "storage/sinvaladt.h" -#include "storage/spin.h" extern SISeg *shmInvalBuffer; /* the shared buffer segment, set by */ diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c index 8a47ecaa42d..fb6170faf43 100644 --- a/src/backend/storage/ipc/sinvaladt.c +++ b/src/backend/storage/ipc/sinvaladt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.21 1999/07/15 15:19:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.22 1999/07/15 22:39:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,11 +17,8 @@ #include "postgres.h" -#include "storage/ipc.h" #include "storage/backendid.h" -#include "storage/sinvaladt.h" #include "storage/lmgr.h" -#include "utils/memutils.h" #include "utils/trace.h" /* ---------------- diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c index 3fe692ff088..c49ebc91948 100644 --- a/src/backend/storage/ipc/spin.c +++ b/src/backend/storage/ipc/spin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.18 1999/02/13 23:18:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.19 1999/07/15 22:39:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,12 +26,8 @@ */ #include <errno.h> #include "postgres.h" -#include "storage/ipc.h" #include "storage/s_lock.h" -#include "storage/shmem.h" -#include "storage/spin.h" #include "storage/proc.h" -#include "utils/trace.h" #ifndef HAS_TEST_AND_SET #include <sys/sem.h> diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index 57d03568c7d..641dab03935 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.53 1999/05/25 16:11:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.54 1999/07/15 22:39:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,30 +22,16 @@ #include "access/genam.h" #include "access/heapam.h" -#include "access/relscan.h" -#include "access/tupdesc.h" -#include "access/transam.h" -#include "access/xact.h" #include "access/nbtree.h" -#include "access/tupdesc.h" #include "catalog/catalog.h" /* for newoid() */ #include "catalog/heap.h" #include "catalog/index.h" /* for index_create() */ -#include "catalog/pg_am.h" /* for BTREE_AM_OID */ #include "catalog/pg_type.h" /* for INT4OID */ #include "catalog/pg_opclass.h" /* for INT4_OPS_OID */ -#include "fmgr.h" #include "libpq/libpq-fs.h" #include "miscadmin.h" -#include "nodes/pg_list.h" -#include "storage/itemptr.h" -#include "storage/bufpage.h" -#include "storage/bufmgr.h" #include "storage/large_object.h" -#include "storage/lmgr.h" #include "storage/smgr.h" -#include "utils/builtins.h" /* for namestrcpy() */ -#include "utils/rel.h" #include "utils/relcache.h" /* diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index cf7a1c86825..9ad92c8a753 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.29 1999/07/15 20:32:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.30 1999/07/15 22:39:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,27 +22,11 @@ #include "postgres.h" -#include "access/heapam.h" -#include "access/htup.h" -#include "access/relscan.h" -#include "access/skey.h" -#include "access/xact.h" -#include "storage/block.h" -#include "storage/buf.h" -#include "storage/itemptr.h" -#include "storage/bufpage.h" -#include "storage/multilev.h" -#include "storage/lmgr.h" -#include "utils/rel.h" -#include "catalog/catname.h" #include "catalog/catalog.h" -#include "catalog/pg_class.h" -#include "nodes/memnodes.h" -#include "storage/bufmgr.h" #include "access/transam.h" /* for AmiTransactionId */ extern Oid MyDatabaseId; diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 74845dbcf87..bdf6bb9860e 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.57 1999/07/15 20:32:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.58 1999/07/15 22:39:51 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -37,15 +37,8 @@ #include "postgres.h" #include "miscadmin.h" -#include "storage/shmem.h" -#include "storage/sinvaladt.h" -#include "storage/spin.h" #include "storage/proc.h" -#include "storage/lock.h" -#include "utils/hsearch.h" -#include "utils/memutils.h" #include "access/xact.h" -#include "access/transam.h" #include "utils/trace.h" #include "utils/ps_status.h" diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index d88ded9a7a8..5822ca4e06c 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.58 1999/07/15 22:39:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.58 1999/07/15 22:39:52 momjian Exp $ */ #include <sys/time.h> #include <unistd.h> @@ -63,17 +63,10 @@ #include "miscadmin.h" #include "libpq/pqsignal.h" -#include "access/xact.h" -#include "utils/hsearch.h" -#include "storage/ipc.h" /* In Ultrix, sem.h must be included after ipc.h */ #include <sys/sem.h> -#include "storage/buf.h" -#include "storage/lock.h" #include "storage/lmgr.h" -#include "storage/shmem.h" -#include "storage/spin.h" #include "storage/proc.h" #include "utils/trace.h" diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index d33bd8c4374..cb3d2f8dce6 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.24 1999/07/15 15:19:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.25 1999/07/15 22:39:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,10 +17,6 @@ #include "postgres.h" -#include "storage/item.h" -#include "storage/buf.h" -#include "storage/bufmgr.h" -#include "utils/memutils.h" #include "storage/bufpage.h" static void PageIndexTupleDeleteAdjustLinePointers(PageHeader phdr, diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c index 1ac32fd5454..e8bee1026fa 100644 --- a/src/backend/storage/page/itemptr.c +++ b/src/backend/storage/page/itemptr.c @@ -7,15 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.6 1999/05/25 16:11:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.7 1999/07/15 22:39:53 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "storage/block.h" -#include "storage/off.h" -#include "storage/itemptr.h" #include "storage/bufpage.h" /* diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index d94c0ef3f4d..33cf5da88ad 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.47 1999/07/15 15:19:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.48 1999/07/15 22:39:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,10 +21,7 @@ #include "miscadmin.h" /* for DataDir */ #include "catalog/catalog.h" -#include "storage/block.h" -#include "storage/fd.h" #include "storage/smgr.h" /* where the declarations go */ -#include "utils/rel.h" #undef DIAGNOSTIC diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c index 5bce97f93a2..6b8cc7f14ca 100644 --- a/src/backend/storage/smgr/mm.c +++ b/src/backend/storage/smgr/mm.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.16 1999/05/25 16:11:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.17 1999/07/15 22:39:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,15 +19,7 @@ #ifdef STABLE_MEMORY_STORAGE #include <math.h> -#include "storage/ipc.h" -#include "storage/smgr.h" /* where the declarations go */ -#include "storage/block.h" -#include "storage/shmem.h" -#include "storage/spin.h" - -#include "utils/hsearch.h" -#include "utils/rel.h" -#include "utils/memutils.h" + /* * MMCacheTag -- Unique triplet for blocks stored by the main memory diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index 5ed9e4965be..2eeb0a0eae1 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -10,17 +10,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.26 1999/07/15 15:19:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.27 1999/07/15 22:39:55 momjian Exp $ * *------------------------------------------------------------------------- */ #include <string.h> #include "postgres.h" -#include "storage/ipc.h" -#include "storage/block.h" #include "storage/smgr.h" -#include "utils/rel.h" static void smgrshutdown(int dummy); diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c index 496346462c5..a695903a547 100644 --- a/src/backend/storage/smgr/smgrtype.c +++ b/src/backend/storage/smgr/smgrtype.c @@ -7,14 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.13 1999/07/15 15:19:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.14 1999/07/15 22:39:55 momjian Exp $ * *------------------------------------------------------------------------- */ #include <string.h> #include "postgres.h" -#include "utils/builtins.h" /* where the declarations go */ #include "storage/smgr.h" typedef struct smgrid |