From 96f690abe32900bfeeb50bfe52eda63e52baab98 Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Wed, 23 Sep 2026 17:15:51 -0400 Subject: [PATCH v3 2/2] Use typed foreach macros for planner relation lists Use foreach_int() and foreach_node() when building the result-relation and row-mark bitmapsets in standard_planner(). This avoids manual ListCell extraction and removes an unnecessary iterator declaration. Suggested-by: David Rowley Discussion: https://postgr.es/m/CAApHDvq_R-gNXu%2B06GQW6w_HaEMh1pezsyiCh7GNhgh%2Bh0UqMw%40mail.gmail.com --- src/backend/optimizer/plan/planner.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 55a35aa3397..3580bbc21b4 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -364,8 +364,7 @@ standard_planner(Query *parse, const char *query_string, int cursorOptions, Path *best_path; Plan *top_plan; ListCell *lp, - *lr, - *lc; + *lr; /* * Set up global state for this planner invocation. This data is needed @@ -689,12 +688,12 @@ standard_planner(Query *parse, const char *query_string, int cursorOptions, * Compute resultRelationRelids and rowMarkRelids from resultRelations and * rowMarks. These can be used for cheap membership checks. */ - foreach(lc, glob->resultRelations) + foreach_int(rti, glob->resultRelations) result->resultRelationRelids = bms_add_member(result->resultRelationRelids, - lfirst_int(lc)); - foreach(lc, glob->finalrowmarks) + rti); + foreach_node(PlanRowMark, rowmark, glob->finalrowmarks) result->rowMarkRelids = bms_add_member(result->rowMarkRelids, - ((PlanRowMark *) lfirst(lc))->rti); + rowmark->rti); result->relationOids = glob->relationOids; result->invalItems = glob->invalItems; -- 2.43.0