From b6a5617ea88bc7ddbc28d644cdca3cc6168554a6 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 11 Apr 2022 12:02:24 -0700 Subject: [PATCH] PG15: handle pg_analyze_and_rewrite_* renaming. From PG commit 791b1b71da. --- src/backend/distributed/executor/multi_executor.c | 3 ++- src/backend/distributed/test/deparse_shard_query.c | 6 +++--- src/backend/distributed/test/distribution_metadata.c | 6 +++--- src/include/pg_version_compat.h | 2 ++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/backend/distributed/executor/multi_executor.c b/src/backend/distributed/executor/multi_executor.c index f03e96b7c..5fd0f5b08 100644 --- a/src/backend/distributed/executor/multi_executor.c +++ b/src/backend/distributed/executor/multi_executor.c @@ -617,7 +617,8 @@ RewriteRawQueryStmt(RawStmt *rawStmt, const char *queryString, Oid *paramOids, i numParams) { List *queryTreeList = - pg_analyze_and_rewrite(rawStmt, queryString, paramOids, numParams, NULL); + pg_analyze_and_rewrite_fixedparams(rawStmt, queryString, paramOids, numParams, + NULL); if (list_length(queryTreeList) != 1) { diff --git a/src/backend/distributed/test/deparse_shard_query.c b/src/backend/distributed/test/deparse_shard_query.c index 1961ad52d..a6196146f 100644 --- a/src/backend/distributed/test/deparse_shard_query.c +++ b/src/backend/distributed/test/deparse_shard_query.c @@ -49,9 +49,9 @@ deparse_shard_query_test(PG_FUNCTION_ARGS) Node *parsetree = NULL; foreach_ptr(parsetree, parseTreeList) { - List *queryTreeList = pg_analyze_and_rewrite((RawStmt *) parsetree, - queryStringChar, - NULL, 0, NULL); + List *queryTreeList = pg_analyze_and_rewrite_fixedparams((RawStmt *) parsetree, + queryStringChar, + NULL, 0, NULL); Query *query = NULL; foreach_ptr(query, queryTreeList) diff --git a/src/backend/distributed/test/distribution_metadata.c b/src/backend/distributed/test/distribution_metadata.c index f9afd3b68..6d769ef27 100644 --- a/src/backend/distributed/test/distribution_metadata.c +++ b/src/backend/distributed/test/distribution_metadata.c @@ -259,9 +259,9 @@ relation_count_in_query(PG_FUNCTION_ARGS) Node *parsetree = NULL; foreach_ptr(parsetree, parseTreeList) { - List *queryTreeList = pg_analyze_and_rewrite((RawStmt *) parsetree, - queryStringChar, - NULL, 0, NULL); + List *queryTreeList = pg_analyze_and_rewrite_fixedparams((RawStmt *) parsetree, + queryStringChar, + NULL, 0, NULL); Query *query = NULL; foreach_ptr(query, queryTreeList) diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h index 5ccc8a9f6..db51fcf69 100644 --- a/src/include/pg_version_compat.h +++ b/src/include/pg_version_compat.h @@ -34,6 +34,8 @@ typedef Value String; #endif #define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b) #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) static inline int64 pg_strtoint64(char *s)