diff options
| author | Robert Haas <rhaas@postgresql.org> | 2018-04-25 15:14:14 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2018-04-25 15:25:55 -0400 |
| commit | dc1057fcd878d5c062c5c4c2b548af2be513b6ab (patch) | |
| tree | c59dae4627f13e4172a3caaddc1b714f3b02fe60 /src/backend/optimizer/util/pathnode.c | |
| parent | f35f30f74b6abb0a2f47c91c20df606cf166e8ff (diff) | |
| download | postgresql-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/util/pathnode.c')
| -rw-r--r-- | src/backend/optimizer/util/pathnode.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 776c592dbe7..e190ad49d16 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -770,6 +770,12 @@ add_partial_path(RelOptInfo *parent_rel, Path *new_path) /* Check for query cancel. */ CHECK_FOR_INTERRUPTS(); + /* Path to be added must be parallel safe. */ + Assert(new_path->parallel_safe); + + /* Relation should be OK for parallelism, too. */ + Assert(parent_rel->consider_parallel); + /* * As in add_path, throw out any paths which are dominated by the new * path, but throw out the new path if some existing path dominates it. |