From 99f99a299ee1f067edcecaf8b765899ee27ad1ed Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Tue, 2 Sep 2025 15:22:11 -0400 Subject: [PATCH v15 10/19] Add database Oid to CkptSortItem This is an oversight that currently isn't causing harm. However, it is required for checkpointer write combining -- which will be added in a future commit. Author: Melanie Plageman Reviewed-by: Chao Li Discussion: https://postgr.es/m/2FA0BAC7-5413-4ABD-94CA-4398FE77750D%40gmail.com --- src/backend/storage/buffer/bufmgr.c | 8 ++++++++ src/include/storage/buf_internals.h | 1 + 2 files changed, 9 insertions(+) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 815b037a8ec..9bdfc6b7f99 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -3825,6 +3825,7 @@ BufferSync(int flags) item = &CkptBufferIds[num_to_scan++]; item->buf_id = buf_id; item->tsId = bufHdr->tag.spcOid; + item->dbId = bufHdr->tag.dbOid; item->relNumber = BufTagGetRelNumber(&bufHdr->tag); item->forkNum = BufTagGetForkNum(&bufHdr->tag); item->blockNum = bufHdr->tag.blockNum; @@ -8242,6 +8243,13 @@ ckpt_buforder_comparator(const CkptSortItem *a, const CkptSortItem *b) return -1; else if (a->tsId > b->tsId) return 1; + + /* compare database */ + if (a->dbId < b->dbId) + return -1; + else if (a->dbId > b->dbId) + return 1; + /* compare relation */ if (a->relNumber < b->relNumber) return -1; diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 1bd7e8aa273..70b22419ad4 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -514,6 +514,7 @@ extern uint64 WaitBufHdrUnlocked(BufferDesc *buf); typedef struct CkptSortItem { Oid tsId; + Oid dbId; RelFileNumber relNumber; ForkNumber forkNum; BlockNumber blockNum; -- 2.43.0