From 743079c9ad4f7d01df38a5344ae87db42e6d75e3 Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot Date: Thu, 12 Feb 2026 09:28:15 +0000 Subject: [PATCH v1 5/5] Replace literal 0 with InvalidRelFileNumber for RelFileNumber assignments Use the proper constant InvalidRelFileNumber instead of literal 0 when assigning RelFileNumber variables and struct fields. This improves code clarity by making it explicit that these are invalid RelFileNumber values rather than ambiguous zero literals. Author: Bertrand Drouvot Discussion: --- src/backend/backup/basebackup_incremental.c | 2 +- src/backend/postmaster/walsummarizer.c | 6 +++--- src/backend/storage/smgr/md.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 19.6% src/backend/backup/ 60.6% src/backend/postmaster/ 19.6% src/backend/storage/smgr/ diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c index f58ed9b198a..eb3f0fdf347 100644 --- a/src/backend/backup/basebackup_incremental.c +++ b/src/backend/backup/basebackup_incremental.c @@ -738,7 +738,7 @@ GetFileBackupMethod(IncrementalBackupInfo *ib, const char *path, */ rlocator.spcOid = spcoid; rlocator.dbOid = dboid; - rlocator.relNumber = 0; + rlocator.relNumber = InvalidRelFileNumber; if (BlockRefTableGetEntry(ib->brtab, &rlocator, MAIN_FORKNUM, &limit_block) != NULL) { diff --git a/src/backend/postmaster/walsummarizer.c b/src/backend/postmaster/walsummarizer.c index 2d8f57099fd..31e2ff01ec7 100644 --- a/src/backend/postmaster/walsummarizer.c +++ b/src/backend/postmaster/walsummarizer.c @@ -1278,7 +1278,7 @@ SummarizeDbaseRecord(XLogReaderState *xlogreader, BlockRefTable *brtab) (xl_dbase_create_file_copy_rec *) XLogRecGetData(xlogreader); rlocator.spcOid = xlrec->tablespace_id; rlocator.dbOid = xlrec->db_id; - rlocator.relNumber = 0; + rlocator.relNumber = InvalidRelFileNumber; BlockRefTableSetLimitBlock(brtab, &rlocator, MAIN_FORKNUM, 0); } else if (info == XLOG_DBASE_CREATE_WAL_LOG) @@ -1289,7 +1289,7 @@ SummarizeDbaseRecord(XLogReaderState *xlogreader, BlockRefTable *brtab) xlrec = (xl_dbase_create_wal_log_rec *) XLogRecGetData(xlogreader); rlocator.spcOid = xlrec->tablespace_id; rlocator.dbOid = xlrec->db_id; - rlocator.relNumber = 0; + rlocator.relNumber = InvalidRelFileNumber; BlockRefTableSetLimitBlock(brtab, &rlocator, MAIN_FORKNUM, 0); } else if (info == XLOG_DBASE_DROP) @@ -1300,7 +1300,7 @@ SummarizeDbaseRecord(XLogReaderState *xlogreader, BlockRefTable *brtab) xlrec = (xl_dbase_drop_rec *) XLogRecGetData(xlogreader); rlocator.dbOid = xlrec->db_id; - rlocator.relNumber = 0; + rlocator.relNumber = InvalidRelFileNumber; for (i = 0; i < xlrec->ntablespaces; ++i) { rlocator.spcOid = xlrec->tablespace_ids[i]; diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 443434e4ea8..52d69e15864 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -1597,7 +1597,7 @@ ForgetDatabaseSyncRequests(Oid dbid) rlocator.dbOid = dbid; rlocator.spcOid = 0; - rlocator.relNumber = 0; + rlocator.relNumber = InvalidRelFileNumber; INIT_MD_FILETAG(tag, rlocator, InvalidForkNumber, InvalidBlockNumber); -- 2.34.1