From d3207bb557aa1d2868a50d357a06318a6c0cb5cd Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 20 Mar 2024 13:48:29 +0200 Subject: [PATCH v5 03/26] Rename record to XLOG_HEAP2_PRUNE_FREEZE To clarify that it also freezes now, and to make it clear that it's significantly different from the old XLOG_HEAP2_PRUNE format. --- src/backend/access/gist/gistxlog.c | 8 ++++---- src/backend/access/hash/hash_xlog.c | 8 ++++---- src/backend/access/heap/heapam.c | 16 ++++++++-------- src/backend/access/heap/pruneheap.c | 4 ++-- src/backend/access/rmgrdesc/heapdesc.c | 6 +++--- src/backend/replication/logical/decode.c | 2 +- src/include/access/heapam_xlog.h | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index fafd9f1c94f..588cade585b 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -183,10 +183,10 @@ gistRedoDeleteRecord(XLogReaderState *record) * * GiST delete records can conflict with standby queries. You might think * that vacuum records would conflict as well, but we've handled that - * already. XLOG_HEAP2_PRUNE records provide the highest xid cleaned by - * the vacuum of the heap and so we can resolve any conflicts just once - * when that arrives. After that we know that no conflicts exist from - * individual gist vacuum records on that index. + * already. XLOG_HEAP2_PRUNE_FREEZE records provide the highest xid + * cleaned by the vacuum of the heap and so we can resolve any conflicts + * just once when that arrives. After that we know that no conflicts + * exist from individual gist vacuum records on that index. */ if (InHotStandby) { diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c index 4e05a1b4632..883915fd1da 100644 --- a/src/backend/access/hash/hash_xlog.c +++ b/src/backend/access/hash/hash_xlog.c @@ -992,10 +992,10 @@ hash_xlog_vacuum_one_page(XLogReaderState *record) * Hash index records that are marked as LP_DEAD and being removed during * hash index tuple insertion can conflict with standby queries. You might * think that vacuum records would conflict as well, but we've handled - * that already. XLOG_HEAP2_PRUNE records provide the highest xid cleaned - * by the vacuum of the heap and so we can resolve any conflicts just once - * when that arrives. After that we know that no conflicts exist from - * individual hash index vacuum records on that index. + * that already. XLOG_HEAP2_PRUNE_FREEZE records provide the highest xid + * cleaned by the vacuum of the heap and so we can resolve any conflicts + * just once when that arrives. After that we know that no conflicts + * exist from individual hash index vacuum records on that index. */ if (InHotStandby) { diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index e6cfffd9f3e..69a9aaa501d 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -7726,10 +7726,10 @@ heap_index_delete_tuples(Relation rel, TM_IndexDeleteOp *delstate) * must have considered the original tuple header as part of * generating its own snapshotConflictHorizon value. * - * Relying on XLOG_HEAP2_PRUNE records like this is the same - * strategy that index vacuuming uses in all cases. Index VACUUM - * WAL records don't even have a snapshotConflictHorizon field of - * their own for this reason. + * Relying on XLOG_HEAP2_PRUNE_FREEZE records like this is the + * same strategy that index vacuuming uses in all cases. Index + * VACUUM WAL records don't even have a snapshotConflictHorizon + * field of their own for this reason. */ if (!ItemIdIsNormal(lp)) break; @@ -8587,10 +8587,10 @@ ExtractReplicaIdentity(Relation relation, HeapTuple tp, bool key_required, } /* - * Handles XLOG_HEAP2_PRUNE record type. + * Handles XLOG_HEAP2_PRUNE_FREEZE record type. */ static void -heap_xlog_prune(XLogReaderState *record) +heap_xlog_prune_freeze(XLogReaderState *record) { XLogRecPtr lsn = record->EndRecPtr; xl_heap_prune *xlrec = (xl_heap_prune *) XLogRecGetData(record); @@ -9762,8 +9762,8 @@ heap2_redo(XLogReaderState *record) switch (info & XLOG_HEAP_OPMASK) { - case XLOG_HEAP2_PRUNE: - heap_xlog_prune(record); + case XLOG_HEAP2_PRUNE_FREEZE: + heap_xlog_prune_freeze(record); break; case XLOG_HEAP2_VISIBLE: heap_xlog_visible(record); diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 9773681868c..704604d206a 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -359,7 +359,7 @@ heap_page_prune(Relation relation, Buffer buffer, MarkBufferDirty(buffer); /* - * Emit a WAL XLOG_HEAP2_PRUNE record showing what we did + * Emit a WAL XLOG_HEAP2_PRUNE_FREEZE record showing what we did */ if (RelationNeedsWAL(relation)) { @@ -1397,7 +1397,7 @@ log_heap_prune_and_freeze(Relation relation, Buffer buffer, XLogRegisterBufData(0, (char *) frz_offsets, sizeof(OffsetNumber) * nfrozen); - recptr = XLogInsert(RM_HEAP2_ID, XLOG_HEAP2_PRUNE); + recptr = XLogInsert(RM_HEAP2_ID, XLOG_HEAP2_PRUNE_FREEZE); PageSetLSN(BufferGetPage(buffer), recptr); } diff --git a/src/backend/access/rmgrdesc/heapdesc.c b/src/backend/access/rmgrdesc/heapdesc.c index 0d7edffff20..8b94c869faf 100644 --- a/src/backend/access/rmgrdesc/heapdesc.c +++ b/src/backend/access/rmgrdesc/heapdesc.c @@ -243,7 +243,7 @@ heap2_desc(StringInfo buf, XLogReaderState *record) uint8 info = XLogRecGetInfo(record) & ~XLR_INFO_MASK; info &= XLOG_HEAP_OPMASK; - if (info == XLOG_HEAP2_PRUNE) + if (info == XLOG_HEAP2_PRUNE_FREEZE) { xl_heap_prune *xlrec = (xl_heap_prune *) rec; @@ -409,8 +409,8 @@ heap2_identify(uint8 info) switch (info & ~XLR_INFO_MASK) { - case XLOG_HEAP2_PRUNE: - id = "PRUNE"; + case XLOG_HEAP2_PRUNE_FREEZE: + id = "PRUNE_FREEZE"; break; case XLOG_HEAP2_VISIBLE: id = "VISIBLE"; diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c index 38d1bdd825e..8c909514381 100644 --- a/src/backend/replication/logical/decode.c +++ b/src/backend/replication/logical/decode.c @@ -445,7 +445,7 @@ heap2_decode(LogicalDecodingContext *ctx, XLogRecordBuffer *buf) * Everything else here is just low level physical stuff we're not * interested in. */ - case XLOG_HEAP2_PRUNE: + case XLOG_HEAP2_PRUNE_FREEZE: case XLOG_HEAP2_VISIBLE: case XLOG_HEAP2_LOCK_UPDATED: break; diff --git a/src/include/access/heapam_xlog.h b/src/include/access/heapam_xlog.h index 6a934be7ecc..3d41aeb6d47 100644 --- a/src/include/access/heapam_xlog.h +++ b/src/include/access/heapam_xlog.h @@ -51,7 +51,7 @@ * these, too. */ #define XLOG_HEAP2_REWRITE 0x00 -#define XLOG_HEAP2_PRUNE 0x10 +#define XLOG_HEAP2_PRUNE_FREEZE 0x10 /* 0x20 is free, was XLOG_HEAP2_VACUUM */ /* 0x30 is free, was XLOG_HEAP2_FREEZE_PAGE */ #define XLOG_HEAP2_VISIBLE 0x40 @@ -301,7 +301,7 @@ typedef struct xl_heap_freeze_plan } xl_heap_freeze_plan; /* - * As of Postgres 17, XLOG_HEAP2_PRUNE records replace + * As of Postgres 17, XLOG_HEAP2_PRUNE_FREEZE records replace * XLOG_HEAP2_FREEZE_PAGE records. * * This is what we need to know about a block being frozen during vacuum -- 2.39.2