From 1c1ef7ab8d989af88bf3adba9d01c50321049142 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Sat, 9 Apr 2022 10:54:15 -0700 Subject: [PATCH] PG15: Handle extra argument to RelationCreateStorage. Account for PG commit 9c08aea6a309. Introduce RelationCreateStorage_compat. --- src/backend/columnar/columnar_tableam.c | 2 +- src/backend/distributed/test/fake_am.c | 2 +- src/include/pg_version_compat.h | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/backend/columnar/columnar_tableam.c b/src/backend/columnar/columnar_tableam.c index e64b7613e..9967a265e 100644 --- a/src/backend/columnar/columnar_tableam.c +++ b/src/backend/columnar/columnar_tableam.c @@ -881,7 +881,7 @@ columnar_relation_set_new_filenode(Relation rel, *freezeXid = RecentXmin; *minmulti = GetOldestMultiXactId(); - SMgrRelation srel = RelationCreateStorage(*newrnode, persistence); + SMgrRelation srel = RelationCreateStorage_compat(*newrnode, persistence, true); ColumnarStorageInit(srel, ColumnarMetadataNewStorageId()); InitColumnarOptions(rel->rd_id); diff --git a/src/backend/distributed/test/fake_am.c b/src/backend/distributed/test/fake_am.c index 63d5a69fe..5a8ede316 100644 --- a/src/backend/distributed/test/fake_am.c +++ b/src/backend/distributed/test/fake_am.c @@ -326,7 +326,7 @@ fake_relation_set_new_filenode(Relation rel, */ *minmulti = GetOldestMultiXactId(); - SMgrRelation srel = RelationCreateStorage(*newrnode, persistence); + SMgrRelation srel = RelationCreateStorage_compat(*newrnode, persistence, true); /* * If required, set up an init fork for an unlogged table so that it can diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h index e298138d9..dc21acf5f 100644 --- a/src/include/pg_version_compat.h +++ b/src/include/pg_version_compat.h @@ -14,11 +14,15 @@ #include "distributed/pg_version_constants.h" #if PG_VERSION_NUM >= PG_VERSION_15 +#define ProcessCompletedNotifies() +#define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b, c) #else #include "storage/smgr.h" #include "utils/rel.h" +#define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b) + static inline SMgrRelation RelationGetSmgr(Relation rel) {