git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Thomas Munro <tmunro@postgresql.org>

2019年3月27日 08:16:50 +0000 (21:16 +1300)

committer Thomas Munro <tmunro@postgresql.org>

2019年3月27日 08:30:04 +0000 (21:30 +1300)

The transaction ID returned by GetNextXidAndEpoch() is in the future,
so we can't attempt to access its status or we might try to read a
CLOG page that doesn't exist. The > vs >= confusion probably stemmed
from the choice of a variable name containing the word "last" instead
of "next", so fix that too.

Back-patch to 10 where the function arrived.

Author: Thomas Munro
Discussion: https://postgr.es/m/CA%2BhUKG%2Buua_BV5cyfsioKVN2d61Lukg28ECsWTXKvh%3DBtN2DPA%40mail.gmail.com

src/backend/utils/adt/txid.c patch | blob | blame | history

diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c

index 791bbf84024c24a1180c4ec815d790f332e06ad0..9958b1a55e890f6f7a8c15867376a1b85b98e2e6 100644 (file)

--- a/src/backend/utils/adt/txid.c

+++ b/src/backend/utils/adt/txid.c

@@ -113,9 +113,9 @@ TransactionIdInRecentPast(uint64 xid_with_epoch, TransactionId *extracted_xid)

uint32 xid_epoch = (uint32) (xid_with_epoch >> 32);

TransactionId xid = (TransactionId) xid_with_epoch;

uint32 now_epoch;

- TransactionId now_epoch_last_xid;

+ TransactionId now_epoch_next_xid;

- GetNextXidAndEpoch(&now_epoch_last_xid, &now_epoch);