diff options
| author | Peter Geoghegan <pg@bowt.ie> | 2019-12-16 17:49:45 -0800 |
|---|---|---|
| committer | Peter Geoghegan <pg@bowt.ie> | 2019-12-16 17:49:45 -0800 |
| commit | fcf3b6917bd8f6f9f463e3e42e53d6ff9612e327 (patch) | |
| tree | ad9636376ce93d53b64c34ddaf0f7c5cd5aab59f /src/backend/access/nbtree/nbtpage.c | |
| parent | 5d43c3c54d77f39135fe463539f5f438f460ae7e (diff) | |
Rename nbtree tuple macros.
Rename two function-style macros, removing the word "inner". This makes
things more consistent.
Diffstat (limited to 'src/backend/access/nbtree/nbtpage.c')
| -rw-r--r-- | src/backend/access/nbtree/nbtpage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 268f869a36c..e1a111b1ed4 100644 --- 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; } |