From 8e3349a2bbc5dd3704a143fccc977be18ad02476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Herrera?= Date: Fri, 6 Mar 2026 13:36:44 +0100 Subject: [PATCH 6/6] remove nodes/tidbitmap.h from genam.h --- src/backend/executor/nodeBitmapIndexscan.c | 1 + src/backend/optimizer/path/costsize.c | 1 + src/include/access/genam.h | 4 ++-- src/include/access/gin_private.h | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index 058a59ef5e7..b3838ab60ef 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -26,6 +26,7 @@ #include "executor/nodeBitmapIndexscan.h" #include "executor/nodeIndexscan.h" #include "miscadmin.h" +#include "nodes/tidbitmap.h" /* ---------------------------------------------------------------- diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 89ca4e08bf1..56d45287c89 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -95,6 +95,7 @@ #include "miscadmin.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" +#include "nodes/tidbitmap.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/optimizer.h" diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 4c0429cc613..7b59cc44fde 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -18,7 +18,6 @@ #include "access/sdir.h" #include "access/skey.h" #include "executor/instrument_node.h" -#include "nodes/tidbitmap.h" #include "storage/buf.h" #include "storage/lockdefs.h" #include "utils/snapshot.h" @@ -26,7 +25,8 @@ /* We don't want this file to depend on execnodes.h. */ typedef struct IndexInfo IndexInfo; typedef struct TupleTableSlot TupleTableSlot; - +/* or tidbitmap.h */ +typedef struct TIDBitmap TIDBitmap; /* or relcache.h */ typedef struct RelationData *Relation; diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h index 7c3b4db94cd..4445d088fa0 100644 --- a/src/include/access/gin_private.h +++ b/src/include/access/gin_private.h @@ -19,6 +19,7 @@ #include "catalog/pg_am_d.h" #include "fmgr.h" #include "lib/rbtree.h" +#include "nodes/tidbitmap.h" #include "storage/bufmgr.h" /* -- 2.47.3