aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/backend/access/index/genam.c46
-rw-r--r--src/backend/access/index/indexam.c47
-rw-r--r--src/backend/access/index/istrat.c45
-rw-r--r--src/backend/access/rtree/rtget.c41
-rw-r--r--src/backend/access/rtree/rtproc.c7
-rw-r--r--src/backend/access/rtree/rtree.c68
-rw-r--r--src/backend/access/rtree/rtscan.c39
-rw-r--r--src/backend/access/rtree/rtstrat.c22
8 files changed, 223 insertions, 92 deletions
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 3d02ba57009..e95742863a6 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.1.1.1 1996/07/09 06:21:11 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.2 1996/10/20 09:27:21 scrappy Exp $
*
* NOTES
* many of the old access method routines have been turned into
@@ -43,27 +43,43 @@
* next item pointer using the flags.
* ----------------------------------------------------------------
*/
+
#include "postgres.h"
+#include "catalog/pg_attribute.h"
#include "access/attnum.h"
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/sdir.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 "storage/bufmgr.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
+#include "access/strat.h"
#include "utils/rel.h"
+
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include <time.h>
+#include "utils/nabstime.h"
+#include "access/htup.h"
-#include "catalog/catname.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_index.h"
-#include "catalog/pg_proc.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
+
+#include "access/itup.h"
-#include "catalog/index.h"
+#include "access/sdir.h"
+
+#include "lib/dllist.h"
+#include "nodes/memnodes.h"
+#include "utils/catcache.h"
+
+#include "access/funcindex.h"
+#include "access/genam.h"
/* ----------------------------------------------------------------
* general access method routines
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 32e42011199..7a01884850f 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.2 1996/08/26 06:27:48 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.3 1996/10/20 09:27:22 scrappy Exp $
*
* INTERFACE ROUTINES
* index_open - open an index relation by relationId
@@ -62,31 +62,40 @@
*
*-------------------------------------------------------------------------
*/
-#include "postgres.h"
+#include "postgres.h"
+
+#include "catalog/pg_attribute.h"
#include "access/attnum.h"
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/sdir.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/funcindex.h"
-
-#include "storage/lmgr.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
+#include "access/strat.h"
#include "utils/rel.h"
-#include "utils/relcache.h"
+
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include "access/itup.h"
-#include "catalog/catname.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_index.h"
-#include "catalog/pg_proc.h"
+#include <time.h>
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
-#include "catalog/index.h"
+#include "access/sdir.h"
+
+#include "access/funcindex.h"
+#include "access/genam.h"
-#include "fmgr.h"
+#include "utils/relcache.h"
/* ----------------
* undefine macros we aren't going to use that would otherwise
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 602d2bd9e94..e34fe220810 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,29 +8,52 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.1.1.1 1996/07/09 06:21:11 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.2 1996/10/20 09:27:24 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include "postgres.h"
+#include "postgres.h"
+
+#include "catalog/pg_attribute.h"
#include "access/attnum.h"
-#include "access/heapam.h"
-#include "access/istrat.h"
-#include "access/itup.h" /* for MaxIndexAttributeNumber */
+#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 "utils/tqual.h" /* for NowTimeQual */
-
-#include "fmgr.h"
-#include "utils/elog.h"
+#include "access/strat.h"
#include "utils/rel.h"
+
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include <time.h>
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
+
+#include "tcop/dest.h"
+#include "catalog/pg_proc.h"
+
+#include "catalog/pg_operator.h"
#include "catalog/catname.h"
+
+#include "catalog/pg_index.h"
+
#include "catalog/pg_amop.h"
+
#include "catalog/pg_amproc.h"
-#include "catalog/pg_index.h"
-#include "catalog/pg_proc.h"
+#include "utils/memutils.h" /* could have been access/itup.h */
+
+#include "access/heapam.h"
/* ----------------------------------------------------------------
* misc strategy support routines
* ----------------------------------------------------------------
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index fb2e169297d..8c3c8b62624 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,24 +7,45 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.1.1.1 1996/07/09 06:21:13 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.2 1996/10/20 09:27:04 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
+
#include "postgres.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/bufmgr.h"
+#include "access/sdir.h"
+
+#include "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include <time.h>
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
+
+#include "storage/itemid.h"
+#include "storage/item.h"
#include "storage/bufpage.h"
+
+#include "access/itup.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "utils/rel.h"
-
-#include "access/heapam.h"
-#include "access/genam.h"
-#include "access/iqual.h"
#include "access/rtree.h"
-#include "access/sdir.h"
static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n,
ScanDirection dir);
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index a2f7bef46b4..12412a78e89 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,18 +7,15 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.1.1.1 1996/07/09 06:21:13 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.2 1996/10/20 09:27:06 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include <math.h>
-#include <string.h>
#include "postgres.h"
-#include "utils/elog.h"
#include "utils/geo-decls.h"
-#include "utils/palloc.h"
+
BOX
*rt_box_union(BOX *a, BOX *b)
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 33002cf1f6b..d9c65e3ac34 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,34 +7,69 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.3 1996/10/18 05:21:27 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.4 1996/10/20 09:27:07 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include "postgres.h"
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-
-#include "utils/elog.h"
-#include "utils/palloc.h"
+#include "postgres.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 "storage/block.h"
+#include "storage/off.h"
+#include "storage/itemptr.h"
+#include <time.h>
+#include "utils/nabstime.h"
+#include "access/htup.h"
+
+#include "access/itup.h"
+
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
+
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/bufpage.h"
-#include "access/heapam.h"
-#include "access/genam.h"
#include "access/rtree.h"
-#include "access/rtscan.h"
-#include "access/funcindex.h"
-#include "access/tupdesc.h"
+#include "access/funcindex.h"
+
+#include "nodes/params.h"
+#include "access/sdir.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 <stdio.h>
+#include "storage/ipc.h"
+#include "storage/bufmgr.h"
+#include "utils/geo-decls.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 "executor/tuptable.h"
-#include "catalog/index.h"
+#include "access/heapam.h"
typedef struct SPLITVEC {
OffsetNumber *spl_left;
@@ -906,7 +941,6 @@ static void initRtstate(RTSTATE *rtstate, Relation index)
}
#ifdef RTDEBUG
-#include "utils/geo-decls.h"
void
_rtdump(Relation r)
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 3b8af296b0e..08b8d53ee4e 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,23 +7,42 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.3 1996/08/27 22:15:08 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.4 1996/10/20 09:27:10 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include "postgres.h"
-
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
+#include "postgres.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 <time.h>
+#include "utils/nabstime.h"
+#include "access/htup.h"
+#include "utils/tqual.h"
+#include "storage/buf.h"
+#include "access/relscan.h"
-#include "access/heapam.h"
-#include "access/genam.h"
#include "access/rtree.h"
-#include "access/rtstrat.h"
+
+#include "access/itup.h"
+#include "access/funcindex.h"
+#include "access/sdir.h"
+#include "access/genam.h"
/* routines defined and used here */
static void rtregscan(IndexScanDesc s);
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index c5d934a22a2..916ad756d62 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -7,19 +7,31 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.1.1.1 1996/07/09 06:21:13 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.2 1996/10/20 09:27:12 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
-#include "c.h"
+#include "postgres.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/bufmgr.h"
-#include "storage/bufpage.h"
+#include "storage/off.h"
+#include "storage/block.h"
+#include "access/rtree.h"
#include "access/istrat.h"
-#include "access/rtree.h"
/*
* Note: negate, commute, and negatecommute all assume that operators are
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 16:41:23 +0000