another directory cleaned of extraneous #includes

makefile fixed for fmgr.h
This commit is contained in:
Marc G. Fournier 1996-11-05 09:40:25 +00:00
parent 0cf60fb718
commit 4312192e6b
9 changed files with 51 additions and 83 deletions

View File

@ -4,14 +4,15 @@
# Makefile for access/hash
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.2 1996/10/31 08:24:36 scrappy Exp $
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.3 1996/11/05 09:40:16 scrappy Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \
INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include
CFLAGS+=$(INCLUDE_OPT)

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.9 1996/11/03 12:34:33 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.10 1996/11/05 09:40:17 scrappy Exp $
*
* NOTES
* This file contains only the public interface routines.
@ -15,33 +15,22 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include <postgres.h>
#include "access/relscan.h"
#include "access/hash.h"
#include "nodes/execnodes.h"
#include "executor/executor.h"
#include "access/heapam.h"
#include "access/genam.h"
#include "utils/palloc.h"
#include "catalog/index.h"
#include <access/hash.h>
#include <executor/executor.h>
#include <access/heapam.h>
#include <access/genam.h>
#include <catalog/index.h>
#include <storage/bufmgr.h>
#include <miscadmin.h>
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
# include <regex/utils.h>
#else
# include <string.h>
#endif
#include "storage/bufmgr.h"
#include "miscadmin.h"
bool BuildingHash = false;
/*

View File

@ -7,24 +7,16 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.6 1996/11/03 12:34:35 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.7 1996/11/05 09:40:18 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include <stdio.h>
#include <time.h>
#include "postgres.h"
#include <postgres.h>
#include "access/relscan.h"
#include "access/hash.h"
#include "storage/bufmgr.h"
#include "utils/palloc.h"
#include "utils/memutils.h"
#include <access/hash.h>
#include <storage/bufmgr.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);

View File

@ -7,22 +7,21 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.7 1996/11/03 12:34:38 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.8 1996/11/05 09:40:20 scrappy Exp $
*
* NOTES
* Overflow pages look like ordinary relation pages.
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include <postgres.h>
#include "access/relscan.h"
#include "access/hash.h"
#include "storage/bufmgr.h"
#include "utils/memutils.h"
#include <access/hash.h>
#include <storage/bufmgr.h>
#include <utils/memutils.h>
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
# include <regex/utils.h>
#else
# include <string.h>
#endif

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.6 1996/11/03 12:34:40 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.7 1996/11/05 09:40:21 scrappy Exp $
*
* NOTES
* Postgres hash pages look like ordinary relation pages. The opaque
@ -23,23 +23,17 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include <postgres.h>
#include "access/relscan.h"
#include "access/hash.h"
#include "storage/bufmgr.h"
#include "miscadmin.h"
#include "utils/memutils.h"
#include "storage/lmgr.h"
#include "access/genam.h"
#include <access/hash.h>
#include <storage/bufmgr.h>
#include <miscadmin.h>
#include <utils/memutils.h>
#include <storage/lmgr.h>
#include <access/genam.h>
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
# include <regex/utils.h>
#else
# include <string.h>
#endif

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.6 1996/11/03 12:34:41 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.7 1996/11/05 09:40:22 scrappy Exp $
*
* NOTES
* Because we can be doing an index scan on a relation while we
@ -27,11 +27,9 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include <postgres.h>
#include "access/relscan.h"
#include "access/hash.h"
#include "utils/palloc.h"
#include <access/hash.h>
static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
static bool _hash_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);

View File

@ -7,17 +7,15 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.6 1996/11/03 12:34:42 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.7 1996/11/05 09:40:23 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include <postgres.h>
#include "access/relscan.h"
#include "access/hash.h"
#include "utils/palloc.h"
#include "storage/bufmgr.h"
#include <access/hash.h>
#include <storage/bufmgr.h>
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"

View File

@ -7,16 +7,15 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.6 1996/11/03 12:34:44 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.7 1996/11/05 09:40:24 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include <postgres.h>
#include "access/relscan.h"
#include "access/hash.h"
#include "access/istrat.h"
#include <access/hash.h>
#include <access/istrat.h>
/*
* only one valid strategy for hash tables: equality.

View File

@ -7,22 +7,20 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.6 1996/11/03 12:34:45 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.7 1996/11/05 09:40:25 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include <postgres.h>
#include "access/relscan.h"
#include "access/hash.h"
#include "utils/palloc.h"
#include "fmgr.h"
#include "utils/memutils.h"
#include "access/iqual.h"
#include <access/hash.h>
#include <fmgr.h>
#include <utils/memutils.h>
#include <access/iqual.h>
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
# include <regex/utils.h>
#else
# include <string.h>
#endif