diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/analyze.c | 6 | ||||
| -rw-r--r-- | src/backend/commands/trigger.c | 8 | ||||
| -rw-r--r-- | src/backend/commands/vacuum.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 3f5cc96f41..5785139a51 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.34 2002/05/21 22:05:54 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.35 2002/05/24 18:57:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -655,8 +655,8 @@ pageloop:; goto pageloop; } ItemPointerSet(&targtuple.t_self, targblock, targoffset); - heap_fetch(onerel, SnapshotNow, &targtuple, &tupbuffer, NULL); - if (targtuple.t_data != NULL) + if (heap_fetch(onerel, SnapshotNow, &targtuple, &tupbuffer, + false, NULL)) { /* * Found a suitable tuple, so save it, replacing one old diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index e0b01b6fee..2cb5f2e457 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.118 2002/05/21 22:05:54 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.119 2002/05/24 18:57:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1421,16 +1421,14 @@ DeferredTriggerExecute(DeferredTriggerEvent event, int itemno, if (ItemPointerIsValid(&(event->dte_oldctid))) { ItemPointerCopy(&(event->dte_oldctid), &(oldtuple.t_self)); - heap_fetch(rel, SnapshotAny, &oldtuple, &oldbuffer, NULL); - if (!oldtuple.t_data) + if (!heap_fetch(rel, SnapshotAny, &oldtuple, &oldbuffer, false, NULL)) elog(ERROR, "DeferredTriggerExecute: failed to fetch old tuple"); } if (ItemPointerIsValid(&(event->dte_newctid))) { ItemPointerCopy(&(event->dte_newctid), &(newtuple.t_self)); - heap_fetch(rel, SnapshotAny, &newtuple, &newbuffer, NULL); - if (!newtuple.t_data) + if (!heap_fetch(rel, SnapshotAny, &newtuple, &newbuffer, false, NULL)) elog(ERROR, "DeferredTriggerExecute: failed to fetch new tuple"); } diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 4889e30040..953ff39714 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.225 2002/05/20 23:51:42 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.226 2002/05/24 18:57:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -458,7 +458,9 @@ vac_update_relstats(Oid relid, BlockNumber num_pages, double num_tuples, /* get the buffer cache tuple */ rtup.t_self = ctup->t_self; ReleaseSysCache(ctup); - heap_fetch(rd, SnapshotNow, &rtup, &buffer, NULL); + if (!heap_fetch(rd, SnapshotNow, &rtup, &buffer, false, NULL)) + elog(ERROR, "pg_class entry for relid %u vanished during vacuuming", + relid); /* overwrite the existing statistics in the tuple */ pgcform = (Form_pg_class) GETSTRUCT(&rtup); |