mirror of
https://github.com/postgres/postgres.git
synced 2025-08-27 07:42:10 +03:00
Changes required so that access/* compiles cleanly...
cleaning up behind myself before *yawn* bed :)
This commit is contained in:
Marc G. Fournier
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* 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
|
||||
* This file contains only the public interface routines.
|
||||
@@ -15,58 +15,13 @@
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <time.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/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/plannodes.h"
|
||||
#include "nodes/parsenodes.h"
|
||||
#include "tcop/dest.h"
|
||||
#include "executor/execdesc.h"
|
||||
#include "catalog/pg_index.h"
|
||||
#include "executor/executor.h"
|
||||
|
||||
#include "access/heapam.h"
|
||||
@@ -83,7 +38,6 @@
|
||||
# include <string.h>
|
||||
#endif
|
||||
|
||||
#include "storage/ipc.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
||||
#include "miscadmin.h"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* 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 @@
|
||||
|
||||
#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/hash.h"
|
||||
|
||||
#include "storage/ipc.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
||||
#include "utils/palloc.h"
|
||||
|
||||
@@ -7,57 +7,26 @@
|
||||
*
|
||||
*
|
||||
* 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
|
||||
* Overflow pages look like ordinary relation pages.
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <string.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/hash.h"
|
||||
|
||||
#include "storage/ipc.h"
|
||||
#include "storage/bufmgr.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 uint32 _hash_firstfreebit(uint32 map);
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* 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
|
||||
* Postgres hash pages look like ordinary relation pages. The opaque
|
||||
@@ -23,58 +23,27 @@
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <string.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/hash.h"
|
||||
|
||||
#include "storage/ipc.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
||||
#include "miscadmin.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 "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_unsetpagelock(Relation rel, BlockNumber blkno, int access);
|
||||
static void _hash_splitpage(Relation rel, Buffer metabuf, Bucket obucket, Bucket nbucket);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* 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
|
||||
* Because we can be doing an index scan on a relation while we
|
||||
@@ -27,41 +27,10 @@
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <time.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/hash.h"
|
||||
|
||||
#include "utils/palloc.h"
|
||||
|
||||
static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
|
||||
|
||||
@@ -7,48 +7,17 @@
|
||||
*
|
||||
*
|
||||
* 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 "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/hash.h"
|
||||
|
||||
#include "utils/palloc.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
||||
#ifndef HAVE_MEMMOVE
|
||||
# include "regex/utils.h"
|
||||
@@ -56,9 +25,6 @@
|
||||
# include <string.h>
|
||||
#endif
|
||||
|
||||
#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.
|
||||
|
||||
@@ -7,46 +7,15 @@
|
||||
*
|
||||
*
|
||||
* 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 "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/hash.h"
|
||||
|
||||
#include "access/istrat.h"
|
||||
|
||||
/*
|
||||
|
||||
@@ -7,47 +7,19 @@
|
||||
*
|
||||
*
|
||||
* 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 "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/hash.h"
|
||||
|
||||
#include "utils/palloc.h"
|
||||
#include "fmgr.h"
|
||||
#include "utils/memutils.h"
|
||||
#include "access/iqual.h"
|
||||
|
||||
#ifndef HAVE_MEMMOVE
|
||||
# include "regex/utils.h"
|
||||
@@ -55,12 +27,6 @@
|
||||
# include <string.h>
|
||||
#endif
|
||||
|
||||
#include "fmgr.h"
|
||||
|
||||
#include "utils/memutils.h"
|
||||
|
||||
#include "access/iqual.h"
|
||||
|
||||
ScanKey
|
||||
_hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user