diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2019-11-01 11:09:52 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2019-11-01 11:18:03 +0100 |
| commit | 604bd3671121b51f977de146ed95484c2297fb3e (patch) | |
| tree | 829045453c054befb9d795c33765501e2f4522f3 /src/pl/plpython/plpy_elog.c | |
| parent | 73025140885c889410b9bfc4a30a3866396fc5db (diff) | |
| download | postgresql-604bd3671121b51f977de146ed95484c2297fb3e.tar.gz postgresql-604bd3671121b51f977de146ed95484c2297fb3e.zip | |
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
Diffstat (limited to 'src/pl/plpython/plpy_elog.c')
| -rw-r--r-- | src/pl/plpython/plpy_elog.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c index 25930f99d78..15cc444af8e 100644 --- a/src/pl/plpython/plpy_elog.c +++ b/src/pl/plpython/plpy_elog.c @@ -141,7 +141,7 @@ PLy_elog_impl(int elevel, const char *fmt,...) (constraint_name) ? err_generic_string(PG_DIAG_CONSTRAINT_NAME, constraint_name) : 0)); } - PG_CATCH(); + PG_FINALLY(); { if (fmt) pfree(emsg.data); @@ -151,19 +151,8 @@ PLy_elog_impl(int elevel, const char *fmt,...) pfree(tbmsg); Py_XDECREF(exc); Py_XDECREF(val); - - PG_RE_THROW(); } PG_END_TRY(); - - if (fmt) - pfree(emsg.data); - if (xmsg) - pfree(xmsg); - if (tbmsg) - pfree(tbmsg); - Py_XDECREF(exc); - Py_XDECREF(val); } /* |