diff options
| -rw-r--r-- | src/backend/optimizer/plan/analyzejoins.c | 20 | ||||
| -rw-r--r-- | src/test/regress/expected/join.out | 16 | ||||
| -rw-r--r-- | src/test/regress/sql/join.sql | 15 |
3 files changed, 45 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); + } } /* diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index 6c3d8fd7a04..68e688b9d3c 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -3744,6 +3744,22 @@ SELECT * FROM (5 rows) rollback; +-- another join removal bug: we must clean up correctly when removing a PHV +begin; +create temp table uniquetbl (f1 text unique); +explain (costs off) +select t1.* from + uniquetbl as t1 + left join (select *, '***'::text as d1 from uniquetbl) t2 + on t1.f1 = t2.f1 + left join uniquetbl t3 + on t2.d1 = t3.f1; + QUERY PLAN +-------------------------- + Seq Scan on uniquetbl t1 +(1 row) + +rollback; -- bug #8444: we've historically allowed duplicate aliases within aliased JOINs select * from int8_tbl x join (int4_tbl x cross join int4_tbl y) j on q1 = f1; -- error diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql index 992e673c12e..402ba61eac7 100644 --- a/src/test/regress/sql/join.sql +++ b/src/test/regress/sql/join.sql @@ -1196,6 +1196,21 @@ SELECT * FROM rollback; +-- another join removal bug: we must clean up correctly when removing a PHV +begin; + +create temp table uniquetbl (f1 text unique); + +explain (costs off) +select t1.* from + uniquetbl as t1 + left join (select *, '***'::text as d1 from uniquetbl) t2 + on t1.f1 = t2.f1 + left join uniquetbl t3 + on t2.d1 = t3.f1; + +rollback; + -- bug #8444: we've historically allowed duplicate aliases within aliased JOINs select * from |