aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/executor')
-rw-r--r--src/backend/executor/execAmi.c4
-rw-r--r--src/backend/executor/execExpr.c1
-rw-r--r--src/backend/executor/execExprInterp.c1
-rw-r--r--src/backend/executor/execGrouping.c1
-rw-r--r--src/backend/executor/execMain.c13
-rw-r--r--src/backend/executor/execParallel.c2
-rw-r--r--src/backend/executor/execPartition.c3
-rw-r--r--src/backend/executor/execReplication.c6
-rw-r--r--src/backend/executor/execSRF.c1
-rw-r--r--src/backend/executor/execScan.c1
-rw-r--r--src/backend/executor/execUtils.c5
-rw-r--r--src/backend/executor/nodeAgg.c1
-rw-r--r--src/backend/executor/nodeAppend.c2
-rw-r--r--src/backend/executor/nodeBitmapAnd.c2
-rw-r--r--src/backend/executor/nodeBitmapHeapscan.c5
-rw-r--r--src/backend/executor/nodeBitmapIndexscan.c3
-rw-r--r--src/backend/executor/nodeBitmapOr.c2
-rw-r--r--src/backend/executor/nodeCtescan.c2
-rw-r--r--src/backend/executor/nodeCustom.c3
-rw-r--r--src/backend/executor/nodeForeignscan.c1
-rw-r--r--src/backend/executor/nodeFunctionscan.c1
-rw-r--r--src/backend/executor/nodeGather.c9
-rw-r--r--src/backend/executor/nodeGatherMerge.c7
-rw-r--r--src/backend/executor/nodeGroup.c1
-rw-r--r--src/backend/executor/nodeHash.c5
-rw-r--r--src/backend/executor/nodeHashjoin.c3
-rw-r--r--src/backend/executor/nodeIncrementalSort.c1
-rw-r--r--src/backend/executor/nodeIndexonlyscan.c3
-rw-r--r--src/backend/executor/nodeIndexscan.c3
-rw-r--r--src/backend/executor/nodeLimit.c1
-rw-r--r--src/backend/executor/nodeMergeAppend.c2
-rw-r--r--src/backend/executor/nodeMergejoin.c1
-rw-r--r--src/backend/executor/nodeModifyTable.c5
-rw-r--r--src/backend/executor/nodeNamedtuplestorescan.c3
-rw-r--r--src/backend/executor/nodeNestloop.c1
-rw-r--r--src/backend/executor/nodeProjectSet.c1
-rw-r--r--src/backend/executor/nodeRecursiveunion.c2
-rw-r--r--src/backend/executor/nodeResult.c1
-rw-r--r--src/backend/executor/nodeSamplescan.c6
-rw-r--r--src/backend/executor/nodeSeqscan.c2
-rw-r--r--src/backend/executor/nodeSubqueryscan.c2
-rw-r--r--src/backend/executor/nodeTidrangescan.c3
-rw-r--r--src/backend/executor/nodeTidscan.c3
-rw-r--r--src/backend/executor/nodeUnique.c1
-rw-r--r--src/backend/executor/nodeWorktablescan.c2
-rw-r--r--src/backend/executor/spi.c1
46 files changed, 27 insertions, 102 deletions
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index a33696efc5d..3289e3e0219 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -14,7 +14,7 @@
#include "access/amapi.h"
#include "access/htup_details.h"
-#include "executor/execdebug.h"
+#include "catalog/pg_class.h"
#include "executor/nodeAgg.h"
#include "executor/nodeAppend.h"
#include "executor/nodeBitmapAnd.h"
@@ -59,9 +59,7 @@
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
#include "nodes/extensible.h"
-#include "nodes/nodeFuncs.h"
#include "nodes/pathnodes.h"
-#include "utils/rel.h"
#include "utils/syscache.h"
static bool IndexSupportsBackwardScan(Oid indexid);
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
index 3181b1136a2..ffd3ca4e619 100644
--- a/src/backend/executor/execExpr.c
+++ b/src/backend/executor/execExpr.c
@@ -47,7 +47,6 @@
#include "utils/acl.h"
#include "utils/array.h"
#include "utils/builtins.h"
-#include "utils/datum.h"
#include "utils/jsonfuncs.h"
#include "utils/lsyscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index 3f20f1dd314..7c1f51e2e0a 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -65,7 +65,6 @@
#include "miscadmin.h"
#include "nodes/miscnodes.h"
#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "pgstat.h"
#include "utils/array.h"
#include "utils/builtins.h"
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index dca8b3d1aaa..7233f1e3c03 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -19,7 +19,6 @@
#include "executor/executor.h"
#include "miscadmin.h"
#include "utils/lsyscache.h"
-#include "utils/memutils.h"
static int TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tuple1, const MinimalTuple tuple2);
static inline uint32 TupleHashTableHash_internal(struct tuplehash_hash *tb,
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 79ef46f2614..940499cc61a 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -37,36 +37,27 @@
*/
#include "postgres.h"
-#include "access/heapam.h"
-#include "access/htup_details.h"
#include "access/sysattr.h"
+#include "access/table.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/xact.h"
#include "catalog/namespace.h"
#include "catalog/partition.h"
-#include "catalog/pg_publication.h"
#include "commands/matview.h"
#include "commands/trigger.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeSubplan.h"
#include "foreign/fdwapi.h"
-#include "jit/jit.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
#include "parser/parse_relation.h"
-#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
#include "tcop/utility.h"
#include "utils/acl.h"
#include "utils/backend_status.h"
#include "utils/lsyscache.h"
-#include "utils/memutils.h"
#include "utils/partcache.h"
#include "utils/rls.h"
-#include "utils/ruleutils.h"
#include "utils/snapmgr.h"
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 540f8d21fd4..3f84c002dc1 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -43,12 +43,10 @@
#include "jit/jit.h"
#include "nodes/nodeFuncs.h"
#include "pgstat.h"
-#include "storage/spin.h"
#include "tcop/tcopprot.h"
#include "utils/datum.h"
#include "utils/dsa.h"
#include "utils/lsyscache.h"
-#include "utils/memutils.h"
#include "utils/snapmgr.h"
/*
diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c
index 429f0a8dd98..8ca512db186 100644
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@ -16,15 +16,12 @@
#include "access/table.h"
#include "access/tableam.h"
#include "catalog/partition.h"
-#include "catalog/pg_inherits.h"
-#include "catalog/pg_type.h"
#include "executor/execPartition.h"
#include "executor/executor.h"
#include "executor/nodeModifyTable.h"
#include "foreign/fdwapi.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "partitioning/partbounds.h"
#include "partitioning/partdesc.h"
#include "partitioning/partprune.h"
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index ff8a7f77f5d..d0a89cd5778 100644
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -23,16 +23,10 @@
#include "commands/trigger.h"
#include "executor/executor.h"
#include "executor/nodeModifyTable.h"
-#include "nodes/nodeFuncs.h"
-#include "parser/parse_relation.h"
-#include "parser/parsetree.h"
#include "replication/logicalrelation.h"
-#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/builtins.h"
-#include "utils/datum.h"
#include "utils/lsyscache.h"
-#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
diff --git a/src/backend/executor/execSRF.c b/src/backend/executor/execSRF.c
index f38fb824096..862d3085f83 100644
--- a/src/backend/executor/execSRF.c
+++ b/src/backend/executor/execSRF.c
@@ -21,7 +21,6 @@
#include "access/htup_details.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_proc.h"
-#include "executor/execdebug.h"
#include "funcapi.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index bf4d4133c5e..f52e28c58e9 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -20,7 +20,6 @@
#include "executor/executor.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index cff5dc723e1..5737f9f4ebd 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -46,18 +46,13 @@
#include "postgres.h"
#include "access/parallel.h"
-#include "access/relscan.h"
#include "access/table.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "executor/executor.h"
-#include "executor/execPartition.h"
#include "executor/nodeModifyTable.h"
#include "jit/jit.h"
#include "mb/pg_wchar.h"
#include "miscadmin.h"
-#include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
#include "parser/parse_relation.h"
#include "partitioning/partdesc.h"
#include "storage/lmgr.h"
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index dbd5661d170..53ead77ece8 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -260,7 +260,6 @@
#include "executor/nodeAgg.h"
#include "lib/hyperloglog.h"
#include "miscadmin.h"
-#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "parser/parse_agg.h"
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index c7059e75280..ca0f54d676f 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -58,8 +58,8 @@
#include "postgres.h"
#include "executor/execAsync.h"
-#include "executor/execdebug.h"
#include "executor/execPartition.h"
+#include "executor/executor.h"
#include "executor/nodeAppend.h"
#include "miscadmin.h"
#include "pgstat.h"
diff --git a/src/backend/executor/nodeBitmapAnd.c b/src/backend/executor/nodeBitmapAnd.c
index 4adf62dcd0d..9c9c6668721 100644
--- a/src/backend/executor/nodeBitmapAnd.c
+++ b/src/backend/executor/nodeBitmapAnd.c
@@ -28,7 +28,7 @@
#include "postgres.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeBitmapAnd.h"
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index c1e81ebed63..345b67649ea 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -39,15 +39,12 @@
#include "access/relscan.h"
#include "access/tableam.h"
-#include "access/transam.h"
#include "access/visibilitymap.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeBitmapHeapscan.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bufmgr.h"
-#include "storage/predicate.h"
-#include "utils/memutils.h"
#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/spccache.h"
diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c
index 83aaf88de87..6df8e17ec84 100644
--- a/src/backend/executor/nodeBitmapIndexscan.c
+++ b/src/backend/executor/nodeBitmapIndexscan.c
@@ -22,11 +22,10 @@
#include "postgres.h"
#include "access/genam.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeBitmapIndexscan.h"
#include "executor/nodeIndexscan.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
/* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeBitmapOr.c b/src/backend/executor/nodeBitmapOr.c
index 24a1d84a34a..7029536c643 100644
--- a/src/backend/executor/nodeBitmapOr.c
+++ b/src/backend/executor/nodeBitmapOr.c
@@ -28,7 +28,7 @@
#include "postgres.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeBitmapOr.h"
#include "miscadmin.h"
diff --git a/src/backend/executor/nodeCtescan.c b/src/backend/executor/nodeCtescan.c
index 1000fdcf2aa..8081eed887b 100644
--- a/src/backend/executor/nodeCtescan.c
+++ b/src/backend/executor/nodeCtescan.c
@@ -15,7 +15,7 @@
#include "postgres.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeCtescan.h"
#include "miscadmin.h"
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index 745ae27770f..e559cd23464 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -17,9 +17,6 @@
#include "nodes/execnodes.h"
#include "nodes/extensible.h"
#include "nodes/plannodes.h"
-#include "parser/parsetree.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/rel.h"
static TupleTableSlot *ExecCustomScan(PlanState *pstate);
diff --git a/src/backend/executor/nodeForeignscan.c b/src/backend/executor/nodeForeignscan.c
index 3622c010fe7..fe4ae55c0f6 100644
--- a/src/backend/executor/nodeForeignscan.c
+++ b/src/backend/executor/nodeForeignscan.c
@@ -25,7 +25,6 @@
#include "executor/executor.h"
#include "executor/nodeForeignscan.h"
#include "foreign/fdwapi.h"
-#include "utils/memutils.h"
#include "utils/rel.h"
static TupleTableSlot *ForeignNext(ForeignScanState *node);
diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
index 4ee8f51f734..3cc37f2177f 100644
--- a/src/backend/executor/nodeFunctionscan.c
+++ b/src/backend/executor/nodeFunctionscan.c
@@ -26,7 +26,6 @@
#include "executor/nodeFunctionscan.h"
#include "funcapi.h"
#include "nodes/nodeFuncs.h"
-#include "utils/builtins.h"
#include "utils/memutils.h"
diff --git a/src/backend/executor/nodeGather.c b/src/backend/executor/nodeGather.c
index 7b6ced98061..5d4ffe989cb 100644
--- a/src/backend/executor/nodeGather.c
+++ b/src/backend/executor/nodeGather.c
@@ -30,18 +30,13 @@
#include "postgres.h"
-#include "access/relscan.h"
-#include "access/xact.h"
-#include "executor/execdebug.h"
#include "executor/execParallel.h"
+#include "executor/executor.h"
#include "executor/nodeGather.h"
-#include "executor/nodeSubplan.h"
#include "executor/tqueue.h"
#include "miscadmin.h"
#include "optimizer/optimizer.h"
-#include "pgstat.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
+#include "utils/wait_event.h"
static TupleTableSlot *ExecGather(PlanState *pstate);
diff --git a/src/backend/executor/nodeGatherMerge.c b/src/backend/executor/nodeGatherMerge.c
index 2d552f42240..45f6017c29e 100644
--- a/src/backend/executor/nodeGatherMerge.c
+++ b/src/backend/executor/nodeGatherMerge.c
@@ -14,18 +14,13 @@
#include "postgres.h"
-#include "access/relscan.h"
-#include "access/xact.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/execParallel.h"
#include "executor/nodeGatherMerge.h"
-#include "executor/nodeSubplan.h"
#include "executor/tqueue.h"
#include "lib/binaryheap.h"
#include "miscadmin.h"
#include "optimizer/optimizer.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
/*
* When we read tuples from workers, it's a good idea to read several at once
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index 1aa3fc29244..da32bec1811 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -25,7 +25,6 @@
#include "executor/executor.h"
#include "executor/nodeGroup.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
/*
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index f90e16ede8a..61480733a12 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -30,19 +30,18 @@
#include "access/parallel.h"
#include "catalog/pg_statistic.h"
#include "commands/tablespace.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/hashjoin.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "miscadmin.h"
-#include "pgstat.h"
#include "port/atomics.h"
#include "port/pg_bitutils.h"
#include "utils/dynahash.h"
-#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/syscache.h"
+#include "utils/wait_event.h"
static void ExecHashIncreaseNumBatches(HashJoinTable hashtable);
static void ExecHashIncreaseNumBuckets(HashJoinTable hashtable);
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 1cbec4647c3..dbf114cd5eb 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -169,9 +169,8 @@
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "miscadmin.h"
-#include "pgstat.h"
-#include "utils/memutils.h"
#include "utils/sharedtuplestore.h"
+#include "utils/wait_event.h"
/*
diff --git a/src/backend/executor/nodeIncrementalSort.c b/src/backend/executor/nodeIncrementalSort.c
index ba5d7bd2f38..2ce5ed5ec8c 100644
--- a/src/backend/executor/nodeIncrementalSort.c
+++ b/src/backend/executor/nodeIncrementalSort.c
@@ -78,7 +78,6 @@
#include "postgres.h"
-#include "access/htup_details.h"
#include "executor/execdebug.h"
#include "executor/nodeIncrementalSort.h"
#include "miscadmin.h"
diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c
index 2c2c9c10b57..9e35aaf56e5 100644
--- a/src/backend/executor/nodeIndexonlyscan.c
+++ b/src/backend/executor/nodeIndexonlyscan.c
@@ -35,13 +35,12 @@
#include "access/tableam.h"
#include "access/tupdesc.h"
#include "access/visibilitymap.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeIndexonlyscan.h"
#include "executor/nodeIndexscan.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "storage/predicate.h"
-#include "utils/memutils.h"
#include "utils/rel.h"
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 03142b4a946..2a3264599d2 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -33,7 +33,7 @@
#include "access/relscan.h"
#include "access/tableam.h"
#include "catalog/pg_am.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeIndexscan.h"
#include "lib/pairingheap.h"
#include "miscadmin.h"
@@ -41,7 +41,6 @@
#include "utils/array.h"
#include "utils/datum.h"
#include "utils/lsyscache.h"
-#include "utils/memutils.h"
#include "utils/rel.h"
/*
diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c
index ab274c7e113..e6f1fb15629 100644
--- a/src/backend/executor/nodeLimit.c
+++ b/src/backend/executor/nodeLimit.c
@@ -24,7 +24,6 @@
#include "executor/executor.h"
#include "executor/nodeLimit.h"
#include "miscadmin.h"
-#include "nodes/nodeFuncs.h"
static void recompute_limits(LimitState *node);
static int64 compute_tuples_needed(LimitState *node);
diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c
index 08178684528..e1b9b984a7a 100644
--- a/src/backend/executor/nodeMergeAppend.c
+++ b/src/backend/executor/nodeMergeAppend.c
@@ -38,7 +38,7 @@
#include "postgres.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/execPartition.h"
#include "executor/nodeMergeAppend.h"
#include "lib/binaryheap.h"
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index c1a8ca24641..4fb34e35371 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -97,7 +97,6 @@
#include "executor/nodeMergejoin.h"
#include "miscadmin.h"
#include "utils/lsyscache.h"
-#include "utils/memutils.h"
/*
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index ff7ec8419bb..fcb6133e945 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -42,11 +42,9 @@
#include "postgres.h"
-#include "access/heapam.h"
#include "access/htup_details.h"
#include "access/tableam.h"
#include "access/xact.h"
-#include "catalog/catalog.h"
#include "commands/trigger.h"
#include "executor/execPartition.h"
#include "executor/executor.h"
@@ -56,12 +54,11 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/optimizer.h"
#include "rewrite/rewriteHandler.h"
-#include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/datum.h"
-#include "utils/memutils.h"
#include "utils/rel.h"
+#include "utils/snapmgr.h"
typedef struct MTTargetRelLookup
diff --git a/src/backend/executor/nodeNamedtuplestorescan.c b/src/backend/executor/nodeNamedtuplestorescan.c
index e3f854e03fb..580f235248b 100644
--- a/src/backend/executor/nodeNamedtuplestorescan.c
+++ b/src/backend/executor/nodeNamedtuplestorescan.c
@@ -15,9 +15,8 @@
#include "postgres.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeNamedtuplestorescan.h"
-#include "miscadmin.h"
#include "utils/queryenvironment.h"
static TupleTableSlot *NamedTuplestoreScanNext(NamedTuplestoreScanState *node);
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index 06fa0a9b31b..7f4bf6c4dbb 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -24,7 +24,6 @@
#include "executor/execdebug.h"
#include "executor/nodeNestloop.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
/* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeProjectSet.c b/src/backend/executor/nodeProjectSet.c
index 4ee42fe066b..e4837300152 100644
--- a/src/backend/executor/nodeProjectSet.c
+++ b/src/backend/executor/nodeProjectSet.c
@@ -26,7 +26,6 @@
#include "executor/nodeProjectSet.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
-#include "utils/memutils.h"
static TupleTableSlot *ExecProjectSRF(ProjectSetState *node, bool continuing);
diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c
index 59270f42edf..c7f8a19fa44 100644
--- a/src/backend/executor/nodeRecursiveunion.c
+++ b/src/backend/executor/nodeRecursiveunion.c
@@ -18,7 +18,7 @@
*/
#include "postgres.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeRecursiveunion.h"
#include "miscadmin.h"
#include "utils/memutils.h"
diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c
index 73ec80f7261..348361e7f44 100644
--- a/src/backend/executor/nodeResult.c
+++ b/src/backend/executor/nodeResult.c
@@ -48,7 +48,6 @@
#include "executor/executor.h"
#include "executor/nodeResult.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
/* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeSamplescan.c b/src/backend/executor/nodeSamplescan.c
index a41b41ae673..714b076e646 100644
--- a/src/backend/executor/nodeSamplescan.c
+++ b/src/backend/executor/nodeSamplescan.c
@@ -20,11 +20,7 @@
#include "common/pg_prng.h"
#include "executor/executor.h"
#include "executor/nodeSamplescan.h"
-#include "miscadmin.h"
-#include "pgstat.h"
-#include "storage/bufmgr.h"
-#include "storage/predicate.h"
-#include "utils/builtins.h"
+#include "utils/fmgrprotos.h"
#include "utils/rel.h"
static TupleTableSlot *SampleNext(SampleScanState *node);
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index ac7fb8283b9..7cb12a11c2d 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -29,7 +29,7 @@
#include "access/relscan.h"
#include "access/tableam.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeSeqscan.h"
#include "utils/rel.h"
diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c
index 7de1595ed8e..782097eaf29 100644
--- a/src/backend/executor/nodeSubqueryscan.c
+++ b/src/backend/executor/nodeSubqueryscan.c
@@ -27,7 +27,7 @@
*/
#include "postgres.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeSubqueryscan.h"
static TupleTableSlot *SubqueryNext(SubqueryScanState *node);
diff --git a/src/backend/executor/nodeTidrangescan.c b/src/backend/executor/nodeTidrangescan.c
index 56090fdc8a8..9aa7683d7e3 100644
--- a/src/backend/executor/nodeTidrangescan.c
+++ b/src/backend/executor/nodeTidrangescan.c
@@ -18,10 +18,9 @@
#include "access/sysattr.h"
#include "access/tableam.h"
#include "catalog/pg_operator.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeTidrangescan.h"
#include "nodes/nodeFuncs.h"
-#include "storage/bufmgr.h"
#include "utils/rel.h"
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index 00899a914fa..864a9013b62 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -25,12 +25,11 @@
#include "access/sysattr.h"
#include "access/tableam.h"
#include "catalog/pg_type.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeTidscan.h"
#include "lib/qunique.h"
#include "miscadmin.h"
#include "nodes/nodeFuncs.h"
-#include "storage/bufmgr.h"
#include "utils/array.h"
#include "utils/rel.h"
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index a90529cb086..a125923e935 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -36,7 +36,6 @@
#include "executor/executor.h"
#include "executor/nodeUnique.h"
#include "miscadmin.h"
-#include "utils/memutils.h"
/* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeWorktablescan.c b/src/backend/executor/nodeWorktablescan.c
index 72389256c04..3f883d8ff66 100644
--- a/src/backend/executor/nodeWorktablescan.c
+++ b/src/backend/executor/nodeWorktablescan.c
@@ -15,7 +15,7 @@
#include "postgres.h"
-#include "executor/execdebug.h"
+#include "executor/executor.h"
#include "executor/nodeWorktablescan.h"
static TupleTableSlot *WorkTableScanNext(WorkTableScanState *node);
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index d71484c0b8b..85857715bd8 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -23,7 +23,6 @@
#include "commands/trigger.h"
#include "executor/executor.h"
#include "executor/spi_priv.h"
-#include "miscadmin.h"
#include "tcop/pquery.h"
#include "tcop/utility.h"
#include "utils/builtins.h"