mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run a portal's cleanup hook immediately when pushing it to DONE state.

Browse Source 
This works around the problem noted by Yamamoto Takashi in bug #5906,
that there were code paths whereby we could reach AtCleanup_Portals
with a portal's cleanup hook still unexecuted.  The changes I made
a few days ago were intended to prevent that from happening, and
I think that on balance it's still a good thing to avoid, so I don't
want to remove the Assert in AtCleanup_Portals.  Hence do this instead.
This commit is contained in:
Tom Lane 2011-03-03 13:03:34 -05:00
parent 32fce70564
commit 6252c4f9e2
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/tcop/pquery.c
View File

@ -814,7 +814,7 @@ PortalRun(Portal portal, long count, bool isTopLevel,
dest, altdest, completionTag); dest, altdest, completionTag);
/* Prevent portal's commands from being re-executed */ /* Prevent portal's commands from being re-executed */
portal->status = PORTAL_DONE; MarkPortalDone(portal);
/* Always complete at end of RunMulti */ /* Always complete at end of RunMulti */
result = true; result = true;

26
src/backend/utils/mmgr/portalmem.c
View File

@ -401,6 +401,32 @@ UnpinPortal(Portal portal)
portal->portalPinned = false; portal->portalPinned = false;
} }
/*
* MarkPortalDone
* Transition a portal from ACTIVE to DONE state.
*/
void
MarkPortalDone(Portal portal)
{
/* Perform the state transition */
Assert(portal->status == PORTAL_ACTIVE);
portal->status = PORTAL_DONE;
/*
* Allow portalcmds.c to clean up the state it knows about. We might
* as well do that now, since the portal can't be executed any more.
*
* In some cases involving execution of a ROLLBACK command in an already
* aborted transaction, this prevents an assertion failure from reaching
* AtCleanup_Portals with the cleanup hook still unexecuted.
*/
if (PointerIsValid(portal->cleanup))
{
(*portal->cleanup) (portal);
portal->cleanup = NULL;
}
}
/* /*
* PortalDrop * PortalDrop
* Destroy the portal. * Destroy the portal.

1
src/include/utils/portal.h
View File

@ -206,6 +206,7 @@ extern Portal CreatePortal(const char *name, bool allowDup, bool dupSilent);
extern Portal CreateNewPortal(void); extern Portal CreateNewPortal(void);
extern void PinPortal(Portal portal); extern void PinPortal(Portal portal);
extern void UnpinPortal(Portal portal); extern void UnpinPortal(Portal portal);
extern void MarkPortalDone(Portal portal);
extern void PortalDrop(Portal portal, bool isTopCommit); extern void PortalDrop(Portal portal, bool isTopCommit);
extern Portal GetPortalByName(const char *name); extern Portal GetPortalByName(const char *name);
extern void PortalDefineQuery(Portal portal, extern void PortalDefineQuery(Portal portal,