diff options
author | Alvaro Herrera | 2008-03-26 21:10:39 +0000 |
---|---|---|
committer | Alvaro Herrera | 2008-03-26 21:10:39 +0000 |
commit | 8fc7d48b35e60a012fa757c8cd388304c1d42af3 (patch) | |
tree | d965830e39af6050839f8994a628708c6a08dcd7 | |
parent | 640e57e0e021913e2d04f76fd83d235a6341bc97 (diff) |
Move the HTSU_Result enum definition into snapshot.h, to avoid including
tqual.h into heapam.h. This makes all inclusion of tqual.h explicit.
I also sorted alphabetically the includes on some source files.
59 files changed, 79 insertions, 20 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index f4ae3a6ed1..863dd976d9 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -37,7 +37,6 @@ #include "libpq-fe.h" #include "fmgr.h" #include "funcapi.h" -#include "miscadmin.h" #include "access/genam.h" #include "access/heapam.h" #include "access/tupdesc.h" @@ -48,6 +47,7 @@ #include "executor/executor.h" #include "executor/spi.h" #include "lib/stringinfo.h" +#include "miscadmin.h" #include "nodes/execnodes.h" #include "nodes/nodes.h" #include "nodes/pg_list.h" @@ -60,8 +60,9 @@ #include "utils/fmgroids.h" #include "utils/hsearch.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" #include "utils/memutils.h" +#include "utils/syscache.h" +#include "utils/tqual.h" #include "dblink.h" diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c index c191e95466..b2279be209 100644 --- a/contrib/pgrowlocks/pgrowlocks.c +++ b/contrib/pgrowlocks/pgrowlocks.c @@ -33,6 +33,7 @@ #include "storage/procarray.h" #include "utils/acl.h" #include "utils/builtins.h" +#include "utils/tqual.h" PG_MODULE_MAGIC; diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 0f9de66344..addcda352e 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -32,6 +32,7 @@ #include "funcapi.h" #include "miscadmin.h" #include "utils/builtins.h" +#include "utils/tqual.h" PG_MODULE_MAGIC; diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index df2e58da89..c208350da1 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -58,6 +58,7 @@ #include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* GUC variable */ diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 794995218c..c6741b3d03 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -19,6 +19,7 @@ #include "miscadmin.h" #include "pgstat.h" #include "utils/inval.h" +#include "utils/tqual.h" /* Working data for heap_page_prune and subroutines */ diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index 857caee95b..20f047989c 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -38,6 +38,7 @@ #include "utils/fmgroids.h" #include "utils/pg_lzcompress.h" #include "utils/typcache.h" +#include "utils/tqual.h" #undef TOAST_DEBUG diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index 54cff05b06..c9410642ce 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -24,6 +24,7 @@ #include "access/transam.h" #include "miscadmin.h" #include "pgstat.h" +#include "utils/tqual.h" /* ---------------------------------------------------------------- diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 540c2e9df0..0929bb1ff3 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -68,6 +68,7 @@ #include "pgstat.h" #include "utils/relcache.h" #include "utils/snapmgr.h" +#include "utils/tqual.h" /* ---------------------------------------------------------------- diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 7fb395fc5c..bfdf50cf2a 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -20,6 +20,7 @@ #include "access/transam.h" #include "miscadmin.h" #include "utils/inval.h" +#include "utils/tqual.h" typedef struct diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 0c0d20f879..34e98373ae 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -41,6 +41,7 @@ #include "utils/fmgroids.h" #include "utils/memutils.h" #include "utils/ps_status.h" +#include "utils/tqual.h" extern int optind; extern char *optarg; diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 4514e48e11..dc9b49f283 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -43,6 +43,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" static void ExecGrant_Relation(InternalGrant *grantStmt); diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index c7f966b0b2..2d6d7133d3 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -61,6 +61,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* expansible list of ObjectAddresses */ diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 0019ebeecf..012207a05c 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -59,8 +59,9 @@ #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/relcache.h" -#include "utils/syscache.h" #include "utils/snapmgr.h" +#include "utils/syscache.h" +#include "utils/tqual.h" static void AddNewRelationTuple(Relation pg_class_desc, diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 9a2e6e146f..f07d9ae5d0 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -56,6 +56,7 @@ #include "utils/syscache.h" #include "utils/tuplesort.h" #include "utils/snapmgr.h" +#include "utils/tqual.h" /* state info for validate_index bulkdelete callback */ diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index a9c15ac3c4..d9b20fd485 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -27,6 +27,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.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 d28e2dc3a8..b3c2aca573 100644 --- a/src/backend/catalog/pg_conversion.c +++ b/src/backend/catalog/pg_conversion.c @@ -22,11 +22,12 @@ #include "catalog/pg_namespace.h" #include "catalog/pg_proc.h" #include "mb/pg_wchar.h" +#include "miscadmin.h" +#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/syscache.h" -#include "utils/acl.h" -#include "miscadmin.h" +#include "utils/tqual.h" /* * ConversionCreate diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 0c0787a6d2..ca97e97a4b 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -23,6 +23,7 @@ #include "miscadmin.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/tqual.h" static bool isObjectPinned(const ObjectAddress *object, Relation rel); diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c index c726fe2fad..24a1e8e653 100644 --- a/src/backend/catalog/pg_enum.c +++ b/src/backend/catalog/pg_enum.c @@ -20,6 +20,7 @@ #include "catalog/pg_enum.h" #include "utils/builtins.h" #include "utils/fmgroids.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 4ad074cb43..90ffc3b34a 100644 --- a/src/backend/catalog/pg_largeobject.c +++ b/src/backend/catalog/pg_largeobject.c @@ -20,6 +20,7 @@ #include "catalog/pg_largeobject.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/tqual.h" /* diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index 57cc53b543..303a73ae31 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -39,6 +39,7 @@ #include "utils/acl.h" #include "utils/fmgroids.h" #include "utils/syscache.h" +#include "utils/tqual.h" typedef enum diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index b7b9cf1b56..93080786f8 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -40,6 +40,7 @@ #include "utils/pg_rusage.h" #include "utils/syscache.h" #include "utils/tuplesort.h" +#include "utils/tqual.h" /* Data structure for Algorithm S from Knuth 3.4.2 */ diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 3a7e9b3f27..583b34d90f 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -101,6 +101,7 @@ #include "utils/fmgroids.h" #include "utils/memutils.h" #include "utils/ps_status.h" +#include "utils/tqual.h" /* diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 35bb9e8f69..a6f241704d 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -43,6 +43,7 @@ #include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index 5eff860a46..6d3efcca2d 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -52,6 +52,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 0e8b18ddf2..a9760b13e4 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -50,6 +50,7 @@ #include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* non-export function prototypes */ diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 85059aa7ad..22d71f2cb1 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -53,6 +53,7 @@ #include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" static void AlterFunctionOwner_internal(Relation rel, HeapTuple tup, diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 703f41f103..cdcd8d3ad7 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -49,6 +49,7 @@ #include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* non-export function prototypes */ diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 585029ff5a..e7fcee8194 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -39,6 +39,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c index c98eccc3f2..c1bf7224eb 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -34,6 +34,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" typedef struct diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index b53bfe8898..df21a5b824 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -67,6 +67,7 @@ #include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 8430624916..a89cf5cfaa 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -65,6 +65,7 @@ #include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/memutils.h" +#include "utils/tqual.h" /* GUC variables */ diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 55bc0ea7bf..0bac668d4e 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -40,6 +40,7 @@ #include "utils/memutils.h" #include "utils/snapmgr.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* GUC variables */ diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index 3217ae82eb..22eb8632a0 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -44,6 +44,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" static void MakeConfigurationMapping(AlterTSConfigurationStmt *stmt, diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index c26935becb..c1d970c384 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -61,6 +61,7 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* result structure for get_rels_with_domain() */ diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 15424b5605..7166ce6919 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -30,6 +30,7 @@ #include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" extern bool Password_encryption; diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 1f03d99e60..ff9ddce147 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -35,6 +35,7 @@ #include "commands/vacuum.h" #include "executor/executor.h" #include "miscadmin.h" +#include "pgstat.h" #include "postmaster/autovacuum.h" #include "storage/freespace.h" #include "storage/proc.h" @@ -50,7 +51,7 @@ #include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" -#include "pgstat.h" +#include "utils/tqual.h" /* diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index 56d98462d8..42162d2d98 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -58,6 +58,7 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/pg_rusage.h" +#include "utils/tqual.h" /* diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 7b43e6e459..bec624a05b 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -52,6 +52,7 @@ #include "utils/acl.h" #include "utils/lsyscache.h" #include "utils/memutils.h" +#include "utils/tqual.h" typedef struct evalPlanQual diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index e93feed412..fe65869e5a 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -49,6 +49,7 @@ #include "parser/parsetree.h" #include "utils/memutils.h" #include "utils/relcache.h" +#include "utils/tqual.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index 4ff1f5fe4e..672dd65bc2 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -41,6 +41,7 @@ #include "pgstat.h" #include "utils/memutils.h" #include "utils/snapmgr.h" +#include "utils/tqual.h" static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node); diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 46c4cb5adf..5e7c648d6e 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -20,7 +20,9 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/transam.h" +#include "catalog/catalog.h" #include "catalog/pg_inherits.h" +#include "miscadmin.h" #include "nodes/makefuncs.h" #include "optimizer/clauses.h" #include "optimizer/plancat.h" @@ -35,8 +37,7 @@ #include "utils/relcache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" -#include "catalog/catalog.h" -#include "miscadmin.h" +#include "utils/tqual.h" /* GUC parameter */ diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 132b724987..abe91a070c 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -31,6 +31,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" static Oid FuncNameAsType(List *funcname); diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index d4ffe4b5bc..cc78cf0fc1 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -97,6 +97,7 @@ #include "utils/memutils.h" #include "utils/ps_status.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 5ec6af144b..ce6bd5ff36 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -58,6 +58,7 @@ #include "utils/guc.h" #include "utils/memutils.h" #include "utils/ps_status.h" +#include "utils/tqual.h" /* ---------- diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 0b56486936..7468df7c20 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -29,9 +29,10 @@ #include "storage/smgr.h" #include "utils/acl.h" #include "utils/builtins.h" +#include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/syscache.h" -#include "utils/inval.h" +#include "utils/tqual.h" static void checkRuleResultList(List *targetList, TupleDesc resultDesc, diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index 44008de92f..b99c3dc2e0 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -26,6 +26,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index a7c1f0e759..51946a33e1 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -43,6 +43,7 @@ #include "utils/fmgroids.h" #include "utils/resowner.h" #include "utils/snapmgr.h" +#include "utils/tqual.h" /* diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 6de5313868..7e52e79dde 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -36,6 +36,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/tqual.h" static void parseNameAndArgTypes(const char *string, bool allowNone, List **names, int *nargs, Oid *argtypes); diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 20eb1b5455..6849590986 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -42,6 +42,7 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/snapmgr.h" +#include "utils/tqual.h" /* ---------- diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 1cbbcdb0cf..5c619e8f51 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -45,6 +45,7 @@ #include "rewrite/rewriteSupport.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" +#include "utils/tqual.h" #include "utils/typcache.h" #include "utils/xml.h" diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 091b7ddef1..4784df774a 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -28,6 +28,7 @@ #include "parser/parsetree.h" #include "utils/acl.h" #include "utils/builtins.h" +#include "utils/tqual.h" #define DatumGetItemPointer(X) ((ItemPointer) DatumGetPointer(X)) diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 8cbf49458f..3f3c67d53e 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -30,6 +30,7 @@ #include "utils/relcache.h" #include "utils/resowner.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* #define CACHEDEBUG */ /* turns DEBUG elogs on */ diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 2ea8b5b6ca..911a8ede7d 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -63,6 +63,7 @@ #include "utils/relcache.h" #include "utils/resowner.h" #include "utils/syscache.h" +#include "utils/tqual.h" #include "utils/typcache.h" diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c index f6ab445082..b18c19db11 100644 --- a/src/backend/utils/cache/ts_cache.c +++ b/src/backend/utils/cache/ts_cache.c @@ -48,6 +48,7 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/syscache.h" +#include "utils/tqual.h" /* diff --git a/src/backend/utils/init/flatfiles.c b/src/backend/utils/init/flatfiles.c index dc2fc4ae79..25a78a8244 100644 --- a/src/backend/utils/init/flatfiles.c +++ b/src/backend/utils/init/flatfiles.c @@ -50,6 +50,7 @@ #include "utils/flatfiles.h" #include "utils/relcache.h" #include "utils/resowner.h" +#include "utils/tqual.h" /* Actual names of the flat files (within $PGDATA) */ diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 811a44aef6..9df7af17ac 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -45,6 +45,7 @@ #include "utils/portal.h" #include "utils/relcache.h" #include "utils/syscache.h" +#include "utils/tqual.h" static bool FindMyDatabase(const char *name, Oid *db_id, Oid *db_tablespace); diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 4395193d68..ed6cd2f636 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -23,7 +23,7 @@ #include "storage/block.h" #include "storage/lmgr.h" #include "utils/rel.h" -#include "utils/tqual.h" +#include "utils/snapshot.h" /* ---------------- * fastgetattr diff --git a/src/include/utils/snapshot.h b/src/include/utils/snapshot.h index 45f133738d..b3dd50d6f7 100644 --- a/src/include/utils/snapshot.h +++ b/src/include/utils/snapshot.h @@ -59,4 +59,17 @@ typedef struct SnapshotData CommandId curcid; /* in my xact, CID < curcid are visible */ } SnapshotData; +/* + * Result codes for HeapTupleSatisfiesUpdate. This should really be in + * tqual.h, but we want to avoid including that file elsewhere. + */ +typedef enum +{ + HeapTupleMayBeUpdated, + HeapTupleInvisible, + HeapTupleSelfUpdated, + HeapTupleUpdated, + HeapTupleBeingUpdated +} HTSU_Result; + #endif /* SNAPSHOT_H */ diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 019a964cd1..5a0fd669d5 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -54,16 +54,6 @@ extern PGDLLIMPORT SnapshotData SnapshotToastData; #define HeapTupleSatisfiesVisibility(tuple, snapshot, buffer) \ ((*(snapshot)->satisfies) ((tuple)->t_data, snapshot, buffer)) -/* Result codes for HeapTupleSatisfiesUpdate */ -typedef enum -{ - HeapTupleMayBeUpdated, - HeapTupleInvisible, - HeapTupleSelfUpdated, - HeapTupleUpdated, - HeapTupleBeingUpdated -} HTSU_Result; - /* Result codes for HeapTupleSatisfiesVacuum */ typedef enum { |