Skip to content

P
Postgres FD Implementation
Commit 302b8097 authored by Marc G. Fournier's avatar Marc G. Fournier
Browse files
Options

Changes required so that access/* compiles cleanly... 

cleaning up behind myself before *yawn* bed :)
parent ff36ebc9
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 551 deletions
src/backend/access/hash/hash.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.8 1996/10/31 08:24:37 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.9 1996/11/03 12:34:33 scrappy Exp $
* *
* NOTES * NOTES
* This file contains only the public interface routines. * This file contains only the public interface routines.
...@@ -15,58 +15,13 @@ ...@@ -15,58 +15,13 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h>
#include <time.h>
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/funcindex.h"
#include "utils/tqual.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/hash.h" #include "access/hash.h"
#include "nodes/params.h"
#include "storage/ipc.h"
#include "executor/hashjoin.h"
#include "utils/fcache.h"
#include "nodes/primnodes.h"
#include "utils/memutils.h"
#include "lib/fstack.h"
#include "nodes/memnodes.h"
#include "executor/tuptable.h"
#include "nodes/execnodes.h" #include "nodes/execnodes.h"
#include "nodes/plannodes.h"
#include "nodes/parsenodes.h"
#include "tcop/dest.h"
#include "executor/execdesc.h"
#include "catalog/pg_index.h"
#include "executor/executor.h" #include "executor/executor.h"
#include "access/heapam.h" #include "access/heapam.h"
...@@ -83,7 +38,6 @@ ...@@ -83,7 +38,6 @@
# include <string.h> # include <string.h>
#endif #endif
#include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "miscadmin.h" #include "miscadmin.h"
......
src/backend/access/hash/hashinsert.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.5 1996/10/31 08:24:38 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.6 1996/11/03 12:34:35 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -17,39 +17,9 @@ ...@@ -17,39 +17,9 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/funcindex.h"
#include "utils/tqual.h"
#include "storage/buf.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/hash.h" #include "access/hash.h"
#include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "utils/palloc.h" #include "utils/palloc.h"
......
src/backend/access/hash/hashovfl.c
View file @ 302b8097
...@@ -7,57 +7,26 @@ ...@@ -7,57 +7,26 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.6 1996/10/31 08:24:39 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.7 1996/11/03 12:34:38 scrappy Exp $
* *
* NOTES * NOTES
* Overflow pages look like ordinary relation pages. * Overflow pages look like ordinary relation pages.
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h>
#include <time.h>
#include <string.h>
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/funcindex.h"
#include "utils/tqual.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/hash.h" #include "access/hash.h"
#include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
#else
# include <string.h>
#endif
static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp); static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp);
static uint32 _hash_firstfreebit(uint32 map); static uint32 _hash_firstfreebit(uint32 map);
......
src/backend/access/hash/hashpage.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.5 1996/10/31 08:24:41 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.6 1996/11/03 12:34:40 scrappy Exp $
* *
* NOTES * NOTES
* Postgres hash pages look like ordinary relation pages. The opaque * Postgres hash pages look like ordinary relation pages. The opaque
...@@ -23,58 +23,27 @@ ...@@ -23,58 +23,27 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h>
#include <time.h>
#include <string.h>
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/funcindex.h"
#include "utils/tqual.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/hash.h" #include "access/hash.h"
#include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#include "storage/spin.h"
#include "utils/hsearch.h"
#include "storage/shmem.h"
#include "storage/lock.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
#include "access/genam.h" #include "access/genam.h"
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
#else
# include <string.h>
#endif
static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access); static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access);
static void _hash_unsetpagelock(Relation rel, BlockNumber blkno, int access); static void _hash_unsetpagelock(Relation rel, BlockNumber blkno, int access);
static void _hash_splitpage(Relation rel, Buffer metabuf, Bucket obucket, Bucket nbucket); static void _hash_splitpage(Relation rel, Buffer metabuf, Bucket obucket, Bucket nbucket);
......
src/backend/access/hash/hashscan.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.5 1996/10/31 08:24:42 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.6 1996/11/03 12:34:41 scrappy Exp $
* *
* NOTES * NOTES
* Because we can be doing an index scan on a relation while we * Because we can be doing an index scan on a relation while we
...@@ -27,41 +27,10 @@ ...@@ -27,41 +27,10 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <time.h>
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/funcindex.h"
#include "utils/tqual.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/hash.h" #include "access/hash.h"
#include "utils/palloc.h" #include "utils/palloc.h"
static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno); static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
......
src/backend/access/hash/hashsearch.c
View file @ 302b8097
...@@ -7,48 +7,17 @@ ...@@ -7,48 +7,17 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.5 1996/10/31 08:24:43 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.6 1996/11/03 12:34:42 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h>
#include <time.h>
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/funcindex.h"
#include "utils/tqual.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/hash.h" #include "access/hash.h"
#include "utils/palloc.h" #include "utils/palloc.h"
#include "storage/bufmgr.h"
#ifndef HAVE_MEMMOVE #ifndef HAVE_MEMMOVE
# include "regex/utils.h" # include "regex/utils.h"
...@@ -56,9 +25,6 @@ ...@@ -56,9 +25,6 @@
# include <string.h> # include <string.h>
#endif #endif
#include "storage/ipc.h"
#include "storage/bufmgr.h"
/* /*
* _hash_search() -- Finds the page/bucket that the contains the * _hash_search() -- Finds the page/bucket that the contains the
* scankey and loads it into *bufP. the buffer has a read lock. * scankey and loads it into *bufP. the buffer has a read lock.
......
src/backend/access/hash/hashstrat.c
View file @ 302b8097
...@@ -7,46 +7,15 @@ ...@@ -7,46 +7,15 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.5 1996/10/31 08:24:45 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.6 1996/11/03 12:34:44 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <time.h>
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/funcindex.h"
#include "utils/tqual.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/hash.h" #include "access/hash.h"
#include "access/istrat.h" #include "access/istrat.h"
/* /*
......
src/backend/access/hash/hashutil.c
View file @ 302b8097
...@@ -7,47 +7,19 @@ ...@@ -7,47 +7,19 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.5 1996/10/31 08:24:47 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.6 1996/11/03 12:34:45 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <time.h>
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/funcindex.h"
#include "utils/tqual.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/hash.h" #include "access/hash.h"
#include "utils/palloc.h" #include "utils/palloc.h"
#include "fmgr.h"
#include "utils/memutils.h"
#include "access/iqual.h"
#ifndef HAVE_MEMMOVE #ifndef HAVE_MEMMOVE
# include "regex/utils.h" # include "regex/utils.h"
...@@ -55,12 +27,6 @@ ...@@ -55,12 +27,6 @@
# include <string.h> # include <string.h>
#endif #endif
#include "fmgr.h"
#include "utils/memutils.h"
#include "access/iqual.h"
ScanKey ScanKey
_hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap) _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)
{ {
......
src/backend/access/heap/heapam.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.6 1996/10/31 08:28:51 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.7 1996/11/03 12:34:50 scrappy Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
...@@ -75,44 +75,13 @@ ...@@ -75,44 +75,13 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include <time.h>
#include "utils/nabstime.h"
#include "access/htup.h"
#include "utils/tqual.h"
#include "storage/buf.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/page.h"
#include "storage/bufpage.h" #include "storage/bufpage.h"
#include "access/heapam.h" #include "access/heapam.h"
#include <sys/types.h>
#include "storage/backendid.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "access/valid.h"
#include "utils/relcache.h" #include "utils/relcache.h"
#ifndef HAVE_MEMMOVE #ifndef HAVE_MEMMOVE
...@@ -121,18 +90,14 @@ ...@@ -121,18 +90,14 @@
# include <string.h> # include <string.h>
#endif #endif
#include <stdio.h> #include "access/valid.h"
#include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "utils/palloc.h" #include "utils/palloc.h"
#include "access/hio.h" #include "access/hio.h"
#include "storage/spin.h"
#include "utils/hsearch.h"
#include "storage/shmem.h"
#include "storage/lock.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
#include "storage/smgr.h" #include "storage/smgr.h"
......
src/backend/access/heap/hio.c
View file @ 302b8097
...@@ -7,51 +7,18 @@ ...@@ -7,51 +7,18 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Id: hio.c,v 1.6 1996/10/31 08:28:52 scrappy Exp $ * $Id: hio.c,v 1.7 1996/11/03 12:34:52 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include <time.h>
#include "utils/nabstime.h"
#include "access/htup.h"
#include "storage/buf.h" #include "storage/buf.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/off.h"
#include "storage/page.h"
#include "storage/bufpage.h" #include "storage/bufpage.h"
#include "utils/tqual.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/heapam.h" #include "access/heapam.h"
#include <stdio.h>
#include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "utils/memutils.h" #include "utils/memutils.h"
/* /*
......
src/backend/access/heap/stats.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.5 1996/10/31 08:28:53 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.6 1996/11/03 12:34:55 scrappy Exp $
* *
* NOTES * NOTES
* initam should be moved someplace else. * initam should be moved someplace else.
...@@ -15,37 +15,14 @@ ...@@ -15,37 +15,14 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "postgres.h" #include <stdio.h>
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h" #include "postgres.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include <time.h>
#include "utils/nabstime.h"
#include "access/htup.h"
#include "utils/tqual.h"
#include "storage/buf.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/heapam.h" #include "access/heapam.h"
#include "utils/memutils.h"
#include "lib/fstack.h"
#include "nodes/memnodes.h" #include "nodes/memnodes.h"
#include "utils/mcxt.h" #include "utils/mcxt.h"
...@@ -58,8 +35,6 @@ ...@@ -58,8 +35,6 @@
# include <string.h> # include <string.h>
#endif #endif
#include <stdio.h>
/* ---------------- /* ----------------
* InitHeapAccessStatistics * InitHeapAccessStatistics
* ---------------- * ----------------
......
src/backend/access/index/genam.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.4 1996/10/31 08:32:21 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.5 1996/11/03 12:35:02 scrappy Exp $
* *
* NOTES * NOTES
* many of the old access method routines have been turned into * many of the old access method routines have been turned into
...@@ -46,42 +46,12 @@ ...@@ -46,42 +46,12 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include <time.h>
#include "utils/nabstime.h"
#include "access/htup.h"
#include "utils/tqual.h"
#include "storage/buf.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/itup.h" #include "access/itup.h"
#include "access/sdir.h" #include "access/sdir.h"
#include "lib/dllist.h"
#include "lib/fstack.h"
#include "utils/memutils.h"
#include "nodes/memnodes.h"
#include "utils/catcache.h" #include "utils/catcache.h"
#include "access/funcindex.h"
#include "access/genam.h" #include "access/genam.h"
#include "utils/palloc.h" #include "utils/palloc.h"
...@@ -92,8 +62,6 @@ ...@@ -92,8 +62,6 @@
# include <string.h> # include <string.h>
#endif #endif
#include <stdio.h>
#include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
......
src/backend/access/nbtree/nbtinsert.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.4 1996/10/25 09:55:36 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.5 1996/11/03 12:35:11 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -17,17 +17,6 @@ ...@@ -17,17 +17,6 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "storage/buf.h" #include "storage/buf.h"
...@@ -51,6 +40,12 @@ ...@@ -51,6 +40,12 @@
#include "storage/ipc.h" #include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
#else
# include <string.h>
#endif
static InsertIndexResult _bt_insertonpg(Relation rel, Buffer buf, BTStack stack, int keysz, ScanKey scankey, BTItem btitem, BTItem afteritem); static InsertIndexResult _bt_insertonpg(Relation rel, Buffer buf, BTStack stack, int keysz, ScanKey scankey, BTItem btitem, BTItem afteritem);
static Buffer _bt_split(Relation rel, Buffer buf); static Buffer _bt_split(Relation rel, Buffer buf);
static OffsetNumber _bt_findsplitloc(Relation rel, Page page, OffsetNumber start, OffsetNumber maxoff, Size llimit); static OffsetNumber _bt_findsplitloc(Relation rel, Page page, OffsetNumber start, OffsetNumber maxoff, Size llimit);
......
src/backend/access/nbtree/nbtpage.c
View file @ 302b8097
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.3 1996/10/23 07:39:04 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.4 1996/11/03 12:35:17 scrappy Exp $
* *
* NOTES * NOTES
* Postgres btree pages look like ordinary relation pages. The opaque * Postgres btree pages look like ordinary relation pages. The opaque
...@@ -24,17 +24,6 @@ ...@@ -24,17 +24,6 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "storage/buf.h" #include "storage/buf.h"
...@@ -57,6 +46,14 @@ ...@@ -57,6 +46,14 @@
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
#else
# include <string.h>
#endif
#include "miscadmin.h"
#define BTREE_METAPAGE 0 #define BTREE_METAPAGE 0
#define BTREE_MAGIC 0x053162 #define BTREE_MAGIC 0x053162
#define BTREE_VERSION 0 #define BTREE_VERSION 0
......
src/backend/access/nbtree/nbtree.c
View file @ 302b8097
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.6 1996/10/24 06:30:40 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.7 1996/11/03 12:35:19 scrappy Exp $
* *
* NOTES * NOTES
* This file contains only the public interface routines. * This file contains only the public interface routines.
...@@ -20,18 +20,6 @@ ...@@ -20,18 +20,6 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "catalog/index.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "storage/block.h" #include "storage/block.h"
...@@ -52,24 +40,16 @@ ...@@ -52,24 +40,16 @@
#include "access/sdir.h" #include "access/sdir.h"
#include "access/nbtree.h" #include "access/nbtree.h"
#include "nodes/params.h"
#include "executor/hashjoin.h"
#include "nodes/primnodes.h"
#include "nodes/memnodes.h"
#include "executor/tuptable.h"
#include "nodes/execnodes.h"
#include "nodes/plannodes.h"
#include "nodes/parsenodes.h"
#include "tcop/dest.h"
#include "executor/execdesc.h"
#include "catalog/pg_index.h"
#include "executor/executor.h" #include "executor/executor.h"
#include "access/heapam.h" #include "access/heapam.h"
#include "access/genam.h" #include "access/genam.h"
#include "catalog/index.h"
#include "miscadmin.h"
bool BuildingBtree = false; bool BuildingBtree = false;
bool FastBuild = false; /* turn this on to make bulk builds work*/ bool FastBuild = false; /* turn this on to make bulk builds work*/
......
src/backend/access/nbtree/nbtsearch.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.5 1996/10/30 06:08:01 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.6 1996/11/03 12:35:21 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
#include "access/nbtree.h" #include "access/nbtree.h"
#include "access/genam.h" #include "access/genam.h"
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
#else
# include <string.h>
#endif
#include "fmgr.h" #include "fmgr.h"
static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, BTStack stack_in); static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, BTStack stack_in);
......
src/backend/access/nbtree/nbtsort.c
View file @ 302b8097
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Id: nbtsort.c,v 1.5 1996/10/23 07:39:11 scrappy Exp $ * $Id: nbtsort.c,v 1.6 1996/11/03 12:35:22 scrappy Exp $
* *
* NOTES * NOTES
* *
...@@ -53,17 +53,6 @@ ...@@ -53,17 +53,6 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "storage/block.h" #include "storage/block.h"
...@@ -83,6 +72,12 @@ ...@@ -83,6 +72,12 @@
#include "access/sdir.h" #include "access/sdir.h"
#include "access/nbtree.h" #include "access/nbtree.h"
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
#else
# include <string.h>
#endif
#include "storage/ipc.h" #include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
......
src/backend/access/nbtree/nbtutils.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.4 1996/10/23 07:39:15 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.5 1996/11/03 12:35:23 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -16,17 +16,6 @@ ...@@ -16,17 +16,6 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h" #include "utils/rel.h"
#include "storage/block.h" #include "storage/block.h"
...@@ -48,7 +37,11 @@ ...@@ -48,7 +37,11 @@
#include "access/istrat.h" #include "access/istrat.h"
#include "access/genam.h" #include "access/genam.h"
#include "access/iqual.h" #include "access/iqual.h"
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
#else
# include <string.h>
#endif
#include "fmgr.h" #include "fmgr.h"
ScanKey ScanKey
......
src/backend/access/rtree/rtree.c
View file @ 302b8097
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.6 1996/10/31 08:52:52 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.7 1996/11/03 12:35:27 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -16,73 +16,29 @@ ...@@ -16,73 +16,29 @@
#include <time.h> #include <time.h>
#include "postgres.h" #include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/nodes.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "utils/nabstime.h"
#include "access/htup.h"
#include "access/itup.h"
#include "utils/tqual.h"
#include "utils/palloc.h" #include "utils/palloc.h"
#include "storage/buf.h" #include "catalog/index.h"
#include "access/relscan.h" #include "access/relscan.h"
#include "access/rtscan.h" #include "access/rtscan.h"
#include "storage/ipc.h"
#include "storage/spin.h"
#include "utils/hsearch.h"
#include "storage/shmem.h"
#include "storage/lock.h"
#include "storage/lmgr.h" #include "storage/lmgr.h"
#include "access/genam.h"
#include "access/rtree.h" #include "access/rtree.h"
#include "access/funcindex.h" #include "access/funcindex.h"
#include "nodes/params.h"
#include "access/sdir.h"
#include "executor/hashjoin.h"
#include "utils/fcache.h"
#include "nodes/primnodes.h"
#include "lib/fstack.h"
#include "utils/memutils.h"
#include "nodes/memnodes.h"
#include "executor/tuptable.h"
#include "nodes/execnodes.h"
#include "storage/ipc.h" #include "storage/ipc.h"
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "utils/geo-decls.h" #include "utils/geo-decls.h"
#include "nodes/plannodes.h"
#include "nodes/parsenodes.h"
#include "tcop/dest.h"
#include "executor/execdesc.h"
#include "catalog/pg_index.h"
#include "executor/executor.h" #include "executor/executor.h"
#include "access/heapam.h" #include "access/heapam.h"
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
#include "storage/page.h"
#include "storage/bufpage.h" #include "storage/bufpage.h"
typedef struct SPLITVEC { typedef struct SPLITVEC {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment