diff options
Diffstat (limited to 'contrib/postgres_fdw/postgres_fdw.c')
| -rw-r--r-- | contrib/postgres_fdw/postgres_fdw.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 8dfee2e02c6..3e4a307880f 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -6896,12 +6896,26 @@ postgresForeignAsyncNotify(AsyncRequest *areq) ForeignScanState *node = (ForeignScanState *) areq->requestee; PgFdwScanState *fsstate = (PgFdwScanState *) node->fdw_state; - /* The request should be currently in-process */ - Assert(fsstate->conn_state->pendingAreq == areq); - /* The core code would have initialized the callback_pending flag */ Assert(!areq->callback_pending); + /* + * If process_pending_request() has been invoked on the given request + * before we get here, we might have some tuples already; in which case + * produce the next tuple + */ + if (fsstate->next_tuple < fsstate->num_tuples) + { + produce_tuple_asynchronously(areq, true); + return; + } + + /* We must have run out of tuples */ + Assert(fsstate->next_tuple >= fsstate->num_tuples); + + /* The request should be currently in-process */ + Assert(fsstate->conn_state->pendingAreq == areq); + /* On error, report the original query, not the FETCH. */ if (!PQconsumeInput(fsstate->conn)) pgfdw_report_error(ERROR, NULL, fsstate->conn, false, fsstate->query); @@ -7027,7 +7041,7 @@ process_pending_request(AsyncRequest *areq) /* * If we didn't get any tuples, must be end of data; complete the request * now. Otherwise, we postpone completing the request until we are called - * from postgresForeignAsyncConfigureWait(). + * from postgresForeignAsyncConfigureWait()/postgresForeignAsyncNotify(). */ if (fsstate->next_tuple >= fsstate->num_tuples) { |