Commit d2722443 authored by Heikki Linnakangas's avatar Heikki Linnakangas

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.
parent 728c06f1
...@@ -119,8 +119,7 @@ writeListPage(Relation index, Buffer buffer, ...@@ -119,8 +119,7 @@ writeListPage(Relation index, Buffer buffer,
rdata[0].len = sizeof(ginxlogInsertListPage); rdata[0].len = sizeof(ginxlogInsertListPage);
rdata[0].next = rdata + 1; rdata[0].next = rdata + 1;
rdata[1].buffer = buffer; rdata[1].buffer = InvalidBuffer;
rdata[1].buffer_std = true;
rdata[1].data = workspace; rdata[1].data = workspace;
rdata[1].len = size; rdata[1].len = size;
rdata[1].next = NULL; rdata[1].next = NULL;
......
...@@ -814,12 +814,10 @@ ginRedoInsertListPage(XLogRecPtr lsn, XLogRecord *record) ...@@ -814,12 +814,10 @@ ginRedoInsertListPage(XLogRecPtr lsn, XLogRecord *record)
tupsize; tupsize;
IndexTuple tuples = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogInsertListPage)); IndexTuple tuples = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogInsertListPage));
/* If we have a full-page image, restore it and we're done */ /*
if (record->xl_info & XLR_BKP_BLOCK(0)) * Backup blocks are not used, we always re-initialize the page.
{ */
(void) RestoreBackupBlock(lsn, record, 0, false, false); Assert(!(record->xl_info & XLR_BKP_BLOCK_MASK));
return;
}
buffer = XLogReadBuffer(data->node, data->blkno, true); buffer = XLogReadBuffer(data->node, data->blkno, true);
Assert(BufferIsValid(buffer)); Assert(BufferIsValid(buffer));
...@@ -848,6 +846,7 @@ ginRedoInsertListPage(XLogRecPtr lsn, XLogRecord *record) ...@@ -848,6 +846,7 @@ ginRedoInsertListPage(XLogRecPtr lsn, XLogRecord *record)
elog(ERROR, "failed to add item to index page"); elog(ERROR, "failed to add item to index page");
tuples = (IndexTuple) (((char *) tuples) + tupsize); tuples = (IndexTuple) (((char *) tuples) + tupsize);
off++;
} }
PageSetLSN(page, lsn); PageSetLSN(page, lsn);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment