aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/nbtree/Makefile5
-rw-r--r--src/backend/access/nbtree/nbtcompare.c7
-rw-r--r--src/backend/access/nbtree/nbtinsert.c35
-rw-r--r--src/backend/access/nbtree/nbtpage.c26
-rw-r--r--src/backend/access/nbtree/nbtree.c34
-rw-r--r--src/backend/access/nbtree/nbtscan.c17
-rw-r--r--src/backend/access/nbtree/nbtsearch.c20
-rw-r--r--src/backend/access/nbtree/nbtsort.c22
-rw-r--r--src/backend/access/nbtree/nbtstrat.c16
-rw-r--r--src/backend/access/nbtree/nbtutils.c23
10 files changed, 70 insertions, 135 deletions
diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile
index 2d848bed640..3dfa3bcc913 100644
--- a/src/backend/access/nbtree/Makefile
+++ b/src/backend/access/nbtree/Makefile
@@ -4,14 +4,15 @@
# Makefile for access/nbtree
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.2 1996/11/03 09:06:55 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.3 1996/11/05 10:35:27 scrappy Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
-INCLUDE_OPT = -I../../port/$(PORTNAME) \
+INCLUDE_OPT = -I../.. \
+ -I../../port/$(PORTNAME) \
-I../../../include
CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index cde150d3539..5b85054a1e8 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.4 1996/11/03 22:57:48 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.5 1996/11/05 10:35:28 scrappy Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -22,8 +22,9 @@
#include <string.h>
-#include "postgres.h"
-#include "utils/nabstime.h"
+#include <postgres.h>
+
+#include <utils/nabstime.h>
int32
btint2cmp(int16 a, int16 b)
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 5fe97489f22..63e06f8e1e3 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,41 +7,20 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.5 1996/11/03 12:35:11 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.6 1996/11/05 10:35:29 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <time.h>
+#include <postgres.h>
-#include "postgres.h"
-
-#include "utils/rel.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 "utils/nabstime.h"
-#include "utils/palloc.h"
-#include "access/htup.h"
-#include "utils/tqual.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/nbtree.h"
-
-#include "storage/ipc.h"
-#include "storage/bufmgr.h"
+#include <utils/memutils.h>
+#include <storage/bufpage.h>
+#include <access/nbtree.h>
+#include <storage/bufmgr.h>
#ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
#else
# include <string.h>
#endif
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 1a7016a4bc2..280f67def1a 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.5 1996/11/03 22:57:52 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.6 1996/11/05 10:35:30 scrappy Exp $
*
* NOTES
* Postgres btree pages look like ordinary relation pages. The opaque
@@ -22,30 +22,20 @@
#include <stdio.h>
#include <time.h>
-#include "postgres.h"
+#include <postgres.h>
-#include "utils/rel.h"
-
-#include "access/itup.h"
-#include "access/funcindex.h"
-#include "storage/bufpage.h"
-#include "access/htup.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/nbtree.h"
-
-#include "storage/lmgr.h"
+#include <storage/bufpage.h>
+#include <access/nbtree.h>
+#include <miscadmin.h>
+#include <storage/bufmgr.h>
+#include <storage/lmgr.h>
#ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
#else
# include <string.h>
#endif
-#include "miscadmin.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 ce99b6d0389..b5248b23eb3 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,34 +8,30 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.8 1996/11/03 22:57:54 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.9 1996/11/05 10:35:32 scrappy Exp $
*
* NOTES
* This file contains only the public interface routines.
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
-#include <time.h>
-#include "postgres.h"
+#include <postgres.h>
-#include "utils/rel.h"
-#include "access/genam.h"
+#include <access/genam.h>
+#include <storage/bufpage.h>
+#include <storage/bufmgr.h>
+#include <access/nbtree.h>
+#include <executor/executor.h>
+#include <access/heapam.h>
+#include <catalog/index.h>
+#include <miscadmin.h>
-#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
-#include "access/htup.h"
-#include "utils/palloc.h"
-#include "access/nbtree.h"
-
-#include "executor/executor.h"
-
-#include "access/heapam.h"
-
-#include "catalog/index.h"
-
-#include "miscadmin.h"
+#ifndef HAVE_MEMMOVE
+# include <regex/utils.h>
+#else
+# include <string.h>
+#endif
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 2002089ba9e..e6b51cb1a51 100644
--- 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.4 1996/11/03 22:57:55 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.5 1996/11/05 10:35:33 scrappy Exp $
*
*
* NOTES
@@ -27,19 +27,10 @@
*-------------------------------------------------------------------------
*/
-#include "postgres.h"
-
-#include "utils/rel.h"
-
-#include "access/itup.h"
-#include "access/funcindex.h"
-#include "storage/bufpage.h"
-#include "access/htup.h"
-#include "utils/palloc.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/nbtree.h"
+#include <postgres.h>
+#include <storage/bufpage.h>
+#include <access/nbtree.h>
typedef struct BTScanListData {
IndexScanDesc btsl_scan;
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 34c5d06a03b..2866e026475 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,29 +7,25 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.7 1996/11/03 22:57:56 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.8 1996/11/05 10:35:34 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include "postgres.h"
+#include <postgres.h>
-#include "utils/rel.h"
-#include "access/genam.h"
-
-#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
-#include "access/htup.h"
-#include "utils/palloc.h"
-#include "access/nbtree.h"
+#include <access/genam.h>
+#include <fmgr.h>
+#include <storage/bufpage.h>
+#include <storage/bufmgr.h>
+#include <access/nbtree.h>
#ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
#else
# include <string.h>
#endif
-#include "fmgr.h"
static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, BTStack stack_in);
static OffsetNumber _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, Size keysz, ScanKey scankey, OffsetNumber offnum);
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 1f328ef38f2..6bf86d6f6e0 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
*
*
* IDENTIFICATION
- * $Id: nbtsort.c,v 1.7 1996/11/03 22:57:57 scrappy Exp $
+ * $Id: nbtsort.c,v 1.8 1996/11/05 10:35:35 scrappy Exp $
*
* NOTES
*
@@ -47,30 +47,22 @@
*-------------------------------------------------------------------------
*/
-#include <stdio.h>
#include <fcntl.h>
-#include "postgres.h"
+#include <postgres.h>
-#include "utils/rel.h"
+#include <utils/memutils.h>
+#include <storage/bufpage.h>
+#include <access/nbtree.h>
+#include <storage/bufmgr.h>
-#include "access/itup.h"
-#include "access/funcindex.h"
-#include "storage/bufpage.h"
-#include "access/htup.h"
-#include "utils/palloc.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/nbtree.h"
#ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
#else
# include <string.h>
#endif
-#include "storage/bufmgr.h"
-
#ifdef FASTBUILD
#define MAXTAPES (7)
diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c
index 152f0efd72a..6de003c06a9 100644
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -7,22 +7,16 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.3 1996/11/03 22:57:59 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.4 1996/11/05 10:35:37 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include "postgres.h"
+#include <postgres.h>
-#include "utils/rel.h"
-
-#include "access/itup.h"
-#include "access/funcindex.h"
-#include "storage/bufpage.h"
-#include "access/htup.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/nbtree.h"
+#include <access/istrat.h>
+#include <storage/bufpage.h>
+#include <access/nbtree.h>
/*
* Note:
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index b88524df7d5..703acd62fa2 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,30 +7,25 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.6 1996/11/03 22:57:59 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.7 1996/11/05 10:35:38 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include <time.h>
+#include <postgres.h>
-#include "postgres.h"
+#include <access/genam.h>
+#include <fmgr.h>
+#include <storage/bufpage.h>
+#include <access/nbtree.h>
+#include <access/istrat.h>
+#include <access/iqual.h>
-#include "utils/rel.h"
-#include "access/genam.h"
-
-#include "storage/bufpage.h"
-#include "access/htup.h"
-#include "utils/palloc.h"
-#include "access/nbtree.h"
-#include "access/istrat.h"
-#include "access/iqual.h"
#ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
#else
# include <string.h>
#endif
-#include "fmgr.h"
ScanKey
_bt_mkscankey(Relation rel, IndexTuple itup)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 16:43:13 +0000