From 604bd3671121b51f977de146ed95484c2297fb3e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 1 Nov 2019 11:09:52 +0100 Subject: PG_FINALLY 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 --- src/pl/tcl/pltcl.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/pl/tcl/pltcl.c') diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 8277d1ea85..fccd22b4f5 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -765,9 +765,10 @@ pltcl_handler(PG_FUNCTION_ARGS, bool pltrusted) retval = pltcl_func_handler(fcinfo, ¤t_call_state, pltrusted); } } - PG_CATCH(); + PG_FINALLY(); { /* Restore static pointer, then clean up the prodesc refcount if any */ + /* (We're being paranoid in case an error is thrown in context deletion) */ pltcl_current_call_state = save_call_state; if (current_call_state.prodesc != NULL) { @@ -775,20 +776,9 @@ pltcl_handler(PG_FUNCTION_ARGS, bool pltrusted) if (--current_call_state.prodesc->fn_refcount == 0) MemoryContextDelete(current_call_state.prodesc->fn_cxt); } - PG_RE_THROW(); } PG_END_TRY(); - /* Restore static pointer, then clean up the prodesc refcount if any */ - /* (We're being paranoid in case an error is thrown in context deletion) */ - pltcl_current_call_state = save_call_state; - if (current_call_state.prodesc != NULL) - { - Assert(current_call_state.prodesc->fn_refcount > 0); - if (--current_call_state.prodesc->fn_refcount == 0) - MemoryContextDelete(current_call_state.prodesc->fn_cxt); - } - return retval; } -- cgit v1.2.1