commit 90b68929d19701cdc8643f1060b17801e6aaf37f Author: Jim Finnerty Date: Fri Jan 22 20:47:51 2021 +0000 Use ClogPageNumber in place of int for type safety diff --git a/src/backend/access/rmgrdesc/clogdesc.c b/src/backend/access/rmgrdesc/clogdesc.c index b12f43a1bb..bbf1570bff 100644 --- a/src/backend/access/rmgrdesc/clogdesc.c +++ b/src/backend/access/rmgrdesc/clogdesc.c @@ -25,17 +25,17 @@ clog_desc(StringInfo buf, XLogReaderState *record) if (info == CLOG_ZEROPAGE) { - int pageno; + ClogPageNumber pageno; - memcpy(&pageno, rec, sizeof(int)); - appendStringInfo(buf, "page %d", pageno); + memcpy(&pageno, rec, sizeof(ClogPageNumber)); + appendStringInfo(buf, "page " CLOG_PAGENO_FMT, pageno); } else if (info == CLOG_TRUNCATE) { xl_clog_truncate xlrec; memcpy(&xlrec, rec, sizeof(xl_clog_truncate)); - appendStringInfo(buf, "page %d; oldestXact %u", + appendStringInfo(buf, "page " CLOG_PAGENO_FMT "; oldestXact " XID_FMT, xlrec.pageno, xlrec.oldestXact); } } diff --git a/src/backend/access/rmgrdesc/committsdesc.c b/src/backend/access/rmgrdesc/committsdesc.c index cdad2e4158..22888a5ff7 100644 --- a/src/backend/access/rmgrdesc/committsdesc.c +++ b/src/backend/access/rmgrdesc/committsdesc.c @@ -26,16 +26,16 @@ commit_ts_desc(StringInfo buf, XLogReaderState *record) if (info == COMMIT_TS_ZEROPAGE) { - int pageno; + ClogPageNumber pageno; - memcpy(&pageno, rec, sizeof(int)); - appendStringInfo(buf, "%d", pageno); + memcpy(&pageno, rec, sizeof(ClogPageNumber)); + appendStringInfo(buf, CLOG_PAGENO_FMT, pageno); } else if (info == COMMIT_TS_TRUNCATE) { xl_commit_ts_truncate *trunc = (xl_commit_ts_truncate *) rec; - appendStringInfo(buf, "pageno %d, oldestXid %u", + appendStringInfo(buf, "pageno " CLOG_PAGENO_FMT ", oldestXid " XID_FMT, trunc->pageno, trunc->oldestXid); } else if (info == COMMIT_TS_SETTS) diff --git a/src/backend/access/rmgrdesc/mxactdesc.c b/src/backend/access/rmgrdesc/mxactdesc.c index aa3d482b4d..57f87f8597 100644 --- a/src/backend/access/rmgrdesc/mxactdesc.c +++ b/src/backend/access/rmgrdesc/mxactdesc.c @@ -55,10 +55,10 @@ multixact_desc(StringInfo buf, XLogReaderState *record) if (info == XLOG_MULTIXACT_ZERO_OFF_PAGE || info == XLOG_MULTIXACT_ZERO_MEM_PAGE) { - int pageno; + ClogPageNumber pageno; - memcpy(&pageno, rec, sizeof(int)); - appendStringInfo(buf, "%d", pageno); + memcpy(&pageno, rec, sizeof(ClogPageNumber)); + appendStringInfo(buf, CLOG_PAGENO_FMT, pageno); } else if (info == XLOG_MULTIXACT_CREATE_ID) { diff --git a/src/include/access/clog.h b/src/include/access/clog.h index 39b8e4afa8..b2c3cd1144 100644 --- a/src/include/access/clog.h +++ b/src/include/access/clog.h @@ -31,7 +31,7 @@ typedef int XidStatus; typedef struct xl_clog_truncate { - int pageno; + ClogPageNumber pageno; TransactionId oldestXact; Oid oldestXactDb; } xl_clog_truncate; diff --git a/src/include/c.h b/src/include/c.h index ae978830da..9cf647e018 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -581,6 +581,12 @@ typedef uint32 SubTransactionId; #define InvalidSubTransactionId ((SubTransactionId) 0) #define TopSubTransactionId ((SubTransactionId) 1) +#define XID_BITS 32 +#define XID_FMT "%u" + +typedef int ClogPageNumber; +#define CLOG_PAGENO_FMT "%d" + /* MultiXactId must be equivalent to TransactionId, to fit in t_xmax */ typedef TransactionId MultiXactId;