From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Fri, 7 Nov 2014 19:14:35 +0000 (+0200)
Subject: Fix generation of SP-GiST vacuum WAL records.
X-Git-Tag: REL9_4_RC1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f36f4fbdca3de615acb2fc232f6bc72d6db19bde;p=thirdparty%2Fpostgresql.git

Fix generation of SP-GiST vacuum WAL records.

I broke these in 8776faa81cb651322b8993422bdd4633f1f6a487. Backpatch to
9.4, where that was done.
---

diff --git a/src/backend/access/spgist/spgvacuum.c b/src/backend/access/spgist/spgvacuum.c
index 01b8ffe5acd..7c5a0016c2a 100644
--- a/src/backend/access/spgist/spgvacuum.c
+++ b/src/backend/access/spgist/spgvacuum.c
@@ -451,7 +451,7 @@ vacuumLeafRoot(spgBulkDeleteState *bds, Relation index, Buffer buffer)
 	xlrec.node = index->rd_node;
 	STORE_STATE(&bds->spgstate, xlrec.stateSrc);
 
-	ACCEPT_RDATA_DATA(&xlrec, sizeof(xlrec), 0);
+	ACCEPT_RDATA_DATA(&xlrec, SizeOfSpgxlogVacuumRoot, 0);
 	/* sizeof(xlrec) should be a multiple of sizeof(OffsetNumber) */
 	ACCEPT_RDATA_DATA(toDelete, sizeof(OffsetNumber) * xlrec.nDelete, 1);
 	ACCEPT_RDATA_BUFFER(buffer, 2);
@@ -584,7 +584,7 @@ vacuumRedirectAndPlaceholder(Relation index, Buffer buffer)
 	{
 		XLogRecPtr	recptr;
 
-		ACCEPT_RDATA_DATA(&xlrec, sizeof(xlrec), 0);
+		ACCEPT_RDATA_DATA(&xlrec, SizeOfSpgxlogVacuumRedirect, 0);
 		ACCEPT_RDATA_DATA(itemToPlaceholder, sizeof(OffsetNumber) * xlrec.nToPlaceholder, 1);
 		ACCEPT_RDATA_BUFFER(buffer, 2);