diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2023-02-08 14:08:46 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2023-02-08 14:08:46 -0500 |
| commit | 798c0176342150c8fe1404b0007b299db2e73ce0 (patch) | |
| tree | 3463c781263358e7ea19f6736ac784dfc0d81be0 /src/backend/optimizer/plan/analyzejoins.c | |
| parent | b7e84c65d5b2d694a669ae1db8ab1d6c51ef8596 (diff) | |
| download | postgresql-798c0176342150c8fe1404b0007b299db2e73ce0.tar.gz postgresql-798c0176342150c8fe1404b0007b299db2e73ce0.zip | |
remove_rel_from_query() must clean up PlaceHolderVar.phrels fields.
While we got away with this sloppiness before, it's not okay now
that fee7b77b9 caused build_joinrel_tlist() to make use of phrels.
Per report from Robins Tharakan.
Richard Guo (some cosmetic tweaks by me)
Discussion: https://postgr.es/m/CAMbWs4_ngw9sKxpTE8hqk=-ooVX_CQP3DarA4HzkRMz_JKpTrA@mail.gmail.com
Diffstat (limited to 'src/backend/optimizer/plan/analyzejoins.c')
| -rw-r--r-- | src/backend/optimizer/plan/analyzejoins.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c index 5bcf95cef3e..283539e53c4 100644 --- a/src/backend/optimizer/plan/analyzejoins.c +++ b/src/backend/optimizer/plan/analyzejoins.c @@ -316,12 +316,8 @@ join_is_removable(PlannerInfo *root, SpecialJoinInfo *sjinfo) * Remove the target relid from the planner's data structures, having * determined that there is no need to include it in the query. * - * We are not terribly thorough here. We must make sure that the rel is - * no longer treated as a baserel, and that attributes of other baserels - * are no longer marked as being needed at joins involving this rel. - * Also, join quals involving the rel have to be removed from the joininfo - * lists, but only if they belong to the outer join identified by ojrelid - * and joinrelids. + * We are not terribly thorough here. We only bother to update parts of + * the planner's data structures that will actually be consulted later. */ static void remove_rel_from_query(PlannerInfo *root, int relid, int ojrelid, @@ -429,11 +425,18 @@ remove_rel_from_query(PlannerInfo *root, int relid, int ojrelid, } else { + PlaceHolderVar *phv = phinfo->ph_var; + phinfo->ph_eval_at = bms_del_member(phinfo->ph_eval_at, relid); phinfo->ph_eval_at = bms_del_member(phinfo->ph_eval_at, ojrelid); - Assert(!bms_is_empty(phinfo->ph_eval_at)); + Assert(!bms_is_empty(phinfo->ph_eval_at)); /* checked previously */ phinfo->ph_needed = bms_del_member(phinfo->ph_needed, relid); phinfo->ph_needed = bms_del_member(phinfo->ph_needed, ojrelid); + /* ph_needed might or might not become empty */ + phv->phrels = bms_del_member(phv->phrels, relid); + phv->phrels = bms_del_member(phv->phrels, ojrelid); + Assert(!bms_is_empty(phv->phrels)); + Assert(phv->phnullingrels == NULL); /* no need to adjust */ } } |