Skip to content

Commit f9a74c1

Browse files
committed
Consider parallel awareness when removing single-child Appends
8edd0e7 added some code to remove Append and MergeAppend nodes when they contained a single child node. As it turned out, this was unsafe to do when the Append/MergeAppend was parallel_aware and the child node was not. Removing the Append/MergeAppend, in this case, could lead to the child plan being called multiple times by parallel workers when it was unsafe to do so. Here we fix this by just not removing the Append/MergeAppend when the parallel_aware flag of the parent and child node don't match. Reported-by: Yura Sokolov Bug: #17335 Discussion: https://postgr.es/m/b59605fecb20ba9ea94e70ab60098c237c870628.camel%40postgrespro.ru Backpatch-through: 12, where 8edd0e7 was first introduced
1 parent 741bd32 commit f9a74c1

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

src/backend/optimizer/plan/setrefs.c

+20-4
Original file line numberDiff line numberDiff line change
@@ -1512,8 +1512,16 @@ set_append_references(PlannerInfo *root,
15121512
lfirst(l) = set_plan_refs(root, (Plan *) lfirst(l), rtoffset);
15131513
}
15141514

1515-
/* Now, if there's just one, forget the Append and return that child */
1516-
if (list_length(aplan->appendplans) == 1)
1515+
/*
1516+
* See if it's safe to get rid of the Append entirely. For this to be
1517+
* safe, there must be only one child plan and that child plan's parallel
1518+
* awareness must match that of the Append's. The reason for the latter
1519+
* is that the if the Append is parallel aware and the child is not then
1520+
* the calling plan may execute the non-parallel aware child multiple
1521+
* times.
1522+
*/
1523+
if (list_length(aplan->appendplans) == 1 &&
1524+
((Plan *) linitial(aplan->appendplans))->parallel_aware == aplan->plan.parallel_aware)
15171525
return clean_up_removed_plan_level((Plan *) aplan,
15181526
(Plan *) linitial(aplan->appendplans));
15191527

@@ -1576,8 +1584,16 @@ set_mergeappend_references(PlannerInfo *root,
15761584
lfirst(l) = set_plan_refs(root, (Plan *) lfirst(l), rtoffset);
15771585
}
15781586

1579-
/* Now, if there's just one, forget the MergeAppend and return that child */
1580-
if (list_length(mplan->mergeplans) == 1)
1587+
/*
1588+
* See if it's safe to get rid of the MergeAppend entirely. For this to
1589+
* be safe, there must be only one child plan and that child plan's
1590+
* parallel awareness must match that of the MergeAppend's. The reason
1591+
* for the latter is that the if the MergeAppend is parallel aware and the
1592+
* child is not then the calling plan may execute the non-parallel aware
1593+
* child multiple times.
1594+
*/
1595+
if (list_length(mplan->mergeplans) == 1 &&
1596+
((Plan *) linitial(mplan->mergeplans))->parallel_aware == mplan->plan.parallel_aware)
15811597
return clean_up_removed_plan_level((Plan *) mplan,
15821598
(Plan *) linitial(mplan->mergeplans));
15831599

0 commit comments

Comments
 (0)