1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust time qual checking code so that we always check TransactionIdIsInProgress

Browse Source 
before we check commit/abort status.  Formerly this was done in some paths
but not all, with the result that a transaction might be considered
committed for some purposes before it became committed for others.
Per example found by Jan Wieck.
This commit is contained in:
Tom Lane 2005-05-07 21:23:49 +00:00
parent 68ab4de905
commit 2e6482493a
1 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
src/backend/utils/time/tqual.c
View File

@ -11,12 +11,26 @@
* containing the tuple. (VACUUM FULL assumes it's sufficient to have * containing the tuple. (VACUUM FULL assumes it's sufficient to have
* exclusive lock on the containing relation, instead.) * exclusive lock on the containing relation, instead.)
* *
* NOTE: must check TransactionIdIsInProgress (which looks in PGPROC array)
* before TransactionIdDidCommit/TransactionIdDidAbort (which look in
* pg_clog). Otherwise we have a race condition: we might decide that a
* just-committed transaction crashed, because none of the tests succeed.
* xact.c is careful to record commit/abort in pg_clog before it unsets
* MyProc->xid in PGPROC array. That fixes that problem, but it also
* means there is a window where TransactionIdIsInProgress and
* TransactionIdDidCommit will both return true. If we check only
* TransactionIdDidCommit, we could consider a tuple committed when a
* later GetSnapshotData call will still think the originating transaction
* is in progress, which leads to application-level inconsistency. The
* upshot is that we gotta check TransactionIdIsInProgress first in all
* code paths.
*
* *
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.49 2002/01/16 23:51:56 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.49.2.1 2005/05/07 21:23:49 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -109,14 +123,16 @@ HeapTupleSatisfiesItself(HeapTupleHeader tuple)
return false; return false;
} }
else if (!TransactionIdDidCommit(tuple->t_xmin)) else if (TransactionIdIsInProgress(tuple->t_xmin))
return false;
else if (TransactionIdDidCommit(tuple->t_xmin))
tuple->t_infomask |= HEAP_XMIN_COMMITTED;
else
{ {
if (TransactionIdDidAbort(tuple->t_xmin)) /* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMIN_INVALID; /* aborted */ tuple->t_infomask |= HEAP_XMIN_INVALID;
return false; return false;
} }
else
tuple->t_infomask |= HEAP_XMIN_COMMITTED;
} }
/* by here, the inserting transaction has committed */ /* by here, the inserting transaction has committed */
@ -138,10 +154,13 @@ HeapTupleSatisfiesItself(HeapTupleHeader tuple)
return false; return false;
} }
if (TransactionIdIsInProgress(tuple->t_xmax))
return true;
if (!TransactionIdDidCommit(tuple->t_xmax)) if (!TransactionIdDidCommit(tuple->t_xmax))
{ {
if (TransactionIdDidAbort(tuple->t_xmax)) /* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMAX_INVALID; /* aborted */ tuple->t_infomask |= HEAP_XMAX_INVALID;
return true; return true;
} }
@ -254,14 +273,16 @@ HeapTupleSatisfiesNow(HeapTupleHeader tuple)
else else
return false; /* deleted before scan started */ return false; /* deleted before scan started */
} }
else if (!TransactionIdDidCommit(tuple->t_xmin)) else if (TransactionIdIsInProgress(tuple->t_xmin))
return false;
else if (TransactionIdDidCommit(tuple->t_xmin))
tuple->t_infomask |= HEAP_XMIN_COMMITTED;
else
{ {
if (TransactionIdDidAbort(tuple->t_xmin)) /* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMIN_INVALID; /* aborted */ tuple->t_infomask |= HEAP_XMIN_INVALID;
return false; return false;
} }
else
tuple->t_infomask |= HEAP_XMIN_COMMITTED;
} }
/* by here, the inserting transaction has committed */ /* by here, the inserting transaction has committed */
@ -286,10 +307,13 @@ HeapTupleSatisfiesNow(HeapTupleHeader tuple)
return false; /* deleted before scan started */ return false; /* deleted before scan started */
} }
if (TransactionIdIsInProgress(tuple->t_xmax))
return true;
if (!TransactionIdDidCommit(tuple->t_xmax)) if (!TransactionIdDidCommit(tuple->t_xmax))
{ {
if (TransactionIdDidAbort(tuple->t_xmax)) /* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMAX_INVALID; /* aborted */ tuple->t_infomask |= HEAP_XMAX_INVALID;
return true; return true;
} }
@ -428,14 +452,16 @@ HeapTupleSatisfiesUpdate(HeapTuple htuple)
return HeapTupleInvisible; /* updated before scan return HeapTupleInvisible; /* updated before scan
* started */ * started */
} }
else if (!TransactionIdDidCommit(tuple->t_xmin)) else if (TransactionIdIsInProgress(tuple->t_xmin))
return HeapTupleInvisible;
else if (TransactionIdDidCommit(tuple->t_xmin))
tuple->t_infomask |= HEAP_XMIN_COMMITTED;
else
{ {
if (TransactionIdDidAbort(tuple->t_xmin)) /* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMIN_INVALID; /* aborted */ tuple->t_infomask |= HEAP_XMIN_INVALID;
return HeapTupleInvisible; return HeapTupleInvisible;
} }
else
tuple->t_infomask |= HEAP_XMIN_COMMITTED;
} }
/* by here, the inserting transaction has committed */ /* by here, the inserting transaction has committed */
@ -461,16 +487,15 @@ HeapTupleSatisfiesUpdate(HeapTuple htuple)
return HeapTupleInvisible; /* updated before scan started */ return HeapTupleInvisible; /* updated before scan started */
} }
if (TransactionIdIsInProgress(tuple->t_xmax))
return HeapTupleBeingUpdated;
if (!TransactionIdDidCommit(tuple->t_xmax)) if (!TransactionIdDidCommit(tuple->t_xmax))
{ {
if (TransactionIdDidAbort(tuple->t_xmax)) /* it must have aborted or crashed */
{ tuple->t_infomask |= HEAP_XMAX_INVALID;
tuple->t_infomask |= HEAP_XMAX_INVALID; /* aborted */
return HeapTupleMayBeUpdated; return HeapTupleMayBeUpdated;
} }
/* running xact */
return HeapTupleBeingUpdated; /* in updation by other */
}
/* xmax transaction committed */ /* xmax transaction committed */
tuple->t_infomask |= HEAP_XMAX_COMMITTED; tuple->t_infomask |= HEAP_XMAX_COMMITTED;
@ -553,19 +578,20 @@ HeapTupleSatisfiesDirty(HeapTupleHeader tuple)
return false; return false;
} }
else if (!TransactionIdDidCommit(tuple->t_xmin)) else if (TransactionIdIsInProgress(tuple->t_xmin))
{ {
if (TransactionIdDidAbort(tuple->t_xmin))
{
tuple->t_infomask |= HEAP_XMIN_INVALID;
return false;
}
SnapshotDirty->xmin = tuple->t_xmin; SnapshotDirty->xmin = tuple->t_xmin;
/* XXX shouldn't we fall through to look at xmax? */ /* XXX shouldn't we fall through to look at xmax? */
return true; /* in insertion by other */ return true; /* in insertion by other */
} }
else else if (TransactionIdDidCommit(tuple->t_xmin))
tuple->t_infomask |= HEAP_XMIN_COMMITTED; tuple->t_infomask |= HEAP_XMIN_COMMITTED;
else
{
/* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMIN_INVALID;
return false;
}
} }
/* by here, the inserting transaction has committed */ /* by here, the inserting transaction has committed */
@ -588,16 +614,17 @@ HeapTupleSatisfiesDirty(HeapTupleHeader tuple)
return false; return false;
} }
if (!TransactionIdDidCommit(tuple->t_xmax)) if (TransactionIdIsInProgress(tuple->t_xmax))
{ {
if (TransactionIdDidAbort(tuple->t_xmax)) SnapshotDirty->xmax = tuple->t_xmax;
{
tuple->t_infomask |= HEAP_XMAX_INVALID; /* aborted */
return true; return true;
} }
/* running xact */
SnapshotDirty->xmax = tuple->t_xmax; if (!TransactionIdDidCommit(tuple->t_xmax))
return true; /* in updation by other */ {
/* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMAX_INVALID;
return true;
} }
/* xmax transaction committed */ /* xmax transaction committed */
@ -693,14 +720,16 @@ HeapTupleSatisfiesSnapshot(HeapTupleHeader tuple, Snapshot snapshot)
else else
return false; /* deleted before scan started */ return false; /* deleted before scan started */
} }
else if (!TransactionIdDidCommit(tuple->t_xmin)) else if (TransactionIdIsInProgress(tuple->t_xmin))
return false;
else if (TransactionIdDidCommit(tuple->t_xmin))
tuple->t_infomask |= HEAP_XMIN_COMMITTED;
else
{ {
if (TransactionIdDidAbort(tuple->t_xmin)) /* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMIN_INVALID; tuple->t_infomask |= HEAP_XMIN_INVALID;
return false; return false;
} }
else
tuple->t_infomask |= HEAP_XMIN_COMMITTED;
} }
/* /*
@ -737,10 +766,13 @@ HeapTupleSatisfiesSnapshot(HeapTupleHeader tuple, Snapshot snapshot)
return false; /* deleted before scan started */ return false; /* deleted before scan started */
} }
if (TransactionIdIsInProgress(tuple->t_xmax))
return true;
if (!TransactionIdDidCommit(tuple->t_xmax)) if (!TransactionIdDidCommit(tuple->t_xmax))
{ {
if (TransactionIdDidAbort(tuple->t_xmax)) /* it must have aborted or crashed */
tuple->t_infomask |= HEAP_XMAX_INVALID; /* aborted */ tuple->t_infomask |= HEAP_XMAX_INVALID;
return true; return true;
} }
@ -785,13 +817,6 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin)
* *
* If the inserting transaction aborted, then the tuple was never visible * If the inserting transaction aborted, then the tuple was never visible
* to any other transaction, so we can delete it immediately. * to any other transaction, so we can delete it immediately.
*
* NOTE: must check TransactionIdIsInProgress (which looks in PROC array)
* before TransactionIdDidCommit/TransactionIdDidAbort (which look in
* pg_clog). Otherwise we have a race condition where we might decide
* that a just-committed transaction crashed, because none of the
* tests succeed. xact.c is careful to record commit/abort in pg_clog
* before it unsets MyProc->xid in PROC array.
*/ */
if (!(tuple->t_infomask & HEAP_XMIN_COMMITTED)) if (!(tuple->t_infomask & HEAP_XMIN_COMMITTED))
{ {
@ -828,17 +853,9 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin)
return HEAPTUPLE_INSERT_IN_PROGRESS; return HEAPTUPLE_INSERT_IN_PROGRESS;
else if (TransactionIdDidCommit(tuple->t_xmin)) else if (TransactionIdDidCommit(tuple->t_xmin))
tuple->t_infomask |= HEAP_XMIN_COMMITTED; tuple->t_infomask |= HEAP_XMIN_COMMITTED;
else if (TransactionIdDidAbort(tuple->t_xmin))
{
tuple->t_infomask |= HEAP_XMIN_INVALID;
return HEAPTUPLE_DEAD;
}
else else
{ {
/* /* it must be aborted or crashed */
* Not in Progress, Not Committed, Not Aborted - so it's from
* crashed process. - vadim 11/26/96
*/
tuple->t_infomask |= HEAP_XMIN_INVALID; tuple->t_infomask |= HEAP_XMIN_INVALID;
return HEAPTUPLE_DEAD; return HEAPTUPLE_DEAD;
} }
@ -879,22 +896,12 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin)
return HEAPTUPLE_DELETE_IN_PROGRESS; return HEAPTUPLE_DELETE_IN_PROGRESS;
else if (TransactionIdDidCommit(tuple->t_xmax)) else if (TransactionIdDidCommit(tuple->t_xmax))
tuple->t_infomask |= HEAP_XMAX_COMMITTED; tuple->t_infomask |= HEAP_XMAX_COMMITTED;
else if (TransactionIdDidAbort(tuple->t_xmax))
{
tuple->t_infomask |= HEAP_XMAX_INVALID;
return HEAPTUPLE_LIVE;
}
else else
{ {
/* /* it must be aborted or crashed */
* Not in Progress, Not Committed, Not Aborted - so it's from
* crashed process. - vadim 06/02/97
*/
tuple->t_infomask |= HEAP_XMAX_INVALID; tuple->t_infomask |= HEAP_XMAX_INVALID;
return HEAPTUPLE_LIVE; return HEAPTUPLE_LIVE;
} }
/* Should only get here if we set XMAX_COMMITTED */
Assert(tuple->t_infomask & HEAP_XMAX_COMMITTED);
} }
/* /*