From a3540b0f657c6352ae91884a9ee47c67395ce122 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 19 Jun 2008 00:46:06 +0000 Subject: [PATCH] Improve our #include situation by moving pointer types away from the corresponding struct definitions. This allows other headers to avoid including certain highly-loaded headers such as rel.h and relscan.h, instead using just relcache.h, heapam.h or genam.h, which are more lightweight and thus cause less unnecessary dependencies. --- contrib/btree_gist/btree_numeric.c | 3 +- contrib/btree_gist/btree_utils_num.h | 3 +- contrib/btree_gist/btree_utils_var.c | 3 +- contrib/pgrowlocks/pgrowlocks.c | 3 +- contrib/pgstattuple/pgstattuple.c | 5 ++-- src/backend/access/gin/ginbtree.c | 3 +- src/backend/access/gin/gindatapage.c | 3 +- src/backend/access/gin/ginentrypage.c | 3 +- src/backend/access/gin/ginget.c | 3 +- src/backend/access/gin/ginscan.c | 5 ++-- src/backend/access/gist/gistget.c | 3 +- src/backend/access/gist/gistscan.c | 3 +- src/backend/access/gist/gistsplit.c | 3 +- src/backend/access/gist/gistutil.c | 3 +- src/backend/access/gist/gistxlog.c | 3 +- src/backend/access/hash/hash.c | 4 +-- src/backend/access/hash/hashinsert.c | 3 +- src/backend/access/hash/hashovfl.c | 3 +- src/backend/access/hash/hashscan.c | 4 ++- src/backend/access/hash/hashsearch.c | 4 ++- src/backend/access/hash/hashutil.c | 4 +-- src/backend/access/heap/heapam.c | 3 +- src/backend/access/heap/pruneheap.c | 3 +- src/backend/access/heap/rewriteheap.c | 3 +- src/backend/access/heap/tuptoaster.c | 3 +- src/backend/access/index/genam.c | 6 ++-- src/backend/access/index/indexam.c | 5 ++-- src/backend/access/nbtree/nbtree.c | 3 +- src/backend/access/nbtree/nbtsearch.c | 4 ++- src/backend/access/nbtree/nbtsort.c | 3 +- src/backend/access/nbtree/nbtutils.c | 3 +- src/backend/access/transam/xlogutils.c | 3 +- src/backend/catalog/aclchk.c | 3 +- src/backend/catalog/catalog.c | 4 +-- src/backend/catalog/index.c | 3 +- src/backend/catalog/namespace.c | 3 +- src/backend/catalog/pg_aggregate.c | 3 +- src/backend/catalog/pg_constraint.c | 3 +- src/backend/catalog/pg_conversion.c | 3 +- src/backend/catalog/pg_depend.c | 3 +- src/backend/catalog/pg_enum.c | 3 +- src/backend/catalog/pg_largeobject.c | 3 +- src/backend/catalog/pg_namespace.c | 3 +- src/backend/catalog/pg_operator.c | 3 +- src/backend/catalog/pg_type.c | 3 +- src/backend/commands/cluster.c | 3 +- src/backend/commands/comment.c | 3 +- src/backend/commands/conversioncmds.c | 3 +- src/backend/commands/functioncmds.c | 3 +- src/backend/commands/lockcmds.c | 3 +- src/backend/commands/opclasscmds.c | 3 +- src/backend/commands/operatorcmds.c | 3 +- src/backend/commands/proclang.c | 3 +- src/backend/commands/tablecmds.c | 3 +- src/backend/commands/tablespace.c | 3 +- src/backend/commands/tsearchcmds.c | 3 +- src/backend/commands/view.c | 3 +- src/backend/executor/nodeBitmapHeapscan.c | 3 +- src/backend/executor/nodeIndexscan.c | 3 +- src/backend/executor/nodeSeqscan.c | 3 +- src/backend/nodes/print.c | 3 +- src/backend/optimizer/plan/planagg.c | 3 +- src/backend/optimizer/prep/preptlist.c | 3 +- src/backend/optimizer/prep/prepunion.c | 3 +- src/backend/optimizer/util/plancat.c | 4 +-- src/backend/parser/analyze.c | 3 +- src/backend/parser/parse_clause.c | 3 +- src/backend/postmaster/pgstat.c | 3 +- src/backend/rewrite/rewriteDefine.c | 3 +- src/backend/rewrite/rewriteRemove.c | 3 +- src/backend/rewrite/rewriteSupport.c | 3 +- src/backend/storage/buffer/bufmgr.c | 3 +- src/backend/storage/large_object/inv_api.c | 3 +- src/backend/utils/adt/dbsize.c | 4 +-- src/backend/utils/adt/regproc.c | 3 +- src/backend/utils/adt/tid.c | 3 +- src/backend/utils/cache/catcache.c | 5 ++-- src/backend/utils/cache/inval.c | 4 +-- src/backend/utils/cache/syscache.c | 3 +- src/backend/utils/cache/typcache.c | 3 +- src/backend/utils/resowner/resowner.c | 4 +-- src/backend/utils/sort/tuplesort.c | 3 +- src/include/access/genam.h | 27 +++++++++--------- src/include/access/gin.h | 4 +-- src/include/access/gist.h | 5 ++-- src/include/access/gist_private.h | 6 ++-- src/include/access/hash.h | 5 ++-- src/include/access/heapam.h | 15 ++++++++-- src/include/access/hio.h | 4 +-- src/include/access/nbtree.h | 4 +-- src/include/access/relscan.h | 33 ++++++++-------------- src/include/access/rewriteheap.h | 4 +-- src/include/access/tuptoaster.h | 4 +-- src/include/access/xlogutils.h | 6 ++-- src/include/catalog/catalog.h | 6 ++-- src/include/catalog/indexing.h | 4 +-- src/include/commands/cluster.h | 4 +-- src/include/commands/tablecmds.h | 4 +-- src/include/commands/vacuum.h | 4 +-- src/include/nodes/execnodes.h | 12 +++++--- src/include/nodes/print.h | 4 +-- src/include/optimizer/plancat.h | 4 +-- src/include/parser/parse_node.h | 4 +-- src/include/pgstat.h | 4 +-- src/include/rewrite/rewriteDefine.h | 4 +-- src/include/rewrite/rewriteHandler.h | 4 +-- src/include/storage/buf_internals.h | 4 +-- src/include/storage/bufmgr.h | 6 ++-- src/include/utils/catcache.h | 4 +-- src/include/utils/inval.h | 4 +-- src/include/utils/rel.h | 15 ++-------- src/include/utils/relcache.h | 17 +++++++++-- src/include/utils/tuplesort.h | 5 ++-- 113 files changed, 292 insertions(+), 205 deletions(-) diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c index e7d4b330faa..7b52d07353d 100644 --- a/contrib/btree_gist/btree_numeric.c +++ b/contrib/btree_gist/btree_numeric.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_numeric.c,v 1.11 2008/05/17 01:28:19 adunstan Exp $ + * $PostgreSQL: pgsql/contrib/btree_gist/btree_numeric.c,v 1.12 2008/06/19 00:46:02 alvherre Exp $ */ #include "btree_gist.h" @@ -9,6 +9,7 @@ #include "btree_utils_var.h" #include "utils/builtins.h" #include "utils/numeric.h" +#include "utils/rel.h" /* ** Bytea ops diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h index de2e35b772c..42573aa8e80 100644 --- a/contrib/btree_gist/btree_utils_num.h +++ b/contrib/btree_gist/btree_utils_num.h @@ -1,10 +1,11 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_num.h,v 1.12 2008/05/17 01:28:19 adunstan Exp $ + * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_num.h,v 1.13 2008/06/19 00:46:02 alvherre Exp $ */ #ifndef __BTREE_UTILS_NUM_H__ #define __BTREE_UTILS_NUM_H__ #include "btree_gist.h" +#include "utils/rel.h" #include #include diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index 37107c9d92f..4f1b7e49a35 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_var.c,v 1.19 2008/05/17 01:28:19 adunstan Exp $ + * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_var.c,v 1.20 2008/06/19 00:46:02 alvherre Exp $ */ #include "btree_gist.h" @@ -10,6 +10,7 @@ #include "btree_utils_var.h" #include "utils/pg_locale.h" #include "utils/builtins.h" +#include "utils/rel.h" PG_FUNCTION_INFO_V1(gbt_var_decompress); Datum gbt_var_decompress(PG_FUNCTION_ARGS); diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c index bb629c9085b..e41c59e7989 100644 --- a/contrib/pgrowlocks/pgrowlocks.c +++ b/contrib/pgrowlocks/pgrowlocks.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.10 2008/05/12 00:00:43 alvherre Exp $ + * $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.11 2008/06/19 00:46:03 alvherre Exp $ * * Copyright (c) 2005-2006 Tatsuo Ishii * @@ -26,6 +26,7 @@ #include "access/heapam.h" #include "access/multixact.h" +#include "access/relscan.h" #include "access/xact.h" #include "catalog/namespace.h" #include "funcapi.h" diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 4ed5ef1d5c5..f4c046ca8c5 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.35 2008/05/16 17:31:17 tgl Exp $ + * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.36 2008/06/19 00:46:03 alvherre Exp $ * * Copyright (c) 2001,2002 Tatsuo Ishii * @@ -26,9 +26,8 @@ #include "access/gist_private.h" #include "access/hash.h" -#include "access/heapam.h" -#include "access/htup.h" #include "access/nbtree.h" +#include "access/relscan.h" #include "catalog/namespace.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c index 0fa72398bc7..eed45001b2a 100644 --- a/src/backend/access/gin/ginbtree.c +++ b/src/backend/access/gin/ginbtree.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginbtree.c,v 1.12 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/gin/ginbtree.c,v 1.13 2008/06/19 00:46:03 alvherre Exp $ *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "access/gin.h" #include "miscadmin.h" #include "storage/bufmgr.h" +#include "utils/rel.h" /* * Locks buffer by needed method for search. diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c index 6c5dc02b066..33ed8928ff5 100644 --- a/src/backend/access/gin/gindatapage.c +++ b/src/backend/access/gin/gindatapage.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/gindatapage.c,v 1.10 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/gin/gindatapage.c,v 1.11 2008/06/19 00:46:03 alvherre Exp $ *------------------------------------------------------------------------- */ @@ -16,6 +16,7 @@ #include "access/gin.h" #include "storage/bufmgr.h" +#include "utils/rel.h" int compareItemPointers(ItemPointer a, ItemPointer b) diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index 3d43353d61d..96be4ee94b0 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginentrypage.c,v 1.15 2008/06/08 22:00:46 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/gin/ginentrypage.c,v 1.16 2008/06/19 00:46:03 alvherre Exp $ *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "access/gin.h" #include "access/tuptoaster.h" #include "storage/bufmgr.h" +#include "utils/rel.h" /* * forms tuple for entry tree. On leaf page, Index tuple has diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c index 3d60d337df4..76d937740f5 100644 --- a/src/backend/access/gin/ginget.c +++ b/src/backend/access/gin/ginget.c @@ -8,13 +8,14 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.16 2008/05/16 16:31:01 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.17 2008/06/19 00:46:03 alvherre Exp $ *------------------------------------------------------------------------- */ #include "postgres.h" #include "access/gin.h" +#include "access/relscan.h" #include "catalog/index.h" #include "miscadmin.h" #include "storage/bufmgr.h" diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c index cec24fbfdbd..ccf43d85577 100644 --- a/src/backend/access/gin/ginscan.c +++ b/src/backend/access/gin/ginscan.c @@ -8,17 +8,18 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.14 2008/05/16 16:31:01 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.15 2008/06/19 00:46:03 alvherre Exp $ *------------------------------------------------------------------------- */ #include "postgres.h" -#include "access/genam.h" #include "access/gin.h" +#include "access/relscan.h" #include "pgstat.h" #include "storage/bufmgr.h" #include "utils/memutils.h" +#include "utils/rel.h" Datum diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 997d3af08d6..a1fd296dbf2 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -8,13 +8,14 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.73 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.74 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "access/gist_private.h" +#include "access/relscan.h" #include "executor/execdebug.h" #include "miscadmin.h" #include "pgstat.h" diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 086a054e706..65833eabf71 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.69 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.70 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "access/genam.h" #include "access/gist_private.h" #include "access/gistscan.h" +#include "access/relscan.h" #include "storage/bufmgr.h" #include "utils/memutils.h" diff --git a/src/backend/access/gist/gistsplit.c b/src/backend/access/gist/gistsplit.c index 49e21dd7fb7..98d8d078c0d 100644 --- a/src/backend/access/gist/gistsplit.c +++ b/src/backend/access/gist/gistsplit.c @@ -8,13 +8,14 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistsplit.c,v 1.5 2008/01/01 19:45:46 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/gist/gistsplit.c,v 1.6 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "access/gist_private.h" +#include "utils/rel.h" typedef struct { diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index cb0cb52c5a8..f6ae7747d71 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistutil.c,v 1.28 2008/06/15 01:41:37 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/gist/gistutil.c,v 1.29 2008/06/19 00:46:03 alvherre Exp $ *------------------------------------------------------------------------- */ #include "postgres.h" @@ -18,6 +18,7 @@ #include "storage/freespace.h" #include "storage/lmgr.h" #include "storage/bufmgr.h" +#include "utils/rel.h" /* * static *S used for temrorary storage (saves stack and palloc() call) diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 801c6e7117c..cf795a45641 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.29 2008/06/12 09:12:30 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.30 2008/06/19 00:46:03 alvherre Exp $ *------------------------------------------------------------------------- */ #include "postgres.h" @@ -18,6 +18,7 @@ #include "miscadmin.h" #include "storage/bufmgr.h" #include "utils/memutils.h" +#include "utils/rel.h" typedef struct diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 6f36a710f09..41607c54dc3 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hash.c,v 1.103 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/hash/hash.c,v 1.104 2008/06/19 00:46:03 alvherre Exp $ * * NOTES * This file contains only the public interface routines. @@ -18,8 +18,8 @@ #include "postgres.h" -#include "access/genam.h" #include "access/hash.h" +#include "access/relscan.h" #include "catalog/index.h" #include "commands/vacuum.h" #include "miscadmin.h" diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index 0dd4ac45d89..7f68318f1a6 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashinsert.c,v 1.49 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/hash/hashinsert.c,v 1.50 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "access/hash.h" #include "storage/bufmgr.h" +#include "utils/rel.h" static OffsetNumber _hash_pgaddtup(Relation rel, Buffer buf, diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index 997c1884fd6..06958ec8657 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashovfl.c,v 1.63 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/hash/hashovfl.c,v 1.64 2008/06/19 00:46:03 alvherre Exp $ * * NOTES * Overflow pages look like ordinary relation pages. @@ -19,6 +19,7 @@ #include "access/hash.h" #include "storage/bufmgr.h" +#include "utils/rel.h" static Buffer _hash_getovflpage(Relation rel, Buffer metabuf); diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c index 1272ec95acb..7087f3cc181 100644 --- a/src/backend/access/hash/hashscan.c +++ b/src/backend/access/hash/hashscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.44 2008/03/07 15:59:03 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.45 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,9 @@ #include "postgres.h" #include "access/hash.h" +#include "access/relscan.h" #include "utils/memutils.h" +#include "utils/rel.h" #include "utils/resowner.h" diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c index b820ddec747..1e05558523f 100644 --- a/src/backend/access/hash/hashsearch.c +++ b/src/backend/access/hash/hashsearch.c @@ -8,15 +8,17 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashsearch.c,v 1.52 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/hash/hashsearch.c,v 1.53 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "access/hash.h" +#include "access/relscan.h" #include "pgstat.h" #include "storage/bufmgr.h" +#include "utils/rel.h" /* diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c index 9f0d1a63a7f..0789eb8caef 100644 --- a/src/backend/access/hash/hashutil.c +++ b/src/backend/access/hash/hashutil.c @@ -8,15 +8,15 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.54 2008/05/12 00:00:44 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.55 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "access/genam.h" #include "access/hash.h" #include "access/reloptions.h" +#include "access/relscan.h" #include "executor/execdebug.h" #include "storage/bufmgr.h" #include "utils/lsyscache.h" diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 9a29a0f209c..482e53dfaa9 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.259 2008/06/12 09:12:30 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.260 2008/06/19 00:46:03 alvherre Exp $ * * * INTERFACE ROUTINES @@ -42,6 +42,7 @@ #include "access/heapam.h" #include "access/hio.h" #include "access/multixact.h" +#include "access/relscan.h" #include "access/sysattr.h" #include "access/transam.h" #include "access/tuptoaster.h" diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 2196301c71b..be630b225b9 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.14 2008/06/12 09:12:30 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.15 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,7 @@ #include "storage/bufmgr.h" #include "storage/off.h" #include "utils/inval.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index dd7ed961ae7..57a7430244a 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -96,7 +96,7 @@ * Portions Copyright (c) 1994-5, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.13 2008/06/08 22:00:47 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.14 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -109,6 +109,7 @@ #include "storage/bufmgr.h" #include "storage/smgr.h" #include "utils/memutils.h" +#include "utils/rel.h" /* diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index b7923e40839..802b7f151b0 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.88 2008/06/13 02:59:47 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.89 2008/06/19 00:46:03 alvherre Exp $ * * * INTERFACE ROUTINES @@ -37,6 +37,7 @@ #include "catalog/catalog.h" #include "utils/fmgroids.h" #include "utils/pg_lzcompress.h" +#include "utils/rel.h" #include "utils/typcache.h" #include "utils/tqual.h" diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index 59e6cc32db5..3a057777503 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.70 2008/06/08 23:16:43 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.71 2008/06/19 00:46:03 alvherre Exp $ * * NOTES * many of the old access method routines have been turned into @@ -19,12 +19,12 @@ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" +#include "access/relscan.h" #include "access/transam.h" #include "miscadmin.h" #include "pgstat.h" #include "storage/bufmgr.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 127740919f1..7d6028804a5 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.108 2008/05/12 00:00:45 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.109 2008/06/19 00:46:03 alvherre Exp $ * * INTERFACE ROUTINES * index_open - open an index relation by relation OID @@ -62,8 +62,7 @@ #include "postgres.h" -#include "access/genam.h" -#include "access/heapam.h" +#include "access/relscan.h" #include "access/transam.h" #include "pgstat.h" #include "storage/bufmgr.h" diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 066e2b43359..64a719f8279 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.160 2008/05/12 00:00:45 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.161 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "access/genam.h" #include "access/nbtree.h" +#include "access/relscan.h" #include "catalog/index.h" #include "commands/vacuum.h" #include "miscadmin.h" diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index ca8d33d0bf4..5849a73ffaf 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.117 2008/05/12 00:00:45 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.118 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -17,9 +17,11 @@ #include "access/genam.h" #include "access/nbtree.h" +#include "access/relscan.h" #include "pgstat.h" #include "storage/bufmgr.h" #include "utils/lsyscache.h" +#include "utils/rel.h" static bool _bt_readpage(IndexScanDesc scan, ScanDirection dir, diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 96274b6ba3a..5fdccd2fb14 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -57,7 +57,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.115 2008/03/16 23:15:08 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.116 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -68,6 +68,7 @@ #include "access/nbtree.h" #include "miscadmin.h" #include "storage/smgr.h" +#include "utils/rel.h" #include "utils/tuplesort.h" diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index ece758a16bd..d55a6452c4b 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.90 2008/05/12 00:00:45 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.91 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "access/genam.h" #include "access/nbtree.h" #include "access/reloptions.h" +#include "access/relscan.h" #include "executor/execdebug.h" #include "miscadmin.h" #include "storage/bufmgr.h" diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index 19758700e7b..9a2f18d5318 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.55 2008/06/12 09:12:30 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.56 2008/06/19 00:46:03 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -21,6 +21,7 @@ #include "storage/bufmgr.h" #include "storage/smgr.h" #include "utils/hsearch.h" +#include "utils/rel.h" /* diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 4b1d946a321..e71f944f1b3 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.146 2008/05/12 00:00:46 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.147 2008/06/19 00:46:03 alvherre Exp $ * * NOTES * See acl.h. @@ -43,6 +43,7 @@ #include "utils/acl.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index becd003ba02..30571267b46 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.76 2008/05/12 00:00:46 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.77 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ #include "miscadmin.h" #include "storage/fd.h" #include "utils/fmgroids.h" -#include "utils/relcache.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 2b2ab11702a..3c50d8c5ed2 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.299 2008/05/12 20:01:59 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.300 2008/06/19 00:46:04 alvherre Exp $ * * * INTERFACE ROUTINES @@ -25,6 +25,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/relscan.h" #include "access/sysattr.h" #include "access/transam.h" #include "access/xact.h" diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 0cb7cf95f7f..5bacb412a97 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.105 2008/03/27 03:57:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.106 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -46,6 +46,7 @@ #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c index 69b01b17e1b..1ff7261877f 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.92 2008/03/27 03:57:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.93 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,7 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index bb790e5fc41..1bf5c4ec3c8 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.41 2008/05/09 23:32:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.42 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,7 @@ #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c index 753acb133df..d03cb647eeb 100644 --- a/src/backend/catalog/pg_conversion.c +++ b/src/backend/catalog/pg_conversion.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.44 2008/06/14 18:04:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.45 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -27,6 +27,7 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index d1fd8f5200f..405510ce90c 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_depend.c,v 1.28 2008/05/16 23:36:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_depend.c,v 1.29 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ #include "miscadmin.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c index bfc339c7662..846c623df6c 100644 --- a/src/backend/catalog/pg_enum.c +++ b/src/backend/catalog/pg_enum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.6 2008/03/26 21:10:37 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.7 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "catalog/pg_enum.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/rel.h" #include "utils/tqual.h" static int oid_cmp(const void *p1, const void *p2); diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c index c1a8dbc83b3..308c4162f47 100644 --- a/src/backend/catalog/pg_largeobject.c +++ b/src/backend/catalog/pg_largeobject.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.29 2008/03/26 21:10:37 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.30 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "catalog/pg_largeobject.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/catalog/pg_namespace.c b/src/backend/catalog/pg_namespace.c index 3f2416beab5..804dfc80161 100644 --- a/src/backend/catalog/pg_namespace.c +++ b/src/backend/catalog/pg_namespace.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_namespace.c,v 1.18 2008/01/01 19:45:48 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_namespace.c,v 1.19 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -19,6 +19,7 @@ #include "catalog/indexing.h" #include "catalog/pg_namespace.h" #include "utils/builtins.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index 4ae5ab9fa64..11690aa8ce6 100644 --- a/src/backend/catalog/pg_operator.c +++ b/src/backend/catalog/pg_operator.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.103 2008/01/01 19:45:48 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.104 2008/06/19 00:46:04 alvherre Exp $ * * NOTES * these routines moved here from commands/define.c and somewhat cleaned up. @@ -31,6 +31,7 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index 525e4472dda..42caacc96be 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_type.c,v 1.118 2008/03/27 03:57:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_type.c,v 1.119 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -29,6 +29,7 @@ #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 18ad7ad812a..9c4cd09241f 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.176 2008/05/12 20:01:59 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.177 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -19,6 +19,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/relscan.h" #include "access/rewriteheap.h" #include "access/transam.h" #include "access/xact.h" diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index 2dde6b7ac6c..b87d7d54eec 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -7,7 +7,7 @@ * Copyright (c) 1996-2008, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.102 2008/03/26 21:10:37 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.103 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -51,6 +51,7 @@ #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index c789dc94467..9d096141a42 100644 --- a/src/backend/commands/conversioncmds.c +++ b/src/backend/commands/conversioncmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.34 2008/06/14 18:04:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.35 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -27,6 +27,7 @@ #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" static void AlterConversionOwner_internal(Relation rel, Oid conversionOid, diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index c361b88e88d..68d3a65db57 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.92 2008/05/12 00:00:47 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.93 2008/06/19 00:46:04 alvherre Exp $ * * DESCRIPTION * These routines take the parse tree and pick out the @@ -55,6 +55,7 @@ #include "utils/fmgroids.h" #include "utils/guc.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c index dfb775f1b82..bad0afc77b4 100644 --- a/src/backend/commands/lockcmds.c +++ b/src/backend/commands/lockcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/lockcmds.c,v 1.17 2008/01/01 19:45:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/lockcmds.c,v 1.18 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "miscadmin.h" #include "utils/acl.h" #include "utils/lsyscache.h" +#include "utils/rel.h" /* diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index f1b22d73863..de114079e25 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.61 2008/05/12 00:00:47 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.62 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -39,6 +39,7 @@ #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c index 7eba1c92db5..884181c5cd9 100644 --- a/src/backend/commands/operatorcmds.c +++ b/src/backend/commands/operatorcmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.39 2008/01/01 19:45:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.40 2008/06/19 00:46:04 alvherre Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -45,6 +45,7 @@ #include "parser/parse_type.h" #include "utils/acl.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c index d03b8c7e2f4..9fb2ea78000 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.78 2008/04/29 19:37:04 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.79 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -34,6 +34,7 @@ #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 639cd7296e2..b674406ffa5 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.258 2008/06/15 16:29:05 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.259 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/reloptions.h" +#include "access/relscan.h" #include "access/sysattr.h" #include "access/xact.h" #include "catalog/catalog.h" diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 277bcd18431..c19eedcb6d5 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.56 2008/05/12 00:00:48 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.57 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -66,6 +66,7 @@ #include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/memutils.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index ceb5fba0e6a..c150f2d1de8 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tsearchcmds.c,v 1.12 2008/06/14 18:04:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tsearchcmds.c,v 1.13 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -43,6 +43,7 @@ #include "utils/catcache.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index 8814cf8dc1b..e6ec1508ab3 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.105 2008/06/14 18:04:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.106 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,7 @@ #include "rewrite/rewriteSupport.h" #include "utils/acl.h" #include "utils/lsyscache.h" +#include "utils/rel.h" static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc); diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index 916340288a7..e09ece65375 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.28 2008/05/13 15:44:08 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.29 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -36,6 +36,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/relscan.h" #include "executor/execdebug.h" #include "executor/nodeBitmapHeapscan.h" #include "pgstat.h" diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index f90c95ed264..4f7fce4e227 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.128 2008/04/13 20:51:20 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.129 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,7 @@ #include "access/genam.h" #include "access/nbtree.h" +#include "access/relscan.h" #include "executor/execdebug.h" #include "executor/nodeIndexscan.h" #include "nodes/nodeFuncs.h" diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index 5ae17c60a02..c059f0533e3 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSeqscan.c,v 1.64 2008/01/01 19:45:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeSeqscan.c,v 1.65 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -25,6 +25,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/relscan.h" #include "executor/execdebug.h" #include "executor/nodeSeqscan.h" diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c index aa595e2ced1..58a7495d37e 100644 --- a/src/backend/nodes/print.c +++ b/src/backend/nodes/print.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/print.c,v 1.88 2008/06/06 22:35:22 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/print.c,v 1.89 2008/06/19 00:46:04 alvherre Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -25,6 +25,7 @@ #include "optimizer/clauses.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" +#include "utils/rel.h" /* diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c index ef13f164cd3..88bea645531 100644 --- a/src/backend/optimizer/plan/planagg.c +++ b/src/backend/optimizer/plan/planagg.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.38 2008/04/21 00:26:45 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.39 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "catalog/pg_aggregate.h" +#include "catalog/pg_am.h" #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "optimizer/clauses.h" diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index 49ea4c63f0f..de0218748d5 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -16,7 +16,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/prep/preptlist.c,v 1.89 2008/05/12 00:00:49 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/prep/preptlist.c,v 1.90 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -34,6 +34,7 @@ #include "parser/analyze.h" #include "parser/parsetree.h" #include "parser/parse_coerce.h" +#include "utils/rel.h" static List *expand_targetlist(List *tlist, int command_type, diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 351d76d0fda..ed18cf5e3fe 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -22,7 +22,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.146 2008/01/01 19:45:50 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.147 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -44,6 +44,7 @@ #include "parser/parse_expr.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" +#include "utils/rel.h" static Plan *recurse_set_operations(Node *setOp, PlannerInfo *root, diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 0c531fb6c64..a0f146aa38e 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.146 2008/05/12 00:00:49 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.147 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,7 @@ #include "storage/bufmgr.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" -#include "utils/relcache.h" +#include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 759dc64d940..831a7899188 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.371 2008/01/01 19:45:50 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.372 2008/06/19 00:46:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -36,6 +36,7 @@ #include "parser/parse_relation.h" #include "parser/parse_target.h" #include "parser/parsetree.h" +#include "utils/rel.h" typedef struct diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index e5a23aaa445..f532b26d374 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.169 2008/02/15 17:19:46 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.170 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -34,6 +34,7 @@ #include "rewrite/rewriteManip.h" #include "utils/guc.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #define ORDER_CLAUSE 0 diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 590ee8a5e38..5d9dcd6c94c 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.174 2008/05/15 00:17:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.175 2008/06/19 00:46:05 alvherre Exp $ * ---------- */ #include "postgres.h" @@ -59,6 +59,7 @@ #include "utils/guc.h" #include "utils/memutils.h" #include "utils/ps_status.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index e662f269814..3c32ddbb7ed 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.126 2008/03/26 21:10:38 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.127 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,7 @@ #include "utils/builtins.h" #include "utils/inval.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index 4c7112baabe..c849296f2b3 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.72 2008/05/12 00:00:50 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.73 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,7 @@ #include "utils/acl.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index b2aa8e0d889..65f6889e7ae 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteSupport.c,v 1.65 2008/01/01 19:45:51 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteSupport.c,v 1.66 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,7 @@ #include "access/heapam.h" #include "catalog/indexing.h" +#include "catalog/pg_class.h" #include "rewrite/rewriteSupport.h" #include "utils/inval.h" #include "utils/syscache.h" diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index a474bd1d3e0..bd3d38c6307 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.232 2008/06/12 09:12:31 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.233 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -40,6 +40,7 @@ #include "storage/ipc.h" #include "storage/proc.h" #include "storage/smgr.h" +#include "utils/rel.h" #include "utils/resowner.h" #include "pgstat.h" diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index 85695fb01c1..7bfafbc8dad 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -24,7 +24,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.133 2008/05/12 20:02:00 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.134 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -41,6 +41,7 @@ #include "libpq/libpq-fs.h" #include "storage/large_object.h" #include "utils/fmgroids.h" +#include "utils/rel.h" #include "utils/resowner.h" #include "utils/snapmgr.h" #include "utils/tqual.h" diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index 7b8aa6b9e67..c358cdea7b4 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -5,7 +5,7 @@ * Copyright (c) 2002-2008, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.18 2008/03/31 01:31:43 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.19 2008/06/19 00:46:05 alvherre Exp $ * */ @@ -24,8 +24,8 @@ #include "storage/fd.h" #include "utils/acl.h" #include "utils/builtins.h" +#include "utils/rel.h" #include "utils/syscache.h" -#include "utils/relcache.h" /* Return physical size of directory contents, or 0 if dir doesn't exist */ diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index a2da346f748..986bac041d9 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.106 2008/03/26 21:10:39 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.107 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -25,6 +25,7 @@ #include "access/heapam.h" #include "catalog/indexing.h" #include "catalog/namespace.h" +#include "catalog/pg_class.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" #include "catalog/pg_ts_config.h" diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 79412891a57..bac75ccb600 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.61 2008/05/12 00:00:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.62 2008/06/19 00:46:05 alvherre Exp $ * * NOTES * input routine largely stolen from boxin(). @@ -29,6 +29,7 @@ #include "parser/parsetree.h" #include "utils/acl.h" #include "utils/builtins.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 564572d46d9..83a12776fd4 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.143 2008/05/12 00:00:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.144 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "access/genam.h" #include "access/hash.h" #include "access/heapam.h" +#include "access/relscan.h" #include "access/sysattr.h" #include "access/valid.h" #include "catalog/pg_operator.h" @@ -28,7 +29,7 @@ #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/memutils.h" -#include "utils/relcache.h" +#include "utils/rel.h" #include "utils/resowner.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index ccb002f0f5d..50e27923566 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -80,7 +80,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.84 2008/03/13 18:00:32 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.85 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -94,7 +94,7 @@ #include "storage/smgr.h" #include "utils/inval.h" #include "utils/memutils.h" -#include "utils/relcache.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index bdd40ab4885..1ccf7b8d69b 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.116 2008/05/12 00:00:52 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.117 2008/06/19 00:46:05 alvherre Exp $ * * NOTES * These routines allow the parser/planner/executor to perform @@ -46,6 +46,7 @@ #include "catalog/pg_ts_parser.h" #include "catalog/pg_ts_template.h" #include "catalog/pg_type.h" +#include "utils/rel.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index 8f92ed48a37..b2dd5425142 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -36,7 +36,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.27 2008/01/01 19:45:53 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.28 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -49,6 +49,7 @@ #include "commands/defrem.h" #include "utils/builtins.h" #include "utils/lsyscache.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index 27e022e81ae..614ca06f3e9 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.28 2008/05/12 00:00:52 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.29 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -24,8 +24,8 @@ #include "storage/bufmgr.h" #include "storage/proc.h" #include "utils/memutils.h" +#include "utils/rel.h" #include "utils/resowner.h" -#include "utils/relcache.h" /* diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index df1a0e7a4cc..896ee71ee65 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -91,7 +91,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.84 2008/05/12 00:00:53 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.85 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -112,6 +112,7 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/pg_rusage.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tuplesort.h" diff --git a/src/include/access/genam.h b/src/include/access/genam.h index c59c3b9d52f..3667c7c843a 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,19 +7,20 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/genam.h,v 1.73 2008/06/08 22:41:04 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/genam.h,v 1.74 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ #ifndef GENAM_H #define GENAM_H -#include "access/relscan.h" #include "access/sdir.h" +#include "access/skey.h" #include "nodes/tidbitmap.h" #include "storage/buf.h" #include "storage/lock.h" -#include "utils/rel.h" +#include "utils/relcache.h" +#include "utils/snapshot.h" /* * Struct for statistics returned by ambuild @@ -73,21 +74,21 @@ typedef struct IndexBulkDeleteResult /* Typedef for callback function to determine if a tuple is bulk-deletable */ typedef bool (*IndexBulkDeleteCallback) (ItemPointer itemptr, void *state); -/* Struct for heap-or-index scans of system tables */ -typedef struct SysScanDescData -{ - Relation heap_rel; /* catalog being scanned */ - Relation irel; /* NULL if doing heap scan */ - HeapScanDesc scan; /* only valid in heap-scan case */ - IndexScanDesc iscan; /* only valid in index-scan case */ -} SysScanDescData; - -typedef SysScanDescData *SysScanDesc; +/* struct definitions appear in relscan.h */ +typedef struct IndexScanDescData *IndexScanDesc; +typedef struct SysScanDescData *SysScanDesc; /* * generalized index_ interface routines (in indexam.c) */ + +/* + * IndexScanIsValid + * True iff the index scan is valid. + */ +#define IndexScanIsValid(scan) PointerIsValid(scan) + extern Relation index_open(Oid relationId, LOCKMODE lockmode); extern void index_close(Relation relation, LOCKMODE lockmode); diff --git a/src/include/access/gin.h b/src/include/access/gin.h index 99d37278965..d47d7ac2d64 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -4,7 +4,7 @@ * * Copyright (c) 2006-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.21 2008/06/06 22:35:22 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.22 2008/06/19 00:46:05 alvherre Exp $ *-------------------------------------------------------------------------- */ @@ -12,8 +12,8 @@ #ifndef GIN_H #define GIN_H +#include "access/genam.h" #include "access/itup.h" -#include "access/relscan.h" #include "access/xlog.h" #include "fmgr.h" #include "nodes/tidbitmap.h" diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 807d5c95bd8..acab76e9b32 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/gist.h,v 1.60 2008/05/12 00:00:53 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/access/gist.h,v 1.61 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -18,8 +18,9 @@ #include "access/xlog.h" #include "access/xlogdefs.h" +#include "storage/block.h" #include "storage/bufpage.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* * amproc indexes for GiST indexes. diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h index 03d201779a4..497ceb318ed 100644 --- a/src/include/access/gist_private.h +++ b/src/include/access/gist_private.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.30 2008/06/12 09:12:31 heikki Exp $ + * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.31 2008/06/19 00:46:05 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -16,9 +16,7 @@ #include "access/gist.h" #include "access/itup.h" -#include "access/xlog.h" -#include "access/xlogdefs.h" -#include "fmgr.h" +#include "storage/bufmgr.h" #define GIST_UNLOCK BUFFER_LOCK_UNLOCK #define GIST_SHARE BUFFER_LOCK_SHARE diff --git a/src/include/access/hash.h b/src/include/access/hash.h index a786117ee55..4d8cd79e9a8 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/hash.h,v 1.87 2008/04/10 22:25:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/hash.h,v 1.88 2008/06/19 00:46:05 alvherre Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -17,12 +17,13 @@ #ifndef HASH_H #define HASH_H +#include "access/genam.h" #include "access/itup.h" -#include "access/relscan.h" #include "access/sdir.h" #include "access/xlog.h" #include "fmgr.h" #include "storage/lock.h" +#include "utils/relcache.h" /* * Mapping from hash bucket number to physical block number of bucket's diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 17e4a735e92..c6b7d5dc114 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.136 2008/06/12 09:12:31 heikki Exp $ + * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.137 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,11 +15,13 @@ #define HEAPAM_H #include "access/htup.h" -#include "access/relscan.h" #include "access/sdir.h" +#include "access/skey.h" #include "access/xlog.h" #include "nodes/primnodes.h" +#include "storage/bufpage.h" #include "storage/lock.h" +#include "utils/relcache.h" #include "utils/snapshot.h" @@ -50,6 +52,15 @@ extern Relation heap_openrv(const RangeVar *relation, LOCKMODE lockmode); #define heap_close(r,l) relation_close(r,l) +/* struct definition appears in relscan.h */ +typedef struct HeapScanDescData *HeapScanDesc; + +/* + * HeapScanIsValid + * True iff the heap scan is valid. + */ +#define HeapScanIsValid(scan) PointerIsValid(scan) + extern HeapScanDesc heap_beginscan(Relation relation, Snapshot snapshot, int nkeys, ScanKey key); extern HeapScanDesc heap_beginscan_strat(Relation relation, Snapshot snapshot, diff --git a/src/include/access/hio.h b/src/include/access/hio.h index 63d1f8e4a86..a089bddbf3f 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.35 2008/01/01 19:45:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.36 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #define HIO_H #include "access/htup.h" -#include "utils/rel.h" +#include "utils/relcache.h" #include "storage/buf.h" extern void RelationPutHeapTuple(Relation relation, Buffer buffer, diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 20c33b37748..9b0e8d0cf77 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,15 +7,15 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.119 2008/06/06 22:35:22 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.120 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ #ifndef NBTREE_H #define NBTREE_H +#include "access/genam.h" #include "access/itup.h" -#include "access/relscan.h" #include "access/sdir.h" #include "access/xlog.h" #include "access/xlogutils.h" diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index b5ab8cff651..fe5cc317880 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,18 +7,15 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.65 2008/05/12 00:00:53 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.66 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ #ifndef RELSCAN_H #define RELSCAN_H -#include "access/htup.h" -#include "access/skey.h" -#include "storage/bufpage.h" -#include "utils/rel.h" -#include "utils/snapshot.h" +#include "access/genam.h" +#include "access/heapam.h" typedef struct HeapScanDescData @@ -54,8 +51,6 @@ typedef struct HeapScanDescData OffsetNumber rs_vistuples[MaxHeapTuplesPerPage]; /* their offsets */ } HeapScanDescData; -typedef HeapScanDescData *HeapScanDesc; - /* * We use the same IndexScanDescData structure for both amgettuple-based * and amgetbitmap-based index scans. Some fields are only relevant in @@ -89,19 +84,13 @@ typedef struct IndexScanDescData TransactionId xs_prev_xmax; /* previous HOT chain member's XMAX, if any */ } IndexScanDescData; -typedef IndexScanDescData *IndexScanDesc; - - -/* - * HeapScanIsValid - * True iff the heap scan is valid. - */ -#define HeapScanIsValid(scan) PointerIsValid(scan) - -/* - * IndexScanIsValid - * True iff the index scan is valid. - */ -#define IndexScanIsValid(scan) PointerIsValid(scan) +/* Struct for heap-or-index scans of system tables */ +typedef struct SysScanDescData +{ + Relation heap_rel; /* catalog being scanned */ + Relation irel; /* NULL if doing heap scan */ + HeapScanDesc scan; /* only valid in heap-scan case */ + IndexScanDesc iscan; /* only valid in index-scan case */ +} SysScanDescData; #endif /* RELSCAN_H */ diff --git a/src/include/access/rewriteheap.h b/src/include/access/rewriteheap.h index 77441bfbb71..c34aab421f0 100644 --- a/src/include/access/rewriteheap.h +++ b/src/include/access/rewriteheap.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/rewriteheap.h,v 1.4 2008/01/01 19:45:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/rewriteheap.h,v 1.5 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,7 @@ #define REWRITE_HEAP_H #include "access/htup.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* struct definition is private to rewriteheap.c */ typedef struct RewriteStateData *RewriteState; diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h index 4ecfe2742dc..7d1ba7d2f82 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -6,7 +6,7 @@ * * Copyright (c) 2000-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.39 2008/05/12 00:00:53 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.40 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #include "access/htup.h" #include "storage/bufpage.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* * This enables de-toasting of index entries. Needed until VACUUM is diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h index b2d5c3be0f1..f1585c032a5 100644 --- a/src/include/access/xlogutils.h +++ b/src/include/access/xlogutils.h @@ -6,13 +6,15 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlogutils.h,v 1.24 2008/06/12 09:12:31 heikki Exp $ + * $PostgreSQL: pgsql/src/include/access/xlogutils.h,v 1.25 2008/06/19 00:46:06 alvherre Exp $ */ #ifndef XLOG_UTILS_H #define XLOG_UTILS_H #include "storage/buf.h" -#include "utils/rel.h" +#include "storage/relfilenode.h" +#include "storage/block.h" +#include "utils/relcache.h" extern void XLogCheckInvalidPages(void); diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index 753926f14ea..845ef035bd5 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.h @@ -7,14 +7,16 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catalog.h,v 1.39 2008/04/12 23:14:21 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catalog.h,v 1.40 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ #ifndef CATALOG_H #define CATALOG_H -#include "utils/rel.h" +#include "catalog/pg_class.h" +#include "storage/relfilenode.h" +#include "utils/relcache.h" extern char *relpath(RelFileNode rnode); diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index 19eb8371eb4..18defe8ee78 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/indexing.h,v 1.102 2008/01/01 19:45:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/indexing.h,v 1.103 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ #define INDEXING_H #include "access/htup.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* * The state object used by CatalogOpenIndexes and friends is actually the diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h index 4cdcd7f402a..c6207735235 100644 --- a/src/include/commands/cluster.h +++ b/src/include/commands/cluster.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/cluster.h,v 1.34 2008/01/01 19:45:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/cluster.h,v 1.35 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,7 @@ #define CLUSTER_H #include "nodes/parsenodes.h" -#include "utils/rel.h" +#include "utils/relcache.h" extern void cluster(ClusterStmt *stmt, bool isTopLevel); diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index d9e1a563728..9e138ada8d9 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.40 2008/06/15 01:25:54 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.41 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #define TABLECMDS_H #include "nodes/parsenodes.h" -#include "utils/rel.h" +#include "utils/relcache.h" extern Oid DefineRelation(CreateStmt *stmt, char relkind); diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 6496fe78687..a3c76cfa306 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.77 2008/06/05 15:47:32 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.78 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ #include "nodes/parsenodes.h" #include "storage/buf.h" #include "storage/lock.h" -#include "utils/rel.h" +#include "utils/relcache.h" /*---------- diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index e977b9f8705..f21a0528e7c 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,18 +7,22 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.183 2008/01/01 19:45:58 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.184 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ #ifndef EXECNODES_H #define EXECNODES_H -#include "access/relscan.h" +#include "access/genam.h" +#include "access/heapam.h" +#include "access/skey.h" #include "nodes/params.h" -#include "nodes/plannodes.h" -#include "nodes/tidbitmap.h" +#include "nodes/plannodes.h" +#include "nodes/tidbitmap.h" #include "utils/hsearch.h" +#include "utils/rel.h" +#include "utils/snapshot.h" #include "utils/tuplestore.h" diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index 421fb097917..58c84868152 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/print.h,v 1.28 2008/01/01 19:45:58 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/print.h,v 1.29 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #define PRINT_H #include "nodes/parsenodes.h" -#include "nodes/execnodes.h" +#include "executor/tuptable.h" #define nodeDisplay(x) pprint(x) diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 9e835493582..7471d1b44d6 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.49 2008/04/01 00:48:33 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.50 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #define PLANCAT_H #include "nodes/relation.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* Hook for plugins to get control in get_relation_info() */ typedef void (*get_relation_info_hook_type) (PlannerInfo *root, diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index bf77ced3286..ed8f7fe3b3a 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.53 2008/01/01 19:45:58 momjian Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.54 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #define PARSE_NODE_H #include "nodes/parsenodes.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* * State information used during parse analysis diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 3cda489b350..9b48f42bb0f 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -5,7 +5,7 @@ * * Copyright (c) 2001-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.75 2008/05/15 00:17:41 tgl Exp $ + * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.76 2008/06/19 00:46:05 alvherre Exp $ * ---------- */ #ifndef PGSTAT_H @@ -14,7 +14,7 @@ #include "libpq/pqcomm.h" #include "portability/instr_time.h" #include "utils/hsearch.h" -#include "utils/rel.h" +#include "utils/relcache.h" #include "utils/timestamp.h" diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h index 3e44baa2a32..514728e7637 100644 --- a/src/include/rewrite/rewriteDefine.h +++ b/src/include/rewrite/rewriteDefine.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rewrite/rewriteDefine.h,v 1.29 2008/05/12 00:00:53 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/rewrite/rewriteDefine.h,v 1.30 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #define REWRITEDEFINE_H #include "nodes/parsenodes.h" -#include "utils/rel.h" +#include "utils/relcache.h" #define RULE_FIRES_ON_ORIGIN 'O' #define RULE_FIRES_ALWAYS 'A' diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index 297cb0411f2..87ce29ee06f 100644 --- a/src/include/rewrite/rewriteHandler.h +++ b/src/include/rewrite/rewriteHandler.h @@ -7,14 +7,14 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rewrite/rewriteHandler.h,v 1.29 2008/01/01 19:45:58 momjian Exp $ + * $PostgreSQL: pgsql/src/include/rewrite/rewriteHandler.h,v 1.30 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ #ifndef REWRITEHANDLER_H #define REWRITEHANDLER_H -#include "utils/rel.h" +#include "utils/relcache.h" #include "nodes/parsenodes.h" extern List *QueryRewrite(Query *parsetree); diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 472e64de1bd..589baa0a7e5 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.96 2008/06/12 09:12:31 heikki Exp $ + * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.97 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ #include "storage/shmem.h" #include "storage/smgr.h" #include "storage/spin.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 29d8bea287f..f940ae466d5 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,16 +7,18 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.113 2008/06/12 09:12:31 heikki Exp $ + * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.114 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ #ifndef BUFMGR_H #define BUFMGR_H +#include "storage/block.h" #include "storage/buf.h" #include "storage/bufpage.h" -#include "utils/rel.h" +#include "storage/relfilenode.h" +#include "utils/relcache.h" typedef void *Block; diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 5e029d0f461..80814c4e6dd 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.66 2008/01/01 19:45:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.67 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ #include "access/htup.h" #include "access/skey.h" #include "lib/dllist.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* * struct catctup: individual tuple in the cache. diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index 80c8c2ab331..821c751d280 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/inval.h,v 1.42 2008/03/13 18:00:32 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/inval.h,v 1.43 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #define INVAL_H #include "access/htup.h" -#include "utils/rel.h" +#include "utils/relcache.h" typedef void (*CacheCallbackFunction) (Datum arg, Oid relid); diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 25b9d43845a..0d9d75dd8b1 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.106 2008/04/10 22:25:26 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.107 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ #include "rewrite/prs2lock.h" #include "storage/block.h" #include "storage/relfilenode.h" +#include "utils/relcache.h" /* @@ -198,18 +199,6 @@ typedef struct RelationData struct PgStat_TableStatus *pgstat_info; /* statistics collection area */ } RelationData; -typedef RelationData *Relation; - - -/* ---------------- - * RelationPtr is used in the executor to support index scans - * where we have to keep track of several index relations in an - * array. -cim 9/10/89 - * ---------------- - */ -typedef Relation *RelationPtr; - - /* * StdRdOptions * Standard contents of rd_options for heaps and generic indexes. diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index c5005abce51..bcfb3a8f581 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -7,14 +7,27 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/relcache.h,v 1.61 2008/01/01 19:45:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/relcache.h,v 1.62 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ #ifndef RELCACHE_H #define RELCACHE_H -#include "utils/rel.h" +#include "access/tupdesc.h" +#include "nodes/bitmapset.h" +#include "nodes/pg_list.h" + + +typedef struct RelationData *Relation; + +/* ---------------- + * RelationPtr is used in the executor to support index scans + * where we have to keep track of several index relations in an + * array. -cim 9/10/89 + * ---------------- + */ +typedef Relation *RelationPtr; /* * Routines to open (lookup) and close a relcache entry diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index ab57fb505e2..8de8e0297ab 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.30 2008/05/12 00:00:54 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.31 2008/06/19 00:46:06 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,8 @@ #include "access/itup.h" #include "executor/tuptable.h" -#include "utils/rel.h" +#include "fmgr.h" +#include "utils/relcache.h" /* Tuplesortstate is an opaque type whose details are not known outside