(cloudberry) 14/24: Re-add SPICleanup for ABI compatibility in stable branch

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

reshke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git

commit 01000174ae98216f8d8210c87c4d715e93849269
Author: Peter Eisentraut <pe...@eisentraut.org>
AuthorDate: Mon Jul 18 16:23:48 2022 +0200

    Re-add SPICleanup for ABI compatibility in stable branch
    
    This fixes an ABI break introduced by
    604651880c71c5106a72529b9ce29eaad0cfab27.
    
    Author: Markus Wanner <ma...@enterprisedb.com>
    Discussion: https://www.postgresql.org/message-id/defd749a-8410-841d-1126-21398686d63d@enterprisedb.com
---
 src/backend/executor/spi.c | 10 ++++++++++
 src/include/executor/spi.h |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 5db53b125ee..4a2ddd5dff3 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -442,6 +442,16 @@ SPI_rollback_and_chain(void)
 	_SPI_rollback(true);
 }
 
+/*
+ * SPICleanup is a no-op, kept for backwards compatibility. We rely on
+ * AtEOXact_SPI to cleanup. Extensions should not (need to) fiddle with the
+ * internal SPI state directly.
+ */
+void
+SPICleanup(void)
+{
+}
+
 /*
  * Clean up SPI state at transaction commit or abort.
  */
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index fc60fdb9584..ef1964b709d 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -205,6 +205,7 @@ extern void SPI_commit_and_chain(void);
 extern void SPI_rollback(void);
 extern void SPI_rollback_and_chain(void);
 
+extern void SPICleanup(void);
 extern void AtEOXact_SPI(bool isCommit);
 extern void AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid);
 extern bool SPI_inside_nonatomic_context(void);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org