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 --- contrib/pg_stat_statements/pg_stat_statements.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'contrib/pg_stat_statements/pg_stat_statements.c') diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 221b47298ce..63b5888ebbc 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -892,12 +892,10 @@ pgss_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count, prev_ExecutorRun(queryDesc, direction, count, execute_once); else standard_ExecutorRun(queryDesc, direction, count, execute_once); - nested_level--; } - PG_CATCH(); + PG_FINALLY(); { nested_level--; - PG_RE_THROW(); } PG_END_TRY(); } @@ -915,12 +913,10 @@ pgss_ExecutorFinish(QueryDesc *queryDesc) prev_ExecutorFinish(queryDesc); else standard_ExecutorFinish(queryDesc); - nested_level--; } - PG_CATCH(); + PG_FINALLY(); { nested_level--; - PG_RE_THROW(); } PG_END_TRY(); } @@ -1007,12 +1003,10 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString, standard_ProcessUtility(pstmt, queryString, context, params, queryEnv, dest, completionTag); - nested_level--; } - PG_CATCH(); + PG_FINALLY(); { nested_level--; - PG_RE_THROW(); } PG_END_TRY(); -- cgit v1.2.3