Skip to content

Commit 75680c3

Browse files
Retire a few backwards compatibility macros.
As of commits dd04e95 and 1833f1a, tuplestore_donestoring(), SPI_push(), SPI_pop(), SPI_push_conditional(), SPI_pop_conditional(), and SPI_restore_connection() are no-op macros provided for backwards compatibility. This commit removes these macros, so any uses in third-party code will need to be removed, too. Since these macros have been no-ops for a while, such adjustments won't produce any behavior changes for all currently-supported versions of PostgreSQL. Author: Bharath Rupireddy Discussion: https://postgr.es/m/CALj2ACVeO58JM5tK2Qa8QC-%3DkC8sdkJOTd4BFU%3DK8zs4gGYpjQ%40mail.gmail.com
1 parent 8a553f2 commit 75680c3

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

src/include/executor/spi.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,6 @@ typedef struct _SPI_plan *SPIPlanPtr;
100100

101101
#define SPI_OPT_NONATOMIC (1 << 0)
102102

103-
/* These used to be functions, now just no-ops for backwards compatibility */
104-
#define SPI_push() ((void) 0)
105-
#define SPI_pop() ((void) 0)
106-
#define SPI_push_conditional() false
107-
#define SPI_pop_conditional(pushed) ((void) 0)
108-
#define SPI_restore_connection() ((void) 0)
109-
110103
extern PGDLLIMPORT uint64 SPI_processed;
111104
extern PGDLLIMPORT SPITupleTable *SPI_tuptable;
112105
extern PGDLLIMPORT int SPI_result;

src/include/utils/tuplestore.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ extern void tuplestore_puttuple(Tuplestorestate *state, HeapTuple tuple);
5656
extern void tuplestore_putvalues(Tuplestorestate *state, TupleDesc tdesc,
5757
const Datum *values, const bool *isnull);
5858

59-
/* Backwards compatibility macro */
60-
#define tuplestore_donestoring(state) ((void) 0)
61-
6259
extern int tuplestore_alloc_read_pointer(Tuplestorestate *state, int eflags);
6360

6461
extern void tuplestore_select_read_pointer(Tuplestorestate *state, int ptr);

0 commit comments

Comments
 (0)