diff options
| author | bjormel <bjormel@yahooinc.com> | 2023-10-01 12:23:12 +0000 |
|---|---|---|
| committer | bjormel <bjormel@yahooinc.com> | 2023-10-01 12:23:12 +0000 |
| commit | e9058b555d4dfea2f6c872d9a677e8678b569569 (patch) | |
| tree | fa1b67c6e39712c1e0d9f308b0dd55573b43f913 /vespalib/src/vespa/vespalib/btree/btreeiterator.hpp | |
| parent | 0ad931fa86658904fe9212b014d810236b0e00e4 (diff) | |
| parent | 16030193ec04ee41e98779a3d7ee6a6c1d0d0d6f (diff) | |
Merge branch 'master' into bjormel/aws-main-controller
Diffstat (limited to 'vespalib/src/vespa/vespalib/btree/btreeiterator.hpp')
| -rw-r--r-- | vespalib/src/vespa/vespalib/btree/btreeiterator.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp b/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp index b7927feaa1a..d6dda0047ce 100644 --- a/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp @@ -387,15 +387,13 @@ position(uint32_t levels) const res += inode->validLeaves(); for (uint32_t c = elem.getIdx(); c < slots; ++c) { BTreeNode::Ref node = inode->getChild(c); - const InternalNodeType *jnode = - _allocator->mapInternalRef(node); + const InternalNodeType *jnode = _allocator->mapInternalRef(node); res -= jnode->validLeaves(); } } else { for (uint32_t c = 0; c < elem.getIdx(); ++c) { BTreeNode::Ref node = inode->getChild(c); - const InternalNodeType *jnode = - _allocator->mapInternalRef(node); + const InternalNodeType *jnode = _allocator->mapInternalRef(node); res += jnode->validLeaves(); } } @@ -484,7 +482,7 @@ template <typename KeyT, typename DataT, typename AggrT, uint32_t INTERNAL_SLOTS, uint32_t LEAF_SLOTS, uint32_t PATH_SIZE> size_t BTreeIteratorBase<KeyT, DataT, AggrT, INTERNAL_SLOTS, LEAF_SLOTS, PATH_SIZE>:: -size() const +size() const noexcept { if (_pathSize > 0) { return _path[_pathSize - 1].getNode()->validLeaves(); |