diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-08-23 23:06:38 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-08-23 23:06:38 +0000 |
| commit | 7326e78c4249393359edce09f555aaa049be2a80 (patch) | |
| tree | d1fc53198588ee98884524a28b13105a6b296952 /src/backend/access/transam/transam.c | |
| parent | 29ec29ffac53b50870a55b88f96b462835e9042a (diff) | |
| download | postgresql-7326e78c4249393359edce09f555aaa049be2a80.tar.gz postgresql-7326e78c4249393359edce09f555aaa049be2a80.zip | |
Ensure that all TransactionId comparisons are encapsulated in macros
(TransactionIdPrecedes, TransactionIdFollows, etc). First step on the
way to transaction ID wrap solution ...
Diffstat (limited to 'src/backend/access/transam/transam.c')
| -rw-r--r-- | src/backend/access/transam/transam.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index 910042fb624..65718b4cae9 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.45 2001/07/12 04:11:13 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.46 2001/08/23 23:06:37 tgl Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -44,7 +44,7 @@ Relation LogRelation = (Relation) NULL; * Single-item cache for results of TransactionLogTest. * ---------------- */ -static TransactionId cachedTestXid = NullTransactionId; +static TransactionId cachedTestXid = InvalidTransactionId; static XidStatus cachedTestXidStatus; /* ---------------- @@ -333,18 +333,19 @@ InitializeTransactionLog(void) /* * if we have a virgin database, we initialize the log relation by - * committing the AmiTransactionId and we initialize the + * committing the BootstrapTransactionId and we initialize the * variable relation by setting the next available transaction id to - * FirstTransactionId. OID initialization happens as a side + * FirstNormalTransactionId. OID initialization happens as a side * effect of bootstrapping in varsup.c. */ SpinAcquire(OidGenLockId); - if (!TransactionIdDidCommit(AmiTransactionId)) + if (!TransactionIdDidCommit(BootstrapTransactionId)) { - TransactionLogUpdate(AmiTransactionId, XID_COMMIT); + TransactionLogUpdate(BootstrapTransactionId, XID_COMMIT); Assert(!IsUnderPostmaster && - ShmemVariableCache->nextXid <= FirstTransactionId); - ShmemVariableCache->nextXid = FirstTransactionId; + TransactionIdEquals(ShmemVariableCache->nextXid, + FirstNormalTransactionId)); + ShmemVariableCache->nextXid = FirstNormalTransactionId; } else if (RecoveryCheckingEnabled()) { |