database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-30 06:01:21 +03:00
Code Activity

Fix bogus coding in ExecAppendAsyncEventWait().

Browse Source 
No configured-by-FDW events would result in "return" directly out of a
PG_TRY block, making the exception stack dangling.  Repair.

Oversight in commit 501cfd07d; back-patch to v14, like that commit, but
as we do not have this issue in HEAD (cf. commit 50c67c201), no need to
apply this patch to it.

In passing, improve a comment about the handling of in-process requests
in a postgres_fdw.c function called from this function.

Alexander Pyhalov, with comment adjustment/improvement by me.

Discussion: https://postgr.es/m/425fa29a429b21b0332737c42a4fdc70%40postgrespro.ru
This commit is contained in:
Etsuro Fujita
2024-04-04 17:25:02 +09:00
parent c2faf48fa3
commit 3f96d113ff
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/executor/nodeAppend.c
View File

@@ -1034,26 +1034,25 @@ ExecAppendAsyncEventWait(AppendState *node)
}
/*
* No need for further processing if there are no configured events
* other than the postmaster death event.
* If there are no configured events other than the postmaster death
* event, we don't need to wait or poll.
*/
if (GetNumRegisteredWaitEvents(node->as_eventset) == 1)
noccurred = 0;
else
{
FreeWaitEventSet(node->as_eventset);
node->as_eventset = NULL;
return;
/* Return at most EVENT_BUFFER_SIZE events in one call. */
if (nevents > EVENT_BUFFER_SIZE)
nevents = EVENT_BUFFER_SIZE;
/*
* If the timeout is -1, wait until at least one event occurs. If
* the timeout is 0, poll for events, but do not wait at all.
*/
noccurred = WaitEventSetWait(node->as_eventset, timeout,
occurred_event, nevents,
WAIT_EVENT_APPEND_READY);
}
/* Return at most EVENT_BUFFER_SIZE events in one call. */
if (nevents > EVENT_BUFFER_SIZE)
nevents = EVENT_BUFFER_SIZE;
/*
* If the timeout is -1, wait until at least one event occurs. If the
* timeout is 0, poll for events, but do not wait at all.
*/
noccurred = WaitEventSetWait(node->as_eventset, timeout, occurred_event,
nevents, WAIT_EVENT_APPEND_READY);
}
PG_FINALLY();
{