From e8dc7199821f3d0556538ff89088e41ec63ab720 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Fri, 5 Jan 2024 18:41:55 -0500 Subject: [PATCH v3 04/28] feature: Adjust page sizes at PageInit() This is the part at which we are now properly reserving the data on the pages, and all sizes should have been adjusted appropriately. --- src/backend/storage/page/bufpage.c | 6 +++--- src/include/storage/bufpage.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 63fce5b588..bb9deacddf 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -46,15 +46,15 @@ PageInit(Page page, Size pageSize, Size specialSize) specialSize = MAXALIGN(specialSize); Assert(pageSize == BLCKSZ); - Assert(pageSize > specialSize + SizeOfPageHeaderData); + Assert(pageSize > specialSize + SizeOfPageHeaderData + ReservedPageSize); /* Make sure all fields of page are zero, as well as unused space */ MemSet(p, 0, pageSize); p->pd_flags = 0; p->pd_lower = SizeOfPageHeaderData; - p->pd_upper = pageSize - specialSize; - p->pd_special = pageSize - specialSize; + p->pd_upper = pageSize - specialSize - ReservedPageSize; + p->pd_special = pageSize - specialSize - ReservedPageSize; PageSetPageSizeAndVersion(page, pageSize, PG_PAGE_LAYOUT_VERSION); /* p->pd_prune_xid = InvalidTransactionId; done by above MemSet */ } diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 9b9c6167ef..c21bb0d86f 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -332,7 +332,7 @@ PageGetUsablePageSize(Page page) static inline uint16 PageGetSpecialSize(Page page) { - return (PageGetPageSize(page) - ((PageHeader) page)->pd_special); + return (PageGetPageSize(page) - ((PageHeader) page)->pd_special - ReservedPageSize); } /* -- 2.40.1