Skip to content

Commit a236dd9

Browse files
author
Neil Conway
committed
There is no need for ReadBuffer() call sites to check that the returned
buffer is valid, as ReadBuffer() will elog on error. Most of the call sites of ReadBuffer() got this right, but this patch fixes those call sites that did not.
1 parent 1c5125a commit a236dd9

File tree

4 files changed

+4
-46
lines changed

4 files changed

+4
-46
lines changed

‎src/backend/access/heap/heapam.c

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.180 2004/10/26 16:05:02 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.181 2004/11/14 02:04:12 neilc Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -191,8 +191,6 @@ heapgettup(Relation relation,
191191
*buffer = ReleaseAndReadBuffer(*buffer,
192192
relation,
193193
ItemPointerGetBlockNumber(tid));
194-
if (!BufferIsValid(*buffer))
195-
elog(ERROR, "ReadBuffer failed");
196194

197195
LockBuffer(*buffer, BUFFER_LOCK_SHARE);
198196

@@ -226,8 +224,6 @@ heapgettup(Relation relation,
226224
*buffer = ReleaseAndReadBuffer(*buffer,
227225
relation,
228226
page);
229-
if (!BufferIsValid(*buffer))
230-
elog(ERROR, "ReadBuffer failed");
231227

232228
LockBuffer(*buffer, BUFFER_LOCK_SHARE);
233229

@@ -266,8 +262,6 @@ heapgettup(Relation relation,
266262
*buffer = ReleaseAndReadBuffer(*buffer,
267263
relation,
268264
page);
269-
if (!BufferIsValid(*buffer))
270-
elog(ERROR, "ReadBuffer failed");
271265

272266
LockBuffer(*buffer, BUFFER_LOCK_SHARE);
273267

@@ -360,8 +354,6 @@ heapgettup(Relation relation,
360354
*buffer = ReleaseAndReadBuffer(*buffer,
361355
relation,
362356
page);
363-
if (!BufferIsValid(*buffer))
364-
elog(ERROR, "ReadBuffer failed");
365357

366358
LockBuffer(*buffer, BUFFER_LOCK_SHARE);
367359
dp = (Page) BufferGetPage(*buffer);
@@ -941,11 +933,6 @@ heap_release_fetch(Relation relation,
941933
buffer = ReleaseAndReadBuffer(*userbuf, relation,
942934
ItemPointerGetBlockNumber(tid));
943935

944-
if (!BufferIsValid(buffer))
945-
elog(ERROR, "ReadBuffer(\"%s\", %lu) failed",
946-
RelationGetRelationName(relation),
947-
(unsigned long) ItemPointerGetBlockNumber(tid));
948-
949936
/*
950937
* Need share lock on buffer to examine tuple commit status.
951938
*/
@@ -1049,14 +1036,7 @@ heap_get_latest_tid(Relation relation,
10491036
* get the buffer from the relation descriptor Note that this does a
10501037
* buffer pin.
10511038
*/
1052-
10531039
buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
1054-
1055-
if (!BufferIsValid(buffer))
1056-
elog(ERROR, "ReadBuffer(\"%s\", %lu) failed",
1057-
RelationGetRelationName(relation),
1058-
(unsigned long) ItemPointerGetBlockNumber(tid));
1059-
10601040
LockBuffer(buffer, BUFFER_LOCK_SHARE);
10611041

10621042
/*
@@ -1304,10 +1284,6 @@ heap_delete(Relation relation, ItemPointer tid,
13041284
Assert(ItemPointerIsValid(tid));
13051285

13061286
buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
1307-
1308-
if (!BufferIsValid(buffer))
1309-
elog(ERROR, "ReadBuffer failed");
1310-
13111287
LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
13121288

13131289
dp = (PageHeader) BufferGetPage(buffer);
@@ -1528,8 +1504,6 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
15281504
Assert(ItemPointerIsValid(otid));
15291505

15301506
buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(otid));
1531-
if (!BufferIsValid(buffer))
1532-
elog(ERROR, "ReadBuffer failed");
15331507
LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
15341508

15351509
dp = (PageHeader) BufferGetPage(buffer);
@@ -1863,10 +1837,6 @@ heap_mark4update(Relation relation, HeapTuple tuple, Buffer *buffer,
18631837
int result;
18641838

18651839
*buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
1866-
1867-
if (!BufferIsValid(*buffer))
1868-
elog(ERROR, "ReadBuffer failed");
1869-
18701840
LockBuffer(*buffer, BUFFER_LOCK_EXCLUSIVE);
18711841

18721842
dp = (PageHeader) BufferGetPage(*buffer);

‎src/backend/commands/analyze.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.78 2004/10/26 16:05:03 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.79 2004/11/14 02:04:13 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -811,8 +811,6 @@ acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows,
811811
* tuples.
812812
*/
813813
targbuffer = ReadBuffer(onerel, targblock);
814-
if (!BufferIsValid(targbuffer))
815-
elog(ERROR, "ReadBuffer failed");
816814
LockBuffer(targbuffer, BUFFER_LOCK_SHARE);
817815
targpage = BufferGetPage(targbuffer);
818816
maxoffset = PageGetMaxOffsetNumber(targpage);

‎src/backend/commands/sequence.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.117 2004/09/16 16:58:28 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.118 2004/11/14 02:04:14 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -192,10 +192,6 @@ DefineSequence(CreateSeqStmt *seq)
192192
/* Initialize first page of relation with special magic number */
193193

194194
buf = ReadBuffer(rel, P_NEW);
195-
196-
if (!BufferIsValid(buf))
197-
elog(ERROR, "ReadBuffer failed");
198-
199195
Assert(BufferGetBlockNumber(buf) == 0);
200196

201197
page = (PageHeader) BufferGetPage(buf);
@@ -850,9 +846,6 @@ read_info(SeqTable elm, Relation rel, Buffer *buf)
850846
Form_pg_sequence seq;
851847

852848
*buf = ReadBuffer(rel, 0);
853-
if (!BufferIsValid(*buf))
854-
elog(ERROR, "ReadBuffer failed");
855-
856849
LockBuffer(*buf, BUFFER_LOCK_EXCLUSIVE);
857850

858851
page = (PageHeader) BufferGetPage(*buf);

‎src/backend/commands/trigger.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.174 2004/10/30 20:52:56 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.175 2004/11/14 02:04:14 neilc Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1625,9 +1625,6 @@ ltrmark:;
16251625

16261626
buffer = ReadBuffer(relation, ItemPointerGetBlockNumber(tid));
16271627

1628-
if (!BufferIsValid(buffer))
1629-
elog(ERROR, "ReadBuffer failed");
1630-
16311628
dp = (PageHeader) BufferGetPage(buffer);
16321629
lp = PageGetItemId(dp, ItemPointerGetOffsetNumber(tid));
16331630

0 commit comments

Comments
 (0)