Commit57eebca

committed

Fix create_lateral_join_info to handle dead relations properly.

Commit0a48050 broke it.Report by Andreas Seltenreich. Fix by Ashutosh Bapat.Discussion:http://postgr.es/m/874ls2vrnx.fsf@ansel.ydns.eu

1 parent7f3a331 commit57eebcaCopy full SHA for 57eebca

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,11 @@ create_lateral_join_info(PlannerInfo *root)`
`632`	`632`	`RelOptInfo*brel=root->simple_rel_array[rti];`
`633`	`633`	`RangeTblEntry*brte=root->simple_rte_array[rti];`
`634`	`634`
`635`		`-if (brel==NULL)`
	`635`	`+/*`
	`636`	`+ * Skip empty slots. Also skip non-simple relations i.e. dead`
	`637`	`+ * relations.`
	`638`	`+ */`
	`639`	`+if (brel==NULL\|\| !IS_SIMPLE_REL(brel))`
`636`	`640`	`continue;`
`637`	`641`
`638`	`642`	`/*`
`@@ -644,7 +648,6 @@ create_lateral_join_info(PlannerInfo *root)`
`644`	`648`	`* therefore be marked with the appropriate lateral info so that those`
`645`	`649`	`* children eventually get marked also.`
`646`	`650`	`*/`
`647`		`-Assert(IS_SIMPLE_REL(brel));`
`648`	`651`	`Assert(brte);`
`649`	`652`	`if (brel->reloptkind==RELOPT_OTHER_MEMBER_REL&&`
`650`	`653`	`(brte->rtekind!=RTE_RELATION\|\|`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4060,6 +4060,18 @@ select i8.* from int8_tbl i8 left join (select f1 from int4_tbl group by f1) i4`
`4060`	`4060`	`Seq Scan on int8_tbl i8`
`4061`	`4061`	`(1 row)`
`4062`	`4062`
	`4063`	`+-- check join removal with lateral references`
	`4064`	`+explain (costs off)`
	`4065`	`+select 1 from (select a.id FROM a left join b on a.b_id = b.id) q,`
	`4066`	`+ lateral generate_series(1, q.id) gs(i) where q.id = gs.i;`
	`4067`	`+ QUERY PLAN`
	`4068`	`+-------------------------------------------`
	`4069`	`+ Nested Loop`
	`4070`	`+ -> Seq Scan on a`
	`4071`	`+ -> Function Scan on generate_series gs`
	`4072`	`+ Filter: (a.id = i)`
	`4073`	`+(4 rows)`
	`4074`	`+`
`4063`	`4075`	`rollback;`
`4064`	`4076`	`create temp table parent (k int primary key, pd int);`
`4065`	`4077`	`create temp table child (k int unique, cd int);`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1336,6 +1336,11 @@ explain (costs off)`
`1336`	`1336`	`select i8.*from int8_tbl i8left join (select f1from int4_tblgroup by f1) i4`
`1337`	`1337`	`oni8.q1=i4.f1;`
`1338`	`1338`
	`1339`	`+-- check join removal with lateral references`
	`1340`	`+explain (costs off)`
	`1341`	`+select1from (selecta.idFROM aleft join bona.b_id=b.id) q,`
	`1342`	`+ lateral generate_series(1,q.id) gs(i)whereq.id=gs.i;`
	`1343`	`+`
`1339`	`1344`	`rollback;`
`1340`	`1345`
`1341`	`1346`	`create temp table parent (kintprimary key, pdint);`

Comments

(0)