Skip to content

Commit 19c8dc8

Browse files
hlinnakahlinnaka
committed
Unite ReadBufferWithFork, ReadBufferWithStrategy, and ZeroOrReadBuffer
functions into one ReadBufferExtended function, that takes the strategy and mode as argument. There's three modes, RBM_NORMAL which is the default used by plain ReadBuffer(), RBM_ZERO, which replaces ZeroOrReadBuffer, and a new mode RBM_ZERO_ON_ERROR, which allows callers to read corrupt pages without throwing an error. The FSM needs the new mode to recover from corrupt pages, which could happend if we crash after extending an FSM file, and the new page is "torn". Add fork number to some error messages in bufmgr.c, that still lacked it.
1 parent 2907705 commit 19c8dc8

File tree

15 files changed

+239
-208
lines changed

15 files changed

+239
-208
lines changed

‎contrib/pageinspect/rawpage.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Copyright (c) 2007-2008, PostgreSQL Global Development Group
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/contrib/pageinspect/rawpage.c,v 1.8 2008/10/06 14:13:17 heikki Exp $
11+
* $PostgreSQL: pgsql/contrib/pageinspect/rawpage.c,v 1.9 2008/10/31 15:04:59 heikki Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -85,7 +85,7 @@ get_raw_page(PG_FUNCTION_ARGS)
8585

8686
/* Take a verbatim copy of the page */
8787

88-
buf = ReadBufferWithFork(rel, forknum, blkno);
88+
buf = ReadBufferExtended(rel, forknum, blkno, RBM_NORMAL, NULL);
8989
LockBuffer(buf, BUFFER_LOCK_SHARE);
9090

9191
memcpy(raw_page_data, BufferGetPage(buf), BLCKSZ);

‎src/backend/access/gin/ginvacuum.c

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.23 2008/10/06 08:04:11 heikki Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.24 2008/10/31 15:04:59 heikki Exp $
1212
*-------------------------------------------------------------------------
1313
*/
1414

@@ -155,10 +155,14 @@ xlogVacuumPage(Relation index, Buffer buffer)
155155
static bool
156156
ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot, Buffer *rootBuffer)
157157
{
158-
Buffer buffer = ReadBufferWithStrategy(gvs->index, blkno, gvs->strategy);
159-
Page page = BufferGetPage(buffer);
158+
Buffer buffer;
159+
Page page;
160160
bool hasVoidPage = FALSE;
161161

162+
buffer = ReadBufferExtended(gvs->index, MAIN_FORKNUM, blkno,
163+
RBM_NORMAL, gvs->strategy);
164+
page = BufferGetPage(buffer);
165+
162166
/*
163167
* We should be sure that we don't concurrent with inserts, insert process
164168
* never release root page until end (but it can unlock it and lock
@@ -241,13 +245,24 @@ static void
241245
ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkno,
242246
BlockNumber parentBlkno, OffsetNumber myoff, bool isParentRoot)
243247
{
244-
Buffer dBuffer = ReadBufferWithStrategy(gvs->index, deleteBlkno, gvs->strategy);
245-
Buffer lBuffer = (leftBlkno == InvalidBlockNumber) ?
246-
InvalidBuffer : ReadBufferWithStrategy(gvs->index, leftBlkno, gvs->strategy);
247-
Buffer pBuffer = ReadBufferWithStrategy(gvs->index, parentBlkno, gvs->strategy);
248+
Buffer dBuffer;
249+
Buffer lBuffer;
250+
Buffer pBuffer;
248251
Page page,
249252
parentPage;
250253

254+
dBuffer = ReadBufferExtended(gvs->index, MAIN_FORKNUM, deleteBlkno,
255+
RBM_NORMAL, gvs->strategy);
256+
257+
if (leftBlkno != InvalidBlockNumber)
258+
lBuffer = ReadBufferExtended(gvs->index, MAIN_FORKNUM, leftBlkno,
259+
RBM_NORMAL, gvs->strategy);
260+
else
261+
lBuffer = InvalidBuffer;
262+
263+
pBuffer = ReadBufferExtended(gvs->index, MAIN_FORKNUM, parentBlkno,
264+
RBM_NORMAL, gvs->strategy);
265+
251266
LockBuffer(dBuffer, GIN_EXCLUSIVE);
252267
if (!isParentRoot) /* parent is already locked by
253268
* LockBufferForCleanup() */
@@ -401,7 +416,8 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot, DataPageDel
401416
me = parent->child;
402417
}
403418

404-
buffer = ReadBufferWithStrategy(gvs->index, blkno, gvs->strategy);
419+
buffer = ReadBufferExtended(gvs->index, MAIN_FORKNUM, blkno,
420+
RBM_NORMAL, gvs->strategy);
405421
page = BufferGetPage(buffer);
406422

407423
Assert(GinPageIsData(page));
@@ -589,7 +605,8 @@ ginbulkdelete(PG_FUNCTION_ARGS)
589605
gvs.strategy = info->strategy;
590606
initGinState(&gvs.ginstate, index);
591607

592-
buffer = ReadBufferWithStrategy(index, blkno, info->strategy);
608+
buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
609+
RBM_NORMAL, info->strategy);
593610

594611
/* find leaf page */
595612
for (;;)
@@ -621,7 +638,8 @@ ginbulkdelete(PG_FUNCTION_ARGS)
621638
Assert(blkno != InvalidBlockNumber);
622639

623640
UnlockReleaseBuffer(buffer);
624-
buffer = ReadBufferWithStrategy(index, blkno, info->strategy);
641+
buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
642+
RBM_NORMAL, info->strategy);
625643
}
626644

627645
/* right now we found leftmost page in entry's BTree */
@@ -663,7 +681,8 @@ ginbulkdelete(PG_FUNCTION_ARGS)
663681
if (blkno == InvalidBlockNumber) /* rightmost page */
664682
break;
665683

666-
buffer = ReadBufferWithStrategy(index, blkno, info->strategy);
684+
buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
685+
RBM_NORMAL, info->strategy);
667686
LockBuffer(buffer, GIN_EXCLUSIVE);
668687
}
669688

@@ -718,7 +737,8 @@ ginvacuumcleanup(PG_FUNCTION_ARGS)
718737

719738
vacuum_delay_point();
720739

721-
buffer = ReadBufferWithStrategy(index, blkno, info->strategy);
740+
buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
741+
RBM_NORMAL, info->strategy);
722742
LockBuffer(buffer, GIN_SHARE);
723743
page = (Page) BufferGetPage(buffer);
724744

‎src/backend/access/gist/gistvacuum.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.38 2008/10/06 08:04:11 heikki Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.39 2008/10/31 15:04:59 heikki Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -86,7 +86,8 @@ gistDeleteSubtree(GistVacuum *gv, BlockNumber blkno)
8686
Buffer buffer;
8787
Page page;
8888

89-
buffer = ReadBufferWithStrategy(gv->index, blkno, gv->strategy);
89+
buffer = ReadBufferExtended(gv->index, MAIN_FORKNUM, blkno, RBM_NORMAL,
90+
gv->strategy);
9091
LockBuffer(buffer, GIST_EXCLUSIVE);
9192
page = (Page) BufferGetPage(buffer);
9293

@@ -306,7 +307,8 @@ gistVacuumUpdate(GistVacuum *gv, BlockNumber blkno, bool needunion)
306307

307308
vacuum_delay_point();
308309

309-
buffer = ReadBufferWithStrategy(gv->index, blkno, gv->strategy);
310+
buffer = ReadBufferExtended(gv->index, MAIN_FORKNUM, blkno, RBM_NORMAL,
311+
gv->strategy);
310312
LockBuffer(buffer, GIST_EXCLUSIVE);
311313
gistcheckpage(gv->index, buffer);
312314
page = (Page) BufferGetPage(buffer);
@@ -595,7 +597,8 @@ gistvacuumcleanup(PG_FUNCTION_ARGS)
595597

596598
vacuum_delay_point();
597599

598-
buffer = ReadBufferWithStrategy(rel, blkno, info->strategy);
600+
buffer = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL,
601+
info->strategy);
599602
LockBuffer(buffer, GIST_SHARE);
600603
page = (Page) BufferGetPage(buffer);
601604

@@ -691,13 +694,15 @@ gistbulkdelete(PG_FUNCTION_ARGS)
691694

692695
while (stack)
693696
{
694-
Buffer buffer = ReadBufferWithStrategy(rel, stack->blkno, info->strategy);
697+
Buffer buffer;
695698
Page page;
696699
OffsetNumber i,
697700
maxoff;
698701
IndexTuple idxtuple;
699702
ItemId iid;
700703

704+
buffer = ReadBufferExtended(rel, MAIN_FORKNUM, stack->blkno,
705+
RBM_NORMAL, info->strategy);
701706
LockBuffer(buffer, GIST_SHARE);
702707
gistcheckpage(rel, buffer);
703708
page = (Page) BufferGetPage(buffer);

‎src/backend/access/hash/hashpage.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/hash/hashpage.c,v 1.77 2008/09/15 18:43:41 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/hash/hashpage.c,v 1.78 2008/10/31 15:04:59 heikki Exp $
1212
*
1313
* NOTES
1414
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -158,7 +158,7 @@ _hash_getinitbuf(Relation rel, BlockNumber blkno)
158158
if (blkno == P_NEW)
159159
elog(ERROR, "hash AM does not use P_NEW");
160160

161-
buf = ReadOrZeroBuffer(rel, MAIN_FORKNUM, blkno);
161+
buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_ZERO, NULL);
162162

163163
LockBuffer(buf, HASH_WRITE);
164164

@@ -203,7 +203,7 @@ _hash_getnewbuf(Relation rel, BlockNumber blkno)
203203
BufferGetBlockNumber(buf), blkno);
204204
}
205205
else
206-
buf = ReadOrZeroBuffer(rel, MAIN_FORKNUM, blkno);
206+
buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_ZERO, NULL);
207207

208208
LockBuffer(buf, HASH_WRITE);
209209

@@ -231,7 +231,7 @@ _hash_getbuf_with_strategy(Relation rel, BlockNumber blkno,
231231
if (blkno == P_NEW)
232232
elog(ERROR, "hash AM does not use P_NEW");
233233

234-
buf = ReadBufferWithStrategy(rel, blkno, bstrategy);
234+
buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL, bstrategy);
235235

236236
if (access != HASH_NOLOCK)
237237
LockBuffer(buf, access);

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

Lines changed: 3 additions & 4 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.266 2008/10/27 21:50:12 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.267 2008/10/31 15:04:59 heikki Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -205,9 +205,8 @@ heapgetpage(HeapScanDesc scan, BlockNumber page)
205205
}
206206

207207
/* read page using selected strategy */
208-
scan->rs_cbuf = ReadBufferWithStrategy(scan->rs_rd,
209-
page,
210-
scan->rs_strategy);
208+
scan->rs_cbuf = ReadBufferExtended(scan->rs_rd, MAIN_FORKNUM, page,
209+
RBM_NORMAL, scan->rs_strategy);
211210
scan->rs_cblock = page;
212211

213212
if (!scan->rs_pageatatime)

‎src/backend/access/nbtree/nbtree.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.163 2008/10/06 08:04:11 heikki Exp $
15+
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.164 2008/10/31 15:04:59 heikki Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -750,7 +750,8 @@ btvacuumpage(BTVacState *vstate, BlockNumber blkno, BlockNumber orig_blkno)
750750
* recycle all-zero pages, not fail. Also, we want to use a nondefault
751751
* buffer access strategy.
752752
*/
753-
buf = ReadBufferWithStrategy(rel, blkno, info->strategy);
753+
buf = ReadBufferExtended(rel, MAIN_FORKNUM, blkno, RBM_NORMAL,
754+
info->strategy);
754755
LockBuffer(buf, BT_READ);
755756
page = BufferGetPage(buf);
756757
opaque = (BTPageOpaque) PageGetSpecialPointer(page);

‎src/backend/access/transam/xlog.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.320 2008/10/30 04:06:16 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.321 2008/10/31 15:04:59 heikki Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -2897,8 +2897,8 @@ RestoreBkpBlocks(XLogRecord *record, XLogRecPtr lsn)
28972897
memcpy(&bkpb, blk, sizeof(BkpBlock));
28982898
blk += sizeof(BkpBlock);
28992899

2900-
buffer = XLogReadBufferWithFork(bkpb.node, bkpb.fork, bkpb.block,
2901-
true);
2900+
buffer = XLogReadBufferExtended(bkpb.node, bkpb.fork, bkpb.block,
2901+
RBM_ZERO);
29022902
Assert(BufferIsValid(buffer));
29032903
page = (Page) BufferGetPage(buffer);
29042904

‎src/backend/access/transam/xlogutils.c

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
14-
* $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.59 2008/09/30 10:52:11 heikki Exp $
14+
* $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.60 2008/10/31 15:04:59 heikki Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -200,6 +200,20 @@ XLogCheckInvalidPages(void)
200200
invalid_page_tab = NULL;
201201
}
202202

203+
/*
204+
* XLogReadBufferExtended
205+
* A shorthand of XLogReadBufferExtended(), for reading from the main
206+
* fork.
207+
*
208+
* For historical reasons, instead of a ReadBufferMode argument, this only
209+
* supports RBM_ZERO (init == true) and RBM_NORMAL (init == false) modes.
210+
*/
211+
Buffer
212+
XLogReadBuffer(RelFileNode rnode, BlockNumber blkno, bool init)
213+
{
214+
return XLogReadBufferExtended(rnode, MAIN_FORKNUM, blkno,
215+
init ? RBM_ZERO : RBM_NORMAL);
216+
}
203217

204218
/*
205219
* XLogReadBuffer
@@ -211,34 +225,21 @@ XLogCheckInvalidPages(void)
211225
* expect that this is only used during single-process XLOG replay, but
212226
* some subroutines such as MarkBufferDirty will complain if we don't.)
213227
*
214-
* If "init" is true then the caller intends to rewrite the page fully
215-
* using the info in the XLOG record. In this case we will extend the
216-
* relation if needed to make the page exist, and we will not complain about
217-
* the page being "new" (all zeroes); in fact, we usually will supply a
218-
* zeroed buffer without reading the page at all, so as to avoid unnecessary
219-
* failure if the page is present on disk but has corrupt headers.
228+
* There's some differences in the behavior wrt. the "mode" argument,
229+
* compared to ReadBufferExtended:
220230
*
221-
* If "init" is false then the caller needs the page to be valid already.
222-
* If the page doesn't exist or contains zeroes, we return InvalidBuffer.
223-
* In this case the caller should silently skip the update on this page.
224-
* (In this situation, we expect that the page was later dropped or truncated.
225-
* If we don't see evidence of that later in the WAL sequence, we'll complain
226-
* at the end of WAL replay.)
227-
*/
228-
Buffer
229-
XLogReadBuffer(RelFileNode rnode, BlockNumber blkno, bool init)
230-
{
231-
return XLogReadBufferWithFork(rnode, MAIN_FORKNUM, blkno, init);
232-
}
233-
234-
/*
235-
* XLogReadBufferWithFork
236-
* Like XLogReadBuffer, but for reading other relation forks than
237-
* the main one.
231+
* In RBM_NORMAL mode, if the page doesn't exist, or contains all-zeroes, we
232+
* return InvalidBuffer. In this case the caller should silently skip the
233+
* update on this page. (In this situation, we expect that the page was later
234+
* dropped or truncated. If we don't see evidence of that later in the WAL
235+
* sequence, we'll complain at the end of WAL replay.)
236+
*
237+
* In RBM_ZERO and RBM_ZERO_ON_ERROR modes, if the page doesn't exist, the
238+
* relation is extended with all-zeroes pages up to the given block number.
238239
*/
239240
Buffer
240-
XLogReadBufferWithFork(RelFileNode rnode, ForkNumber forknum,
241-
BlockNumber blkno, bool init)
241+
XLogReadBufferExtended(RelFileNode rnode, ForkNumber forknum,
242+
BlockNumber blkno, ReadBufferMode mode)
242243
{
243244
BlockNumber lastblock;
244245
Buffer buffer;
@@ -264,12 +265,13 @@ XLogReadBufferWithFork(RelFileNode rnode, ForkNumber forknum,
264265
if (blkno < lastblock)
265266
{
266267
/* page exists in file */
267-
buffer = ReadBufferWithoutRelcache(rnode, false, forknum, blkno, init);
268+
buffer = ReadBufferWithoutRelcache(rnode, false, forknum, blkno,
269+
mode, NULL);
268270
}
269271
else
270272
{
271273
/* hm, page doesn't exist in file */
272-
if (!init)
274+
if (mode == RBM_NORMAL)
273275
{
274276
log_invalid_page(rnode, forknum, blkno, false);
275277
return InvalidBuffer;
@@ -283,15 +285,15 @@ XLogReadBufferWithFork(RelFileNode rnode, ForkNumber forknum,
283285
if (buffer != InvalidBuffer)
284286
ReleaseBuffer(buffer);
285287
buffer = ReadBufferWithoutRelcache(rnode, false, forknum,
286-
P_NEW, false);
288+
P_NEW, mode, NULL);
287289
lastblock++;
288290
}
289291
Assert(BufferGetBlockNumber(buffer) == blkno);
290292
}
291293

292294
LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
293295

294-
if (!init)
296+
if (mode == RBM_NORMAL)
295297
{
296298
/* check that page has been initialized */
297299
Page page = (Page) BufferGetPage(buffer);

0 commit comments

Comments
 (0)