database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +03:00
Code Activity

PG_FINALLY

Browse Source 
This gives an alternative way of catching exceptions, for the common
case where the cleanup code is the same in the error and non-error
cases.  So instead of

    PG_TRY();
    {
        ... code that might throw ereport(ERROR) ...
    }
    PG_CATCH();
    {
        cleanup();
	PG_RE_THROW();
    }
    PG_END_TRY();
    cleanup();

one can write

    PG_TRY();
    {
        ... code that might throw ereport(ERROR) ...
    }
    PG_FINALLY();
    {
        cleanup();
    }
    PG_END_TRY();

Discussion: https://www.postgresql.org/message-id/flat/95a822c3-728b-af0e-d7e5-71890507ae0c%402ndquadrant.com
This commit is contained in:
Peter Eisentraut
2019-11-01 11:09:52 +01:00
parent 7302514088
commit 604bd36711
32 changed files with 91 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/commands/subscriptioncmds.c
View File

@ -493,16 +493,11 @@ CreateSubscription(CreateSubscriptionStmt *stmt, bool isTopLevel)
slotname)));
}
}
PG_CATCH();
PG_FINALLY();
{
/* Close the connection in case of failure. */
walrcv_disconnect(wrconn);
PG_RE_THROW();
}
PG_END_TRY();
/* And we are done with the remote side. */
walrcv_disconnect(wrconn);
}
else
ereport(WARNING,
@ -1023,16 +1018,12 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
walrcv_clear_result(res);
}
PG_CATCH();
PG_FINALLY();
{
/* Close the connection in case of failure */
walrcv_disconnect(wrconn);
PG_RE_THROW();
}
PG_END_TRY();
walrcv_disconnect(wrconn);
pfree(cmd.data);
table_close(rel, NoLock);