From 941921b875c7710e2b070c02c7819f2510808fdd Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Mon, 4 Oct 2021 10:31:01 +0200 Subject: [PATCH] Replace occurrences of InvalidXid with InvalidTransactionId While Xid is a known shortening of TransactionId, InvalidXid is not defined in the code. Fix comments which mistakenly were using the shorter version. Author: Bharath Rupireddy Discussion: https://postgr.es/m/CALj2ACUQzdigML868nV4cojfELPkEzNLNOk7b91Pho4JB90fng@mail.gmail.com --- src/backend/access/heap/heapam.c | 6 +++--- src/backend/utils/time/snapmgr.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 2a264c6ac1..2da2be1696 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -3589,9 +3589,9 @@ l2: /* * And also prepare an Xmax value for the new copy of the tuple. If there * was no xmax previously, or there was one but all lockers are now gone, - * then use InvalidXid; otherwise, get the xmax from the old tuple. (In - * rare cases that might also be InvalidXid and yet not have the - * HEAP_XMAX_INVALID bit set; that's fine.) + * then use InvalidTransactionId; otherwise, get the xmax from the old + * tuple. (In rare cases that might also be InvalidTransactionId and yet + * not have the HEAP_XMAX_INVALID bit set; that's fine.) */ if ((oldtup.t_data->t_infomask & HEAP_XMAX_INVALID) || HEAP_LOCKED_UPGRADED(oldtup.t_data->t_infomask) || diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index dca1bc8afc..5001efdf7a 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -919,9 +919,9 @@ xmin_cmp(const pairingheap_node *a, const pairingheap_node *b, void *arg) /* * SnapshotResetXmin * - * If there are no more snapshots, we can reset our PGPROC->xmin to InvalidXid. - * Note we can do this without locking because we assume that storing an Xid - * is atomic. + * If there are no more snapshots, we can reset our PGPROC->xmin to + * InvalidTransactionId. Note we can do this without locking because we assume + * that storing an Xid is atomic. * * Even if there are some remaining snapshots, we may be able to advance our * PGPROC->xmin to some degree. This typically happens when a portal is