summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc G. Fournier1996-10-21 05:45:21 +0000
committerMarc G. Fournier1996-10-21 05:45:21 +0000
commitede7e6b0451f0a58507d4a5b2a2aa16ef9461f24 (patch)
tree33ec7ca0756c4e981bf70f33d82213d078128786
parent045222798907d940aabcd11f84891b17d4dcf247 (diff)
-Wall'd
-rw-r--r--src/backend/access/hash/hash.c17
-rw-r--r--src/backend/access/hash/hashinsert.c9
-rw-r--r--src/backend/access/hash/hashovfl.c9
-rw-r--r--src/backend/access/hash/hashpage.c18
-rw-r--r--src/backend/access/hash/hashscan.c4
-rw-r--r--src/backend/access/hash/hashsearch.c14
-rw-r--r--src/backend/access/hash/hashstrat.c4
-rw-r--r--src/backend/access/hash/hashutil.c16
8 files changed, 83 insertions, 8 deletions
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index d511e078c5a..8e1c1c41079 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 2d399797164..7527114bd0e 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 8a9d88b2479..caa4ac1a250 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 06a9f4d00fb..6a236e3085a 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 cf701e340c1..a4f2c442bf9 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 80ca30efd15..fc099515112 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 6cabd8fb803..6a54f87a703 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 43f2b350fad..25231d9671d 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)
{