diff options
author | Tor Egge <Tor.Egge@online.no> | 2022-02-25 13:55:01 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2022-02-25 13:55:43 +0100 |
commit | dcab370fa8c146fdf481e3fdd98b18a687dd9f9c (patch) | |
tree | 6d6c9dba6dabc06f1766546fb8c5e158a7ec66ff /vespalib | |
parent | fc9db2992f799bffb80df2b1d57bd4f320da5e7e (diff) |
Prepare for different semantics for getData and getChild member functions
in internal btree node.
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/vespa/vespalib/btree/btreenode.hpp | 4 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/test/btree/btree_printer.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vespalib/src/vespa/vespalib/btree/btreenode.hpp b/vespalib/src/vespa/vespalib/btree/btreenode.hpp index 547dd6f5f3f..62773e57c6f 100644 --- a/vespalib/src/vespa/vespalib/btree/btreenode.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreenode.hpp @@ -273,7 +273,7 @@ splitInsert(BTreeInternalNode *splitNode, uint32_t idx, const KeyT &key, for (uint32_t i = sih.getMedian(); i < validSlots(); ++i) { splitNode->_keys[i - sih.getMedian()] = _keys[i]; splitNode->setData(i - sih.getMedian(), getData(i)); - splitLeaves += allocator.validLeaves(getData(i)); + splitLeaves += allocator.validLeaves(getChild(i)); } splitNode->_validLeaves = splitLeaves; this->cleanRange(sih.getMedian(), validSlots()); @@ -316,7 +316,7 @@ BTreeInternalNode<KeyT, AggrT, NumSlots>::countValidLeaves(uint32_t start, uint3 assert(end <= validSlots()); uint32_t leaves = 0; for (uint32_t i = start; i < end; ++i) { - leaves += allocator.validLeaves(getData(i)); + leaves += allocator.validLeaves(getChild(i)); } return leaves; } diff --git a/vespalib/src/vespa/vespalib/test/btree/btree_printer.h b/vespalib/src/vespa/vespalib/test/btree/btree_printer.h index acac4df90c8..8430dc894ba 100644 --- a/vespalib/src/vespa/vespalib/test/btree/btree_printer.h +++ b/vespalib/src/vespa/vespalib/test/btree/btree_printer.h @@ -60,7 +60,7 @@ class BTreePrinter return; } for (uint32_t i = 0; i < n.validSlots(); ++i) { - printNode(n.getData(i)); + printNode(n.getChild(i)); } } |