aboutsummaryrefslogtreecommitdiff
path: root/src/backend/optimizer/prep/prepunion.c
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2018-04-25 15:14:14 -0400
committerRobert Haas <rhaas@postgresql.org>2018-04-25 15:25:55 -0400
commitdc1057fcd878d5c062c5c4c2b548af2be513b6ab (patch)
treec59dae4627f13e4172a3caaddc1b714f3b02fe60 /src/backend/optimizer/prep/prepunion.c
parentf35f30f74b6abb0a2f47c91c20df606cf166e8ff (diff)
downloadpostgresql-dc1057fcd878d5c062c5c4c2b548af2be513b6ab.tar.gz
postgresql-dc1057fcd878d5c062c5c4c2b548af2be513b6ab.zip
Prevent generation of bogus subquery scan paths.
Commit 0927d2f46ddd4cf7d6bf2cc84b3be923e0aedc52 didn't check that consider_parallel was set for the target relation or account for the possibility that required_outer might be non-empty. To prevent future bugs of this ilk, add some assertions to add_partial_path and do a bit of future-proofing of the code recently added to recurse_set_operations. Report by Andreas Seltenreich. Patch by Jeevan Chalke. Review by Amit Kapila and by me. Discussion: http://postgr.es/m/CAM2+6=U+9otsyF2fYB8x_2TBeHTR90itarqW=qAEjN-kHaC7kw@mail.gmail.com
Diffstat (limited to 'src/backend/optimizer/prep/prepunion.c')
-rw-r--r--src/backend/optimizer/prep/prepunion.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 8d86e98adc1..61d0770f108 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -330,7 +330,8 @@ recurse_set_operations(Node *setOp, PlannerInfo *root,
* to build a partial path for this relation. But there's no point in
* considering any path but the cheapest.
*/
- if (final_rel->partial_pathlist != NIL)
+ if (rel->consider_parallel && bms_is_empty(rel->lateral_relids) &&
+ final_rel->partial_pathlist != NIL)
{
Path *partial_subpath;
Path *partial_path;