From 264560b908cea9c974d3d13f76c0059b89c634aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Herrera?= Date: Fri, 6 Mar 2026 13:18:26 +0100 Subject: [PATCH 4/6] don't include tuptable.h in execnodes.h --- src/backend/optimizer/plan/initsplan.c | 1 + src/backend/optimizer/prep/preptlist.c | 1 + src/backend/optimizer/util/appendinfo.c | 1 + src/include/nodes/execnodes.h | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 9aaf1c4e5ca..c20e7e49780 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -15,6 +15,7 @@ #include "postgres.h" #include "access/nbtree.h" +#include "access/sysattr.h" #include "catalog/pg_constraint.h" #include "catalog/pg_type.h" #include "nodes/makefuncs.h" diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index bd16d197d4f..1647066a13d 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -36,6 +36,7 @@ #include "postgres.h" +#include "access/sysattr.h" #include "access/table.h" #include "catalog/pg_type_d.h" #include "nodes/makefuncs.h" diff --git a/src/backend/optimizer/util/appendinfo.c b/src/backend/optimizer/util/appendinfo.c index eadecd0bb92..778e4662f6e 100644 --- a/src/backend/optimizer/util/appendinfo.c +++ b/src/backend/optimizer/util/appendinfo.c @@ -15,6 +15,7 @@ #include "postgres.h" #include "access/htup_details.h" +#include "access/sysattr.h" #include "access/table.h" #include "foreign/fdwapi.h" #include "nodes/makefuncs.h" diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index b0c65172a2c..82bd5dcb683 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -29,10 +29,10 @@ #ifndef EXECNODES_H #define EXECNODES_H +#include "access/htup.h" #include "access/skey.h" #include "executor/instrument.h" #include "executor/instrument_node.h" -#include "executor/tuptable.h" #include "fmgr.h" #include "lib/ilist.h" #include "lib/pairingheap.h" @@ -41,6 +41,7 @@ #include "nodes/plannodes.h" #include "nodes/tidbitmap.h" #include "partitioning/partdefs.h" +#include "storage/buf.h" #include "storage/condition_variable.h" #include "utils/hsearch.h" #include "utils/queryenvironment.h" @@ -58,6 +59,8 @@ typedef struct ExprContext ExprContext; typedef struct Tuplesortstate Tuplesortstate; typedef struct Tuplestorestate Tuplestorestate; typedef struct TupleConversionMap TupleConversionMap; +typedef struct TupleTableSlot TupleTableSlot; +typedef struct TupleTableSlotOps TupleTableSlotOps; /* ---------------- -- 2.47.3