From 09bfc689208d7aea8d875f4638bdccd6d77c1293 Mon Sep 17 00:00:00 2001 From: Matthias van de Meent Date: Mon, 23 Jan 2023 17:31:18 +0100 Subject: [PATCH v3 3/6] Rename rmgr_identify 'info'-bits argument to rmgrinfo This indicates the provided bits are fully owned by the rmgr, and none of the xlog record's owned bits are shared with the rmgr anymore. --- src/backend/access/rmgrdesc/brindesc.c | 4 ++-- src/backend/access/rmgrdesc/clogdesc.c | 4 ++-- src/backend/access/rmgrdesc/dbasedesc.c | 4 ++-- src/backend/access/rmgrdesc/gindesc.c | 4 ++-- src/backend/access/rmgrdesc/gistdesc.c | 4 ++-- src/backend/access/rmgrdesc/hashdesc.c | 4 ++-- src/backend/access/rmgrdesc/heapdesc.c | 8 ++++---- src/backend/access/rmgrdesc/logicalmsgdesc.c | 4 ++-- src/backend/access/rmgrdesc/mxactdesc.c | 4 ++-- src/backend/access/rmgrdesc/nbtdesc.c | 4 ++-- src/backend/access/rmgrdesc/relmapdesc.c | 4 ++-- src/backend/access/rmgrdesc/seqdesc.c | 4 ++-- src/backend/access/rmgrdesc/smgrdesc.c | 4 ++-- src/backend/access/rmgrdesc/spgdesc.c | 4 ++-- src/backend/access/rmgrdesc/standbydesc.c | 4 ++-- src/backend/access/rmgrdesc/tblspcdesc.c | 4 ++-- src/backend/access/rmgrdesc/xlogdesc.c | 4 ++-- src/include/access/brin_xlog.h | 2 +- src/include/access/clog.h | 2 +- src/include/access/ginxlog.h | 2 +- src/include/access/gistxlog.h | 2 +- src/include/access/hash_xlog.h | 2 +- src/include/access/heapam_xlog.h | 4 ++-- src/include/access/multixact.h | 2 +- src/include/access/nbtxlog.h | 2 +- src/include/access/spgxlog.h | 2 +- src/include/access/xlog.h | 2 +- src/include/catalog/storage_xlog.h | 2 +- src/include/commands/dbcommands_xlog.h | 2 +- src/include/commands/sequence.h | 2 +- src/include/commands/tablespace.h | 2 +- src/include/replication/message.h | 2 +- src/include/storage/standbydefs.h | 2 +- src/include/utils/relmapper.h | 2 +- src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c | 4 ++-- 35 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/backend/access/rmgrdesc/brindesc.c b/src/backend/access/rmgrdesc/brindesc.c index 1d3e5ee03e..fa272f0720 100644 --- a/src/backend/access/rmgrdesc/brindesc.c +++ b/src/backend/access/rmgrdesc/brindesc.c @@ -71,11 +71,11 @@ brin_desc(StringInfo buf, XLogReaderState *record) } const char * -brin_identify(uint8 info) +brin_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_BRIN_CREATE_INDEX: id = "CREATE_INDEX"; diff --git a/src/backend/access/rmgrdesc/clogdesc.c b/src/backend/access/rmgrdesc/clogdesc.c index 915f9945d0..b368af595e 100644 --- a/src/backend/access/rmgrdesc/clogdesc.c +++ b/src/backend/access/rmgrdesc/clogdesc.c @@ -41,11 +41,11 @@ clog_desc(StringInfo buf, XLogReaderState *record) } const char * -clog_identify(uint8 info) +clog_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case CLOG_ZEROPAGE: id = "ZEROPAGE"; diff --git a/src/backend/access/rmgrdesc/dbasedesc.c b/src/backend/access/rmgrdesc/dbasedesc.c index a9529bde05..a405c0738a 100644 --- a/src/backend/access/rmgrdesc/dbasedesc.c +++ b/src/backend/access/rmgrdesc/dbasedesc.c @@ -54,11 +54,11 @@ dbase_desc(StringInfo buf, XLogReaderState *record) } const char * -dbase_identify(uint8 info) +dbase_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_DBASE_CREATE_FILE_COPY: id = "CREATE_FILE_COPY"; diff --git a/src/backend/access/rmgrdesc/gindesc.c b/src/backend/access/rmgrdesc/gindesc.c index 08fc7ba49b..e7ed7a6094 100644 --- a/src/backend/access/rmgrdesc/gindesc.c +++ b/src/backend/access/rmgrdesc/gindesc.c @@ -179,11 +179,11 @@ gin_desc(StringInfo buf, XLogReaderState *record) } const char * -gin_identify(uint8 info) +gin_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_GIN_CREATE_PTREE: id = "CREATE_PTREE"; diff --git a/src/backend/access/rmgrdesc/gistdesc.c b/src/backend/access/rmgrdesc/gistdesc.c index 6473069c1a..899e12bcc3 100644 --- a/src/backend/access/rmgrdesc/gistdesc.c +++ b/src/backend/access/rmgrdesc/gistdesc.c @@ -86,11 +86,11 @@ gist_desc(StringInfo buf, XLogReaderState *record) } const char * -gist_identify(uint8 info) +gist_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_GIST_PAGE_UPDATE: id = "PAGE_UPDATE"; diff --git a/src/backend/access/rmgrdesc/hashdesc.c b/src/backend/access/rmgrdesc/hashdesc.c index bcb2013048..451251caca 100644 --- a/src/backend/access/rmgrdesc/hashdesc.c +++ b/src/backend/access/rmgrdesc/hashdesc.c @@ -122,11 +122,11 @@ hash_desc(StringInfo buf, XLogReaderState *record) } const char * -hash_identify(uint8 info) +hash_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_HASH_INIT_META_PAGE: id = "INIT_META_PAGE"; diff --git a/src/backend/access/rmgrdesc/heapdesc.c b/src/backend/access/rmgrdesc/heapdesc.c index 15f943051a..5224869af1 100644 --- a/src/backend/access/rmgrdesc/heapdesc.c +++ b/src/backend/access/rmgrdesc/heapdesc.c @@ -302,11 +302,11 @@ heap2_desc(StringInfo buf, XLogReaderState *record) } const char * -heap_identify(uint8 info) +heap_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_HEAP_INSERT: id = "INSERT"; @@ -347,11 +347,11 @@ heap_identify(uint8 info) } const char * -heap2_identify(uint8 info) +heap2_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_HEAP2_PRUNE: id = "PRUNE"; diff --git a/src/backend/access/rmgrdesc/logicalmsgdesc.c b/src/backend/access/rmgrdesc/logicalmsgdesc.c index 2bb6cb06c3..7566630961 100644 --- a/src/backend/access/rmgrdesc/logicalmsgdesc.c +++ b/src/backend/access/rmgrdesc/logicalmsgdesc.c @@ -43,9 +43,9 @@ logicalmsg_desc(StringInfo buf, XLogReaderState *record) } const char * -logicalmsg_identify(uint8 info) +logicalmsg_identify(uint8 rmgrinfo) { - if ((info & ~XLR_INFO_MASK) == XLOG_LOGICAL_MESSAGE) + if (rmgrinfo == XLOG_LOGICAL_MESSAGE) return "MESSAGE"; return NULL; diff --git a/src/backend/access/rmgrdesc/mxactdesc.c b/src/backend/access/rmgrdesc/mxactdesc.c index cdcf8a4f45..7676778239 100644 --- a/src/backend/access/rmgrdesc/mxactdesc.c +++ b/src/backend/access/rmgrdesc/mxactdesc.c @@ -81,11 +81,11 @@ multixact_desc(StringInfo buf, XLogReaderState *record) } const char * -multixact_identify(uint8 info) +multixact_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_MULTIXACT_ZERO_OFF_PAGE: id = "ZERO_OFF_PAGE"; diff --git a/src/backend/access/rmgrdesc/nbtdesc.c b/src/backend/access/rmgrdesc/nbtdesc.c index ede8df72c0..ff9e28ca55 100644 --- a/src/backend/access/rmgrdesc/nbtdesc.c +++ b/src/backend/access/rmgrdesc/nbtdesc.c @@ -134,11 +134,11 @@ btree_desc(StringInfo buf, XLogReaderState *record) } const char * -btree_identify(uint8 info) +btree_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_BTREE_INSERT_LEAF: id = "INSERT_LEAF"; diff --git a/src/backend/access/rmgrdesc/relmapdesc.c b/src/backend/access/rmgrdesc/relmapdesc.c index f4f0e5ce8b..9c9f191700 100644 --- a/src/backend/access/rmgrdesc/relmapdesc.c +++ b/src/backend/access/rmgrdesc/relmapdesc.c @@ -32,11 +32,11 @@ relmap_desc(StringInfo buf, XLogReaderState *record) } const char * -relmap_identify(uint8 info) +relmap_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_RELMAP_UPDATE: id = "UPDATE"; diff --git a/src/backend/access/rmgrdesc/seqdesc.c b/src/backend/access/rmgrdesc/seqdesc.c index 6def7b653b..eed631b5d8 100644 --- a/src/backend/access/rmgrdesc/seqdesc.c +++ b/src/backend/access/rmgrdesc/seqdesc.c @@ -31,11 +31,11 @@ seq_desc(StringInfo buf, XLogReaderState *record) } const char * -seq_identify(uint8 info) +seq_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_SEQ_LOG: id = "LOG"; diff --git a/src/backend/access/rmgrdesc/smgrdesc.c b/src/backend/access/rmgrdesc/smgrdesc.c index 8604bee0c0..653caf58e4 100644 --- a/src/backend/access/rmgrdesc/smgrdesc.c +++ b/src/backend/access/rmgrdesc/smgrdesc.c @@ -43,11 +43,11 @@ smgr_desc(StringInfo buf, XLogReaderState *record) } const char * -smgr_identify(uint8 info) +smgr_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_SMGR_CREATE: id = "CREATE"; diff --git a/src/backend/access/rmgrdesc/spgdesc.c b/src/backend/access/rmgrdesc/spgdesc.c index 9e1e48240b..0d1af9a5b6 100644 --- a/src/backend/access/rmgrdesc/spgdesc.c +++ b/src/backend/access/rmgrdesc/spgdesc.c @@ -128,11 +128,11 @@ spg_desc(StringInfo buf, XLogReaderState *record) } const char * -spg_identify(uint8 info) +spg_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_SPGIST_ADD_LEAF: id = "ADD_LEAF"; diff --git a/src/backend/access/rmgrdesc/standbydesc.c b/src/backend/access/rmgrdesc/standbydesc.c index 9a08e10fe1..56acea1407 100644 --- a/src/backend/access/rmgrdesc/standbydesc.c +++ b/src/backend/access/rmgrdesc/standbydesc.c @@ -76,11 +76,11 @@ standby_desc(StringInfo buf, XLogReaderState *record) } const char * -standby_identify(uint8 info) +standby_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_STANDBY_LOCK: id = "LOCK"; diff --git a/src/backend/access/rmgrdesc/tblspcdesc.c b/src/backend/access/rmgrdesc/tblspcdesc.c index c1feb4fa05..c5849ccf7c 100644 --- a/src/backend/access/rmgrdesc/tblspcdesc.c +++ b/src/backend/access/rmgrdesc/tblspcdesc.c @@ -38,11 +38,11 @@ tblspc_desc(StringInfo buf, XLogReaderState *record) } const char * -tblspc_identify(uint8 info) +tblspc_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_TBLSPC_CREATE: id = "CREATE"; diff --git a/src/backend/access/rmgrdesc/xlogdesc.c b/src/backend/access/rmgrdesc/xlogdesc.c index 3692dfb96a..4db4f3331f 100644 --- a/src/backend/access/rmgrdesc/xlogdesc.c +++ b/src/backend/access/rmgrdesc/xlogdesc.c @@ -151,11 +151,11 @@ xlog_desc(StringInfo buf, XLogReaderState *record) } const char * -xlog_identify(uint8 info) +xlog_identify(uint8 rmgrinfo) { const char *id = NULL; - switch (info & ~XLR_INFO_MASK) + switch (rmgrinfo) { case XLOG_CHECKPOINT_SHUTDOWN: id = "CHECKPOINT_SHUTDOWN"; diff --git a/src/include/access/brin_xlog.h b/src/include/access/brin_xlog.h index ae263a371f..45a688d09b 100644 --- a/src/include/access/brin_xlog.h +++ b/src/include/access/brin_xlog.h @@ -145,7 +145,7 @@ typedef struct xl_brin_desummarize extern void brin_redo(XLogReaderState *record); extern void brin_desc(StringInfo buf, XLogReaderState *record); -extern const char *brin_identify(uint8 info); +extern const char *brin_identify(uint8 rmgrinfo); extern void brin_mask(char *pagedata, BlockNumber blkno); #endif /* BRIN_XLOG_H */ diff --git a/src/include/access/clog.h b/src/include/access/clog.h index d99444f073..224cad4415 100644 --- a/src/include/access/clog.h +++ b/src/include/access/clog.h @@ -58,6 +58,6 @@ extern int clogsyncfiletag(const FileTag *ftag, char *path); extern void clog_redo(XLogReaderState *record); extern void clog_desc(StringInfo buf, XLogReaderState *record); -extern const char *clog_identify(uint8 info); +extern const char *clog_identify(uint8 rmgrinfo); #endif /* CLOG_H */ diff --git a/src/include/access/ginxlog.h b/src/include/access/ginxlog.h index 37095e5f17..adf1f6b6d8 100644 --- a/src/include/access/ginxlog.h +++ b/src/include/access/ginxlog.h @@ -208,7 +208,7 @@ typedef struct ginxlogDeleteListPages extern void gin_redo(XLogReaderState *record); extern void gin_desc(StringInfo buf, XLogReaderState *record); -extern const char *gin_identify(uint8 info); +extern const char *gin_identify(uint8 rmgrinfo); extern void gin_xlog_startup(void); extern void gin_xlog_cleanup(void); extern void gin_mask(char *pagedata, BlockNumber blkno); diff --git a/src/include/access/gistxlog.h b/src/include/access/gistxlog.h index aff2ffbdcc..0ca37f3a07 100644 --- a/src/include/access/gistxlog.h +++ b/src/include/access/gistxlog.h @@ -109,7 +109,7 @@ typedef struct gistxlogPageReuse extern void gist_redo(XLogReaderState *record); extern void gist_desc(StringInfo buf, XLogReaderState *record); -extern const char *gist_identify(uint8 info); +extern const char *gist_identify(uint8 rmgrinfo); extern void gist_xlog_startup(void); extern void gist_xlog_cleanup(void); extern void gist_mask(char *pagedata, BlockNumber blkno); diff --git a/src/include/access/hash_xlog.h b/src/include/access/hash_xlog.h index b93619d1a8..74859a2a47 100644 --- a/src/include/access/hash_xlog.h +++ b/src/include/access/hash_xlog.h @@ -263,7 +263,7 @@ typedef struct xl_hash_vacuum_one_page extern void hash_redo(XLogReaderState *record); extern void hash_desc(StringInfo buf, XLogReaderState *record); -extern const char *hash_identify(uint8 info); +extern const char *hash_identify(uint8 rmgrinfo); extern void hash_mask(char *pagedata, BlockNumber blkno); #endif /* HASH_XLOG_H */ diff --git a/src/include/access/heapam_xlog.h b/src/include/access/heapam_xlog.h index a038450787..70e9acd350 100644 --- a/src/include/access/heapam_xlog.h +++ b/src/include/access/heapam_xlog.h @@ -406,11 +406,11 @@ extern void HeapTupleHeaderAdvanceConflictHorizon(HeapTupleHeader tuple, extern void heap_redo(XLogReaderState *record); extern void heap_desc(StringInfo buf, XLogReaderState *record); -extern const char *heap_identify(uint8 info); +extern const char *heap_identify(uint8 rmgrinfo); extern void heap_mask(char *pagedata, BlockNumber blkno); extern void heap2_redo(XLogReaderState *record); extern void heap2_desc(StringInfo buf, XLogReaderState *record); -extern const char *heap2_identify(uint8 info); +extern const char *heap2_identify(uint8 rmgrinfo); extern void heap_xlog_logical_rewrite(XLogReaderState *r); extern XLogRecPtr log_heap_visible(Relation rel, Buffer heap_buffer, diff --git a/src/include/access/multixact.h b/src/include/access/multixact.h index 246f757f6a..d52e69aa05 100644 --- a/src/include/access/multixact.h +++ b/src/include/access/multixact.h @@ -158,7 +158,7 @@ extern void multixact_twophase_postabort(TransactionId xid, uint16 info, extern void multixact_redo(XLogReaderState *record); extern void multixact_desc(StringInfo buf, XLogReaderState *record); -extern const char *multixact_identify(uint8 info); +extern const char *multixact_identify(uint8 rmgrinfo); extern char *mxid_to_string(MultiXactId multi, int nmembers, MultiXactMember *members); diff --git a/src/include/access/nbtxlog.h b/src/include/access/nbtxlog.h index 7dd9fd0206..422ac13d56 100644 --- a/src/include/access/nbtxlog.h +++ b/src/include/access/nbtxlog.h @@ -362,6 +362,6 @@ extern void btree_mask(char *pagedata, BlockNumber blkno); * prototypes for functions in nbtdesc.c */ extern void btree_desc(StringInfo buf, XLogReaderState *record); -extern const char *btree_identify(uint8 info); +extern const char *btree_identify(uint8 rmgrinfo); #endif /* NBTXLOG_H */ diff --git a/src/include/access/spgxlog.h b/src/include/access/spgxlog.h index a7f10bf2d3..3533894baf 100644 --- a/src/include/access/spgxlog.h +++ b/src/include/access/spgxlog.h @@ -251,7 +251,7 @@ typedef struct spgxlogVacuumRedirect extern void spg_redo(XLogReaderState *record); extern void spg_desc(StringInfo buf, XLogReaderState *record); -extern const char *spg_identify(uint8 info); +extern const char *spg_identify(uint8 rmgrinfo); extern void spg_xlog_startup(void); extern void spg_xlog_cleanup(void); extern void spg_mask(char *pagedata, BlockNumber blkno); diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 48ca852381..9007f559f3 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -211,7 +211,7 @@ extern void XLogSetReplicationSlotMinimumLSN(XLogRecPtr lsn); extern void xlog_redo(struct XLogReaderState *record); extern void xlog_desc(StringInfo buf, struct XLogReaderState *record); -extern const char *xlog_identify(uint8 info); +extern const char *xlog_identify(uint8 rmgrinfo); extern void issue_xlog_fsync(int fd, XLogSegNo segno, TimeLineID tli); diff --git a/src/include/catalog/storage_xlog.h b/src/include/catalog/storage_xlog.h index 6b0a7aa3df..27514163be 100644 --- a/src/include/catalog/storage_xlog.h +++ b/src/include/catalog/storage_xlog.h @@ -54,6 +54,6 @@ extern void log_smgrcreate(const RelFileLocator *rlocator, ForkNumber forkNum); extern void smgr_redo(XLogReaderState *record); extern void smgr_desc(StringInfo buf, XLogReaderState *record); -extern const char *smgr_identify(uint8 info); +extern const char *smgr_identify(uint8 rmgrinfo); #endif /* STORAGE_XLOG_H */ diff --git a/src/include/commands/dbcommands_xlog.h b/src/include/commands/dbcommands_xlog.h index a1433275f5..f3c11060b6 100644 --- a/src/include/commands/dbcommands_xlog.h +++ b/src/include/commands/dbcommands_xlog.h @@ -55,6 +55,6 @@ typedef struct xl_dbase_drop_rec extern void dbase_redo(XLogReaderState *record); extern void dbase_desc(StringInfo buf, XLogReaderState *record); -extern const char *dbase_identify(uint8 info); +extern const char *dbase_identify(uint8 rmgrinfo); #endif /* DBCOMMANDS_XLOG_H */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index 7db7b3da7b..fb7059b8f6 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -64,7 +64,7 @@ extern void ResetSequenceCaches(void); extern void seq_redo(XLogReaderState *record); extern void seq_desc(StringInfo buf, XLogReaderState *record); -extern const char *seq_identify(uint8 info); +extern const char *seq_identify(uint8 rmgrinfo); extern void seq_mask(char *page, BlockNumber blkno); #endif /* SEQUENCE_H */ diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h index f1961c1813..db21eb59ee 100644 --- a/src/include/commands/tablespace.h +++ b/src/include/commands/tablespace.h @@ -64,6 +64,6 @@ extern void remove_tablespace_symlink(const char *linkloc); extern void tblspc_redo(XLogReaderState *record); extern void tblspc_desc(StringInfo buf, XLogReaderState *record); -extern const char *tblspc_identify(uint8 info); +extern const char *tblspc_identify(uint8 rmgrinfo); #endif /* TABLESPACE_H */ diff --git a/src/include/replication/message.h b/src/include/replication/message.h index 6ce7f2038b..2fe985a6fe 100644 --- a/src/include/replication/message.h +++ b/src/include/replication/message.h @@ -36,6 +36,6 @@ extern XLogRecPtr LogLogicalMessage(const char *prefix, const char *message, #define XLOG_LOGICAL_MESSAGE 0x00 extern void logicalmsg_redo(XLogReaderState *record); extern void logicalmsg_desc(StringInfo buf, XLogReaderState *record); -extern const char *logicalmsg_identify(uint8 info); +extern const char *logicalmsg_identify(uint8 rmgrinfo); #endif /* PG_LOGICAL_MESSAGE_H */ diff --git a/src/include/storage/standbydefs.h b/src/include/storage/standbydefs.h index 188e348618..84e1f03c8f 100644 --- a/src/include/storage/standbydefs.h +++ b/src/include/storage/standbydefs.h @@ -22,7 +22,7 @@ /* Recovery handlers for the Standby Rmgr (RM_STANDBY_ID) */ extern void standby_redo(XLogReaderState *record); extern void standby_desc(StringInfo buf, XLogReaderState *record); -extern const char *standby_identify(uint8 info); +extern const char *standby_identify(uint8 rmgrinfo); extern void standby_desc_invalidations(StringInfo buf, int nmsgs, SharedInvalidationMessage *msgs, Oid dbId, Oid tsId, diff --git a/src/include/utils/relmapper.h b/src/include/utils/relmapper.h index 5c173bdbb3..e3c41ff093 100644 --- a/src/include/utils/relmapper.h +++ b/src/include/utils/relmapper.h @@ -68,6 +68,6 @@ extern void RestoreRelationMap(char *startAddress); extern void relmap_redo(XLogReaderState *record); extern void relmap_desc(StringInfo buf, XLogReaderState *record); -extern const char *relmap_identify(uint8 info); +extern const char *relmap_identify(uint8 rmgrinfo); #endif /* RELMAPPER_H */ diff --git a/src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c b/src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c index b5537a5f5b..21514f8e33 100644 --- a/src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c +++ b/src/test/modules/test_custom_rmgrs/test_custom_rmgrs.c @@ -103,9 +103,9 @@ testcustomrmgrs_desc(StringInfo buf, XLogReaderState *record) } const char * -testcustomrmgrs_identify(uint8 info) +testcustomrmgrs_identify(uint8 rmgrinfo) { - if ((info & ~XLR_INFO_MASK) == XLOG_TEST_CUSTOM_RMGRS_MESSAGE) + if (rmgrinfo == XLOG_TEST_CUSTOM_RMGRS_MESSAGE) return "TEST_CUSTOM_RMGRS_MESSAGE"; return NULL; -- 2.40.1