Skip to content

Commit 1e96eff

Browse files
committed
Fix two bugs in WAL-logging of GIN pending-list pages.
In writeListPage, never take a full-page image of the page, because we have all the information required to re-initialize in the WAL record anyway. Before this fix, a full-page image was always generated, unless full_page_writes=off, because when the page is initialized its LSN is always 0. In stable-branches, keep the code to restore the backup blocks if they exist, in case that the WAL is generated with an older minor version, but in master Assert that there are no full-page images. In the redo routine, add missing "off++". Otherwise the tuples are added to the page in reverse order. That happens to be harmless because we always scan and remove all the tuples together, but it was clearly wrong. Also, it was masked by the first bug unless full_page_writes=off, because the page was always restored from a full-page image. Backpatch to all supported versions.
1 parent ea9ac77 commit 1e96eff

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/backend/access/gin/ginfast.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ writeListPage(Relation index, Buffer buffer,
119119
rdata[0].len = sizeof(ginxlogInsertListPage);
120120
rdata[0].next = rdata + 1;
121121

122-
rdata[1].buffer = buffer;
123-
rdata[1].buffer_std = true;
122+
rdata[1].buffer = InvalidBuffer;
124123
rdata[1].data = workspace;
125124
rdata[1].len = size;
126125
rdata[1].next = NULL;

src/backend/access/gin/ginxlog.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,11 @@ ginRedoInsertListPage(XLogRecPtr lsn, XLogRecord *record)
620620
tupsize;
621621
IndexTuple tuples = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogInsertListPage));
622622

623-
/* If we have a full-page image, restore it and we're done */
623+
/*
624+
* If we have a full-page image, restore it and we're done. (As the code
625+
* stands, we never create full-page images, but we used to. Cope if
626+
* we're reading WAL generated with an older minor version.)
627+
*/
624628
if (record->xl_info & XLR_BKP_BLOCK(0))
625629
{
626630
(void) RestoreBackupBlock(lsn, record, 0, false, false);
@@ -654,6 +658,7 @@ ginRedoInsertListPage(XLogRecPtr lsn, XLogRecord *record)
654658
elog(ERROR, "failed to add item to index page");
655659

656660
tuples = (IndexTuple) (((char *) tuples) + tupsize);
661+
off++;
657662
}
658663

659664
PageSetLSN(page, lsn);

0 commit comments

Comments
 (0)