From 3e1180de7800ba09dbc87509bec6680ceca1d35a Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 11 Apr 2022 12:14:28 -0700 Subject: [PATCH] PG15: handle extra argument to parse_analyze_varparams(). From PG commit 25751f54b8. --- src/backend/distributed/planner/multi_explain.c | 4 ++-- src/include/pg_version_compat.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/backend/distributed/planner/multi_explain.c b/src/backend/distributed/planner/multi_explain.c index 4c6370e5a..a807085af 100644 --- a/src/backend/distributed/planner/multi_explain.c +++ b/src/backend/distributed/planner/multi_explain.c @@ -1062,8 +1062,8 @@ worker_save_query_explain_analyze(PG_FUNCTION_ARGS) } /* resolve OIDs of unknown (user-defined) types */ - Query *analyzedQuery = parse_analyze_varparams(parseTree, queryString, - ¶mTypes, &numParams); + Query *analyzedQuery = parse_analyze_varparams_compat(parseTree, queryString, + ¶mTypes, &numParams, NULL); #if PG_VERSION_NUM >= PG_VERSION_14 diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h index db51fcf69..2f076cf07 100644 --- a/src/include/pg_version_compat.h +++ b/src/include/pg_version_compat.h @@ -16,6 +16,8 @@ #if PG_VERSION_NUM >= PG_VERSION_15 #define ProcessCompletedNotifies() #define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b, c) +#define parse_analyze_varparams_compat(a, b, c, d, e) parse_analyze_varparams(a, b, c, d, \ + e) #else #include "nodes/value.h" @@ -33,6 +35,7 @@ typedef Value String; #define strtou64(str, endptr, base) ((uint64) strtoull(str, endptr, base)) #endif #define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b) +#define parse_analyze_varparams_compat(a, b, c, d, e) parse_analyze_varparams(a, b, c, d) #define pgstat_init_relation(r) pgstat_initstats(r) #define pg_analyze_and_rewrite_fixedparams(a, b, c, d, e) pg_analyze_and_rewrite(a, b, c, \ d, e)