Fix vacuum

Artur Zakirov · Artur Zakirov · commit 250ae46d7502 · 2016-04-26T14:30:48.000+03:00
diff --git a/rumvacuum.c b/rumvacuum.c
@@ -257,11 +257,11 @@ rumVacuumPostingTreeLeaves(RumVacuumState *gvs, OffsetNumber attnum,
 			RumPageGetOpaque(page)->maxoff = newMaxOff;
 			updateItemIndexes(page, attnum, &gvs->rumstate);
 
-			GenericXLogFinish(state);
-
 			/* if root is a leaf page, we don't desire further processing */
 			if (!isRoot && RumPageGetOpaque(page)->maxoff < FirstOffsetNumber)
 				hasVoidPage = TRUE;
+
+			GenericXLogFinish(state);
 		}
 		else
 			GenericXLogAbort(state);
@@ -643,14 +643,10 @@ rumbulkdelete(IndexVacuumInfo *info,
 
 	for (;;)
 	{
-		GenericXLogState *state;
-		Page		page;
+		Page		page = BufferGetPage(buffer);
 		Page		resPage;
 		uint32		i;
 
-		state = GenericXLogStart(index);
-		page = GenericXLogRegisterBuffer(state, buffer, 0);
-
 		Assert(!RumPageIsData(page));
 
 		resPage = rumVacuumEntryPage(&gvs, buffer, rootOfPostingTree, attnumOfPostingTree, &nRoot);
@@ -659,13 +655,16 @@ rumbulkdelete(IndexVacuumInfo *info,
 
 		if (resPage)
 		{
+			GenericXLogState *state;
+
+			state = GenericXLogStart(index);
+			page = GenericXLogRegisterBuffer(state, buffer, 0);
 			PageRestoreTempPage(resPage, page);
 			GenericXLogFinish(state);
 			UnlockReleaseBuffer(buffer);
 		}
 		else
 		{
-			GenericXLogAbort(state);
 			UnlockReleaseBuffer(buffer);
 		}
 
