From a3e77e88dee59a7e13a9c33726cc1ba08f4bb3e3 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Fri, 12 Jan 2024 17:19:15 -0500 Subject: [PATCH v3 23/28] chore: Rename MaxTIDsPerBTreePageDynamic to ClusterMaxTIDsPerBTreePage We are now using the computed variable instead of calculating the expression. --- contrib/amcheck/verify_nbtree.c | 4 ++-- src/backend/access/nbtree/nbtdedup.c | 4 ++-- src/backend/access/nbtree/nbtinsert.c | 4 ++-- src/backend/access/nbtree/nbtree.c | 4 ++-- src/backend/access/nbtree/nbtsearch.c | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c index a2d26394be..c3b82dbbbe 100644 --- a/contrib/amcheck/verify_nbtree.c +++ b/contrib/amcheck/verify_nbtree.c @@ -533,12 +533,12 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace, /* * Size Bloom filter based on estimated number of tuples in index, * while conservatively assuming that each block must contain at least - * MaxTIDsPerBTreePageDynamic / 3 "plain" tuples -- see + * ClusterMaxTIDsPerBTreePage / 3 "plain" tuples -- see * bt_posting_plain_tuple() for definition, and details of how posting * list tuples are handled. */ total_pages = RelationGetNumberOfBlocks(rel); - total_elems = Max(total_pages * (MaxTIDsPerBTreePageDynamic / 3), + total_elems = Max(total_pages * (ClusterMaxTIDsPerBTreePage / 3), (int64) state->rel->rd_rel->reltuples); /* Generate a random seed to avoid repetition */ seed = pg_prng_uint64(&pg_global_prng_state); diff --git a/src/backend/access/nbtree/nbtdedup.c b/src/backend/access/nbtree/nbtdedup.c index d6655b2988..dab043bf78 100644 --- a/src/backend/access/nbtree/nbtdedup.c +++ b/src/backend/access/nbtree/nbtdedup.c @@ -355,8 +355,8 @@ _bt_bottomupdel_pass(Relation rel, Buffer buf, Relation heapRel, delstate.bottomup = true; delstate.bottomupfreespace = Max(BLCKSZ / 16, newitemsz); delstate.ndeltids = 0; - delstate.deltids = palloc(MaxTIDsPerBTreePageDynamic * sizeof(TM_IndexDelete)); - delstate.status = palloc(MaxTIDsPerBTreePageDynamic * sizeof(TM_IndexStatus)); + delstate.deltids = palloc(ClusterMaxTIDsPerBTreePage * sizeof(TM_IndexDelete)); + delstate.status = palloc(ClusterMaxTIDsPerBTreePage * sizeof(TM_IndexStatus)); minoff = P_FIRSTDATAKEY(opaque); maxoff = PageGetMaxOffsetNumber(page); diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index b41365b16b..ccc2454801 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -2829,8 +2829,8 @@ _bt_simpledel_pass(Relation rel, Buffer buffer, Relation heapRel, delstate.bottomup = false; delstate.bottomupfreespace = 0; delstate.ndeltids = 0; - delstate.deltids = palloc(MaxTIDsPerBTreePageDynamic * sizeof(TM_IndexDelete)); - delstate.status = palloc(MaxTIDsPerBTreePageDynamic * sizeof(TM_IndexStatus)); + delstate.deltids = palloc(ClusterMaxTIDsPerBTreePage * sizeof(TM_IndexDelete)); + delstate.status = palloc(ClusterMaxTIDsPerBTreePage * sizeof(TM_IndexStatus)); for (offnum = minoff; offnum <= maxoff; diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 041bb73c47..520e52ee12 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -263,8 +263,8 @@ btgettuple(IndexScanDesc scan, ScanDirection dir) */ if (so->killedItems == NULL) so->killedItems = (int *) - palloc(MaxTIDsPerBTreePageDynamic * sizeof(int)); - if (so->numKilled < MaxTIDsPerBTreePageDynamic) + palloc(ClusterMaxTIDsPerBTreePage * sizeof(int)); + if (so->numKilled < ClusterMaxTIDsPerBTreePage) so->killedItems[so->numKilled++] = so->currPos.itemIndex; } diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 8e80a41571..4925ace477 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -1726,7 +1726,7 @@ _bt_readpage(IndexScanDesc scan, ScanDirection dir, OffsetNumber offnum, if (!continuescan) so->currPos.moreRight = false; - Assert(itemIndex <= MaxTIDsPerBTreePageDynamic); + Assert(itemIndex <= ClusterMaxTIDsPerBTreePage); so->currPos.firstItem = 0; so->currPos.lastItem = itemIndex - 1; so->currPos.itemIndex = 0; @@ -1734,7 +1734,7 @@ _bt_readpage(IndexScanDesc scan, ScanDirection dir, OffsetNumber offnum, else { /* load items[] in descending order */ - itemIndex = MaxTIDsPerBTreePageDynamic; + itemIndex = ClusterMaxTIDsPerBTreePage; offnum = Min(offnum, maxoff); @@ -1836,8 +1836,8 @@ _bt_readpage(IndexScanDesc scan, ScanDirection dir, OffsetNumber offnum, Assert(itemIndex >= 0); so->currPos.firstItem = itemIndex; - so->currPos.lastItem = MaxTIDsPerBTreePageDynamic - 1; - so->currPos.itemIndex = MaxTIDsPerBTreePageDynamic - 1; + so->currPos.lastItem = ClusterMaxTIDsPerBTreePage - 1; + so->currPos.itemIndex = ClusterMaxTIDsPerBTreePage - 1; } return (so->currPos.firstItem <= so->currPos.lastItem); -- 2.40.1