diff options
Diffstat (limited to 'src/backend/access/rtree')
-rw-r--r-- | src/backend/access/rtree/rtget.c | 36 | ||||
-rw-r--r-- | src/backend/access/rtree/rtree.c | 9 | ||||
-rw-r--r-- | src/backend/access/rtree/rtscan.c | 40 | ||||
-rw-r--r-- | src/backend/access/rtree/rtstrat.c | 14 |
4 files changed, 10 insertions, 89 deletions
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c index aec1416f43e..e70f8ee368e 100644 --- a/src/backend/access/rtree/rtget.c +++ b/src/backend/access/rtree/rtget.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.4 1996/10/31 08:52:51 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.5 1996/11/03 22:58:03 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -17,48 +17,20 @@ #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/bufmgr.h" #include "access/sdir.h" -#include "storage/block.h" -#include "storage/off.h" -#include "storage/itemptr.h" -#include "utils/nabstime.h" #include "access/htup.h" -#include "utils/tqual.h" #include "utils/palloc.h" -#include "storage/buf.h" #include "access/relscan.h" -#include "storage/block.h" #include "access/itup.h" #include "access/iqual.h" -#include "storage/itemid.h" -#include "storage/item.h" -#include "storage/page.h" -#include "storage/bufpage.h" -#include <stdio.h> -#include <sys/types.h> -#include "storage/ipc.h" -#include "storage/bufmgr.h" - -#include "access/itup.h" - #include "access/rtree.h" +#include "storage/bufpage.h" + static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir); static RetrieveIndexResult rtscancache(IndexScanDesc s, ScanDirection dir); diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c index 29315574146..21ee69243dd 100644 --- a/src/backend/access/rtree/rtree.c +++ b/src/backend/access/rtree/rtree.c @@ -7,30 +7,25 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.7 1996/11/03 12:35:27 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.8 1996/11/03 22:58:06 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> -#include <time.h> #include "postgres.h" +#include "access/genam.h" #include "utils/palloc.h" #include "catalog/index.h" -#include "access/relscan.h" #include "access/rtscan.h" #include "storage/lmgr.h" -#include "access/genam.h" - #include "access/rtree.h" -#include "access/funcindex.h" -#include "storage/ipc.h" #include "storage/bufmgr.h" #include "utils/geo-decls.h" diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c index 7f278b8c8f1..d0b02db0886 100644 --- a/src/backend/access/rtree/rtscan.c +++ b/src/backend/access/rtree/rtscan.c @@ -7,61 +7,27 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.6 1996/10/31 08:52:53 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.7 1996/11/03 22:58:09 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <string.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/bufmgr.h" +#include "access/genam.h" -#include "storage/block.h" -#include "storage/off.h" -#include "storage/itemptr.h" -#include "utils/nabstime.h" #include "utils/palloc.h" #include "access/htup.h" -#include "utils/tqual.h" -#include "storage/buf.h" -#include <sys/types.h> -#include "storage/ipc.h" -#include "storage/spin.h" -#include "utils/hsearch.h" -#include "storage/shmem.h" -#include "storage/lock.h" #include "storage/lmgr.h" -#include "storage/itemid.h" -#include "storage/item.h" -#include "storage/page.h" #include "storage/bufpage.h" #include <stdio.h> -#include "storage/bufmgr.h" -#include "access/relscan.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); static void rtdropscan(IndexScanDesc s); diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c index e9b3275246f..868152a09a5 100644 --- a/src/backend/access/rtree/rtstrat.c +++ b/src/backend/access/rtree/rtstrat.c @@ -7,25 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.3 1996/10/31 08:52:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.4 1996/11/03 22:58:10 scrappy Exp $ * *------------------------------------------------------------------------- */ #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/off.h" |