Ensure that all TransactionId comparisons are encapsulated in macros

(TransactionIdPrecedes, TransactionIdFollows, etc).  First step on the
way to transaction ID wrap solution ...

1 files changed, 6 insertions, 6 deletions

diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index a93e91237f6..de05c4a84a2 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.37 2001/07/16 22:43:34 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.38 2001/08/23 23:06:37 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -241,12 +241,12 @@ GetXmaxRecent(TransactionId *XmaxRecent)
 			/* Fetch xid just once - see GetNewTransactionId */
 			TransactionId xid = proc->xid;
 
-			if (! TransactionIdIsSpecial(xid))
+			if (TransactionIdIsNormal(xid))
 			{
 				if (TransactionIdPrecedes(xid, result))
 					result = xid;
 				xid = proc->xmin;
-				if (! TransactionIdIsSpecial(xid))
+				if (TransactionIdIsNormal(xid))
 					if (TransactionIdPrecedes(xid, result))
 						result = xid;
 			}
@@ -347,8 +347,8 @@ GetSnapshotData(bool serializable)
 			 * treat them as running anyway.
 			 */
 			if (proc == MyProc ||
-				TransactionIdIsSpecial(xid) ||
-				! TransactionIdPrecedes(xid, snapshot->xmax))
+				! TransactionIdIsNormal(xid) ||
+				TransactionIdFollowsOrEquals(xid, snapshot->xmax))
 				continue;
 
 			if (TransactionIdPrecedes(xid, snapshot->xmin))
@@ -364,7 +364,7 @@ GetSnapshotData(bool serializable)
 	SpinRelease(SInvalLock);
 
 	/* Serializable snapshot must be computed before any other... */
-	Assert(MyProc->xmin != InvalidTransactionId);
+	Assert(TransactionIdIsValid(MyProc->xmin));
 
 	snapshot->xcnt = count;
 	return snapshot;