Fixes in bloom contrib module missed during review

feodor · feodor · commit 27f3bbfad46e · 2016-04-01T20:09:13.000+03:00
- macroses llike (var &amp; FLAG) are changed to ((var &amp; FLAG) != 0)
- do not copy uninitialized part of notFullPage array to page
diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
@@ -44,10 +44,14 @@ typedef BloomPageOpaqueData *BloomPageOpaque;
 /* Macros for accessing bloom page structures */
 #define BloomPageGetOpaque(page) ((BloomPageOpaque) PageGetSpecialPointer(page))
 #define BloomPageGetMaxOffset(page) (BloomPageGetOpaque(page)->maxoff)
-#define BloomPageIsMeta(page) (BloomPageGetOpaque(page)->flags & BLOOM_META)
-#define BloomPageIsDeleted(page) (BloomPageGetOpaque(page)->flags & BLOOM_DELETED)
-#define BloomPageSetDeleted(page) (BloomPageGetOpaque(page)->flags |= BLOOM_DELETED)
-#define BloomPageSetNonDeleted(page) (BloomPageGetOpaque(page)->flags &= ~BLOOM_DELETED)
+#define BloomPageIsMeta(page) \
+	((BloomPageGetOpaque(page)->flags & BLOOM_META) != 0)
+#define BloomPageIsDeleted(page) \
+	((BloomPageGetOpaque(page)->flags & BLOOM_DELETED) != 0)
+#define BloomPageSetDeleted(page) \
+	(BloomPageGetOpaque(page)->flags |= BLOOM_DELETED)
+#define BloomPageSetNonDeleted(page) \
+	(BloomPageGetOpaque(page)->flags &= ~BLOOM_DELETED)
 #define BloomPageGetData(page)		((BloomTuple *)PageGetContents(page))
 #define BloomPageGetTuple(state, page, offset) \
 	((BloomTuple *)(PageGetContents(page) \
diff --git a/contrib/bloom/blvacuum.c b/contrib/bloom/blvacuum.c
@@ -142,7 +142,7 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		page = GenericXLogRegister(gxlogState, buffer, false);
 
 		metaData = BloomPageGetMeta(page);
-		memcpy(metaData->notFullPage, notFullPage, sizeof(FreeBlockNumberArray));
+		memcpy(metaData->notFullPage, notFullPage, sizeof(BlockNumber) * countPage);
 		metaData->nStart = 0;
 		metaData->nEnd = countPage;
 
