mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In log_newpage_range(), heed forkNum and page_std arguments.

Browse Source 
The function assumed forkNum=MAIN_FORKNUM and page_std=true, ignoring
the actual arguments.  Existing callers passed exactly those values, so
there's no live bug.  Back-patch to v12, where the function first
appeared, because another fix needs this.

Discussion: https://postgr.es/m/20191118045434.GA1173436@rfd.leadboat.com
This commit is contained in:
Noah Misch 2020-03-21 09:38:26 -07:00
parent e629a01f69
commit d3e572855b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/access/transam/xloginsert.c
View File

@ -1043,8 +1043,13 @@ log_newpage_range(Relation rel, ForkNumber forkNum,
BlockNumber startblk, BlockNumber endblk, BlockNumber startblk, BlockNumber endblk,
bool page_std) bool page_std)
{ {
int flags;
BlockNumber blkno; BlockNumber blkno;
flags = REGBUF_FORCE_IMAGE;
if (page_std)
flags |= REGBUF_STANDARD;
/* /*
* Iterate over all the pages in the range. They are collected into * Iterate over all the pages in the range. They are collected into
* batches of XLR_MAX_BLOCK_ID pages, and a single WAL-record is written * batches of XLR_MAX_BLOCK_ID pages, and a single WAL-record is written
@ -1066,7 +1071,8 @@ log_newpage_range(Relation rel, ForkNumber forkNum,
nbufs = 0; nbufs = 0;
while (nbufs < XLR_MAX_BLOCK_ID && blkno < endblk) while (nbufs < XLR_MAX_BLOCK_ID && blkno < endblk)
{ {
Buffer buf = ReadBuffer(rel, blkno); Buffer buf = ReadBufferExtended(rel, forkNum, blkno,
RBM_NORMAL, NULL);
LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE); LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE);
@ -1088,7 +1094,7 @@ log_newpage_range(Relation rel, ForkNumber forkNum,
START_CRIT_SECTION(); START_CRIT_SECTION();
for (i = 0; i < nbufs; i++) for (i = 0; i < nbufs; i++)
{ {
XLogRegisterBuffer(i, bufpack[i], REGBUF_FORCE_IMAGE | REGBUF_STANDARD); XLogRegisterBuffer(i, bufpack[i], flags);
MarkBufferDirty(bufpack[i]); MarkBufferDirty(bufpack[i]);
} }