From 500d8884e6e408b7f781e908826639cb8aaf134c Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Fri, 13 Mar 2026 10:14:53 -0400 Subject: [PATCH v2 03/17] remove attmap.h from index.h --- src/include/catalog/index.h | 7 ++++++- src/backend/catalog/index.c | 1 + src/backend/commands/indexcmds.c | 1 + src/backend/optimizer/plan/initsplan.c | 1 + src/backend/optimizer/prep/preptlist.c | 1 + src/backend/optimizer/util/appendinfo.c | 1 + src/backend/parser/parse_utilcmd.c | 1 + 7 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index e475e278aa8..36b70689254 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -14,11 +14,16 @@ #ifndef INDEX_H #define INDEX_H -#include "access/attmap.h" #include "catalog/objectaddress.h" #include "nodes/execnodes.h" +/* + * forward references in this file + */ +typedef struct AttrMap AttrMap; + + #define DEFAULT_INDEX_TYPE "btree" /* Action code for index_set_state_flags */ diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 5ee6389d39c..836d76ae474 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -24,6 +24,7 @@ #include #include "access/amapi.h" +#include "access/attmap.h" #include "access/heapam.h" #include "access/multixact.h" #include "access/relscan.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 635679cc1f2..cbd76066f74 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -16,6 +16,7 @@ #include "postgres.h" #include "access/amapi.h" +#include "access/attmap.h" #include "access/gist.h" #include "access/heapam.h" #include "access/htup_details.h" 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/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index cc244c49e9e..9a918e14aa7 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -23,6 +23,7 @@ #include "postgres.h" #include "access/amapi.h" +#include "access/attmap.h" #include "access/htup_details.h" #include "access/relation.h" #include "access/reloptions.h" -- 2.53.0.1.gb2826b52eb