Prevent mark as deleted and as 'has free space' page in bloom module

feodor · feodor · commit e9e441c9fac6 · 2016-04-02T14:20:46.000+03:00
Vacuum might put page into list of pages with some free space and mark as
deleted at the same time.
diff --git a/contrib/bloom/blvacuum.c b/contrib/bloom/blvacuum.c
@@ -108,15 +108,20 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		Assert(itupPtr == BloomPageGetTuple(&state, page,
 								OffsetNumberNext(BloomPageGetMaxOffset(page))));
 
-		if (BloomPageGetFreeSpace(&state, page) > state.sizeOfBloomTuple &&
+		/*
+		 * Add page to notFullPage list if we will not mark page as deleted and
+		 * there is a free space on it
+		 */
+		if (BloomPageGetMaxOffset(page) == 0 &&
+			BloomPageGetFreeSpace(&state, page) > state.sizeOfBloomTuple &&
 			countPage < BloomMetaBlockN)
 			notFullPage[countPage++] = blkno;
 
 		/* Did we delete something? */
 		if (itupPtr != itup)
 		{
 			/* Is it empty page now? */
-			if (itupPtr == BloomPageGetData(page))
+			if (BloomPageGetMaxOffset(page) == 0)
 				BloomPageSetDeleted(page);
 			/* Adjust pg_lower */
 			((PageHeader) page)->pd_lower = (Pointer) itupPtr - page;
