diff options
| author | Robert Haas <rhaas@postgresql.org> | 2016-06-06 14:52:58 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2016-06-06 14:52:58 -0400 |
| commit | c6dbf1fe79287291bc260cbc06b0de419d2a198c (patch) | |
| tree | 8edc5d8f7d13201c73d90f0c217f6e00a27e5099 /src/backend/executor/execMain.c | |
| parent | 44339b892a04e94bbb472235882dc6f7023bdc65 (diff) | |
| download | postgresql-c6dbf1fe79287291bc260cbc06b0de419d2a198c.tar.gz postgresql-c6dbf1fe79287291bc260cbc06b0de419d2a198c.zip | |
Stop the executor if no more tuples can be sent from worker to leader.
If a Gather node has read as many tuples as it needs (for example, due
to Limit) it may detach the queue connecting it to the worker before
reading all of the worker's tuples. Rather than let the worker
continue to generate and send all of the results, have it stop after
sending the next tuple.
More could be done here to stop the worker even quicker, but this is
about as well as we can hope to do for 9.6.
This is in response to a problem report from Andreas Seltenreich.
Commit 44339b892a04e94bbb472235882dc6f7023bdc65 should be actually be
sufficient to fix that example even without this change, but it seems
better to do this, too, since we might otherwise waste quite a large
amount of effort in one or more workers.
Discussion: CAA4eK1KOKGqmz9bGu+Z42qhRwMbm4R5rfnqsLCNqFs9j14jzEA@mail.gmail.com
Amit Kapila
Diffstat (limited to 'src/backend/executor/execMain.c')
| -rw-r--r-- | src/backend/executor/execMain.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index ac0230411c3..b5ced388d20 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -1593,7 +1593,15 @@ ExecutePlan(EState *estate, * practice, this is probably always the case at this point.) */ if (sendTuples) - (*dest->receiveSlot) (slot, dest); + { + /* + * If we are not able to send the tuple, we assume the destination + * has closed and no more tuples can be sent. If that's the case, + * end the loop. + */ + if (!((*dest->receiveSlot) (slot, dest))) + break; + } /* * Count tuples processed, if this is a SELECT. (For other operation |