From 5c83a63b0fc3d96f7830a5123abd8a7bbd323b9d Mon Sep 17 00:00:00 2001 From: David Christensen Date: Wed, 7 Feb 2024 10:49:31 -0500 Subject: [PATCH v1 1/4] Split MaxHeapTuplesPerPage into runtime and max values --- contrib/pg_surgery/heap_surgery.c | 4 +-- src/backend/access/brin/brin_bloom.c | 8 +++--- src/backend/access/brin/brin_minmax_multi.c | 8 +++--- src/backend/access/gin/ginpostinglist.c | 6 ++--- src/backend/access/heap/README.HOT | 2 +- src/backend/access/heap/heapam.c | 6 ++--- src/backend/access/heap/heapam_handler.c | 8 +++--- src/backend/access/heap/hio.c | 2 +- src/backend/access/heap/pruneheap.c | 22 ++++++++-------- src/backend/access/heap/vacuumlazy.c | 22 ++++++++-------- src/backend/nodes/tidbitmap.c | 2 +- src/backend/storage/page/bufpage.c | 18 ++++++------- src/include/access/ginblock.h | 2 +- src/include/access/heapam.h | 6 ++--- src/include/access/htup_details.h | 26 ++++++++++++++----- .../test_ginpostinglist/test_ginpostinglist.c | 6 ++--- 16 files changed, 81 insertions(+), 67 deletions(-) diff --git a/contrib/pg_surgery/heap_surgery.c b/contrib/pg_surgery/heap_surgery.c index 37dffe3f7d..86aff2494e 100644 --- a/contrib/pg_surgery/heap_surgery.c +++ b/contrib/pg_surgery/heap_surgery.c @@ -89,7 +89,7 @@ heap_force_common(FunctionCallInfo fcinfo, HeapTupleForceOption heap_force_opt) Relation rel; OffsetNumber curr_start_ptr, next_start_ptr; - bool include_this_tid[MaxHeapTuplesPerPage]; + bool include_this_tid[MaxHeapTuplesPerPageLimit]; if (RecoveryInProgress()) ereport(ERROR, @@ -225,7 +225,7 @@ heap_force_common(FunctionCallInfo fcinfo, HeapTupleForceOption heap_force_opt) } /* Mark it for processing. */ - Assert(offno < MaxHeapTuplesPerPage); + Assert(offno < ClusterMaxHeapTuplesPerPage); include_this_tid[offno] = true; } diff --git a/src/backend/access/brin/brin_bloom.c b/src/backend/access/brin/brin_bloom.c index 13c1e681f3..652a67f356 100644 --- a/src/backend/access/brin/brin_bloom.c +++ b/src/backend/access/brin/brin_bloom.c @@ -166,7 +166,7 @@ typedef struct BloomOptions * on the fact that the filter header is ~20B alone, which is about * the same as the filter bitmap for 16 distinct items with 1% false * positive rate. So by allowing lower values we'd not gain much. In - * any case, the min should not be larger than MaxHeapTuplesPerPage + * any case, the min should not be larger than ClusterMaxHeapTuplesPerPage * (~290), which is the theoretical maximum for single-page ranges. */ #define BLOOM_MIN_NDISTINCT_PER_RANGE 16 @@ -478,7 +478,7 @@ brin_bloom_opcinfo(PG_FUNCTION_ARGS) * * Adjust the ndistinct value based on the pagesPerRange value. First, * if it's negative, it's assumed to be relative to maximum number of - * tuples in the range (assuming each page gets MaxHeapTuplesPerPage + * tuples in the range (assuming each page gets ClusterMaxHeapTuplesPerPage * tuples, which is likely a significant over-estimate). We also clamp * the value, not to over-size the bloom filter unnecessarily. * @@ -493,7 +493,7 @@ brin_bloom_opcinfo(PG_FUNCTION_ARGS) * seems better to rely on the upper estimate. * * XXX We might also calculate a better estimate of rows per BRIN range, - * instead of using MaxHeapTuplesPerPage (which probably produces values + * instead of using ClusterMaxHeapTuplesPerPage (which probably produces values * much higher than reality). */ static int @@ -508,7 +508,7 @@ brin_bloom_get_ndistinct(BrinDesc *bdesc, BloomOptions *opts) Assert(BlockNumberIsValid(pagesPerRange)); - maxtuples = MaxHeapTuplesPerPage * pagesPerRange; + maxtuples = ClusterMaxHeapTuplesPerPage * pagesPerRange; /* * Similarly to n_distinct, negative values are relative - in this case to diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index 3ffaad3e42..901676122a 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -2007,10 +2007,10 @@ brin_minmax_multi_distance_tid(PG_FUNCTION_ARGS) * We use the no-check variants here, because user-supplied values may * have (ip_posid == 0). See ItemPointerCompare. */ - da1 = ItemPointerGetBlockNumberNoCheck(pa1) * MaxHeapTuplesPerPage + + da1 = ItemPointerGetBlockNumberNoCheck(pa1) * ClusterMaxHeapTuplesPerPage + ItemPointerGetOffsetNumberNoCheck(pa1); - da2 = ItemPointerGetBlockNumberNoCheck(pa2) * MaxHeapTuplesPerPage + + da2 = ItemPointerGetBlockNumberNoCheck(pa2) * ClusterMaxHeapTuplesPerPage + ItemPointerGetOffsetNumberNoCheck(pa2); PG_RETURN_FLOAT8(da2 - da1); @@ -2461,7 +2461,7 @@ brin_minmax_multi_add_value(PG_FUNCTION_ARGS) * much lower, but meh. */ maxvalues = Min(target_maxvalues * MINMAX_BUFFER_FACTOR, - MaxHeapTuplesPerPage * pagesPerRange); + ClusterMaxHeapTuplesPerPage * pagesPerRange); /* but always at least the original value */ maxvalues = Max(maxvalues, target_maxvalues); @@ -2507,7 +2507,7 @@ brin_minmax_multi_add_value(PG_FUNCTION_ARGS) * much lower, but meh. */ maxvalues = Min(serialized->maxvalues * MINMAX_BUFFER_FACTOR, - MaxHeapTuplesPerPage * pagesPerRange); + ClusterMaxHeapTuplesPerPage * pagesPerRange); /* but always at least the original value */ maxvalues = Max(maxvalues, serialized->maxvalues); diff --git a/src/backend/access/gin/ginpostinglist.c b/src/backend/access/gin/ginpostinglist.c index 708f9f49ec..8aa0f17bf8 100644 --- a/src/backend/access/gin/ginpostinglist.c +++ b/src/backend/access/gin/ginpostinglist.c @@ -26,7 +26,7 @@ * lowest 32 bits are the block number. That leaves 21 bits unused, i.e. * only 43 low bits are used. * - * 11 bits is enough for the offset number, because MaxHeapTuplesPerPage < + * 11 bits is enough for the offset number, because ClusterMaxHeapTuplesPerPage < * 2^11 on all supported block sizes. We are frugal with the bits, because * smaller integers use fewer bytes in the varbyte encoding, saving disk * space. (If we get a new table AM in the future that wants to use the full @@ -74,9 +74,9 @@ /* * How many bits do you need to encode offset number? OffsetNumber is a 16-bit * integer, but you can't fit that many items on a page. 11 ought to be more - * than enough. It's tempting to derive this from MaxHeapTuplesPerPage, and + * than enough. It's tempting to derive this from ClusterMaxHeapTuplesPerPage, and * use the minimum number of bits, but that would require changing the on-disk - * format if MaxHeapTuplesPerPage changes. Better to leave some slack. + * format if ClusterMaxHeapTuplesPerPage changes. Better to leave some slack. */ #define MaxHeapTuplesPerPageBits 11 diff --git a/src/backend/access/heap/README.HOT b/src/backend/access/heap/README.HOT index 74e407f375..e286e1dec3 100644 --- a/src/backend/access/heap/README.HOT +++ b/src/backend/access/heap/README.HOT @@ -264,7 +264,7 @@ of line pointer bloat: we might end up with huge numbers of line pointers and just a few actual tuples on a page. To limit the damage in the worst case, and to keep various work arrays as well as the bitmaps in bitmap scans reasonably sized, the maximum number of line pointers per page -is arbitrarily capped at MaxHeapTuplesPerPage (the most tuples that +is arbitrarily capped at ClusterMaxHeapTuplesPerPage (the most tuples that could fit without HOT pruning). Effectively, space reclamation happens during tuple retrieval when the diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 707460a536..f740d4225e 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -478,7 +478,7 @@ heapgetpage(TableScanDesc sscan, BlockNumber block) LockBuffer(buffer, BUFFER_LOCK_UNLOCK); - Assert(ntup <= MaxHeapTuplesPerPage); + Assert(ntup <= ClusterMaxHeapTuplesPerPage); scan->rs_ntuples = ntup; } @@ -6750,8 +6750,8 @@ heap_freeze_execute_prepared(Relation rel, Buffer buffer, /* Now WAL-log freezing if necessary */ if (RelationNeedsWAL(rel)) { - xl_heap_freeze_plan plans[MaxHeapTuplesPerPage]; - OffsetNumber offsets[MaxHeapTuplesPerPage]; + xl_heap_freeze_plan plans[MaxHeapTuplesPerPageLimit]; + OffsetNumber offsets[MaxHeapTuplesPerPageLimit]; int nplans; xl_heap_freeze_page xlrec; XLogRecPtr recptr; diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index d15a02b2be..58fc0dd618 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -1191,7 +1191,7 @@ heapam_index_build_range_scan(Relation heapRelation, TransactionId OldestXmin; BlockNumber previous_blkno = InvalidBlockNumber; BlockNumber root_blkno = InvalidBlockNumber; - OffsetNumber root_offsets[MaxHeapTuplesPerPage]; + OffsetNumber root_offsets[MaxHeapTuplesPerPageLimit]; /* * sanity checks @@ -1754,8 +1754,8 @@ heapam_index_validate_scan(Relation heapRelation, EState *estate; ExprContext *econtext; BlockNumber root_blkno = InvalidBlockNumber; - OffsetNumber root_offsets[MaxHeapTuplesPerPage]; - bool in_index[MaxHeapTuplesPerPage]; + OffsetNumber root_offsets[MaxHeapTuplesPerPageLimit]; + bool in_index[MaxHeapTuplesPerPageLimit]; BlockNumber previous_blkno = InvalidBlockNumber; /* state variables for the merge */ @@ -2220,7 +2220,7 @@ heapam_scan_bitmap_next_block(TableScanDesc scan, LockBuffer(buffer, BUFFER_LOCK_UNLOCK); - Assert(ntup <= MaxHeapTuplesPerPage); + Assert(ntup <= ClusterMaxHeapTuplesPerPage); hscan->rs_ntuples = ntup; return ntup > 0; diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index c7248d7c68..58f0a384c8 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -547,7 +547,7 @@ RelationGetBufferForTuple(Relation relation, Size len, * extensions while inserting large tuples into low-fillfactor tables. */ nearlyEmptyFreeSpace = MaxHeapTupleSize - - (MaxHeapTuplesPerPage / 8 * sizeof(ItemIdData)); + (ClusterMaxHeapTuplesPerPage / 8 * sizeof(ItemIdData)); if (len + saveFreeSpace > nearlyEmptyFreeSpace) targetFreeSpace = Max(len, nearlyEmptyFreeSpace); else diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 5917633567..4073b0db35 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -44,17 +44,17 @@ typedef struct int ndead; int nunused; /* arrays that accumulate indexes of items to be changed */ - OffsetNumber redirected[MaxHeapTuplesPerPage * 2]; - OffsetNumber nowdead[MaxHeapTuplesPerPage]; - OffsetNumber nowunused[MaxHeapTuplesPerPage]; + OffsetNumber redirected[MaxHeapTuplesPerPageLimit * 2]; + OffsetNumber nowdead[MaxHeapTuplesPerPageLimit]; + OffsetNumber nowunused[MaxHeapTuplesPerPageLimit]; /* * marked[i] is true if item i is entered in one of the above arrays. * - * This needs to be MaxHeapTuplesPerPage + 1 long as FirstOffsetNumber is + * This needs to be ClusterMaxHeapTuplesPerPage + 1 long as FirstOffsetNumber is * 1. Otherwise every access would need to subtract 1. */ - bool marked[MaxHeapTuplesPerPage + 1]; + bool marked[MaxHeapTuplesPerPageLimit + 1]; } PruneState; /* Local functions */ @@ -496,7 +496,7 @@ heap_prune_chain(Buffer buffer, OffsetNumber rootoffnum, OffsetNumber latestdead = InvalidOffsetNumber, maxoff = PageGetMaxOffsetNumber(dp), offnum; - OffsetNumber chainitems[MaxHeapTuplesPerPage]; + OffsetNumber chainitems[MaxHeapTuplesPerPageLimit]; int nchain = 0, i; @@ -777,7 +777,7 @@ static void heap_prune_record_redirect(PruneState *prstate, OffsetNumber offnum, OffsetNumber rdoffnum) { - Assert(prstate->nredirected < MaxHeapTuplesPerPage); + Assert(prstate->nredirected < ClusterMaxHeapTuplesPerPage); prstate->redirected[prstate->nredirected * 2] = offnum; prstate->redirected[prstate->nredirected * 2 + 1] = rdoffnum; prstate->nredirected++; @@ -791,7 +791,7 @@ heap_prune_record_redirect(PruneState *prstate, static void heap_prune_record_dead(PruneState *prstate, OffsetNumber offnum) { - Assert(prstate->ndead < MaxHeapTuplesPerPage); + Assert(prstate->ndead < ClusterMaxHeapTuplesPerPage); prstate->nowdead[prstate->ndead] = offnum; prstate->ndead++; Assert(!prstate->marked[offnum]); @@ -823,7 +823,7 @@ heap_prune_record_dead_or_unused(PruneState *prstate, OffsetNumber offnum) static void heap_prune_record_unused(PruneState *prstate, OffsetNumber offnum) { - Assert(prstate->nunused < MaxHeapTuplesPerPage); + Assert(prstate->nunused < ClusterMaxHeapTuplesPerPage); prstate->nowunused[prstate->nunused] = offnum; prstate->nunused++; Assert(!prstate->marked[offnum]); @@ -1036,7 +1036,7 @@ page_verify_redirects(Page page) * If item k is part of a HOT-chain with root at item j, then we set * root_offsets[k - 1] = j. * - * The passed-in root_offsets array must have MaxHeapTuplesPerPage entries. + * The passed-in root_offsets array must have ClusterMaxHeapTuplesPerPage entries. * Unused entries are filled with InvalidOffsetNumber (zero). * * The function must be called with at least share lock on the buffer, to @@ -1053,7 +1053,7 @@ heap_get_root_tuples(Page page, OffsetNumber *root_offsets) maxoff; MemSet(root_offsets, InvalidOffsetNumber, - MaxHeapTuplesPerPage * sizeof(OffsetNumber)); + ClusterMaxHeapTuplesPerPage * sizeof(OffsetNumber)); maxoff = PageGetMaxOffsetNumber(page); for (offnum = FirstOffsetNumber; offnum <= maxoff; offnum = OffsetNumberNext(offnum)) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index fa56480808..cd234f2910 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -893,8 +893,8 @@ lazy_scan_heap(LVRelState *vacrel) * dead_items TIDs, pause and do a cycle of vacuuming before we tackle * this page. */ - Assert(dead_items->max_items >= MaxHeapTuplesPerPage); - if (dead_items->max_items - dead_items->num_items < MaxHeapTuplesPerPage) + Assert(dead_items->max_items >= ClusterMaxHeapTuplesPerPage); + if (dead_items->max_items - dead_items->num_items < ClusterMaxHeapTuplesPerPage) { /* * Before beginning index vacuuming, we release any pin we may @@ -1376,8 +1376,8 @@ lazy_scan_prune(LVRelState *vacrel, all_frozen; TransactionId visibility_cutoff_xid; int64 fpi_before = pgWalUsage.wal_fpi; - OffsetNumber deadoffsets[MaxHeapTuplesPerPage]; - HeapTupleFreeze frozen[MaxHeapTuplesPerPage]; + OffsetNumber deadoffsets[MaxHeapTuplesPerPageLimit]; + HeapTupleFreeze frozen[MaxHeapTuplesPerPageLimit]; Assert(BufferGetBlockNumber(buf) == blkno); @@ -1905,7 +1905,7 @@ lazy_scan_noprune(LVRelState *vacrel, HeapTupleHeader tupleheader; TransactionId NoFreezePageRelfrozenXid = vacrel->NewRelfrozenXid; MultiXactId NoFreezePageRelminMxid = vacrel->NewRelminMxid; - OffsetNumber deadoffsets[MaxHeapTuplesPerPage]; + OffsetNumber deadoffsets[MaxHeapTuplesPerPageLimit]; Assert(BufferGetBlockNumber(buf) == blkno); @@ -2449,7 +2449,7 @@ lazy_vacuum_heap_page(LVRelState *vacrel, BlockNumber blkno, Buffer buffer, { VacDeadItems *dead_items = vacrel->dead_items; Page page = BufferGetPage(buffer); - OffsetNumber unused[MaxHeapTuplesPerPage]; + OffsetNumber unused[MaxHeapTuplesPerPageLimit]; int nunused = 0; TransactionId visibility_cutoff_xid; bool all_frozen; @@ -3100,16 +3100,16 @@ dead_items_max_items(LVRelState *vacrel) max_items = Min(max_items, MAXDEADITEMS(MaxAllocSize)); /* curious coding here to ensure the multiplication can't overflow */ - if ((BlockNumber) (max_items / MaxHeapTuplesPerPage) > rel_pages) - max_items = rel_pages * MaxHeapTuplesPerPage; + if ((BlockNumber) (max_items / ClusterMaxHeapTuplesPerPage) > rel_pages) + max_items = rel_pages * ClusterMaxHeapTuplesPerPage; /* stay sane if small maintenance_work_mem */ - max_items = Max(max_items, MaxHeapTuplesPerPage); + max_items = Max(max_items, ClusterMaxHeapTuplesPerPage); } else { /* One-pass case only stores a single heap page's TIDs at a time */ - max_items = MaxHeapTuplesPerPage; + max_items = ClusterMaxHeapTuplesPerPage; } return (int) max_items; @@ -3129,7 +3129,7 @@ dead_items_alloc(LVRelState *vacrel, int nworkers) int max_items; max_items = dead_items_max_items(vacrel); - Assert(max_items >= MaxHeapTuplesPerPage); + Assert(max_items >= ClusterMaxHeapTuplesPerPage); /* * Initialize state for a parallel vacuum. As of now, only one worker can diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c index 0f4850065f..d02ddedfa5 100644 --- a/src/backend/nodes/tidbitmap.c +++ b/src/backend/nodes/tidbitmap.c @@ -53,7 +53,7 @@ * the per-page bitmaps variable size. We just legislate that the size * is this: */ -#define MAX_TUPLES_PER_PAGE MaxHeapTuplesPerPage +#define MAX_TUPLES_PER_PAGE ClusterMaxHeapTuplesPerPage /* * When we have to switch over to lossy storage, we use a data structure diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index be6f1f62d2..f78efce9ad 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -186,7 +186,7 @@ PageIsVerifiedExtended(Page page, BlockNumber blkno, int flags) * one that is both unused and deallocated. * * If flag PAI_IS_HEAP is set, we enforce that there can't be more than - * MaxHeapTuplesPerPage line pointers on the page. + * ClusterMaxHeapTuplesPerPage line pointers on the page. * * !!! EREPORT(ERROR) IS DISALLOWED HERE !!! */ @@ -295,9 +295,9 @@ PageAddItemExtended(Page page, } /* Reject placing items beyond heap boundary, if heap */ - if ((flags & PAI_IS_HEAP) != 0 && offsetNumber > MaxHeapTuplesPerPage) + if ((flags & PAI_IS_HEAP) != 0 && offsetNumber > ClusterMaxHeapTuplesPerPage) { - elog(WARNING, "can't put more than MaxHeapTuplesPerPage items in a heap page"); + elog(WARNING, "can't put more than ClusterMaxHeapTuplesPerPage items in a heap page"); return InvalidOffsetNumber; } @@ -702,7 +702,7 @@ PageRepairFragmentation(Page page) Offset pd_upper = ((PageHeader) page)->pd_upper; Offset pd_special = ((PageHeader) page)->pd_special; Offset last_offset; - itemIdCompactData itemidbase[MaxHeapTuplesPerPage]; + itemIdCompactData itemidbase[MaxHeapTuplesPerPageLimit]; itemIdCompact itemidptr; ItemId lp; int nline, @@ -979,12 +979,12 @@ PageGetExactFreeSpace(Page page) * reduced by the space needed for a new line pointer. * * The difference between this and PageGetFreeSpace is that this will return - * zero if there are already MaxHeapTuplesPerPage line pointers in the page + * zero if there are already ClusterMaxHeapTuplesPerPage line pointers in the page * and none are free. We use this to enforce that no more than - * MaxHeapTuplesPerPage line pointers are created on a heap page. (Although + * ClusterMaxHeapTuplesPerPage line pointers are created on a heap page. (Although * no more tuples than that could fit anyway, in the presence of redirected * or dead line pointers it'd be possible to have too many line pointers. - * To avoid breaking code that assumes MaxHeapTuplesPerPage is a hard limit + * To avoid breaking code that assumes ClusterMaxHeapTuplesPerPage is a hard limit * on the number of line pointers, we make this extra check.) */ Size @@ -999,10 +999,10 @@ PageGetHeapFreeSpace(Page page) nline; /* - * Are there already MaxHeapTuplesPerPage line pointers in the page? + * Are there already ClusterMaxHeapTuplesPerPage line pointers in the page? */ nline = PageGetMaxOffsetNumber(page); - if (nline >= MaxHeapTuplesPerPage) + if (nline >= ClusterMaxHeapTuplesPerPage) { if (PageHasFreeLinePointers(page)) { diff --git a/src/include/access/ginblock.h b/src/include/access/ginblock.h index b3b7daa049..c55d11be64 100644 --- a/src/include/access/ginblock.h +++ b/src/include/access/ginblock.h @@ -162,7 +162,7 @@ extern bool GinPageIsRecyclable(Page page); * pointers for that page * Note that these are all distinguishable from an "invalid" item pointer * (which is InvalidBlockNumber/0) as well as from all normal item - * pointers (which have item numbers in the range 1..MaxHeapTuplesPerPage). + * pointers (which have item numbers in the range 1..ClusterMaxHeapTuplesPerPage). */ #define ItemPointerSetMin(p) \ ItemPointerSet((p), (BlockNumber)0, (OffsetNumber)0) diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 4b133f6859..3217d72f99 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -75,7 +75,7 @@ typedef struct HeapScanDescData /* these fields only used in page-at-a-time mode and for bitmap scans */ int rs_cindex; /* current tuple's index in vistuples */ int rs_ntuples; /* number of visible tuples on page */ - OffsetNumber rs_vistuples[MaxHeapTuplesPerPage]; /* their offsets */ + OffsetNumber rs_vistuples[MaxHeapTuplesPerPageLimit]; /* their offsets */ } HeapScanDescData; typedef struct HeapScanDescData *HeapScanDesc; @@ -205,10 +205,10 @@ typedef struct PruneResult * This is of type int8[], instead of HTSV_Result[], so we can use -1 to * indicate no visibility has been computed, e.g. for LP_DEAD items. * - * This needs to be MaxHeapTuplesPerPage + 1 long as FirstOffsetNumber is + * This needs to be ClusterMaxHeapTuplesPerPage + 1 long as FirstOffsetNumber is * 1. Otherwise every access would need to subtract 1. */ - int8 htsv[MaxHeapTuplesPerPage + 1]; + int8 htsv[MaxHeapTuplesPerPageLimit + 1]; } PruneResult; /* diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h index 5e38ef8696..7a35baf4b1 100644 --- a/src/include/access/htup_details.h +++ b/src/include/access/htup_details.h @@ -564,19 +564,33 @@ StaticAssertDecl(MaxOffsetNumber < SpecTokenOffsetNumber, #define MinHeapTupleSize MAXALIGN(SizeofHeapTupleHeader) /* - * MaxHeapTuplesPerPage is an upper bound on the number of tuples that can - * fit on one heap page. (Note that indexes could have more, because they - * use a smaller tuple header.) We arrive at the divisor because each tuple - * must be maxaligned, and it must have an associated line pointer. + * ClusterMaxHeapTuplesPerPage is a cluster-specific upper bound on the number + * of tuples that can fit on one heap page. (Note that indexes could have + * more, because they use a smaller tuple header.) We arrive at the divisor + * because each tuple must be maxaligned, and it must have an associated line + * pointer. + * + * MaxHeapTuplesPerPageLimit is the largest value that + * ClusterMaxHeapTuplesPerPage could be. While these currently evaluate to + * the same value, these are being split out so ClusterMaxHeapTuplesPerPage + * can become a variable instead of a constant. + * + * The CalcMaxHeapTuplesPerPage() macro is used to determine the appropriate + * values, given the usable page space on a given page. + * + * The old MaxHeapTuplesPerPage symbol has been removed; static allocations + * should use the MaxHeapTuplesPerPageLimit constant, while runtime code + * should use ClusterMaxHeapTuplesPerPage. * * Note: with HOT, there could theoretically be more line pointers (not actual * tuples) than this on a heap page. However we constrain the number of line * pointers to this anyway, to avoid excessive line-pointer bloat and not * require increases in the size of work arrays. */ -#define MaxHeapTuplesPerPage \ - ((int) ((BLCKSZ - SizeOfPageHeaderData) / \ +#define CalcMaxHeapTuplesPerPage(size) ((int) ((size) / \ (MAXALIGN(SizeofHeapTupleHeader) + sizeof(ItemIdData)))) +#define ClusterMaxHeapTuplesPerPage CalcMaxHeapTuplesPerPage(BLCKSZ - SizeOfPageHeaderData) +#define MaxHeapTuplesPerPageLimit CalcMaxHeapTuplesPerPage(BLCKSZ - SizeOfPageHeaderData) /* * MaxAttrSize is a somewhat arbitrary upper limit on the declared size of diff --git a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c index 04215cadd9..f79dbc2bdd 100644 --- a/src/test/modules/test_ginpostinglist/test_ginpostinglist.c +++ b/src/test/modules/test_ginpostinglist/test_ginpostinglist.c @@ -88,9 +88,9 @@ Datum test_ginpostinglist(PG_FUNCTION_ARGS) { test_itemptr_pair(0, 2, 14); - test_itemptr_pair(0, MaxHeapTuplesPerPage, 14); - test_itemptr_pair(MaxBlockNumber, MaxHeapTuplesPerPage, 14); - test_itemptr_pair(MaxBlockNumber, MaxHeapTuplesPerPage, 16); + test_itemptr_pair(0, ClusterMaxHeapTuplesPerPage, 14); + test_itemptr_pair(MaxBlockNumber, ClusterMaxHeapTuplesPerPage, 14); + test_itemptr_pair(MaxBlockNumber, ClusterMaxHeapTuplesPerPage, 16); PG_RETURN_VOID(); } -- 2.40.1