Rename nbtree tuple macros.

Rename two function-style macros, removing the word "inner".  This makes
things more consistent.

diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c
index 3542545de5681f6bf574f1f7bb50eef1b91dcfa9..194c93fd3a6660498911a771939f57d64c35b0bd 100644 (file)
--- a/contrib/amcheck/verify_nbtree.c
+++ b/contrib/amcheck/verify_nbtree.c
@@ -758,7 +758,7 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)
                                              state->target,
                                              P_FIRSTDATAKEY(opaque));
                itup = (IndexTuple) PageGetItem(state->target, itemid);
-               nextleveldown.leftmost = BTreeInnerTupleGetDownLink(itup);
+               nextleveldown.leftmost = BTreeTupleGetDownLink(itup);
                nextleveldown.level = opaque->btpo.level - 1;
            }
            else
@@ -978,7 +978,7 @@ bt_target_page_check(BtreeCheckState *state)
        /* Fingerprint downlink blocks in heapallindexed + readonly case */
        if (state->heapallindexed && state->readonly && !P_ISLEAF(topaque))
        {
-           BlockNumber childblock = BTreeInnerTupleGetDownLink(itup);
+           BlockNumber childblock = BTreeTupleGetDownLink(itup);
 
            bloom_add_element(state->downlinkfilter,
                              (unsigned char *) &childblock,
@@ -1267,7 +1267,7 @@ bt_target_page_check(BtreeCheckState *state)
         */
        if (!P_ISLEAF(topaque) && state->readonly)
        {
-           BlockNumber childblock = BTreeInnerTupleGetDownLink(itup);
+           BlockNumber childblock = BTreeTupleGetDownLink(itup);
 
            bt_downlink_check(state, skey, childblock);
        }
@@ -1746,7 +1746,7 @@ bt_downlink_missing_check(BtreeCheckState *state)
    itemid = PageGetItemIdCareful(state, state->targetblock, state->target,
                                  P_FIRSTDATAKEY(topaque));
    itup = (IndexTuple) PageGetItem(state->target, itemid);
-   childblk = BTreeInnerTupleGetDownLink(itup);
+   childblk = BTreeTupleGetDownLink(itup);
    for (;;)
    {
        CHECK_FOR_INTERRUPTS();
@@ -1771,7 +1771,7 @@ bt_downlink_missing_check(BtreeCheckState *state)
        itemid = PageGetItemIdCareful(state, childblk, child,
                                      P_FIRSTDATAKEY(copaque));
        itup = (IndexTuple) PageGetItem(child, itemid);
-       childblk = BTreeInnerTupleGetDownLink(itup);
+       childblk = BTreeTupleGetDownLink(itup);
        /* Be slightly more pro-active in freeing this memory, just in case */
        pfree(child);
    }

diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index b93b2a0ffd6f3f3014cef4bedd5728f002f72f5d..2e8e60cd0c84be4f18ecc7fd7e1ee56dfbdec7a6 100644 (file)
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -1807,7 +1807,7 @@ _bt_insert_parent(Relation rel,
 
        /* form an index tuple that points at the new right page */
        new_item = CopyIndexTuple(ritem);
-       BTreeInnerTupleSetDownLink(new_item, rbknum);
+       BTreeTupleSetDownLink(new_item, rbknum);
 
        /*
         * Re-find and write lock the parent of buf.
@@ -1991,7 +1991,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, BlockNumber child)
                itemid = PageGetItemId(page, offnum);
                item = (IndexTuple) PageGetItem(page, itemid);
 
-               if (BTreeInnerTupleGetDownLink(item) == child)
+               if (BTreeTupleGetDownLink(item) == child)
                {
                    /* Return accurate pointer to where link is now */
                    stack->bts_blkno = blkno;
@@ -2007,7 +2007,7 @@ _bt_getstackbuf(Relation rel, BTStack stack, BlockNumber child)
                itemid = PageGetItemId(page, offnum);
                item = (IndexTuple) PageGetItem(page, itemid);
 
-               if (BTreeInnerTupleGetDownLink(item) == child)
+               if (BTreeTupleGetDownLink(item) == child)
                {
                    /* Return accurate pointer to where link is now */
                    stack->bts_blkno = blkno;
@@ -2096,7 +2096,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
    left_item_sz = sizeof(IndexTupleData);
    left_item = (IndexTuple) palloc(left_item_sz);
    left_item->t_info = left_item_sz;
-   BTreeInnerTupleSetDownLink(left_item, lbkno);
+   BTreeTupleSetDownLink(left_item, lbkno);
    BTreeTupleSetNAtts(left_item, 0);
 
    /*
@@ -2107,7 +2107,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
    right_item_sz = ItemIdGetLength(itemid);
    item = (IndexTuple) PageGetItem(lpage, itemid);
    right_item = CopyIndexTuple(item);
-   BTreeInnerTupleSetDownLink(right_item, rbkno);
+   BTreeTupleSetDownLink(right_item, rbkno);
 
    /* NO EREPORT(ERROR) from here till newroot op is logged */
    START_CRIT_SECTION();

diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 268f869a36c9189c8af66f15ef715deb40457215..e1a111b1ed4239e5695b56ebfab17939bf15fe94 100644 (file)
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -1605,17 +1605,17 @@ _bt_mark_page_halfdead(Relation rel, Buffer leafbuf, BTStack stack)
 #ifdef USE_ASSERT_CHECKING
    itemid = PageGetItemId(page, topoff);
    itup = (IndexTuple) PageGetItem(page, itemid);
-   Assert(BTreeInnerTupleGetDownLink(itup) == target);
+   Assert(BTreeTupleGetDownLink(itup) == target);
 #endif
 
    nextoffset = OffsetNumberNext(topoff);
    itemid = PageGetItemId(page, nextoffset);
    itup = (IndexTuple) PageGetItem(page, itemid);
-   if (BTreeInnerTupleGetDownLink(itup) != rightsib)
+   if (BTreeTupleGetDownLink(itup) != rightsib)
        ereport(ERROR,
                    (errcode(ERRCODE_INDEX_CORRUPTED),
                     errmsg_internal("right sibling %u of block %u is not next child %u of block %u in index \"%s\"",
-                                    rightsib, target, BTreeInnerTupleGetDownLink(itup),
+                                    rightsib, target, BTreeTupleGetDownLink(itup),
                     BufferGetBlockNumber(topparent), RelationGetRelationName(rel))));
 
    /*
@@ -1638,7 +1638,7 @@ _bt_mark_page_halfdead(Relation rel, Buffer leafbuf, BTStack stack)
 
    itemid = PageGetItemId(page, topoff);
    itup = (IndexTuple) PageGetItem(page, itemid);
-   BTreeInnerTupleSetDownLink(itup, rightsib);
+   BTreeTupleSetDownLink(itup, rightsib);
 
    nextoffset = OffsetNumberNext(topoff);
    PageIndexTupleDelete(page, nextoffset);
@@ -1902,7 +1902,7 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, bool *rightsib_empty)
 
        /* remember the next non-leaf child down in the branch. */
        itemid = PageGetItemId(page, P_FIRSTDATAKEY(opaque));
-       nextchild = BTreeInnerTupleGetDownLink((IndexTuple) PageGetItem(page, itemid));
+       nextchild = BTreeTupleGetDownLink((IndexTuple) PageGetItem(page, itemid));
        if (nextchild == leafblkno)
            nextchild = InvalidBlockNumber;
    }

diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 8e512461a0e3c7b94d0fa00cd76efe45278258ac..b62648d935f7ff0ac4d618aaf9f00f3a5c2e9c67 100644 (file)
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -142,7 +142,7 @@ _bt_search(Relation rel, BTScanInsert key, Buffer *bufP, int access,
        offnum = _bt_binsrch(rel, key, *bufP);
        itemid = PageGetItemId(page, offnum);
        itup = (IndexTuple) PageGetItem(page, itemid);
-       blkno = BTreeInnerTupleGetDownLink(itup);
+       blkno = BTreeTupleGetDownLink(itup);
        par_blkno = BufferGetBlockNumber(*bufP);
 
        /*
@@ -2120,7 +2120,7 @@ _bt_get_endpoint(Relation rel, uint32 level, bool rightmost,
            offnum = P_FIRSTDATAKEY(opaque);
 
        itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
-       blkno = BTreeInnerTupleGetDownLink(itup);
+       blkno = BTreeTupleGetDownLink(itup);
 
        buf = _bt_relandgetbuf(rel, buf, blkno, BT_READ);
        page = BufferGetPage(buf);

diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 1dd39a95350bb083f0e5be3003c06f5aa106525d..c8110a130ac05290b84dfef2e14e02405394f660 100644 (file)
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -982,7 +982,7 @@ _bt_buildadd(BTWriteState *wstate, BTPageState *state, IndexTuple itup)
               P_LEFTMOST((BTPageOpaque) PageGetSpecialPointer(opage)));
        Assert(BTreeTupleGetNAtts(state->btps_lowkey, wstate->index) == 0 ||
               !P_LEFTMOST((BTPageOpaque) PageGetSpecialPointer(opage)));
-       BTreeInnerTupleSetDownLink(state->btps_lowkey, oblkno);
+       BTreeTupleSetDownLink(state->btps_lowkey, oblkno);
        _bt_buildadd(wstate, state->btps_next, state->btps_lowkey);
        pfree(state->btps_lowkey);
 
@@ -1089,7 +1089,7 @@ _bt_uppershutdown(BTWriteState *wstate, BTPageState *state)
                   P_LEFTMOST(opaque));
            Assert(BTreeTupleGetNAtts(s->btps_lowkey, wstate->index) == 0 ||
                   !P_LEFTMOST(opaque));
-           BTreeInnerTupleSetDownLink(s->btps_lowkey, blkno);
+           BTreeTupleSetDownLink(s->btps_lowkey, blkno);
            _bt_buildadd(wstate, s->btps_next, s->btps_lowkey);
            pfree(s->btps_lowkey);
            s->btps_lowkey = NULL;

diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index 44f62839500ad20b772f0be7f8da84ec3f58c90f..4325cbee5ba5160e685e560aeb9ed205c4b2454d 100644 (file)
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -597,11 +597,11 @@ btree_xlog_mark_page_halfdead(uint8 info, XLogReaderState *record)
        nextoffset = OffsetNumberNext(poffset);
        itemid = PageGetItemId(page, nextoffset);
        itup = (IndexTuple) PageGetItem(page, itemid);
-       rightsib = BTreeInnerTupleGetDownLink(itup);
+       rightsib = BTreeTupleGetDownLink(itup);
 
        itemid = PageGetItemId(page, poffset);
        itup = (IndexTuple) PageGetItem(page, itemid);
-       BTreeInnerTupleSetDownLink(itup, rightsib);
+       BTreeTupleSetDownLink(itup, rightsib);
        nextoffset = OffsetNumberNext(poffset);
        PageIndexTupleDelete(page, nextoffset);
 

diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 18a2a3e71cdce7b83e65dcdfd0bcc29bde325b45..780b69442efb67d23aaa397c93d85032fdca6601 100644 (file)
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -298,10 +298,10 @@ typedef struct BTMetaPageData
 #define BT_N_KEYS_OFFSET_MASK      0x0FFF
 #define BT_HEAP_TID_ATTR           0x1000
 
-/* Get/set downlink block number */
-#define BTreeInnerTupleGetDownLink(itup) \
+/* Get/set downlink block number in pivot tuple */
+#define BTreeTupleGetDownLink(itup) \
    ItemPointerGetBlockNumberNoCheck(&((itup)->t_tid))
-#define BTreeInnerTupleSetDownLink(itup, blkno) \
+#define BTreeTupleSetDownLink(itup, blkno) \
    ItemPointerSetBlockNumber(&((itup)->t_tid), (blkno))
 
 /*