diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index d511e078c5a7d21859f364a1cd35564c9fd2114e..8e1c1c410792e285ece2f63bc28cb3b89fb5d0de 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.4 1996/10/20 08:31:39 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.5 1996/10/21 05:45:11 scrappy Exp $ * * NOTES * This file contains only the public interface routines. @@ -66,6 +66,21 @@ #include "access/genam.h" +#include "utils/palloc.h" + +#include "catalog/index.h" + +#ifndef HAVE_MEMMOVE +# include "regex/utils.h" +#else +# include <string.h> +#endif + +#include "storage/ipc.h" +#include "storage/bufmgr.h" + +#include "miscadmin.h" + bool BuildingHash = false; /* diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index 2d3997971649f15f72ac5b1b6a6a7e8e36aceab0..7527114bd0efdf829f7068de68e900296177086a 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.3 1996/10/20 08:31:41 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.4 1996/10/21 05:45:13 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -45,6 +45,13 @@ #include "access/relscan.h" #include "access/hash.h" +#include <stdio.h> +#include "storage/ipc.h" +#include "storage/bufmgr.h" + +#include "utils/palloc.h" + +#include "utils/memutils.h" static InsertIndexResult _hash_insertonpg(Relation rel, Buffer buf, int keysz, ScanKey scankey, HashItem hitem, Buffer metabuf); static OffsetNumber _hash_pgaddtup(Relation rel, Buffer buf, int keysz, ScanKey itup_scankey, Size itemsize, HashItem hitem); diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index 8a9d88b2479260215a128a30039054d33a6911ea..caa4ac1a2508556e75ddca7dca658d9951091339 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.3 1996/10/20 08:31:44 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.4 1996/10/21 05:45:14 scrappy Exp $ * * NOTES * Overflow pages look like ordinary relation pages. @@ -48,6 +48,13 @@ #include "access/relscan.h" #include "access/hash.h" +#include <stdio.h> +#include "storage/ipc.h" +#include "storage/bufmgr.h" + +#include <string.h> + +#include "utils/memutils.h" static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp); static uint32 _hash_firstfreebit(uint32 map); diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index 06a9f4d00fb0476950de74e187f7c857113d5815..6a236e3085aeba8f87a80e770fb704e4893b39f1 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.3 1996/10/20 08:31:46 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.4 1996/10/21 05:45:15 scrappy Exp $ * * NOTES * Postgres hash pages look like ordinary relation pages. The opaque @@ -56,8 +56,24 @@ #include "access/relscan.h" #include "access/hash.h" +#include <stdio.h> +#include "storage/ipc.h" #include "storage/bufmgr.h" +#include "miscadmin.h" + +#include "utils/memutils.h" + +#include <string.h> + +#include "storage/spin.h" +#include "utils/hsearch.h" +#include "storage/shmem.h" +#include "storage/lock.h" +#include "storage/lmgr.h" + +#include "access/genam.h" + static void _hash_setpagelock(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); diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c index cf701e340c1d7fa305dfed9f3f975b609f8466fd..a4f2c442bf93977bd33b5fa704df20d73689fdba 100644 --- a/src/backend/access/hash/hashscan.c +++ b/src/backend/access/hash/hashscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.3 1996/10/20 08:31:48 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.4 1996/10/21 05:45:16 scrappy Exp $ * * NOTES * Because we can be doing an index scan on a relation while we @@ -60,6 +60,8 @@ #include "access/relscan.h" #include "access/hash.h" +#include "utils/palloc.h" + static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno); static bool _hash_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno); diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c index 80ca30efd159c8fc88ecee8e9c6170868b1adb30..fc099515112f284a2df135bfe7290cddb0de0192 100644 --- a/src/backend/access/hash/hashsearch.c +++ b/src/backend/access/hash/hashsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.3 1996/10/20 08:31:49 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.4 1996/10/21 05:45:19 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -45,6 +45,18 @@ #include "access/relscan.h" #include "access/hash.h" +#include "utils/palloc.h" + +#ifndef HAVE_MEMMOVE +# include "regex/utils.h" +#else +# include <string.h> +#endif + +#include <stdio.h> +#include "storage/ipc.h" +#include "storage/bufmgr.h" + /* * _hash_search() -- Finds the page/bucket that the contains the * scankey and loads it into *bufP. the buffer has a read lock. diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c index 6cabd8fb8037c512ea229d2dc5641870d4396d3a..6a54f87a703f36eddda662392e6926bf7a376373 100644 --- a/src/backend/access/hash/hashstrat.c +++ b/src/backend/access/hash/hashstrat.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.3 1996/10/20 08:31:51 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.4 1996/10/21 05:45:20 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -45,6 +45,8 @@ #include "access/relscan.h" #include "access/hash.h" +#include "access/istrat.h" + /* * only one valid strategy for hash tables: equality. */ diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c index 43f2b350fadb536a36140a5a46d347a7c973e196..25231d9671dac70ec5586ec45bab823edf2a072e 100644 --- a/src/backend/access/hash/hashutil.c +++ b/src/backend/access/hash/hashutil.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.3 1996/10/20 08:31:52 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.4 1996/10/21 05:45:21 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -45,6 +45,20 @@ #include "access/relscan.h" #include "access/hash.h" +#include "utils/palloc.h" + +#ifndef HAVE_MEMMOVE +# include "regex/utils.h" +#else +# include <string.h> +#endif + +#include "fmgr.h" + +#include "utils/memutils.h" + +#include "access/iqual.h" + ScanKey _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap) {