From de4537fd7375cacdc182c0c7e3af196491e453eb Mon Sep 17 00:00:00 2001 From: David Christensen Date: Fri, 12 Jan 2024 17:19:15 -0500 Subject: [PATCH v3 22/28] chore: Rename MaxIndexTuplesPerPageDynamic to ClusterMaxIndexTuplesPerPage --- contrib/amcheck/verify_nbtree.c | 6 +++--- src/backend/access/gist/gistget.c | 8 ++++---- src/backend/access/hash/hash.c | 4 ++-- src/backend/access/hash/hashsearch.c | 10 +++++----- src/backend/access/spgist/spgscan.c | 2 +- src/backend/storage/page/bufpage.c | 2 +- src/include/access/itup.h | 1 - src/include/access/spgist_private.h | 2 +- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c index 4d2ae3927e..a2d26394be 100644 --- a/contrib/amcheck/verify_nbtree.c +++ b/contrib/amcheck/verify_nbtree.c @@ -3446,12 +3446,12 @@ palloc_btree_page(BtreeCheckState *state, BlockNumber blocknum) * to move left, in the case of backward index scans). */ maxoffset = PageGetMaxOffsetNumber(page); - if (maxoffset > MaxIndexTuplesPerPageDynamic) + if (maxoffset > ClusterMaxIndexTuplesPerPage) ereport(ERROR, (errcode(ERRCODE_INDEX_CORRUPTED), - errmsg("Number of items on block %u of index \"%s\" exceeds MaxIndexTuplesPerPageDynamic (%u)", + errmsg("Number of items on block %u of index \"%s\" exceeds ClusterMaxIndexTuplesPerPage (%u)", blocknum, RelationGetRelationName(state->rel), - MaxIndexTuplesPerPageDynamic))); + (unsigned int)ClusterMaxIndexTuplesPerPage))); if (!P_ISLEAF(opaque) && !P_ISDELETED(opaque) && maxoffset < P_FIRSTDATAKEY(opaque)) ereport(ERROR, diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 7af7b95997..1caa072581 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -659,12 +659,12 @@ gistgettuple(IndexScanDesc scan, ScanDirection dir) MemoryContextSwitchTo(so->giststate->scanCxt); so->killedItems = - (OffsetNumber *) palloc(MaxIndexTuplesPerPageDynamic + (OffsetNumber *) palloc(ClusterMaxIndexTuplesPerPage * sizeof(OffsetNumber)); MemoryContextSwitchTo(oldCxt); } - if (so->numKilled < MaxIndexTuplesPerPageDynamic) + if (so->numKilled < ClusterMaxIndexTuplesPerPage) so->killedItems[so->numKilled++] = so->pageData[so->curPageData - 1].offnum; } @@ -696,12 +696,12 @@ gistgettuple(IndexScanDesc scan, ScanDirection dir) MemoryContextSwitchTo(so->giststate->scanCxt); so->killedItems = - (OffsetNumber *) palloc(MaxIndexTuplesPerPageDynamic + (OffsetNumber *) palloc(ClusterMaxIndexTuplesPerPage * sizeof(OffsetNumber)); MemoryContextSwitchTo(oldCxt); } - if (so->numKilled < MaxIndexTuplesPerPageDynamic) + if (so->numKilled < ClusterMaxIndexTuplesPerPage) so->killedItems[so->numKilled++] = so->pageData[so->curPageData - 1].offnum; } diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 125ab213bc..3f66b2570a 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -312,9 +312,9 @@ hashgettuple(IndexScanDesc scan, ScanDirection dir) */ if (so->killedItems == NULL) so->killedItems = (int *) - palloc(MaxIndexTuplesPerPageDynamic * sizeof(int)); + palloc(ClusterMaxIndexTuplesPerPage * sizeof(int)); - if (so->numKilled < MaxIndexTuplesPerPageDynamic) + if (so->numKilled < ClusterMaxIndexTuplesPerPage) so->killedItems[so->numKilled++] = so->currPos.itemIndex; } diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c index b8bdee54c7..d033950f71 100644 --- a/src/backend/access/hash/hashsearch.c +++ b/src/backend/access/hash/hashsearch.c @@ -532,7 +532,7 @@ _hash_readpage(IndexScanDesc scan, Buffer *bufP, ScanDirection dir) itemIndex = _hash_load_qualified_items(scan, page, offnum, dir); - if (itemIndex != MaxIndexTuplesPerPageDynamic) + if (itemIndex != ClusterMaxIndexTuplesPerPage) break; /* @@ -571,8 +571,8 @@ _hash_readpage(IndexScanDesc scan, Buffer *bufP, ScanDirection dir) } so->currPos.firstItem = itemIndex; - so->currPos.lastItem = MaxIndexTuplesPerPageDynamic - 1; - so->currPos.itemIndex = MaxIndexTuplesPerPageDynamic - 1; + so->currPos.lastItem = ClusterMaxIndexTuplesPerPage - 1; + so->currPos.itemIndex = ClusterMaxIndexTuplesPerPage - 1; } if (so->currPos.buf == so->hashso_bucket_buf || @@ -652,13 +652,13 @@ _hash_load_qualified_items(IndexScanDesc scan, Page page, offnum = OffsetNumberNext(offnum); } - Assert(itemIndex <= MaxIndexTuplesPerPageDynamic); + Assert(itemIndex <= ClusterMaxIndexTuplesPerPage); return itemIndex; } else { /* load items[] in descending order */ - itemIndex = MaxIndexTuplesPerPageDynamic; + itemIndex = ClusterMaxIndexTuplesPerPage; while (offnum >= FirstOffsetNumber) { diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c index de6f767c89..5690fc4981 100644 --- a/src/backend/access/spgist/spgscan.c +++ b/src/backend/access/spgist/spgscan.c @@ -961,7 +961,7 @@ storeGettuple(SpGistScanOpaque so, ItemPointer heapPtr, SpGistLeafTuple leafTuple, bool recheck, bool recheckDistances, double *nonNullDistances) { - Assert(so->nPtrs < MaxIndexTuplesPerPageDynamic); + Assert(so->nPtrs < ClusterMaxIndexTuplesPerPage); so->heapPtrs[so->nPtrs] = *heapPtr; so->recheck[so->nPtrs] = recheck; so->recheckDistances[so->nPtrs] = recheckDistances; diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index e4bbc46405..8a5fb66a8e 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -1177,7 +1177,7 @@ PageIndexMultiDelete(Page page, OffsetNumber *itemnos, int nitems) OffsetNumber offnum; bool presorted = true; /* For now */ - Assert(nitems <= MaxIndexTuplesPerPageDynamic); + Assert(nitems <= ClusterMaxIndexTuplesPerPage); /* * If there aren't very many items to delete, then retail diff --git a/src/include/access/itup.h b/src/include/access/itup.h index edda73e929..d84f3e2505 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -167,5 +167,4 @@ index_getattr(IndexTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull) ((int) ((usablespace) / \ (MAXALIGN(sizeof(IndexTupleData) + 1) + sizeof(ItemIdData)))) #define MaxIndexTuplesPerPageLimit (CalcMaxIndexTuplesPerPage(PageUsableSpaceMax)) -#define MaxIndexTuplesPerPageDynamic (CalcMaxIndexTuplesPerPage(PageUsableSpace)) #endif /* ITUP_H */ diff --git a/src/include/access/spgist_private.h b/src/include/access/spgist_private.h index ba643648fa..d8ca2b7e0f 100644 --- a/src/include/access/spgist_private.h +++ b/src/include/access/spgist_private.h @@ -236,7 +236,7 @@ typedef struct SpGistScanOpaqueData IndexOrderByDistance *distances[MaxIndexTuplesPerPageLimit]; /* - * Note: using MaxIndexTuplesPerPageDynamic above is a bit hokey since + * Note: using ClusterMaxIndexTuplesPerPage above is a bit hokey since * SpGistLeafTuples aren't exactly IndexTuples; however, they are larger, * so this is safe. */ -- 2.40.1