Fixes in bloom contrib module missed during review

- macroses llike (var & FLAG) are changed to ((var & FLAG) != 0)
- do not copy uninitialized part of notFullPage array to page

diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
index 50bf99bf034e4d44c66f2e43fb2b9c777e9c84d9..63095723c9a55331cc0bc97e3f1f77a5b8a813d5 100644 (file)
--- 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
index fb8d9b8a5f614d8affd9ad3c3f2a904767fe6147..d976ce53305ebf82fade0ea967947fc43c4a3a6d 100644 (file)
--- 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;