#include file cleanup

diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index e567b3c44cbcd6e59ddb33965cb02b4d9ec9892f..e2f7787b5198249ea91187af0036a1b7603e7b8c 100644 (file)
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * btcompare.c--
+ * nbtcompare.c--
  *    Comparison functions for btree access method.
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.1.1.1 1996/07/09 06:21:12 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.2 1996/10/20 10:53:02 scrappy Exp $
  *
  *  NOTES
  * These functions are stored in pg_amproc.  For each operator class
@@ -19,8 +19,9 @@
  *         > 0 if a > b.
  *-------------------------------------------------------------------------
  */
-#include 
+
 #include "postgres.h"
+#include 
 #include "utils/nabstime.h"
 
 int32

diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 536c0aa385d393b3e10db88703ff7da7c1c1e606..4ed8b2994aaa3fdff559c46e45fd90c814d3980e 100644 (file)
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,24 +7,48 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.1.1.1 1996/07/09 06:21:12 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.2 1996/10/20 10:53:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.h"
-#include "utils/palloc.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/excid.h"
 
-#include "access/heapam.h"
-#include "access/genam.h"
+#include "storage/buf.h"
+
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/bufpage.h"
+#include 
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 #include "access/nbtree.h"
 
+#include 
+#include "storage/ipc.h"
+#include "storage/bufmgr.h"
+
 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 OffsetNumber _bt_findsplitloc(Relation rel, Page page, OffsetNumber start, OffsetNumber maxoff, Size llimit);

diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index ce411a80d11399173083dd43c4d897fa1ae8677c..044e37b8546540d4b1b0b9580f303ac9879e6d91 100644 (file)
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * btpage.c--
+ * nbtpage.c--
  *    BTree-specific page management code for the Postgres btree access
  *    method.
  *
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.1.1.1 1996/07/09 06:21:12 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.2 1996/10/20 10:53:06 scrappy Exp $
  *
  *  NOTES
  *     Postgres btree pages look like ordinary relation pages.  The opaque
@@ -19,18 +19,44 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.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/excid.h"
 
-#include "access/genam.h"
+#include "storage/buf.h"
+
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/bufpage.h"
+#include 
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 #include "access/nbtree.h"
 
+#include 
+#include "storage/ipc.h"
+#include "storage/bufmgr.h"
+
 #define BTREE_METAPAGE 0
 #define BTREE_MAGIC    0x053162
 #define BTREE_VERSION  0

diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 90afe6b36373595c72a4d701416bead2e6513253..c4f7fead008a964e2d09d3fb0e0ad20e5cfbd0aa 100644 (file)
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,36 +8,64 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.3 1996/08/26 06:28:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.4 1996/10/20 10:53:08 scrappy Exp $
  *
  * NOTES
  *    This file contains only the public interface routines.
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.h"
-#include "utils/palloc.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/excid.h"
 
-#include "access/heapam.h"
-#include "access/genam.h"
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include 
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "access/relscan.h"
 #include "access/sdir.h"
 #include "access/nbtree.h"
-#include "access/funcindex.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/plannodes.h"
+#include "nodes/parsenodes.h"
+#include "tcop/dest.h"
+#include "executor/execdesc.h"
+#include 
+#include "catalog/pg_index.h"
 #include "executor/executor.h"
-#include "executor/tuptable.h"
 
-#include "catalog/index.h"
+#include "access/heapam.h"
+
+#include "access/genam.h"
 
 bool   BuildingBtree = false;
 bool   FastBuild = false; /* turn this on to make bulk builds work*/

diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index 62a029bc06fdaa58306141e7fe15c3428e814241..43371db860df82ed2b75a93e3ed6c71598f06114 100644 (file)
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.1.1.1 1996/07/09 06:21:12 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.2 1996/10/20 10:53:10 scrappy Exp $
  *
  *
  * NOTES
@@ -26,21 +26,40 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.h"
-#include "utils/palloc.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/excid.h"
 
-#include "access/heapam.h"
-#include "access/genam.h"
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include 
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "access/relscan.h"
 #include "access/sdir.h"
 #include "access/nbtree.h"
 
+
 typedef struct BTScanListData {
     IndexScanDesc      btsl_scan;
     struct BTScanListData  *btsl_next;

diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 3756c2fc30cad38c4a57eb212f333839dc7a3212..5ea38af09c7fa63283e69ba365c6c65b15d5e42a 100644 (file)
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,25 +7,40 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.2 1996/07/30 07:56:02 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.3 1996/10/20 10:53:11 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.h"
-#include "utils/palloc.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/excid.h"
 
-#include "fmgr.h"
-
-#include "access/heapam.h"
-#include "access/genam.h"
-#include "access/skey.h"
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include 
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "access/relscan.h"
 #include "access/sdir.h"
 #include "access/nbtree.h"
 

diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 297c3ff337dd9a9759c02a9b9d5099431a27384b..7f30f1505be365b07a4ef14f1b4ac1f742684f91 100644 (file)
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *    $Id: nbtsort.c,v 1.3 1996/10/18 05:21:20 scrappy Exp $
+ *    $Id: nbtsort.c,v 1.4 1996/10/20 10:53:13 scrappy Exp $
  *
  * NOTES
  *
@@ -47,17 +47,43 @@
  *-------------------------------------------------------------------------
  */
 
-#include 
+#include "postgres.h"
 
-#include "c.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 "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include 
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 #include "access/nbtree.h"
 
+#include 
+#include 
+
+#include "storage/ipc.h"
 #include "storage/bufmgr.h"
-#include "storage/fd.h"
-#include "utils/rel.h"
-#include "utils/palloc.h"
-#include "utils/elog.h"
 
 #ifdef FASTBUILD
 

diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c
index 2214c60950de7665e3fdd648d70791077543fd6d..efbb2fdc64d723ddadaba7f246a0179232e93de7 100644 (file)
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -7,19 +7,41 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.1.1.1 1996/07/09 06:21:12 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.2 1996/10/20 10:53:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.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/excid.h"
 
-#include "access/genam.h"
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include 
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 #include "access/nbtree.h"
 
 /*

diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index d06b857851e8e8d3fe99314fa240e1dd58d89e2e..2abcb7bb89a7d90028a52511a3b7c9bce833a086 100644 (file)
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,28 +7,45 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.2 1996/07/30 07:56:04 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.3 1996/10/20 10:53:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include 
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "fmgr.h"
-#include "utils/elog.h"
-#include "utils/palloc.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/excid.h"
-#include "utils/datum.h"
 
-#include "access/heapam.h"
-#include "access/genam.h"
-#include "access/iqual.h"
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
+#include 
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 #include "access/nbtree.h"
 
+#include "access/istrat.h"
+
 ScanKey 
 _bt_mkscankey(Relation rel, IndexTuple itup)
 {