Skip to content

Commit 9b0c67e

Browse files
tglsfdcreshke
authored andcommitted
Fix SPI's handling of errors during transaction commit.
SPI_commit previously left it up to the caller to recover from any error occurring during commit. Since that's complicated and requires use of low-level xact.c facilities, it's not too surprising that no caller got it right. Let's move the responsibility for cleanup into spi.c. Doing that requires redefining SPI_commit as starting a new transaction, so that it becomes equivalent to SPI_commit_and_chain except that you get default transaction characteristics instead of preserving the prior transaction's characteristics. We can make this pretty transparent API-wise by redefining SPI_start_transaction() as a no-op. Callers that expect to do something in between might be surprised, but available evidence is that no callers do so. Having made that API redefinition, we can fix this mess by having SPI_commit[_and_chain] trap errors and start a new, clean transaction before re-throwing the error. Likewise for SPI_rollback[_and_chain]. Some cleanup is also needed in AtEOXact_SPI, which was nowhere near smart enough to deal with SPI contexts nested inside a committing context. While plperl and pltcl need no changes beyond removing their now-useless SPI_start_transaction() calls, plpython needs some more work because it hadn't gotten the memo about catching commit/rollback errors in the first place. Such an error resulted in longjmp'ing out of the Python interpreter, which leaks Python stack entries at present and is reported to crash Python 3.11 altogether. Add the missing logic to catch such errors and convert them into Python exceptions. This is a back-patch of commit 2e51781. That's now aged long enough to reduce the concerns about whether it will break something, and we do need to ensure that supported branches will work with Python 3.11. Peter Eisentraut and Tom Lane Discussion: https://postgr.es/m/3375ffd8-d71c-2565-e348-a597d6e739e3@enterprisedb.com Discussion: https://postgr.es/m/17416-ed8fe5d7213d6c25@postgresql.org
1 parent f582f98 commit 9b0c67e

2 files changed

Lines changed: 0 additions & 11 deletions

File tree

src/backend/executor/spi.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -442,16 +442,6 @@ SPI_rollback_and_chain(void)
442442
_SPI_rollback(true);
443443
}
444444

445-
/*
446-
* SPICleanup is a no-op, kept for backwards compatibility. We rely on
447-
* AtEOXact_SPI to cleanup. Extensions should not (need to) fiddle with the
448-
* internal SPI state directly.
449-
*/
450-
void
451-
SPICleanup(void)
452-
{
453-
}
454-
455445
/*
456446
* Clean up SPI state at transaction commit or abort.
457447
*/

src/include/executor/spi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ extern void SPI_commit_and_chain(void);
205205
extern void SPI_rollback(void);
206206
extern void SPI_rollback_and_chain(void);
207207

208-
extern void SPICleanup(void);
209208
extern void AtEOXact_SPI(bool isCommit);
210209
extern void AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid);
211210
extern bool SPI_inside_nonatomic_context(void);

0 commit comments

Comments
 (0)