database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Fix oversight in recent MULTIEXPR_SUBLINK fix.

Browse Source 
Commits 3f7323cbb et al missed the possibility that the Params
they are looking for could be buried under implicit coercions,
as well as other stuff that processIndirection() could add to
the original targetlist entry.  Copy the code in ruleutils.c
that deals with such cases.  (I thought about refactoring so
that there's just one copy; but seeing that we only need this
in old back branches, it seems not worth the trouble.)

Per off-list report from Andre Lin.  As before, only v10-v13
need the patch.

Discussion: https://postgr.es/m/17596-c5357f61427a81dc@postgresql.org
This commit is contained in:
Tom Lane
2022-09-02 14:54:40 -04:00
parent d7bc6ea052
commit 18f51083c9
3 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/backend/optimizer/plan/subselect.c
View File

@ -914,20 +914,54 @@ SS_make_multiexprs_unique(PlannerInfo *root, PlannerInfo *subroot)
/*
* Now we must find the Param nodes that reference the MULTIEXPR outputs
* and update their sublink IDs so they'll reference the new outputs.
* Fortunately, those too must be at top level of the cloned targetlist.
* Fortunately, those too must be in the cloned targetlist, but they could
* be buried under FieldStores and SubscriptingRefs and CoerceToDomains
* (cf processIndirection()), and underneath those there could be an
* implicit type coercion.
*/
offset = list_length(root->multiexpr_params);
foreach(lc, subroot->parse->targetList)
{
TargetEntry *tent = (TargetEntry *) lfirst(lc);
Node *expr;
Param *p;
int subqueryid;
int colno;
if (!IsA(tent->expr, Param))
expr = (Node *) tent->expr;
while (expr)
{
if (IsA(expr, FieldStore))
{
FieldStore *fstore = (FieldStore *) expr;
expr = (Node *) linitial(fstore->newvals);
}
else if (IsA(expr, SubscriptingRef))
{
SubscriptingRef *sbsref = (SubscriptingRef *) expr;
if (sbsref->refassgnexpr == NULL)
break;
expr = (Node *) sbsref->refassgnexpr;
}
else if (IsA(expr, CoerceToDomain))
{
CoerceToDomain *cdomain = (CoerceToDomain *) expr;
if (cdomain->coercionformat != COERCE_IMPLICIT_CAST)
break;
expr = (Node *) cdomain->arg;
}
else
break;
}
expr = strip_implicit_coercions(expr);
if (expr == NULL || !IsA(expr, Param))
continue;
p = (Param *) tent->expr;
p = (Param *) expr;
if (p->paramkind != PARAM_MULTIEXPR)
continue;
subqueryid = p->paramid >> 16;