Merge pull request #9746 from vespa-engine/balder/remove-strict-seek-assert

Balder/remove strict seek assert

8 files changed, 27 insertions, 95 deletions

diff --git a/vespalib/src/vespa/vespalib/btree/btree.hpp b/vespalib/src/vespa/vespalib/btree/btree.hpp
index 928d8d6cfcd..7bba2e936f3 100644
--- a/vespalib/src/vespa/vespalib/btree/btree.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btree.hpp
@@ -4,8 +4,7 @@
 
 #include "btree.h"
 
-namespace search {
-namespace btree {
+namespace search::btree {
 
 template <typename KeyT, typename DataT, typename AggrT, typename CompareT,
           typename TraitsT, class AggrCalcT>
@@ -24,7 +23,4 @@ BTree<KeyT, DataT, AggrT, CompareT, TraitsT, AggrCalcT>::~BTree()
     _alloc.clearHoldLists();
 }
 
-
-} // namespace search::btree
-} // namespace search
-
+}
diff --git a/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp b/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp
index f307c474f90..c00d2342eed 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp
@@ -6,16 +6,11 @@
 #include "btreeinserter.hpp"
 #include "btreenode.hpp"
 
-#include <vespa/log/log.h>
-LOG_SETUP(".searchlib.btree.btreeinserter");
-
 namespace search::btree {
 
 template class BTreeInserter<uint32_t, uint32_t, NoAggregated>;
 template class BTreeInserter<uint32_t, BTreeNoLeafData, NoAggregated>;
 template class BTreeInserter<uint32_t, int32_t, MinMaxAggregated,
-                             std::less<uint32_t>,
-                             BTreeDefaultTraits,
-                             MinMaxAggrCalc>;
+                             std::less<uint32_t>, BTreeDefaultTraits, MinMaxAggrCalc>;
 
 }
diff --git a/vespalib/src/vespa/vespalib/btree/btreeinserter.h b/vespalib/src/vespa/vespalib/btree/btreeinserter.h
index a3fa2916a88..a66a7bc3f92 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeinserter.h
+++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.h
@@ -10,11 +10,7 @@
 #include "minmaxaggrcalc.h"
 #include "btreeiterator.h" 
 
-namespace search
-{
-
-namespace btree
-{
+namespace search::btree {
 
 template <typename KeyT,
           typename DataT,
@@ -32,12 +28,9 @@ public:
                             TraitsT::INTERNAL_SLOTS,
                             TraitsT::LEAF_SLOTS,
                             AggrCalcT> Aggregator;
-    typedef BTreeIterator<KeyT, DataT, AggrT,
-                          CompareT, TraitsT> Iterator;
-    typedef BTreeInternalNode<KeyT, AggrT, TraitsT::INTERNAL_SLOTS>
-    InternalNodeType;
-    typedef BTreeLeafNode<KeyT, DataT, AggrT, TraitsT::LEAF_SLOTS>
-    LeafNodeType;
+    typedef BTreeIterator<KeyT, DataT, AggrT, CompareT, TraitsT> Iterator;
+    typedef BTreeInternalNode<KeyT, AggrT, TraitsT::INTERNAL_SLOTS> InternalNodeType;
+    typedef BTreeLeafNode<KeyT, DataT, AggrT, TraitsT::LEAF_SLOTS> LeafNodeType;
     typedef KeyT  KeyType;
     typedef DataT DataType;
     typedef typename InternalNodeType::RefPair InternalNodeTypeRefPair;
@@ -49,19 +42,12 @@ private:
 
 public:
     static void
-    insert(BTreeNode::Ref &root,
-           Iterator &itr,
-           const KeyType &key, const DataType &data,
-           const AggrCalcT &aggrCalc);
+    insert(BTreeNode::Ref &root, Iterator &itr, const KeyType &key, const DataType &data, const AggrCalcT &aggrCalc);
 };
 
 extern template class BTreeInserter<uint32_t, uint32_t, NoAggregated>;
 extern template class BTreeInserter<uint32_t, BTreeNoLeafData, NoAggregated>;
 extern template class BTreeInserter<uint32_t, int32_t, MinMaxAggregated,
-                                    std::less<uint32_t>,
-                                    BTreeDefaultTraits,
-                                    MinMaxAggrCalc>;
-
-} // namespace search::btree
-} // namespace search
+                                    std::less<uint32_t>, BTreeDefaultTraits, MinMaxAggrCalc>;
 
+}
diff --git a/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp b/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp
index d1da94c1b17..b24874088a2 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp
@@ -7,8 +7,7 @@
 #include "btreeiterator.hpp"
 #include <vespa/vespalib/stllike/asciistream.h>
 
-namespace search {
-namespace btree {
+namespace search::btree {
 
 namespace {
 
@@ -178,7 +177,4 @@ insert(BTreeNode::Ref &root,
     }
 }
 
-
-} // namespace search::btree
-} // namespace search
-
+}
diff --git a/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp b/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp
index b26f249c51b..13d41ef61f3 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp
@@ -9,8 +9,6 @@
 
 namespace search::btree {
 
-#define STRICT_BTREE_ITERATOR_SEEK
-
 template <typename KeyT, typename DataT, typename AggrT,
           uint32_t INTERNAL_SLOTS, uint32_t LEAF_SLOTS, uint32_t PATH_SIZE>
 BTreeIteratorBase<KeyT, DataT, AggrT, INTERNAL_SLOTS, LEAF_SLOTS, PATH_SIZE>::
@@ -81,10 +79,7 @@ operator=(const BTreeIteratorBase &other)
 
 template <typename KeyT, typename DataT, typename AggrT,
           uint32_t INTERNAL_SLOTS, uint32_t LEAF_SLOTS, uint32_t PATH_SIZE>
-BTreeIteratorBase<KeyT, DataT, AggrT, INTERNAL_SLOTS, LEAF_SLOTS, PATH_SIZE>::
-~BTreeIteratorBase()
-{
-}
+BTreeIteratorBase<KeyT, DataT, AggrT, INTERNAL_SLOTS, LEAF_SLOTS, PATH_SIZE>::~BTreeIteratorBase() = default;
 
 template <typename KeyT, typename DataT, typename AggrT,
           uint32_t INTERNAL_SLOTS, uint32_t LEAF_SLOTS, uint32_t PATH_SIZE>
@@ -674,11 +669,7 @@ BTreeConstIterator<KeyT, DataT, AggrT, CompareT, TraitsT>::
 binarySeek(const KeyType & key, CompareT comp)
 {
     const LeafNodeType *lnode = _leaf.getNode();
-    uint32_t lidx = _leaf.getIdx();
-#ifdef STRICT_BTREE_ITERATOR_SEEK
-    assert(_leaf.valid() && comp(lnode->getKey(lidx), key));
-#endif
-    ++lidx;
+    uint32_t lidx = _leaf.getIdx() + 1;
     if (lidx < lnode->validSlots()) {
         if (!comp(lnode->getKey(lidx), key)) {
             _leaf.setIdx(lidx);
@@ -723,11 +714,7 @@ BTreeConstIterator<KeyT, DataT, AggrT, CompareT, TraitsT>::
 linearSeek(const KeyType & key, CompareT comp)
 {
     const LeafNodeType *lnode = _leaf.getNode();
-    uint32_t lidx = _leaf.getIdx();
-#ifdef STRICT_BTREE_ITERATOR_SEEK
-    assert(_leaf.valid() && comp(lnode->getKey(lidx), key));
-#endif
-    ++lidx;
+    uint32_t lidx = _leaf.getIdx() + 1;
     if (lidx < lnode->validSlots()) {
         if (!comp(lnode->getKey(lidx), key)) {
             _leaf.setIdx(lidx);
@@ -792,11 +779,7 @@ BTreeConstIterator<KeyT, DataT, AggrT, CompareT, TraitsT>::
 binarySeekPast(const KeyType & key, CompareT comp)
 {
     const LeafNodeType *lnode = _leaf.getNode();
-    uint32_t lidx = _leaf.getIdx();
-#ifdef STRICT_BTREE_ITERATOR_SEEK
-    assert(_leaf.valid() && !comp(key, lnode->getKey(lidx)));
-#endif
-    ++lidx;
+    uint32_t lidx = _leaf.getIdx() + 1;
     if (lidx < lnode->validSlots()) {
         if (comp(key, lnode->getKey(lidx))) {
             _leaf.setIdx(lidx);
@@ -841,11 +824,8 @@ BTreeConstIterator<KeyT, DataT, AggrT, CompareT, TraitsT>::
 linearSeekPast(const KeyType & key, CompareT comp)
 {
     const LeafNodeType *lnode = _leaf.getNode();
-    uint32_t lidx = _leaf.getIdx();
-#ifdef STRICT_BTREE_ITERATOR_SEEK
-    assert(_leaf.valid() && !comp(key, lnode->getKey(lidx)));
-#endif
-    ++lidx;
+    uint32_t lidx = _leaf.getIdx() + 1;
+
     if (lidx < lnode->validSlots()) {
         if (comp(key, lnode->getKey(lidx))) {
             _leaf.setIdx(lidx);
diff --git a/vespalib/src/vespa/vespalib/btree/btreeremover.cpp b/vespalib/src/vespa/vespalib/btree/btreeremover.cpp
index 2322eebf784..f5ada77fed6 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeremover.cpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeremover.cpp
@@ -11,8 +11,6 @@ namespace search::btree {
 template class BTreeRemover<uint32_t, uint32_t, NoAggregated>;
 template class BTreeRemover<uint32_t, BTreeNoLeafData, NoAggregated>;
 template class BTreeRemover<uint32_t, int32_t, MinMaxAggregated,
-                            std::less<uint32_t>,
-                            BTreeDefaultTraits,
-                            MinMaxAggrCalc>;
+                            std::less<uint32_t>, BTreeDefaultTraits, MinMaxAggrCalc>;
 
 }
diff --git a/vespalib/src/vespa/vespalib/btree/btreeremover.h b/vespalib/src/vespa/vespalib/btree/btreeremover.h
index 87355aa4ce7..bbb825d6299 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeremover.h
+++ b/vespalib/src/vespa/vespalib/btree/btreeremover.h
@@ -10,11 +10,7 @@
 #include "minmaxaggrcalc.h"
 #include "btreeiterator.h" 
 
-namespace search
-{
-
-namespace btree
-{
+namespace search::btree {
 
 template <typename KeyT,
           typename DataT,
@@ -82,23 +78,15 @@ public:
     typedef DataT DataType;
     typedef typename InternalNodeType::RefPair InternalNodeTypeRefPair;
     typedef typename LeafNodeType::RefPair LeafNodeTypeRefPair;
-    typedef BTreeIterator<KeyT, DataT, AggrT,
-                          CompareT, TraitsT> Iterator;
+    typedef BTreeIterator<KeyT, DataT, AggrT, CompareT, TraitsT> Iterator;
 
     static void
-    remove(BTreeNode::Ref &root,
-           Iterator &itr,
-           const AggrCalcT &aggrCalc);
+    remove(BTreeNode::Ref &root, Iterator &itr, const AggrCalcT &aggrCalc);
 };
 
 extern template class BTreeRemover<uint32_t, uint32_t, NoAggregated>;
 extern template class BTreeRemover<uint32_t, BTreeNoLeafData, NoAggregated>;
-extern template class BTreeRemover<uint32_t, int32_t,
-                                   MinMaxAggregated,
-                                   std::less<uint32_t>,
-                                   BTreeDefaultTraits,
-                                   MinMaxAggrCalc>;
-
-} // namespace search::btree
-} // namespace search
+extern template class BTreeRemover<uint32_t, int32_t, MinMaxAggregated,
+                                   std::less<uint32_t>, BTreeDefaultTraits, MinMaxAggrCalc>;
 
+}
diff --git a/vespalib/src/vespa/vespalib/btree/btreeremover.hpp b/vespalib/src/vespa/vespalib/btree/btreeremover.hpp
index c304ea13016..2281fd99f6d 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeremover.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeremover.hpp
@@ -6,11 +6,7 @@
 #include "btreerootbase.hpp"
 #include <vespa/vespalib/stllike/asciistream.h>
 
-namespace search
-{
-
-namespace btree
-{
+namespace search::btree {
 
 template <typename KeyT, typename DataT, typename AggrT, size_t INTERNAL_SLOTS,
           size_t LEAF_SLOTS, class AggrCalcT>
@@ -179,7 +175,4 @@ remove(BTreeNode::Ref &root,
         ++itr;
 }
 
-
-} // namespace search::btree
-} // namespace search
-
+}