Replace occurrences of InvalidXid with InvalidTransactionId

danielgustafsson · danielgustafsson · commit 941921b875c7 · 2021-10-04T10:31:01.000+02:00
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 <bharath.rupireddyforpostgres@gmail.com> Discussion: https://postgr.es/m/CALj2ACUQzdigML868nV4cojfELPkEzNLNOk7b91Pho4JB90fng@mail.gmail.com
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -3589,9 +3589,9 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 	/*
 	 * 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -919,9 +919,9 @@ xmin_cmp(const pairingheap_node a, const pairingheap_node b, void *arg)`
`919`	`919`	`/*`
`920`	`920`	`* SnapshotResetXmin`
`921`	`921`	`*`
`922`		`- * If there are no more snapshots, we can reset our PGPROC->xmin to InvalidXid.`
`923`		`- * Note we can do this without locking because we assume that storing an Xid`
`924`		`- * is atomic.`
	`922`	`+ * If there are no more snapshots, we can reset our PGPROC->xmin to`
	`923`	`+ * InvalidTransactionId. Note we can do this without locking because we assume`
	`924`	`+ * that storing an Xid is atomic.`
`925`	`925`	`*`
`926`	`926`	`* Even if there are some remaining snapshots, we may be able to advance our`
`927`	`927`	`* PGPROC->xmin to some degree. This typically happens when a portal is`