1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing parenthesis to max item size macro.

Browse Source 
Oversight in commit 92f37505, per buildfarm.
This commit is contained in:
Peter Geoghegan 2022-08-05 13:06:19 -07:00
parent 4c81a50e5b
commit b2fe783aec
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/access/nbtree/nbtdedup.c
View File

@ -566,6 +566,8 @@ _bt_dedup_finish_pending(Page newpage, BTDedupState state)
{ {
/* Use original, unchanged base tuple */ /* Use original, unchanged base tuple */
tuplesz = IndexTupleSize(state->base); tuplesz = IndexTupleSize(state->base);
Assert(tuplesz == MAXALIGN(IndexTupleSize(state->base)));
Assert(tuplesz <= BTMaxItemSize(newpage));
if (PageAddItem(newpage, (Item) state->base, tuplesz, tupoff, if (PageAddItem(newpage, (Item) state->base, tuplesz, tupoff,
false, false) == InvalidOffsetNumber) false, false) == InvalidOffsetNumber)
elog(ERROR, "deduplication failed to add tuple to page"); elog(ERROR, "deduplication failed to add tuple to page");
@ -585,6 +587,7 @@ _bt_dedup_finish_pending(Page newpage, BTDedupState state)
state->intervals[state->nintervals].nitems = state->nitems; state->intervals[state->nintervals].nitems = state->nitems;
Assert(tuplesz == MAXALIGN(IndexTupleSize(final))); Assert(tuplesz == MAXALIGN(IndexTupleSize(final)));
Assert(tuplesz <= BTMaxItemSize(newpage));
if (PageAddItem(newpage, (Item) final, tuplesz, tupoff, false, if (PageAddItem(newpage, (Item) final, tuplesz, tupoff, false,
false) == InvalidOffsetNumber) false) == InvalidOffsetNumber)
elog(ERROR, "deduplication failed to add tuple to page"); elog(ERROR, "deduplication failed to add tuple to page");

8
src/include/access/nbtree.h
View File

@ -162,10 +162,10 @@ typedef struct BTMetaPageData
* attribute, which we account for here. * attribute, which we account for here.
*/ */
#define BTMaxItemSize(page) \ #define BTMaxItemSize(page) \
MAXALIGN_DOWN((PageGetPageSize(page) - \ (MAXALIGN_DOWN((PageGetPageSize(page) - \
MAXALIGN(SizeOfPageHeaderData + 3*sizeof(ItemIdData)) - \ MAXALIGN(SizeOfPageHeaderData + 3*sizeof(ItemIdData)) - \
MAXALIGN(sizeof(BTPageOpaqueData))) / 3) - \ MAXALIGN(sizeof(BTPageOpaqueData))) / 3) - \
MAXALIGN(sizeof(ItemPointerData)) MAXALIGN(sizeof(ItemPointerData)))
#define BTMaxItemSizeNoHeapTid(page) \ #define BTMaxItemSizeNoHeapTid(page) \
MAXALIGN_DOWN((PageGetPageSize(page) - \ MAXALIGN_DOWN((PageGetPageSize(page) - \
MAXALIGN(SizeOfPageHeaderData + 3*sizeof(ItemIdData)) - \ MAXALIGN(SizeOfPageHeaderData + 3*sizeof(ItemIdData)) - \