mirror of
https://github.com/postgres/postgres.git
synced 2025-08-24 09:27:52 +03:00
Fix another cause of "wrong varnullingrels" planner failures.
I removed the delay_upper_joins mechanism in commit b448f1c8d
,
reasoning that it was only needed when we have a single-table
(SELECT ... WHERE) as the immediate RHS child of a left join,
and we could get rid of that by hoisting the WHERE condition into
the parent join's quals. However that new code missed a case:
we could have "foo LEFT JOIN ((SELECT ... WHERE) LEFT JOIN bar)",
and if the two left joins can be commuted then we now have the
problematic query shape. We can fix this too easily enough,
by allowing the syntactically-lower left join to pass through
its parent qual location pointer recursively. That lets
prepjointree.c discard the SELECT by temporarily hoisting the
WHERE condition into the ancestor join's qual.
Per bug #17978 from Zuming Jiang.
Discussion: https://postgr.es/m/17978-12f3d93a55297266@postgresql.org
This commit is contained in:
@@ -3213,6 +3213,8 @@ remove_useless_result_rtes(PlannerInfo *root)
|
||||
* jtnode is the current jointree node. If it could be valid to merge
|
||||
* its quals into those of the parent node, parent_quals should point to
|
||||
* the parent's quals list; otherwise, pass NULL for parent_quals.
|
||||
* (Note that in some cases, parent_quals points to the quals of a parent
|
||||
* more than one level up in the tree.)
|
||||
*/
|
||||
static Node *
|
||||
remove_useless_results_recurse(PlannerInfo *root, Node *jtnode,
|
||||
@@ -3316,13 +3318,22 @@ remove_useless_results_recurse(PlannerInfo *root, Node *jtnode,
|
||||
int varno;
|
||||
|
||||
/*
|
||||
* First, recurse. We can accept pushed-up FromExpr quals from either
|
||||
* child if the jointype is INNER, and we can accept them from the RHS
|
||||
* child if the jointype is LEFT.
|
||||
* First, recurse. We can absorb pushed-up FromExpr quals from either
|
||||
* child into this node if the jointype is INNER, since then this is
|
||||
* equivalent to a FromExpr. When the jointype is LEFT, we can absorb
|
||||
* quals from the RHS child into the current node, as they're
|
||||
* essentially degenerate quals of the outer join. Moreover, if we've
|
||||
* been passed down a parent_quals pointer then we can allow quals of
|
||||
* the LHS child to be absorbed into the parent. (This is important
|
||||
* to ensure we remove single-child FromExprs immediately below
|
||||
* commutable left joins.) For other jointypes, we can't move child
|
||||
* quals up, or at least there's no particular reason to.
|
||||
*/
|
||||
j->larg = remove_useless_results_recurse(root, j->larg,
|
||||
(j->jointype == JOIN_INNER) ?
|
||||
&j->quals : NULL,
|
||||
&j->quals :
|
||||
(j->jointype == JOIN_LEFT) ?
|
||||
parent_quals : NULL,
|
||||
dropped_outer_joins);
|
||||
j->rarg = remove_useless_results_recurse(root, j->rarg,
|
||||
(j->jointype == JOIN_INNER ||
|
||||
|
Reference in New Issue
Block a user