diff options
Diffstat (limited to 'src/backend/optimizer/plan/analyzejoins.c')
| -rw-r--r-- | src/backend/optimizer/plan/analyzejoins.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c index 129fc3dfae6..6b967df3779 100644 --- a/src/backend/optimizer/plan/analyzejoins.c +++ b/src/backend/optimizer/plan/analyzejoins.c @@ -382,16 +382,24 @@ remove_rel_from_query(PlannerInfo *root, int relid, Relids joinrelids) } /* - * Likewise remove references from PlaceHolderVar data structures. + * Likewise remove references from PlaceHolderVar data structures, + * removing any no-longer-needed placeholders entirely. */ - foreach(l, root->placeholder_list) + for (l = list_head(root->placeholder_list); l != NULL; l = nextl) { PlaceHolderInfo *phinfo = (PlaceHolderInfo *) lfirst(l); - phinfo->ph_eval_at = bms_del_member(phinfo->ph_eval_at, relid); - Assert(!bms_is_empty(phinfo->ph_eval_at)); - Assert(!bms_is_member(relid, phinfo->ph_lateral)); - phinfo->ph_needed = bms_del_member(phinfo->ph_needed, relid); + nextl = lnext(l); + if (bms_is_subset(phinfo->ph_needed, joinrelids)) + root->placeholder_list = list_delete_ptr(root->placeholder_list, + phinfo); + else + { + phinfo->ph_eval_at = bms_del_member(phinfo->ph_eval_at, relid); + Assert(!bms_is_empty(phinfo->ph_eval_at)); + Assert(!bms_is_member(relid, phinfo->ph_lateral)); + phinfo->ph_needed = bms_del_member(phinfo->ph_needed, relid); + } } /* |