diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 4761dfc83f..ad817f950d 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -11,93 +11,25 @@ *------------------------------------------------------------------------- */ -#include -#include -#include -#include - #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 "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 "storage/itemid.h" -#include "storage/item.h" -#include "storage/buf.h" -#include "storage/page.h" -#include "storage/bufpage.h" -#include "access/gist.h" - -#include "access/funcindex.h" - -#include "utils/nabstime.h" -#include "access/htup.h" - -#include "executor/tuptable.h" - -#include "utils/tqual.h" -#include "access/relscan.h" - -#include "nodes/params.h" -#include "access/sdir.h" -#include "storage/ipc.h" -#include "executor/hashjoin.h" -#include "utils/fcache.h" -#include "nodes/primnodes.h" -#include "utils/memutils.h" -#include "lib/fstack.h" -#include "nodes/memnodes.h" -#include "nodes/execnodes.h" - -#include "storage/bufmgr.h" - -#include "catalog/pg_index.h" - -#include "utils/syscache.h" - -#include "nodes/plannodes.h" -#include "nodes/parsenodes.h" -#include "tcop/dest.h" -#include "executor/execdesc.h" -#include "executor/executor.h" - -#include "access/heapam.h" - -#include "storage/spin.h" -#include "utils/hsearch.h" -#include "storage/shmem.h" -#include "storage/lock.h" -#include "storage/lmgr.h" - -#include "utils/palloc.h" - -#include "catalog/index.h" +#include "fmgr.h" #include "access/genam.h" +#include "access/gist.h" +#include "access/gistscan.h" +#include "access/heapam.h" +#include "catalog/index.h" +#include "executor/executor.h" +#include "storage/bufmgr.h" +#include "storage/bufpage.h" +#include "storage/lmgr.h" +#include "utils/palloc.h" +#include "utils/syscache.h" #ifndef HAVE_MEMMOVE # include "regex/utils.h" #endif -#include "access/gistscan.h" - -#include "fmgr.h" - /* non-export function prototypes */ static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup, GISTSTATE *GISTstate); diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 7abc2ca5c4..01c93da00c 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -16,44 +16,14 @@ #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/block.h" -#include "storage/off.h" -#include "storage/itemptr.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/page.h" #include "storage/bufpage.h" - #include "access/sdir.h" - #include "access/itup.h" - #include "access/gist.h" - #include "executor/execdebug.h" - #include "utils/palloc.h" +#include "storage/bufmgr.h" #ifndef HAVE_MEMMOVE # include "regex/utils.h" @@ -61,8 +31,6 @@ # include #endif -#include "storage/ipc.h" -#include "storage/bufmgr.h" static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir); diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 262504e165..bab14bac69 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -15,47 +15,9 @@ #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/block.h" -#include "storage/off.h" -#include "storage/itemptr.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/page.h" -#include "storage/bufpage.h" #include "access/gist.h" - -#include "access/itup.h" -#include "access/funcindex.h" -#include "access/sdir.h" #include "access/genam.h" - -#include -#include "storage/ipc.h" -#include "storage/spin.h" -#include "utils/hsearch.h" -#include "storage/shmem.h" -#include "storage/lock.h" #include "storage/lmgr.h" #ifndef HAVE_MEMMOVE diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c index d2c97ccbde..aa7bfc2862 100644 --- a/src/backend/access/gist/giststrat.c +++ b/src/backend/access/gist/giststrat.c @@ -14,31 +14,8 @@ #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" - -#include "storage/block.h" - -#include "storage/itemid.h" -#include "storage/item.h" -#include "storage/buf.h" -#include "storage/page.h" -#include "storage/bufpage.h" #include "access/gist.h" - #include "access/istrat.h" /*