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.

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index f4ae3a6ed1e94ac4edf08a3baa9ba95fd74218ab..863dd976d9befade39eb3c043c5e578d015e561d 100644 (file)
--- 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 c191e95466ae8a519da8076a0060145f2973415e..b2279be2098404c007046362115326cda532012d 100644 (file)
--- 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 0f9de66344c65c63d53728b37aac097c50de255c..addcda352e8da08e756ab5036654a78516bd8756 100644 (file)
--- 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 df2e58da898599876be924d6f18a6d10374ba5c9..c208350da195fe6136d74d7bb2127c2d411efa58 100644 (file)
--- 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 794995218cf731d12cac9fb665f6fa5ae7b3821f..c6741b3d03dc6ca9a1d03e565a0d2ddc9b0d496d 100644 (file)
--- 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 857caee95be730979abdc26ea2be723edd0928b0..20f047989ca335fb57e90bbb9e8ae68ba1dc1584 100644 (file)
--- 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 54cff05b069098c3ccd37e97955e403dfcf73335..c9410642ce7fc587b77ed23be9839dcf26f7f534 100644 (file)
--- 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 540c2e9df07c7138737a60f3070ca59ab88ae243..0929bb1ff341d750a4f6818cac359901f71b800b 100644 (file)
--- 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 7fb395fc5c92a484e01cf9529979c2e12ef52279..bfdf50cf2a3f5790e6c71caf9e83d3026c16d8d2 100644 (file)
--- 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 0c0d20f8797ba2e7cfc5183de97aeb7c3cdfbddc..34e98373aef0f7b1326608b5065d227272530c7d 100644 (file)
--- 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 4514e48e11b0a426795631292206f78ec077fc38..dc9b49f283e4b503a15f91e51598013bb37b1615 100644 (file)
--- 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 c7f966b0b2472a448c2e4355e9e815093c4b3ea2..2d6d7133d3e6afa419528c75cf85a4619138e548 100644 (file)
--- 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 0019ebeecf564833722cb4e90aa1618591e2d1b8..012207a05cf542c082fda288bd70baf930253eb8 100644 (file)
--- 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 9a2e6e146fe8e9df4e17f2969c9b9fd6369d5834..f07d9ae5d01563593972bb07f757d86f06d73ef9 100644 (file)
--- 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 a9c15ac3c47e70619394bbf1bd2745bf17d7beaa..d9b20fd48516e05ec581fdd6baac565b6dc49658 100644 (file)
--- 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 d28e2dc3a83b5134a2c79975fd2367971859b243..b3c2aca5739ad0f9d273a6ed57bc36ed1166dff1 100644 (file)
--- 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 0c0787a6d2d5af737b987dac539c04d60534cd50..ca97e97a4b3c221098d6ee5e6737d9e46de10979 100644 (file)
--- 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 c726fe2fadc6405efa4a397745f7f53cd49a5be9..24a1e8e65363f033835155becbdfd57186944bd9 100644 (file)
--- 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 4ad074cb43d403572e3c95c21b74a3bf98077de4..90ffc3b34a1f0f7f64557c1c9ecb80309663c377 100644 (file)
--- 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 57cc53b54383008f8edb50005d59c8ff8bf645ff..303a73ae3117b78af62045f5bf4d68fbaac780a2 100644 (file)
--- 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 b7b9cf1b56cf5bf0cfff7e5110dff000964f1d6f..93080786f8cd339c5ebbd6187722e728cf111862 100644 (file)
--- 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 3a7e9b3f27d51e1d4ee3a50b64929113d9adff54..583b34d90f969a8efc74d638b59b5535ac9d49ea 100644 (file)
--- 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 35bb9e8f69ddc38b8ae74b4afe584071f6377101..a6f241704d951988ba8318c054660445ded3e544 100644 (file)
--- 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 5eff860a46c1381bd193fbbef66f2fdd1bed37c0..6d3efcca2def03ee1670ede796d15f066b0eff57 100644 (file)
--- 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 0e8b18ddf298541d007d634cfb6106d65e9f4c5c..a9760b13e4e6599b2d82736d9aec7aee0cc84226 100644 (file)
--- 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 85059aa7ad8817c0e14f1c97713fa1e5404969ae..22d71f2cb19d3b7fc657e7dcb65528aa6176b2d7 100644 (file)
--- 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 703f41f10318fd8f3e2d97668aa9d39c08baa1fd..cdcd8d3ad715eb737ca394ae2d3e4abf59e51682 100644 (file)
--- 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 585029ff5a079025440dc48e03ab8dfe0bbe6ae7..e7fcee8194a4ff453e2edc5153959f0a9277ed59 100644 (file)
--- 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 c98eccc3f2ad54e2c2804478e5e084060c4baa27..c1bf7224ebb14d0483a6047a51b278c888f904e9 100644 (file)
--- 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 b53bfe8898fbebc0cde1f1477925810a62a6385b..df21a5b824bad0736579a9cc2408ae73b4b5f5c7 100644 (file)
--- 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 84306249160fd367487e8afbe9b128bd3545ab16..a89cf5cfaa492bebdc29ac4f110c0e7035839e21 100644 (file)
--- 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 55bc0ea7bf7f9e19d591307c60c1b90a373eb4ae..0bac668d4e65a9b5171c32209b6d49a247f56f2b 100644 (file)
--- 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 3217ae82eb1ea2f4cce77a1ab598ad3c81a10a62..22eb8632a0ca1dd0f7cac42b3034dbcdcc7fd17b 100644 (file)
--- 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 c26935becb04a2a89dedc4a661bbc3d9855e060f..c1d970c38461ad491ffc49c983cc0f267e791fb4 100644 (file)
--- 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 15424b56053643a5cf0a8b0488ea3b84123bfd72..7166ce6919c020dde8994ac7d4ef1b2cdafe3dc7 100644 (file)
--- 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 1f03d99e60f5031c7027a12a933624b448b9f6cd..ff9ddce147a0d1a2db4de0aa0ffeabb5a4125b12 100644 (file)
--- 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 56d98462d8e79337c995bcd1964741d8f95df637..42162d2d98a956d29a27747b893b4c926a77a2b7 100644 (file)
--- 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 7b43e6e459a9ee0fb693320fd39fe9cb34f14010..bec624a05b5525891c77694d5e1a0ccab9bb6f4d 100644 (file)
--- 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 e93feed412126634c6160fbb96b1609bae6bd789..fe65869e5a9b0ee4d3a5a8dfe0cd2f7b5a5ade4d 100644 (file)
--- 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 4ff1f5fe4e1074fc7ffc041de3ea8b2f4693ddf4..672dd65bc2e5c83bd258f7348bea04302e3b26c8 100644 (file)
--- 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 46c4cb5adf6406eeadd8b2cd91545156be307846..5e7c648d6e6b5582e3eb92be427cfaa93b0805d5 100644 (file)
--- 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 132b7249879abc78205cc9a0ef1fb29d06bbf4a5..abe91a070cb02aa48d41056d3f58ba0be1dbc5d2 100644 (file)
--- 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 d4ffe4b5bc4297a37e85366b34caec87bcd140a4..cc78cf0fc1f69a5d974ee4da1bd4d537cc0610bc 100644 (file)
--- 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 5ec6af144baa820439f665743bbbbd4245073930..ce6bd5ff366d54dbc56623b86b7cdb467e6a483d 100644 (file)
--- 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 0b56486936fa41c85bb92217c3b981446cf5f51d..7468df7c203fad1376489c9d9a220639d4f16002 100644 (file)
--- 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 44008de92fe0127c8887a93f00ad1c31ab835972..b99c3dc2e087c997bf470e3bd3da8dbbb61486d2 100644 (file)
--- 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 a7c1f0e7599959c729cf1b49de62fd12b1b95c80..51946a33e1244cd3b260dea09a581d2c03707b53 100644 (file)
--- 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 6de5313868c80ed1912b1337dda6c3bb43b69a69..7e52e79dde631862194c8ee334a5845e5ab370a6 100644 (file)
--- 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 20eb1b5455959a469fb1a81eeb90077c9fa1df45..6849590986ecebc20eadf8738600b7fe711d7e3d 100644 (file)
--- 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 1cbbcdb0cf14b8a71e0731df4266efd3f829c7ef..5c619e8f514a0d3a99431f62f6d9a314865bb5c1 100644 (file)
--- 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 091b7ddef1e9194bdd26421684dcc6710455ae35..4784df774a7b2489fe2915725d9ad702711b089d 100644 (file)
--- 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 8cbf49458f432f433aadb6bc136b6b376513c756..3f3c67d53e8712f9d1d95836c5ed1f7c7e2466de 100644 (file)
--- 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 2ea8b5b6ca570315ee2868ad7565c17a7fd961ed..911a8ede7d0aaf490f0b4f48dc0b84943ae9bdbf 100644 (file)
--- 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 f6ab44508200f719babca083579dcc0ad1ebb42b..b18c19db1168456dc8f214f95e049d58a604cb0b 100644 (file)
--- 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 dc2fc4ae79db7027ccd8d2f436e4175544879c2d..25a78a824436572439efd0f3c3eb6592a18c2517 100644 (file)
--- 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 811a44aef692bd7cbd6ae5e306d3a0d8ee038fc5..9df7af17aca90eac8459522163de9f2da11061b1 100644 (file)
--- 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 4395193d684030283c6f2abe9d50c0ffa6e820d3..ed6cd2f6369afd2572861853112225bba0a9636d 100644 (file)
--- 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 45f133738db0453f8da395c7eb915e7e6a98a121..b3dd50d6f738b3c7fbc3c83fe77a8f4b03656118 100644 (file)
--- 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 019a964cd1f67497566c1e784bec4add64a430f3..5a0fd669d500f1c8254255b90857655b3882b3e2 100644 (file)
--- 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
 {