postgres.git / summary / log / commit / refs

commit    278d2a672e65d22d5d191c674cda863623df59d7
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Mon Oct 26 00:55:01 2026 +0000
First released in: 14.25, 15.20, 16.16, 17.12, 18.7, 19.0

    Set HEAP_XMAX_INVALID for tuples updated by aborted subtransaction
    
    HeapTupleSatisfiesVacuumHorizon() did not set HEAP_XMAX_INVALID on a
    tuple inserted, then updated by a subtransaction that rolled back.
    rewriteheap.c relies on this hint to tell if such tuples should be
    treated as updated and would drop them, causing rewrites to lose some
    tuples.
    
    HeapTupleSatisfiesVacuumHorizon() is updated to set the hint
    HEAP_XMAX_INVALID, so as heap AM is able to redirect such a tuple to its
    correct route, and does not lose it.
    
    This issue impacted both CLUSTER (down to v14) and REPACK [USING] (down
    to v19).
    
    Reported-by: Alperen Keles <alpkeles99@gmail.com>
    Author: Shihao Zhong <zhong950419@gmail.com>
    Author: Michael Paquier <michael@paquier.xyz>
    Reported-by: Zhijie Hou <houzhijie22@gmail.com>
    Reported-by: Takeshi Ideriha <iderihatakeshi@gmail.com>
    Reported-by: Ayush Tiwari <ayushtiwari.slg01@gmail.com>
    Discussion: https://postgr.es/m/19760-8f9a0eba17bc8c92@postgresql.org
    Backpatch-through: 14


src/backend/access/heap/heapam_visibility.c | 2 ++ src/test/regress/expected/cluster.out | 28 ++++++++++++++++++++++++++++ src/test/regress/sql/cluster.sql | 19 +++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/src/backend/access/heap/heapam_visibility.c b/src/backend/access/heap/heapam_visibility.c index 20d82cad4b6..b7be3d73916 100644 --- a/src/backend/access/heap/heapam_visibility.c +++ b/src/backend/access/heap/heapam_visibility.c @@ -1261,6 +1261,8 @@ HeapTupleSatisfiesVacuumHorizon(HeapTuple htup, Buffer buffer, TransactionId *de if (TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetUpdateXid(tuple))) return HEAPTUPLE_DELETE_IN_PROGRESS; /* deleting subtransaction must have aborted */ + SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, + InvalidTransactionId); return HEAPTUPLE_INSERT_IN_PROGRESS; } else if (TransactionIdIsInProgress(HeapTupleHeaderGetRawXmin(tuple))) diff --git a/src/test/regress/expected/cluster.out b/src/test/regress/expected/cluster.out index 7293c0f03ea..4fa4b471480 100644 --- a/src/test/regress/expected/cluster.out +++ b/src/test/regress/expected/cluster.out @@ -591,6 +591,33 @@ SELECT * FROM clstr_expression WHERE -a = -3 ORDER BY -a, b; (4 rows) COMMIT; +-- CLUSTER with rollbacked subtransaction, where the same row is inserted, +-- updated, then rollbacked. +BEGIN; +-- Index scan required for CLUSTER, force it. +SET LOCAL random_page_cost = 0.0001; +SET LOCAL seq_page_cost = 1000; +CREATE TABLE cluster_aborted_upd (a int, b int); +CREATE INDEX cluster_aborted_upd_idx ON cluster_aborted_upd (b); +INSERT INTO cluster_aborted_upd VALUES (1, 3); +SAVEPOINT sp; +UPDATE cluster_aborted_upd SET a = 2; +ROLLBACK TO sp; +CLUSTER cluster_aborted_upd USING cluster_aborted_upd_idx; +COMMIT; +-- One row expected. +SELECT count(*) FROM cluster_aborted_upd; + count +------- + 1 +(1 row) + +SELECT * FROM cluster_aborted_upd; + a | b +---+--- + 1 | 3 +(1 row) + -- clean up DROP TABLE clustertest; DROP TABLE clstr_1; @@ -598,4 +625,5 @@ DROP TABLE clstr_2; DROP TABLE clstr_3; DROP TABLE clstr_4; DROP TABLE clstr_expression; +DROP TABLE cluster_aborted_upd; DROP USER regress_clstr_user; diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql index 99ee533c8d0..54a4dfae3f3 100644 --- a/src/test/regress/sql/cluster.sql +++ b/src/test/regress/sql/cluster.sql @@ -269,6 +269,24 @@ EXPLAIN (COSTS OFF) SELECT * FROM clstr_expression WHERE -a = -3 ORDER BY -a, b; SELECT * FROM clstr_expression WHERE -a = -3 ORDER BY -a, b; COMMIT; +-- CLUSTER with rollbacked subtransaction, where the same row is inserted, +-- updated, then rollbacked. +BEGIN; +-- Index scan required for CLUSTER, force it. +SET LOCAL random_page_cost = 0.0001; +SET LOCAL seq_page_cost = 1000; +CREATE TABLE cluster_aborted_upd (a int, b int); +CREATE INDEX cluster_aborted_upd_idx ON cluster_aborted_upd (b); +INSERT INTO cluster_aborted_upd VALUES (1, 3); +SAVEPOINT sp; +UPDATE cluster_aborted_upd SET a = 2; +ROLLBACK TO sp; +CLUSTER cluster_aborted_upd USING cluster_aborted_upd_idx; +COMMIT; +-- One row expected. +SELECT count(*) FROM cluster_aborted_upd; +SELECT * FROM cluster_aborted_upd; + -- clean up DROP TABLE clustertest; DROP TABLE clstr_1; @@ -276,5 +294,6 @@ DROP TABLE clstr_2; DROP TABLE clstr_3; DROP TABLE clstr_4; DROP TABLE clstr_expression; +DROP TABLE cluster_aborted_upd; DROP USER regress_clstr_user; [parent: 12cd839ec86a]