diff options
| author | Vadim B. Mikheev <vadim4o@yahoo.com> | 1998-12-16 11:53:55 +0000 |
|---|---|---|
| committer | Vadim B. Mikheev <vadim4o@yahoo.com> | 1998-12-16 11:53:55 +0000 |
| commit | c13a64d7fb3002f437fdf9ab28120c00d0853d04 (patch) | |
| tree | 42ec5fe73650bbe5d844b90ecd5d3755361ba2e7 /src/backend/access/transam | |
| parent | 54c3e6524217e8fbd5680e212407b98117829c53 (diff) | |
| download | postgresql-c13a64d7fb3002f437fdf9ab28120c00d0853d04.tar.gz | |
Serialized mode works!
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/transam.c | 28 | ||||
| -rw-r--r-- | src/backend/access/transam/xact.c | 8 |
2 files changed, 16 insertions, 20 deletions
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index b68b6ab669..478afbbcca 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.20 1998/12/15 12:45:30 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.21 1998/12/16 11:53:44 vadim Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -172,12 +172,8 @@ TransactionLogTest(TransactionId transactionId, /* transaction id to test */ if (!fail) { - /* must not cache status of running xaction !!! */ - if (xidstatus != XID_INPROGRESS) - { - TransactionIdStore(transactionId, &cachedTestXid); - cachedTestXidStatus = xidstatus; - } + TransactionIdStore(transactionId, &cachedTestXid); + cachedTestXidStatus = xidstatus; return (bool) (status == xidstatus); } @@ -230,11 +226,8 @@ TransactionLogUpdate(TransactionId transactionId, /* trans id to update */ * * What's the hell ?! Why != XID_COMMIT ?! */ - if (status != XID_INPROGRESS) - { - TransactionIdStore(transactionId, &cachedTestXid); - cachedTestXidStatus = status; - } + TransactionIdStore(transactionId, &cachedTestXid); + cachedTestXidStatus = status; } @@ -588,14 +581,11 @@ TransactionIdAbort(TransactionId transactionId) TransactionLogUpdate(transactionId, XID_ABORT); } -#ifdef NOT_USED void -TransactionIdSetInProgress(TransactionId transactionId) +TransactionIdFlushCache() { - if (AMI_OVERRIDE) - return; - TransactionLogUpdate(transactionId, XID_INPROGRESS); -} + TransactionIdStore(AmiTransactionId, &cachedTestXid); + cachedTestXidStatus = XID_COMMIT; -#endif +} diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 002b43cd04..6a9bb9ab63 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.26 1998/12/15 12:45:35 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.27 1998/12/16 11:53:44 vadim Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -516,6 +516,9 @@ CommandCounterIncrement() /* make cache changes visible to me */ AtCommit_Cache(); AtStart_Cache(); + + TransactionIdFlushCache(); + } void @@ -793,6 +796,9 @@ StartTransaction() { TransactionState s = CurrentTransactionState; + TransactionIdFlushCache(); + FreeXactSnapshot(); + /* ---------------- * Check the current transaction state. If the transaction system * is switched off, or if we're already in a transaction, do nothing. |