From 962dbb9e2967a41c20f9bfda0edad551a061094c Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Tue, 2 Sep 2025 15:22:11 -0400 Subject: [PATCH v10 5/7] Add database Oid to CkptSortItem This is useful 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 8a3a5a04d91..7ecf201d1ef 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -3405,6 +3405,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; @@ -6810,6 +6811,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 ab502c4f825..feb370175f0 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -449,6 +449,7 @@ extern uint32 WaitBufHdrUnlocked(BufferDesc *buf); typedef struct CkptSortItem { Oid tsId; + Oid dbId; RelFileNumber relNumber; ForkNumber forkNum; BlockNumber blockNum; -- 2.43.0