Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb2fe783

Browse files
Add missing parenthesis to max item size macro.
Oversight in commit92f3750, per buildfarm.
1 parent4c81a50 commitb2fe783

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

‎src/backend/access/nbtree/nbtdedup.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,8 @@ _bt_dedup_finish_pending(Page newpage, BTDedupState state)
566566
{
567567
/* Use original, unchanged base tuple */
568568
tuplesz=IndexTupleSize(state->base);
569+
Assert(tuplesz==MAXALIGN(IndexTupleSize(state->base)));
570+
Assert(tuplesz <=BTMaxItemSize(newpage));
569571
if (PageAddItem(newpage, (Item)state->base,tuplesz,tupoff,
570572
false, false)==InvalidOffsetNumber)
571573
elog(ERROR,"deduplication failed to add tuple to page");
@@ -585,6 +587,7 @@ _bt_dedup_finish_pending(Page newpage, BTDedupState state)
585587
state->intervals[state->nintervals].nitems=state->nitems;
586588

587589
Assert(tuplesz==MAXALIGN(IndexTupleSize(final)));
590+
Assert(tuplesz <=BTMaxItemSize(newpage));
588591
if (PageAddItem(newpage, (Item)final,tuplesz,tupoff, false,
589592
false)==InvalidOffsetNumber)
590593
elog(ERROR,"deduplication failed to add tuple to page");

‎src/include/access/nbtree.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ typedef struct BTMetaPageData
162162
* attribute, which we account for here.
163163
*/
164164
#defineBTMaxItemSize(page) \
165-
MAXALIGN_DOWN((PageGetPageSize(page) - \
166-
MAXALIGN(SizeOfPageHeaderData + 3*sizeof(ItemIdData)) - \
167-
MAXALIGN(sizeof(BTPageOpaqueData))) / 3) - \
168-
MAXALIGN(sizeof(ItemPointerData))
165+
(MAXALIGN_DOWN((PageGetPageSize(page) - \
166+
MAXALIGN(SizeOfPageHeaderData + 3*sizeof(ItemIdData)) - \
167+
MAXALIGN(sizeof(BTPageOpaqueData))) / 3) - \
168+
MAXALIGN(sizeof(ItemPointerData)))
169169
#defineBTMaxItemSizeNoHeapTid(page) \
170170
MAXALIGN_DOWN((PageGetPageSize(page) - \
171171
MAXALIGN(SizeOfPageHeaderData + 3*sizeof(ItemIdData)) - \

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp