database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Repair possible failure to update hint bits back to disk, per

Browse Source 
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.
This commit is contained in:
Tom Lane
2004-10-13 22:22:22 +00:00
parent 8a9b331c32
commit 78c0692b15
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/pgstattuple/pgstattuple.c
View File

@ -1,5 +1,5 @@
/*
* $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.9 2002/09/04 20:31:08 momjian Exp $
* $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.9.2.1 2004/10/13 22:22:20 tgl Exp $
*
* Copyright (c) 2001,2002 Tatsuo Ishii
*
@ -103,6 +103,9 @@ pgstattuple(PG_FUNCTION_ARGS)
/* 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;
@ -113,6 +116,8 @@ pgstattuple(PG_FUNCTION_ARGS)
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

20
src/backend/access/heap/heapam.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.149 2002/09/26 22:46:29 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.149.2.1 2004/10/13 22:22:21 tgl Exp $
*
*
* INTERFACE ROUTINES
@ -1271,6 +1271,7 @@ heap_delete(Relation relation, ItemPointer tid,
PageHeader dp;
Buffer buffer;
int result;
uint16 sv_infomask;
/* increment access statistics */
IncrHeapAccessStat(local_delete);
@ -1294,7 +1295,10 @@ heap_delete(Relation relation, ItemPointer tid,
tp.t_tableOid = relation->rd_id;
l1:
sv_infomask = tp.t_data->t_infomask;
result = HeapTupleSatisfiesUpdate(&tp, cid);
if (sv_infomask != tp.t_data->t_infomask)
SetBufferCommitInfoNeedsSave(buffer);
if (result == HeapTupleInvisible)
{
@ -1311,7 +1315,7 @@ l1:
XactLockTableWait(xwait);
LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
if (TransactionIdDidAbort(xwait))
if (!TransactionIdDidCommit(xwait))
goto l1;
/*
@ -1470,6 +1474,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
Size newtupsize,
pagefree;
int result;
uint16 sv_infomask;
/* increment access statistics */
IncrHeapAccessStat(local_replace);
@ -1498,7 +1503,10 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
*/
l2:
sv_infomask = oldtup.t_data->t_infomask;
result = HeapTupleSatisfiesUpdate(&oldtup, cid);
if (sv_infomask != oldtup.t_data->t_infomask)
SetBufferCommitInfoNeedsSave(buffer);
if (result == HeapTupleInvisible)
{
@ -1515,7 +1523,7 @@ l2:
XactLockTableWait(xwait);
LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
if (TransactionIdDidAbort(xwait))
if (!TransactionIdDidCommit(xwait))
goto l2;
/*
@ -1795,6 +1803,7 @@ heap_mark4update(Relation relation, HeapTuple tuple, Buffer *buffer,
ItemId lp;
PageHeader dp;
int result;
uint16 sv_infomask;
/* increment access statistics */
IncrHeapAccessStat(local_mark4update);
@ -1814,7 +1823,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, cid);
if (sv_infomask != tuple->t_data->t_infomask)
SetBufferCommitInfoNeedsSave(*buffer);
if (result == HeapTupleInvisible)
{
@ -1831,7 +1843,7 @@ l3:
XactLockTableWait(xwait);
LockBuffer(*buffer, BUFFER_LOCK_EXCLUSIVE);
if (TransactionIdDidAbort(xwait))
if (!TransactionIdDidCommit(xwait))
goto l3;
/*

5
src/backend/utils/adt/ri_triggers.c
View File

@ -17,7 +17,7 @@
*
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.43.2.4 2003/10/31 03:57:41 wieck Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.43.2.5 2004/10/13 22:22:22 tgl Exp $
*
* ----------
*/
@ -241,6 +241,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)
{