Skip to content

Commit fcf3b69

Browse files
petergeogheganpetergeoghegan
committed
Rename nbtree tuple macros.
Rename two function-style macros, removing the word "inner". This makes things more consistent.
1 parent 5d43c3c commit fcf3b69

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎contrib/amcheck/verify_nbtree.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)
758758
state->target,
759759
P_FIRSTDATAKEY(opaque));
760760
itup = (IndexTuple) PageGetItem(state->target, itemid);
761-
nextleveldown.leftmost = BTreeInnerTupleGetDownLink(itup);
761+
nextleveldown.leftmost = BTreeTupleGetDownLink(itup);
762762
nextleveldown.level = opaque->btpo.level - 1;
763763
}
764764
else
@@ -978,7 +978,7 @@ bt_target_page_check(BtreeCheckState *state)
978978
/* Fingerprint downlink blocks in heapallindexed + readonly case */
979979
if (state->heapallindexed && state->readonly && !P_ISLEAF(topaque))
980980
{
981-
BlockNumber childblock = BTreeInnerTupleGetDownLink(itup);
981+
BlockNumber childblock = BTreeTupleGetDownLink(itup);
982982

983983
bloom_add_element(state->downlinkfilter,
984984
(unsigned char *) &childblock,
@@ -1267,7 +1267,7 @@ bt_target_page_check(BtreeCheckState *state)
12671267
*/
12681268
if (!P_ISLEAF(topaque) && state->readonly)
12691269
{
1270-
BlockNumber childblock = BTreeInnerTupleGetDownLink(itup);
1270+
BlockNumber childblock = BTreeTupleGetDownLink(itup);
12711271

12721272
bt_downlink_check(state, skey, childblock);
12731273
}
@@ -1746,7 +1746,7 @@ bt_downlink_missing_check(BtreeCheckState *state)
17461746
itemid = PageGetItemIdCareful(state, state->targetblock, state->target,
17471747
P_FIRSTDATAKEY(topaque));
17481748
itup = (IndexTuple) PageGetItem(state->target, itemid);
1749-
childblk = BTreeInnerTupleGetDownLink(itup);
1749+
childblk = BTreeTupleGetDownLink(itup);
17501750
for (;;)
17511751
{
17521752
CHECK_FOR_INTERRUPTS();
@@ -1771,7 +1771,7 @@ bt_downlink_missing_check(BtreeCheckState *state)
17711771
itemid = PageGetItemIdCareful(state, childblk, child,
17721772
P_FIRSTDATAKEY(copaque));
17731773
itup = (IndexTuple) PageGetItem(child, itemid);
1774-
childblk = BTreeInnerTupleGetDownLink(itup);
1774+
childblk = BTreeTupleGetDownLink(itup);
17751775
/* Be slightly more pro-active in freeing this memory, just in case */
17761776
pfree(child);
17771777
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,7 @@ _bt_insert_parent(Relation rel,
18071807

18081808
/* form an index tuple that points at the new right page */
18091809
new_item = CopyIndexTuple(ritem);
1810-
BTreeInnerTupleSetDownLink(new_item, rbknum);
1810+
BTreeTupleSetDownLink(new_item, rbknum);
18111811

18121812
/*
18131813
* Re-find and write lock the parent of buf.
@@ -1991,7 +1991,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, BlockNumber child)
19911991
itemid = PageGetItemId(page, offnum);
19921992
item = (IndexTuple) PageGetItem(page, itemid);
19931993

1994-
if (BTreeInnerTupleGetDownLink(item) == child)
1994+
if (BTreeTupleGetDownLink(item) == child)
19951995
{
19961996
/* Return accurate pointer to where link is now */
19971997
stack->bts_blkno = blkno;
@@ -2007,7 +2007,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, BlockNumber child)
20072007
itemid = PageGetItemId(page, offnum);
20082008
item = (IndexTuple) PageGetItem(page, itemid);
20092009

2010-
if (BTreeInnerTupleGetDownLink(item) == child)
2010+
if (BTreeTupleGetDownLink(item) == child)
20112011
{
20122012
/* Return accurate pointer to where link is now */
20132013
stack->bts_blkno = blkno;
@@ -2096,7 +2096,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
20962096
left_item_sz = sizeof(IndexTupleData);
20972097
left_item = (IndexTuple) palloc(left_item_sz);
20982098
left_item->t_info = left_item_sz;
2099-
BTreeInnerTupleSetDownLink(left_item, lbkno);
2099+
BTreeTupleSetDownLink(left_item, lbkno);
21002100
BTreeTupleSetNAtts(left_item, 0);
21012101

21022102
/*
@@ -2107,7 +2107,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
21072107
right_item_sz = ItemIdGetLength(itemid);
21082108
item = (IndexTuple) PageGetItem(lpage, itemid);
21092109
right_item = CopyIndexTuple(item);
2110-
BTreeInnerTupleSetDownLink(right_item, rbkno);
2110+
BTreeTupleSetDownLink(right_item, rbkno);
21112111

21122112
/* NO EREPORT(ERROR) from here till newroot op is logged */
21132113
START_CRIT_SECTION();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,17 +1605,17 @@ _bt_mark_page_halfdead(Relation rel, Buffer leafbuf, BTStack stack)
16051605
#ifdef USE_ASSERT_CHECKING
16061606
itemid = PageGetItemId(page, topoff);
16071607
itup = (IndexTuple) PageGetItem(page, itemid);
1608-
Assert(BTreeInnerTupleGetDownLink(itup) == target);
1608+
Assert(BTreeTupleGetDownLink(itup) == target);
16091609
#endif
16101610

16111611
nextoffset = OffsetNumberNext(topoff);
16121612
itemid = PageGetItemId(page, nextoffset);
16131613
itup = (IndexTuple) PageGetItem(page, itemid);
1614-
if (BTreeInnerTupleGetDownLink(itup) != rightsib)
1614+
if (BTreeTupleGetDownLink(itup) != rightsib)
16151615
ereport(ERROR,
16161616
(errcode(ERRCODE_INDEX_CORRUPTED),
16171617
errmsg_internal("right sibling %u of block %u is not next child %u of block %u in index \"%s\"",
1618-
rightsib, target, BTreeInnerTupleGetDownLink(itup),
1618+
rightsib, target, BTreeTupleGetDownLink(itup),
16191619
BufferGetBlockNumber(topparent), RelationGetRelationName(rel))));
16201620

16211621
/*
@@ -1638,7 +1638,7 @@ _bt_mark_page_halfdead(Relation rel, Buffer leafbuf, BTStack stack)
16381638

16391639
itemid = PageGetItemId(page, topoff);
16401640
itup = (IndexTuple) PageGetItem(page, itemid);
1641-
BTreeInnerTupleSetDownLink(itup, rightsib);
1641+
BTreeTupleSetDownLink(itup, rightsib);
16421642

16431643
nextoffset = OffsetNumberNext(topoff);
16441644
PageIndexTupleDelete(page, nextoffset);
@@ -1902,7 +1902,7 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, bool *rightsib_empty)
19021902

19031903
/* remember the next non-leaf child down in the branch. */
19041904
itemid = PageGetItemId(page, P_FIRSTDATAKEY(opaque));
1905-
nextchild = BTreeInnerTupleGetDownLink((IndexTuple) PageGetItem(page, itemid));
1905+
nextchild = BTreeTupleGetDownLink((IndexTuple) PageGetItem(page, itemid));
19061906
if (nextchild == leafblkno)
19071907
nextchild = InvalidBlockNumber;
19081908
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ _bt_search(Relation rel, BTScanInsert key, Buffer *bufP, int access,
142142
offnum = _bt_binsrch(rel, key, *bufP);
143143
itemid = PageGetItemId(page, offnum);
144144
itup = (IndexTuple) PageGetItem(page, itemid);
145-
blkno = BTreeInnerTupleGetDownLink(itup);
145+
blkno = BTreeTupleGetDownLink(itup);
146146
par_blkno = BufferGetBlockNumber(*bufP);
147147

148148
/*
@@ -2120,7 +2120,7 @@ _bt_get_endpoint(Relation rel, uint32 level, bool rightmost,
21202120
offnum = P_FIRSTDATAKEY(opaque);
21212121

21222122
itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
2123-
blkno = BTreeInnerTupleGetDownLink(itup);
2123+
blkno = BTreeTupleGetDownLink(itup);
21242124

21252125
buf = _bt_relandgetbuf(rel, buf, blkno, BT_READ);
21262126
page = BufferGetPage(buf);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ _bt_buildadd(BTWriteState *wstate, BTPageState *state, IndexTuple itup)
982982
P_LEFTMOST((BTPageOpaque) PageGetSpecialPointer(opage)));
983983
Assert(BTreeTupleGetNAtts(state->btps_lowkey, wstate->index) == 0 ||
984984
!P_LEFTMOST((BTPageOpaque) PageGetSpecialPointer(opage)));
985-
BTreeInnerTupleSetDownLink(state->btps_lowkey, oblkno);
985+
BTreeTupleSetDownLink(state->btps_lowkey, oblkno);
986986
_bt_buildadd(wstate, state->btps_next, state->btps_lowkey);
987987
pfree(state->btps_lowkey);
988988

@@ -1089,7 +1089,7 @@ _bt_uppershutdown(BTWriteState *wstate, BTPageState *state)
10891089
P_LEFTMOST(opaque));
10901090
Assert(BTreeTupleGetNAtts(s->btps_lowkey, wstate->index) == 0 ||
10911091
!P_LEFTMOST(opaque));
1092-
BTreeInnerTupleSetDownLink(s->btps_lowkey, blkno);
1092+
BTreeTupleSetDownLink(s->btps_lowkey, blkno);
10931093
_bt_buildadd(wstate, s->btps_next, s->btps_lowkey);
10941094
pfree(s->btps_lowkey);
10951095
s->btps_lowkey = NULL;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,11 +597,11 @@ btree_xlog_mark_page_halfdead(uint8 info, XLogReaderState *record)
597597
nextoffset = OffsetNumberNext(poffset);
598598
itemid = PageGetItemId(page, nextoffset);
599599
itup = (IndexTuple) PageGetItem(page, itemid);
600-
rightsib = BTreeInnerTupleGetDownLink(itup);
600+
rightsib = BTreeTupleGetDownLink(itup);
601601

602602
itemid = PageGetItemId(page, poffset);
603603
itup = (IndexTuple) PageGetItem(page, itemid);
604-
BTreeInnerTupleSetDownLink(itup, rightsib);
604+
BTreeTupleSetDownLink(itup, rightsib);
605605
nextoffset = OffsetNumberNext(poffset);
606606
PageIndexTupleDelete(page, nextoffset);
607607

‎src/include/access/nbtree.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,10 @@ typedef struct BTMetaPageData
298298
#define BT_N_KEYS_OFFSET_MASK 0x0FFF
299299
#define BT_HEAP_TID_ATTR 0x1000
300300

301-
/* Get/set downlink block number */
302-
#define BTreeInnerTupleGetDownLink(itup) \
301+
/* Get/set downlink block number in pivot tuple */
302+
#define BTreeTupleGetDownLink(itup) \
303303
ItemPointerGetBlockNumberNoCheck(&((itup)->t_tid))
304-
#define BTreeInnerTupleSetDownLink(itup, blkno) \
304+
#define BTreeTupleSetDownLink(itup, blkno) \
305305
ItemPointerSetBlockNumber(&((itup)->t_tid), (blkno))
306306

307307
/*

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy