diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-15 22:40:29 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-15 22:40:29 +0000 |
commit | 9ffc8ed58b55cb3925bb95cc184583fcb9772013 (patch) | |
tree | 9039f51525070c611a86f03a2e85a13b24005ac3 /src/backend/access/nbtree/nbtinsert.c | |
parent | db9e2fd0a9144707055ed382f184f5a9c11aafff (diff) |
Repair possible failure to update hint bits back to disk, per
http://archives.postgresql.org/pgsql-hackers/2004-10/msg00464.php.
This fix is intended to be permanent: it moves the responsibility for
calling SetBufferCommitInfoNeedsSave() into the tqual.c routines,
eliminating the requirement for callers to test whether t_infomask changed.
Also, tighten validity checking on buffer IDs in bufmgr.c --- several
routines were paranoid about out-of-range shared buffer numbers but not
about out-of-range local ones, which seems a tad pointless.
Diffstat (limited to 'src/backend/access/nbtree/nbtinsert.c')
-rw-r--r-- | src/backend/access/nbtree/nbtinsert.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 815e207fb2f..32615a62c27 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.116 2004/08/29 05:06:40 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.117 2004/10/15 22:39:49 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -261,19 +261,13 @@ _bt_check_unique(Relation rel, BTItem btitem, Relation heapRel, * marked killed. This logic should match * index_getnext and btgettuple. */ - uint16 sv_infomask; - LockBuffer(hbuffer, BUFFER_LOCK_SHARE); - sv_infomask = htup.t_data->t_infomask; - if (HeapTupleSatisfiesVacuum(htup.t_data, - RecentGlobalXmin) == - HEAPTUPLE_DEAD) + if (HeapTupleSatisfiesVacuum(htup.t_data, RecentGlobalXmin, + hbuffer) == HEAPTUPLE_DEAD) { curitemid->lp_flags |= LP_DELETE; SetBufferCommitInfoNeedsSave(buf); } - if (sv_infomask != htup.t_data->t_infomask) - SetBufferCommitInfoNeedsSave(hbuffer); LockBuffer(hbuffer, BUFFER_LOCK_UNLOCK); ReleaseBuffer(hbuffer); } |