external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PG15: Handle extra argument to RelationCreateStorage. 

Account for PG commit 9c08aea6a309. Introduce
RelationCreateStorage_compat.
pull/5920/head
Jeff Davis 2022-04-09 10:54:15 -07:00 committed by jeff-davis
parent ac952b2cc2
commit 1c1ef7ab8d
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/columnar/columnar_tableam.c
View File

@ -881,7 +881,7 @@ columnar_relation_set_new_filenode(Relation rel,
*freezeXid = RecentXmin; *freezeXid = RecentXmin;
*minmulti = GetOldestMultiXactId(); *minmulti = GetOldestMultiXactId();
SMgrRelation srel = RelationCreateStorage(*newrnode, persistence); SMgrRelation srel = RelationCreateStorage_compat(*newrnode, persistence, true);
ColumnarStorageInit(srel, ColumnarMetadataNewStorageId()); ColumnarStorageInit(srel, ColumnarMetadataNewStorageId());
InitColumnarOptions(rel->rd_id); InitColumnarOptions(rel->rd_id);

2
src/backend/distributed/test/fake_am.c
View File

@ -326,7 +326,7 @@ fake_relation_set_new_filenode(Relation rel,
*/ */
*minmulti = GetOldestMultiXactId(); *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 * If required, set up an init fork for an unlogged table so that it can

4
src/include/pg_version_compat.h
View File

@ -14,11 +14,15 @@
#include "distributed/pg_version_constants.h" #include "distributed/pg_version_constants.h"
#if PG_VERSION_NUM >= PG_VERSION_15 #if PG_VERSION_NUM >= PG_VERSION_15
#define ProcessCompletedNotifies()
#define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b, c)
#else #else
#include "storage/smgr.h" #include "storage/smgr.h"
#include "utils/rel.h" #include "utils/rel.h"
#define RelationCreateStorage_compat(a, b, c) RelationCreateStorage(a, b)
static inline SMgrRelation static inline SMgrRelation
RelationGetSmgr(Relation rel) RelationGetSmgr(Relation rel)
{ {