Commita7928a5

committed

Replace the relid in some missing fields during SJE

1 parent9a17be1 commita7928a5Copy full SHA for a7928a5

File tree

+24

-1

lines changed

+24

-1

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1866,6 +1866,8 @@ remove_self_join_rel(PlannerInfo root, PlanRowMark kmark, PlanRowMark *rmark,`
`1866`	`1866`	`/* Replace varno in all the query structures */`
`1867`	`1867`	`query_tree_walker(root->parse,replace_varno_walker,&ctx,`
`1868`	`1868`	`QTW_EXAMINE_SORTGROUP);`
	`1869`	`+if (root->parse->resultRelation==toRemove->relid)`
	`1870`	`+root->parse->resultRelation=toKeep->relid;`
`1869`	`1871`
`1870`	`1872`	`/* Replace links in the planner info */`
`1871`	`1873`	`remove_rel_from_query(root,toRemove,toKeep->relid,NULL,NULL);`
`@@ -1875,6 +1877,9 @@ remove_self_join_rel(PlannerInfo root, PlanRowMark kmark, PlanRowMark *rmark,`
`1875`	`1877`	`toRemove->relid,toKeep->relid);`
`1876`	`1878`	`replace_varno((Node*)root->processed_groupClause,`
`1877`	`1879`	`toRemove->relid,toKeep->relid);`
	`1880`	`+replace_relid(root->all_result_relids,toRemove->relid,toKeep->relid);`
	`1881`	`+replace_relid(root->leaf_result_relids,toRemove->relid,toKeep->relid);`
	`1882`	`+`
`1878`	`1883`
`1879`	`1884`	`/*`
`1880`	`1885`	`* There may be references to the rel in root->fkey_list, but if so,`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6868,6 +6868,18 @@ select * from emp1 t1`
`6868`	`6868`	`-> Seq Scan on emp1 t3`
`6869`	`6869`	`(6 rows)`
`6870`	`6870`
	`6871`	`+-- Check that SJE replaces target relation correctly`
	`6872`	`+explain (costs off)`
	`6873`	`+WITH t1 AS (SELECT * FROM emp1)`
	`6874`	`+UPDATE emp1 SET code = t1.code + 1 FROM t1`
	`6875`	`+WHERE t1.id = emp1.id RETURNING emp1.id, emp1.code;`
	`6876`	`+ QUERY PLAN`
	`6877`	`+----------------------------------`
	`6878`	`+ Update on emp1`
	`6879`	`+ -> Seq Scan on emp1`
	`6880`	`+ Filter: (id IS NOT NULL)`
	`6881`	`+(3 rows)`
	`6882`	`+`
`6871`	`6883`	`-- We can remove the join even if we find the join can't duplicate rows and`
`6872`	`6884`	`-- the base quals of each side are different. In the following case we end up`
`6873`	`6885`	`-- moving quals over to s1 to make it so it can't match any rows.`
`@@ -7030,7 +7042,7 @@ EXPLAIN (COSTS OFF) -- A RowMark exists for the table being kept`
`7030`	`7042`	`UPDATE sj sq SET b = 1 FROM sj as sz WHERE sq.a = sz.a;`
`7031`	`7043`	`QUERY PLAN`
`7032`	`7044`	`---------------------------------`
`7033`		`- Update on sjsq`
	`7045`	`+ Update on sjsz`
`7034`	`7046`	`-> Seq Scan on sj sz`
`7035`	`7047`	`Filter: (a IS NOT NULL)`
`7036`	`7048`	`(3 rows)`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2616,6 +2616,12 @@ select * from emp1 t1`
`2616`	`2616`	`inner join emp1 t2ont1.id=t2.id`
`2617`	`2617`	`left join emp1 t3ont1.id>1andt1.id<2;`
`2618`	`2618`
	`2619`	`+-- Check that SJE replaces target relation correctly`
	`2620`	`+explain (costs off)`
	`2621`	`+WITH t1AS (SELECT*FROM emp1)`
	`2622`	`+UPDATE emp1SET code=t1.code+1FROM t1`
	`2623`	`+WHEREt1.id=emp1.id RETURNINGemp1.id,emp1.code;`
	`2624`	`+`
`2619`	`2625`	`-- We can remove the join even if we find the join can't duplicate rows and`
`2620`	`2626`	`-- the base quals of each side are different. In the following case we end up`
`2621`	`2627`	`-- moving quals over to s1 to make it so it can't match any rows.`

Comments

(0)