From a1f627a6e8c347bdb3112033ae08ace57fbf0a10 Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot Date: Thu, 16 Feb 2023 15:01:29 +0000 Subject: [PATCH v2] Change xl_hash_vacuum_one_page.ntuples from int to uint16. This will create two bytes of padding space in xl_hash_vacuum_one_page which can be used for future patches. This makes the datatype of xl_hash_vacuum_one_page.ntuples same as gistxlogDelete.ntodelete which is advisable as both are used for the same purpose. Bump XLOG_PAGE_MAGIC. --- src/include/access/hash_xlog.h | 4 ++-- src/include/access/xlog_internal.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 100.0% src/include/access/ diff --git a/src/include/access/hash_xlog.h b/src/include/access/hash_xlog.h index a2f0f39213..9894ab9afe 100644 --- a/src/include/access/hash_xlog.h +++ b/src/include/access/hash_xlog.h @@ -251,13 +251,13 @@ typedef struct xl_hash_init_bitmap_page typedef struct xl_hash_vacuum_one_page { TransactionId snapshotConflictHorizon; - int ntuples; + uint16 ntuples; /* TARGET OFFSET NUMBERS FOLLOW AT THE END */ } xl_hash_vacuum_one_page; #define SizeOfHashVacuumOnePage \ - (offsetof(xl_hash_vacuum_one_page, ntuples) + sizeof(int)) + (offsetof(xl_hash_vacuum_one_page, ntuples) + sizeof(uint16)) extern void hash_redo(XLogReaderState *record); extern void hash_desc(StringInfo buf, XLogReaderState *record); diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index 59fc7bc105..8edae7bb07 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -31,7 +31,7 @@ /* * Each page of XLOG file has a header like this: */ -#define XLOG_PAGE_MAGIC 0xD111 /* can be used as WAL version indicator */ +#define XLOG_PAGE_MAGIC 0xD112 /* can be used as WAL version indicator */ typedef struct XLogPageHeaderData { -- 2.34.1