From: Tom Lane Date: Wed, 13 Oct 2004 22:22:03 +0000 (+0000) Subject: Repair possible failure to update hint bits back to disk, per X-Git-Tag: REL7_4_6~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d46f0e613e4c147643d8b755fb7d4ea7d710311;p=postgresql Repair possible failure to update hint bits back to disk, per http://archives.postgresql.org/pgsql-hackers/2004-10/msg00464.php. I plan a more permanent fix in HEAD, but for the back branches it seems best to just touch the places that actually have a problem. --- diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 94160605dc..31de26aa3f 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.12 2003/08/04 00:43:11 momjian Exp $ + * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.12.4.1 2004/10/13 22:22:00 tgl Exp $ * * Copyright (c) 2001,2002 Tatsuo Ishii * @@ -137,6 +137,9 @@ pgstattuple_real(Relation rel) /* scan the relation */ while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL) { + uint16 sv_infomask; + + sv_infomask = tuple->t_data->t_infomask; if (HeapTupleSatisfiesNow(tuple->t_data)) { tuple_len += tuple->t_len; @@ -147,6 +150,8 @@ pgstattuple_real(Relation rel) dead_tuple_len += tuple->t_len; dead_tuple_count++; } + if (sv_infomask != tuple->t_data->t_infomask) + SetBufferCommitInfoNeedsSave(scan->rs_cbuf); /* * To avoid physically reading the table twice, try to do the diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 1d1bd6f637..fe44363a92 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.157 2003/10/01 21:30:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.157.2.1 2004/10/13 22:22:02 tgl Exp $ * * * INTERFACE ROUTINES @@ -1230,6 +1230,7 @@ heap_delete(Relation relation, ItemPointer tid, PageHeader dp; Buffer buffer; int result; + uint16 sv_infomask; Assert(ItemPointerIsValid(tid)); @@ -1249,7 +1250,10 @@ heap_delete(Relation relation, ItemPointer tid, tp.t_tableOid = relation->rd_id; l1: + sv_infomask = tp.t_data->t_infomask; result = HeapTupleSatisfiesUpdate(tp.t_data, cid); + if (sv_infomask != tp.t_data->t_infomask) + SetBufferCommitInfoNeedsSave(buffer); if (result == HeapTupleInvisible) { @@ -1266,7 +1270,7 @@ l1: XactLockTableWait(xwait); LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); - if (TransactionIdDidAbort(xwait)) + if (!TransactionIdDidCommit(xwait)) goto l1; /* @@ -1291,8 +1295,11 @@ l1: if (crosscheck != SnapshotAny && result == HeapTupleMayBeUpdated) { /* Perform additional check for serializable RI updates */ + sv_infomask = tp.t_data->t_infomask; if (!HeapTupleSatisfiesSnapshot(tp.t_data, crosscheck)) result = HeapTupleUpdated; + if (sv_infomask != tp.t_data->t_infomask) + SetBufferCommitInfoNeedsSave(buffer); } if (result != HeapTupleMayBeUpdated) @@ -1455,6 +1462,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup, Size newtupsize, pagefree; int result; + uint16 sv_infomask; Assert(ItemPointerIsValid(otid)); @@ -1479,7 +1487,10 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup, */ l2: + sv_infomask = oldtup.t_data->t_infomask; result = HeapTupleSatisfiesUpdate(oldtup.t_data, cid); + if (sv_infomask != oldtup.t_data->t_infomask) + SetBufferCommitInfoNeedsSave(buffer); if (result == HeapTupleInvisible) { @@ -1496,7 +1507,7 @@ l2: XactLockTableWait(xwait); LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); - if (TransactionIdDidAbort(xwait)) + if (!TransactionIdDidCommit(xwait)) goto l2; /* @@ -1521,8 +1532,11 @@ l2: if (crosscheck != SnapshotAny && result == HeapTupleMayBeUpdated) { /* Perform additional check for serializable RI updates */ + sv_infomask = oldtup.t_data->t_infomask; if (!HeapTupleSatisfiesSnapshot(oldtup.t_data, crosscheck)) result = HeapTupleUpdated; + if (sv_infomask != oldtup.t_data->t_infomask) + SetBufferCommitInfoNeedsSave(buffer); } if (result != HeapTupleMayBeUpdated) @@ -1789,6 +1803,7 @@ heap_mark4update(Relation relation, HeapTuple tuple, Buffer *buffer, ItemId lp; PageHeader dp; int result; + uint16 sv_infomask; *buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid)); @@ -1804,7 +1819,10 @@ heap_mark4update(Relation relation, HeapTuple tuple, Buffer *buffer, tuple->t_len = ItemIdGetLength(lp); l3: + sv_infomask = tuple->t_data->t_infomask; result = HeapTupleSatisfiesUpdate(tuple->t_data, cid); + if (sv_infomask != tuple->t_data->t_infomask) + SetBufferCommitInfoNeedsSave(*buffer); if (result == HeapTupleInvisible) { @@ -1821,7 +1839,7 @@ l3: XactLockTableWait(xwait); LockBuffer(*buffer, BUFFER_LOCK_EXCLUSIVE); - if (TransactionIdDidAbort(xwait)) + if (!TransactionIdDidCommit(xwait)) goto l3; /* diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index d0e3e9c081..2164738b17 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -17,7 +17,7 @@ * * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.63 2003/10/31 03:58:20 wieck Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.63.2.1 2004/10/13 22:22:03 tgl Exp $ * * ---------- */ @@ -223,6 +223,9 @@ RI_FKey_check(PG_FUNCTION_ARGS) * We should not even consider checking the row if it is no longer * valid since it was either deleted (doesn't matter) or updated (in * which case it'll be checked with its final values). + * + * Note: we need not SetBufferCommitInfoNeedsSave() here since the + * new tuple's commit state can't possibly change. */ if (new_row) {