Code cleanup while reading code.

12 files changed, 41 insertions, 69 deletions

diff --git a/searchlib/src/vespa/searchlib/queryeval/andsearch.cpp b/searchlib/src/vespa/searchlib/queryeval/andsearch.cpp
index 57d7e8c7506..3cbb30e5f89 100644
--- a/searchlib/src/vespa/searchlib/queryeval/andsearch.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/andsearch.cpp
@@ -5,8 +5,7 @@
 #include "termwise_helper.h"
 #include <vespa/searchlib/common/bitvector.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 BitVector::UP
 AndSearch::get_hits(uint32_t begin_id) {
@@ -24,12 +23,14 @@ AndSearch::and_hits_into(BitVector &result, uint32_t begin_id)
     TermwiseHelper::andChildren(result, getChildren().begin(), getChildren().end(), begin_id);
 }
 
-SearchIterator::UP AndSearch::andWith(UP filter, uint32_t estimate_)
+SearchIterator::UP
+AndSearch::andWith(UP filter, uint32_t estimate_)
 {
     return offerFilterToChildren(std::move(filter), estimate_);
 }
 
-SearchIterator::UP AndSearch::offerFilterToChildren(UP filter, uint32_t estimate_)
+SearchIterator::UP
+AndSearch::offerFilterToChildren(UP filter, uint32_t estimate_)
 {
     const Children & children(getChildren());
     for (uint32_t i(0); filter && (i < children.size()); ++i) {
@@ -38,7 +39,8 @@ SearchIterator::UP AndSearch::offerFilterToChildren(UP filter, uint32_t estimate
     return filter;
 }
 
-void AndSearch::doUnpack(uint32_t docid)
+void
+AndSearch::doUnpack(uint32_t docid)
 {
     const Children & children(getChildren());
     for (uint32_t i(0); i < children.size(); ++i) {
@@ -126,5 +128,4 @@ AndSearch::create(const MultiSearch::Children &children, bool strict, const Unpa
     }
 }
 
-}  // namespace queryeval
-}  // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/simplesearch.cpp b/searchlib/src/vespa/searchlib/queryeval/simplesearch.cpp
index 58f217f106f..1e5ba8d0c27 100644
--- a/searchlib/src/vespa/searchlib/queryeval/simplesearch.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/simplesearch.cpp
@@ -3,8 +3,7 @@
 #include "simplesearch.h"
 #include <vespa/vespalib/objects/visit.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 void
 SimpleSearch::doSeek(uint32_t docid)
@@ -38,9 +37,6 @@ SimpleSearch::visitMembers(vespalib::ObjectVisitor &visitor) const
     visit(visitor, "tag", _tag);
 }
 
-SimpleSearch::~SimpleSearch()
-{
-}
+SimpleSearch::~SimpleSearch() = default;
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/simplesearch.h b/searchlib/src/vespa/searchlib/queryeval/simplesearch.h
index f8a9c61a393..8dfec9abd4a 100644
--- a/searchlib/src/vespa/searchlib/queryeval/simplesearch.h
+++ b/searchlib/src/vespa/searchlib/queryeval/simplesearch.h
@@ -5,8 +5,7 @@
 #include "searchiterator.h"
 #include "simpleresult.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * Simple search class used to return a predefined set of
@@ -36,6 +35,4 @@ public:
     ~SimpleSearch();
 };
 
-} // namespace queryeval
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp b/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp
index 23a0d2d52a6..3280e0ac2cc 100644
--- a/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.cpp
@@ -6,8 +6,7 @@
 #include <vespa/vespalib/objects/visit.hpp>
 #include <vespa/vespalib/util/array.hpp>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 EmptySearch SourceBlenderSearch::_emptySearch;
 
@@ -91,13 +90,13 @@ SourceBlenderSearchStrict::advance()
             return;
         }
         search = getSearch(_sourceSelector->getSource(minNextId));
-        for (uint32_t i = 0; i < _nextChildren.size(); ++i) {
-            if (_nextChildren[i] == search) {
+        for (SearchIterator * child : _nextChildren) {
+            if (child == search) {
                 _matchedChild = search;
                 setDocId(minNextId);
                 return;
             }
-            _nextChildren[i]->seek(minNextId + 1);
+            child->seek(minNextId + 1);
         }
     }
 }
@@ -111,7 +110,7 @@ SourceBlenderSearch::doUnpack(uint32_t docid)
 SourceBlenderSearch::SourceBlenderSearch(
         std::unique_ptr<sourceselector::Iterator> sourceSelector,
         const Children &children) :
-    _matchedChild(NULL),
+    _matchedChild(nullptr),
     _sourceSelector(std::move(sourceSelector)),
     _children(),
     _docIdLimit(_sourceSelector->getDocIdLimit())
@@ -155,7 +154,7 @@ SourceBlenderSearch::~SourceBlenderSearch()
 
 void
 SourceBlenderSearch::setChild(size_t index, SearchIterator::UP child) {
-    assert(_sources[_children[index]] == NULL);
+    assert(_sources[_children[index]] == nullptr);
     _sources[_children[index]] = child.release();
 }
 
@@ -170,9 +169,7 @@ SourceBlenderSearch::create(std::unique_ptr<sourceselector::Iterator> sourceSele
     }
 }
 
-
-} // namespace queryeval
-} // namespace search
+}
 
 void visit(vespalib::ObjectVisitor &self, const vespalib::string &name,
            const search::queryeval::SourceBlenderSearch::Child &obj)
diff --git a/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.h b/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.h
index 3e51f7f6a1b..9b4d8f58034 100644
--- a/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.h
+++ b/searchlib/src/vespa/searchlib/queryeval/sourceblendersearch.h
@@ -6,8 +6,7 @@
 #include "emptysearch.h"
 #include <vector>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
     namespace sourceselector { class Iterator; }
 /**
@@ -29,7 +28,7 @@ public:
     struct Child {
         SearchIterator *search;
         uint32_t    sourceId;
-        Child() : search(NULL), sourceId(0) { }
+        Child() : search(nullptr), sourceId(0) { }
         Child(SearchIterator *s, uint32_t id) : search(s), sourceId(id) {}
     };
     typedef std::vector<Child> Children;
@@ -71,19 +70,18 @@ public:
      **/
     static SourceBlenderSearch * create(std::unique_ptr<Iterator> sourceSelector,
                                         const Children &children, bool strict);
-    virtual ~SourceBlenderSearch();
+    ~SourceBlenderSearch() override;
     size_t getNumChildren() const { return _children.size(); }
     SearchIterator::UP steal(size_t index) {
         SearchIterator::UP retval(_sources[_children[index]]);
-        _sources[_children[index]] = NULL;
+        _sources[_children[index]] = nullptr;
         return retval;
     }
     void setChild(size_t index, SearchIterator::UP child);
     void initRange(uint32_t beginId, uint32_t endId) override;
 };
 
-} // namespace queryeval
-} // namespace search
+}
 
 void visit(vespalib::ObjectVisitor &self, const vespalib::string &name,
            const search::queryeval::SourceBlenderSearch::Child &obj);
diff --git a/searchlib/src/vespa/searchlib/queryeval/termwise_blueprint_helper.cpp b/searchlib/src/vespa/searchlib/queryeval/termwise_blueprint_helper.cpp
index 3eddda57ccc..ae21fd93ba3 100644
--- a/searchlib/src/vespa/searchlib/queryeval/termwise_blueprint_helper.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/termwise_blueprint_helper.cpp
@@ -3,8 +3,7 @@
 #include "termwise_blueprint_helper.h"
 #include "termwise_search.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 TermwiseBlueprintHelper::TermwiseBlueprintHelper(const IntermediateBlueprint &self,
                                                  const MultiSearch::Children &subSearches,
@@ -32,7 +31,7 @@ TermwiseBlueprintHelper::TermwiseBlueprintHelper(const IntermediateBlueprint &se
     }
 }
 
-TermwiseBlueprintHelper::~TermwiseBlueprintHelper() { }
+TermwiseBlueprintHelper::~TermwiseBlueprintHelper() = default;
 
 void
 TermwiseBlueprintHelper::insert_termwise(SearchIterator::UP search, bool strict)
@@ -41,5 +40,4 @@ TermwiseBlueprintHelper::insert_termwise(SearchIterator::UP search, bool strict)
     children.insert(children.begin() + first_termwise, termwise_search.release());
 }
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/termwise_blueprint_helper.h b/searchlib/src/vespa/searchlib/queryeval/termwise_blueprint_helper.h
index 335daeae7f0..e6b46cfb7d2 100644
--- a/searchlib/src/vespa/searchlib/queryeval/termwise_blueprint_helper.h
+++ b/searchlib/src/vespa/searchlib/queryeval/termwise_blueprint_helper.h
@@ -7,8 +7,7 @@
 #include "unpackinfo.h"
 #include "searchiterator.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * Utility used to keep track of which children can be evaluated
@@ -28,5 +27,4 @@ struct TermwiseBlueprintHelper {
     void insert_termwise(SearchIterator::UP search, bool strict);
 };
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/termwise_helper.h b/searchlib/src/vespa/searchlib/queryeval/termwise_helper.h
index d2be71f3ab8..8abcf6e0e42 100644
--- a/searchlib/src/vespa/searchlib/queryeval/termwise_helper.h
+++ b/searchlib/src/vespa/searchlib/queryeval/termwise_helper.h
@@ -5,9 +5,7 @@
 #include "searchiterator.h"
 #include <vespa/searchlib/common/bitvector.h>
 
-namespace search {
-
-namespace queryeval {
+namespace search::queryeval {
 
 /**
 * Helper methods for doing termwise evaluation.
@@ -132,4 +130,3 @@ TermwiseHelper::orIterators(BitVector & result, IT begin, IT end, uint32_t begin
 }
 
 }
-}
diff --git a/searchlib/src/vespa/searchlib/queryeval/termwise_search.cpp b/searchlib/src/vespa/searchlib/queryeval/termwise_search.cpp
index e7df5aa6bae..2f00b249795 100644
--- a/searchlib/src/vespa/searchlib/queryeval/termwise_search.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/termwise_search.cpp
@@ -4,8 +4,7 @@
 #include <vespa/vespalib/objects/visit.h>
 #include <vespa/searchlib/common/bitvector.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 template <bool IS_STRICT>
 struct TermwiseSearch : public SearchIterator {
@@ -64,5 +63,4 @@ make_termwise(SearchIterator::UP search, bool strict)
     }
 }
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/termwise_search.h b/searchlib/src/vespa/searchlib/queryeval/termwise_search.h
index 2446c5dc847..193f2f86ed7 100644
--- a/searchlib/src/vespa/searchlib/queryeval/termwise_search.h
+++ b/searchlib/src/vespa/searchlib/queryeval/termwise_search.h
@@ -4,8 +4,7 @@
 
 #include "searchiterator.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * Creates a termwise wrapper for the given search. The wrapper will
@@ -23,5 +22,4 @@ namespace queryeval {
  **/
 SearchIterator::UP make_termwise(SearchIterator::UP search, bool strict);
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/truesearch.cpp b/searchlib/src/vespa/searchlib/queryeval/truesearch.cpp
index a5a179230e5..b585647fb3e 100644
--- a/searchlib/src/vespa/searchlib/queryeval/truesearch.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/truesearch.cpp
@@ -2,8 +2,7 @@
 
 #include "truesearch.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 void
 TrueSearch::doSeek(uint32_t docid)
@@ -24,9 +23,6 @@ TrueSearch::TrueSearch(fef::TermFieldMatchData & tfmd) :
     _tfmd.resetOnlyDocId(0);
 }
 
-TrueSearch::~TrueSearch()
-{
-}
+TrueSearch::~TrueSearch() = default;
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/truesearch.h b/searchlib/src/vespa/searchlib/queryeval/truesearch.h
index deaafd82351..6cf1e4dec02 100644
--- a/searchlib/src/vespa/searchlib/queryeval/truesearch.h
+++ b/searchlib/src/vespa/searchlib/queryeval/truesearch.h
@@ -2,11 +2,10 @@
 
 #pragma once
 
-#include <vespa/searchlib/fef/termfieldmatchdata.h>
 #include "searchiterator.h"
+#include <vespa/searchlib/fef/termfieldmatchdata.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 class TrueSearch : public SearchIterator
 {
@@ -21,5 +20,4 @@ public:
     ~TrueSearch();
 };
 
-} // namespace queryeval
-} // namespace search
+}