1
0
mirror of https://github.com/postgres/postgres.git synced 2026-01-26 09:41:40 +03:00

heapam: Use exclusive lock on old page in CLUSTER

To be able to guarantee that we can set the hint bit, acquire an exclusive
lock on the old buffer. This is required as a future commit will only allow
hint bits to be set with a new lock level, which is acquired as-needed in a
non-blocking fashion.

We need the hint bits, set in heapam_relation_copy_for_cluster() ->
HeapTupleSatisfiesVacuum(), to be set, as otherwise reform_and_rewrite_tuple()
-> rewrite_heap_tuple() will get confused. Specifically, rewrite_heap_tuple()
checks for HEAP_XMAX_INVALID in the old tuple to determine whether to check
the old-to-new mapping hash table.

It'd be better if we somehow could avoid setting hint bits on the old page. A
common reason to use VACUUM FULL is very bloated tables - rewriting most of
the old table during VACUUM FULL doesn't exactly help.

Reviewed-by: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Reviewed-by: Kirill Reshke <reshkekirill@gmail.com>
Discussion: https://postgr.es/m/4wggb7purufpto6x35fd2kwhasehnzfdy3zdcu47qryubs2hdz@fa5kannykekr
This commit is contained in:
Andres Freund
2026-01-12 11:50:05 -05:00
parent 45f658dacb
commit 852558b9ec
3 changed files with 25 additions and 1 deletions

View File

@@ -837,7 +837,21 @@ heapam_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap,
tuple = ExecFetchSlotHeapTuple(slot, false, NULL);
buf = hslot->buffer;
LockBuffer(buf, BUFFER_LOCK_SHARE);
/*
* To be able to guarantee that we can set the hint bit, acquire an
* exclusive lock on the old buffer. We need the hint bits, set in
* heapam_relation_copy_for_cluster() -> HeapTupleSatisfiesVacuum(),
* to be set, as otherwise reform_and_rewrite_tuple() ->
* rewrite_heap_tuple() will get confused. Specifically,
* rewrite_heap_tuple() checks for HEAP_XMAX_INVALID in the old tuple
* to determine whether to check the old-to-new mapping hash table.
*
* It'd be better if we somehow could avoid setting hint bits on the
* old page. One reason to use VACUUM FULL are very bloated tables -
* rewriting most of the old table during VACUUM FULL doesn't exactly
* help...
*/
LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
switch (HeapTupleSatisfiesVacuum(tuple, OldestXmin, buf))
{

View File

@@ -141,6 +141,13 @@ void
HeapTupleSetHintBits(HeapTupleHeader tuple, Buffer buffer,
uint16 infomask, TransactionId xid)
{
/*
* The uses from heapam.c rely on being able to perform the hint bit
* updates, which can only be guaranteed if we are holding an exclusive
* lock on the buffer - which all callers are doing.
*/
Assert(BufferIsLockedByMeInMode(buffer, BUFFER_LOCK_EXCLUSIVE));
SetHintBits(tuple, buffer, infomask, xid);
}

View File

@@ -382,6 +382,9 @@ rewrite_heap_tuple(RewriteState state,
/*
* If the tuple has been updated, check the old-to-new mapping hash table.
*
* Note that this check relies on the HeapTupleSatisfiesVacuum() in
* heapam_relation_copy_for_cluster() to have set hint bits.
*/
if (!((old_tuple->t_data->t_infomask & HEAP_XMAX_INVALID) ||
HeapTupleHeaderIsOnlyLocked(old_tuple->t_data)) &&