Initial compatibility fixes for PostgreSQL 19

Author: PierreSenellart

src/RvSample.cpp

@@ -24,6 +24,7 @@ extern "C" {
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
+#include "utils/tuplestore.h"
 #include "utils/uuid.h"
 #include "provsql_utils.h"
 #include "provsql_error.h"

src/compatibility.h

@@ -19,12 +19,18 @@
  * - **list_make5() (13)**: existed pre-13, dropped by the PG13 list
  *   rewrite, re-added in PG14; backported for the PG13 gap as a macro
  *   over @c list_make4() + @c lappend().
+ * - **FuncnameGetCandidates() / OpernameGetCandidates() (14, 19)**:
+ *   PostgreSQL 14 added an @p include_out_arguments parameter to the
+ *   former; PostgreSQL 19 added a mandatory @p fgc_flags out-parameter
+ *   to both.  The @c *Compat wrappers take the PG 14-style argument
+ *   list and drop / dummy-fill the extra arguments as needed.
  */
 #ifndef COMPATIBILITY_H
 #define COMPATIBILITY_H
 
 #include "postgres.h"
 #include "nodes/pg_list.h"
+#include "catalog/namespace.h"
 
 /**
  * @brief Version-agnostic wrapper around @c list_delete_cell().
@@ -66,6 +72,53 @@ static inline ListCell *my_lnext(const List *l, const ListCell *c)
 #endif
 }
 
+/**
+ * @brief Version-agnostic wrapper around @c FuncnameGetCandidates().
+ *
+ * Takes the PostgreSQL 14+ argument list.  On PG < 14 the
+ * @p include_out_arguments parameter (added in 14) is dropped; on
+ * PG >= 19 the @p fgc_flags out-parameter (added in 19, must not be
+ * @c NULL) receives a discarded local, as no caller inspects the
+ * lookup-failure flags.
+ */
+static inline FuncCandidateList
+FuncnameGetCandidatesCompat(List *names, int nargs, List *argnames,
+                            bool expand_variadic, bool expand_defaults,
+                            bool include_out_arguments, bool missing_ok)
+{
+#if PG_VERSION_NUM >= 190000
+  int fgc_flags;
+  return FuncnameGetCandidates(names, nargs, argnames, expand_variadic,
+                               expand_defaults, include_out_arguments,
+                               missing_ok, &fgc_flags);
+#elif PG_VERSION_NUM >= 140000
+  return FuncnameGetCandidates(names, nargs, argnames, expand_variadic,
+                               expand_defaults, include_out_arguments,
+                               missing_ok);
+#else
+  return FuncnameGetCandidates(names, nargs, argnames, expand_variadic,
+                               expand_defaults, missing_ok);
+#endif
+}
+
+/**
+ * @brief Version-agnostic wrapper around @c OpernameGetCandidates().
+ *
+ * PostgreSQL 19 added an @p fgc_flags out-parameter (must not be
+ * @c NULL); it receives a discarded local, as no caller inspects the
+ * lookup-failure flags.
+ */
+static inline FuncCandidateList
+OpernameGetCandidatesCompat(List *names, char oprkind, bool missing_schema_ok)
+{
+#if PG_VERSION_NUM >= 190000
+  int fgc_flags;
+  return OpernameGetCandidates(names, oprkind, missing_schema_ok, &fgc_flags);
+#else
+  return OpernameGetCandidates(names, oprkind, missing_schema_ok);
+#endif
+}
+
 #if PG_VERSION_NUM < 130000
 /**
  * @brief Insert @p datum at position @p pos in @p list (PG < 13 backport).

src/provsql.c

@@ -4820,13 +4820,10 @@ rewrite_probability_events(const constants_t *constants, Query *q)
 static Expr *build_joint_width_provenance_expr(const constants_t *constants,
                                                const char *desc, Expr *fallback)
 {
-  FuncCandidateList fcl = FuncnameGetCandidates(
+  FuncCandidateList fcl = FuncnameGetCandidatesCompat(
     list_make2(makeString("provsql"), makeString("ucq_joint_provenance")),
     2, NIL, false, false,
-#if PG_VERSION_NUM >= 140000
-    false,
-#endif
-    false);
+    false, false);
   FuncExpr *fe;
   Const *c;
   Datum jb;
@@ -4866,13 +4863,10 @@ static Expr *build_joint_width_provenance_expr(const constants_t *constants,
 static Expr *build_mobius_provenance_expr(const constants_t *constants,
                                           const char *desc, Expr *fallback)
 {
-  FuncCandidateList fcl = FuncnameGetCandidates(
+  FuncCandidateList fcl = FuncnameGetCandidatesCompat(
     list_make2(makeString("provsql"), makeString("ucq_mobius_provenance")),
     2, NIL, false, false,
-#if PG_VERSION_NUM >= 140000
-    false,
-#endif
-    false);
+    false, false);
   FuncExpr *fe;
   Const *c;
   Datum jb;
@@ -4909,13 +4903,10 @@ static Expr *build_joint_width_answer_expr(const constants_t *constants,
                                            const char *desc, List *head_var_idx,
                                            List *head_exprs, Expr *fallback)
 {
-  FuncCandidateList fcl = FuncnameGetCandidates(
+  FuncCandidateList fcl = FuncnameGetCandidatesCompat(
     list_make2(makeString("provsql"), makeString("ucq_joint_provenance_answer")),
     4, NIL, false, false,
-#if PG_VERSION_NUM >= 140000
-    false,
-#endif
-    false);
+    false, false);
   FuncExpr *fe;
   Const *desc_c, *hv_c;
   ArrayExpr *vals;
@@ -4982,13 +4973,10 @@ static Expr *build_mobius_answer_expr(const constants_t *constants,
                                       const char *desc, List *head_var_idx,
                                       List *head_exprs, Expr *fallback)
 {
-  FuncCandidateList fcl = FuncnameGetCandidates(
+  FuncCandidateList fcl = FuncnameGetCandidatesCompat(
     list_make2(makeString("provsql"), makeString("ucq_mobius_provenance_answer")),
     4, NIL, false, false,
-#if PG_VERSION_NUM >= 140000
-    false,
-#endif
-    false);
+    false, false);
   FuncExpr *fe;
   Const *desc_c, *hv_c;
   ArrayExpr *vals;
@@ -5046,13 +5034,10 @@ static Expr *build_mobius_answer_expr(const constants_t *constants,
  */
 static Expr *wrap_mobius_or_null(const constants_t *constants, Expr *mobius_call)
 {
-  FuncCandidateList fcl = FuncnameGetCandidates(
+  FuncCandidateList fcl = FuncnameGetCandidatesCompat(
     list_make2(makeString("provsql"), makeString("mobius_or_null")),
     1, NIL, false, false,
-#if PG_VERSION_NUM >= 140000
-    false,
-#endif
-    false);
+    false, false);
   FuncExpr *fe;
 
   if (fcl == NULL)
@@ -14788,7 +14773,11 @@ static PlannedStmt *provsql_planner(Query *q,
                                     const char *query_string,
 #endif
                                     int cursorOptions,
-                                    ParamListInfo boundParams) {
+                                    ParamListInfo boundParams
+#if PG_VERSION_NUM >= 190000
+                                    , ExplainState *es
+#endif
+                                    ) {
   /* Scope the inert-fetch record to this rewrite (re-entrant: nested
    * planner invocations save and restore their own). */
   List *saved_inert_subselects = provsql_inert_subselects;
@@ -14890,13 +14879,21 @@ static PlannedStmt *provsql_planner(Query *q,
 #if PG_VERSION_NUM >= 130000
                         query_string,
 #endif
-                        cursorOptions, boundParams);
+                        cursorOptions, boundParams
+#if PG_VERSION_NUM >= 190000
+                        , es
+#endif
+                        );
   else
     return standard_planner(q,
 #if PG_VERSION_NUM >= 130000
                             query_string,
 #endif
-                            cursorOptions, boundParams);
+                            cursorOptions, boundParams
+#if PG_VERSION_NUM >= 190000
+                            , es
+#endif
+                            );
 }
 
 /* -------------------------------------------------------------------------

src/provsql_mmap.c

@@ -86,8 +86,29 @@ bool provsql_read_all(int fd, void *dst, size_t n)
   return true;
 }
 
+#if PG_VERSION_NUM >= 190000
+/* PostgreSQL 19 changed the default background-worker SIGTERM handler
+ * from bgworker_die() (immediate FATAL from the signal handler) to the
+ * flag-based die(), which only acts at the next CHECK_FOR_INTERRUPTS().
+ * This worker blocks in read() on the IPC pipe (restarted by
+ * SA_RESTART), so it would never observe the flag and a fast shutdown
+ * would hang on it.  Restore the pre-19 semantics: the worker holds no
+ * transaction state and the mmap store is crash-safe, so exiting
+ * mid-read is fine. */
+static void provsql_worker_die(SIGNAL_ARGS)
+{
+  ereport(FATAL,
+          (errcode(ERRCODE_ADMIN_SHUTDOWN),
+           errmsg("terminating background worker \"%s\" due to administrator command",
+                  MyBgworkerEntry->bgw_type)));
+}
+#endif
+
 PGDLLEXPORT void provsql_mmap_worker(Datum ignored)
 {
+#if PG_VERSION_NUM >= 190000
+  pqsignal(SIGTERM, provsql_worker_die);
+#endif
   BackgroundWorkerUnblockSignals();
   initialize_provsql_mmap();
   close(provsql_shared_state->pipebmw);

src/provsql_utils.c

@@ -39,6 +39,7 @@
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
+#include "compatibility.h"
 #include "fmgr.h"
 #include "nodes/value.h"
 #include "parser/parse_func.h"
@@ -144,7 +145,7 @@ Oid find_equality_operator(Oid ltypeId, Oid rtypeId)
   if(result!=InvalidOid)
     return result;
 
-  clist = OpernameGetCandidates(equals, 'b', false);
+  clist = OpernameGetCandidatesCompat(equals, 'b', false);
 
   ncandidates = func_match_argtypes(2, inputOids,
                                     clist, &clist);
@@ -173,15 +174,13 @@ Oid find_equality_operator(Oid ltypeId, Oid rtypeId)
  */
 static Oid get_func_oid(char *s)
 {
-  FuncCandidateList fcl=FuncnameGetCandidates(
+  FuncCandidateList fcl=FuncnameGetCandidatesCompat(
     list_make1(makeString(s)),
     -1,
     NIL,
     false,
     false,
-#if PG_VERSION_NUM >= 140000
     false,
-#endif
     false);
   if(fcl)
     return fcl->oid;
@@ -199,15 +198,13 @@ static Oid get_func_oid(char *s)
  */
 static Oid get_provsql_func_oid(char *s)
 {
-  FuncCandidateList fcl=FuncnameGetCandidates(
+  FuncCandidateList fcl=FuncnameGetCandidatesCompat(
     list_make2(makeString("provsql"),makeString(s)),
     -1,
     NIL,
     false,
     false,
-#if PG_VERSION_NUM >= 140000
     false,
-#endif
     false);
   if(fcl)
     return fcl->oid;

src/reachability_evaluate.cpp

@@ -30,6 +30,7 @@ extern "C" {
 #include "catalog/pg_type.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
+#include "utils/tuplestore.h"
 #include "utils/uuid.h"
 
 #include "provsql_utils.h"

src/rv_families.cpp

@@ -18,6 +18,7 @@ extern "C" {
 #include "catalog/pg_type.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
+#include "utils/tuplestore.h"
 
 #include "compatibility.h"   /* TYPALIGN_INT fallback for PG < 11 */
 

src/shapley.cpp

@@ -25,6 +25,7 @@ extern "C" {
 #include "postgres.h"
 #include "fmgr.h"
 #include "catalog/pg_type.h"
+#include "utils/tuplestore.h"
 #include "utils/uuid.h"
 #include "executor/spi.h"
 #include "provsql_shmem.h"

src/tool_registry_sql.cpp

@@ -36,6 +36,7 @@ extern "C" {
 #include "catalog/pg_type.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
+#include "utils/tuplestore.h"
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
 #endif