Add noexcept and use emplace

4 files changed, 9 insertions, 14 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
index 8de8f6247c9..a5ca37906ba 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp
@@ -13,13 +13,11 @@
 #include <vespa/eval/eval/value.h>
 #include <vespa/searchlib/common/location.h>
 #include <vespa/searchlib/common/locationiterators.h>
-#include <vespa/searchlib/common/matching_elements_fields.h>
 #include <vespa/searchlib/query/query_term_decoder.h>
 #include <vespa/searchlib/query/query_term_ucs4.h>
 #include <vespa/searchlib/query/tree/stackdumpcreator.h>
 #include <vespa/searchlib/queryeval/andsearchstrict.h>
 #include <vespa/searchlib/queryeval/create_blueprint_visitor_helper.h>
-#include <vespa/searchlib/queryeval/docid_with_weight_search_iterator.h>
 #include <vespa/searchlib/queryeval/dot_product_blueprint.h>
 #include <vespa/searchlib/queryeval/dot_product_search.h>
 #include <vespa/searchlib/queryeval/emptysearch.h>
@@ -28,7 +26,6 @@
 #include <vespa/searchlib/queryeval/get_weight_from_node.h>
 #include <vespa/searchlib/queryeval/intermediate_blueprints.h>
 #include <vespa/searchlib/queryeval/leaf_blueprints.h>
-#include <vespa/searchlib/queryeval/matching_elements_search.h>
 #include <vespa/searchlib/queryeval/nearest_neighbor_blueprint.h>
 #include <vespa/searchlib/queryeval/orlikesearch.h>
 #include <vespa/searchlib/queryeval/flow_tuning.h>
@@ -43,7 +40,6 @@
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/issue.h>
-#include <sstream>
 #include <charconv>
 
 #include <vespa/log/log.h>
@@ -274,7 +270,7 @@ public:
         using OrFlow = search::queryeval::OrFlow;
         struct MyAdapter {
             uint32_t docid_limit;
-            MyAdapter(uint32_t docid_limit_in) noexcept : docid_limit(docid_limit_in) {}
+            explicit MyAdapter(uint32_t docid_limit_in) noexcept : docid_limit(docid_limit_in) {}
             double estimate(const AttrHitEstimate &est) const noexcept {
                 return est.is_unknown() ? 0.5 : abs_to_rel_est(est.est_hits(), docid_limit);
             }
@@ -480,7 +476,7 @@ public:
         using OrFlow = search::queryeval::OrFlow;
         struct MyAdapter {
             uint32_t docid_limit;
-            MyAdapter(uint32_t docid_limit_in) noexcept : docid_limit(docid_limit_in) {}
+            explicit MyAdapter(uint32_t docid_limit_in) noexcept : docid_limit(docid_limit_in) {}
             double estimate(const IDirectPostingStore::LookupResult &term) const noexcept {
                 return abs_to_rel_est(term.posting_size, docid_limit);
             }
diff --git a/searchlib/src/vespa/searchlib/query/tree/querybuilder.cpp b/searchlib/src/vespa/searchlib/query/tree/querybuilder.cpp
index 1e05fb1fe0e..2e1d2d42afa 100644
--- a/searchlib/src/vespa/searchlib/query/tree/querybuilder.cpp
+++ b/searchlib/src/vespa/searchlib/query/tree/querybuilder.cpp
@@ -71,7 +71,7 @@ void QueryBuilderBase::addIntermediateNode(Intermediate *n, int child_count)
             if (!_nodes.empty()) {
                 weight_override = _nodes.top().weight_override;
             }
-            _nodes.push(NodeInfo(node.release(), child_count));
+            _nodes.emplace(node.release(), child_count);
             _nodes.top().weight_override = weight_override;
             if (child_count == 0) {
                 Node *completed(_nodes.top().node);
@@ -95,7 +95,7 @@ Node::UP QueryBuilderBase::build() {
         reportError("QueryBuilderBase::build: Trying to build incomplete query tree.");
     }
     if (hasError()) {
-        return Node::UP();
+        return {};
     }
     return std::move(_root);
 }
@@ -105,6 +105,6 @@ void QueryBuilderBase::reset() {
         delete _nodes.top().node;
         _nodes.pop();
     }
-    _root.reset(0);
+    _root.reset();
     _error_msg = "";
 }
diff --git a/searchlib/src/vespa/searchlib/query/tree/querybuilder.h b/searchlib/src/vespa/searchlib/query/tree/querybuilder.h
index a8db09bb03f..41990af6908 100644
--- a/searchlib/src/vespa/searchlib/query/tree/querybuilder.h
+++ b/searchlib/src/vespa/searchlib/query/tree/querybuilder.h
@@ -39,15 +39,15 @@ class QueryBuilderBase
         bool _active;
         Weight _weight;
     public:
-        WeightOverride() : _active(false), _weight(0) {}
-        WeightOverride(Weight weight) : _active(true), _weight(weight) {}
+        WeightOverride() noexcept : _active(false), _weight(0) {}
+        explicit WeightOverride(Weight weight) noexcept : _active(true), _weight(weight) {}
         void adjustWeight(Weight &weight) const { if (_active) weight = _weight; }
     };
     struct NodeInfo {
         Intermediate *node;
         int remaining_child_count;
         WeightOverride weight_override;
-        NodeInfo(Intermediate *n, int c) : node(n), remaining_child_count(c) {}
+        NodeInfo(Intermediate *n, int c) noexcept : node(n), remaining_child_count(c) {}
     };
     Node::UP _root;
     std::stack<NodeInfo> _nodes;
diff --git a/searchlib/src/vespa/searchlib/query/tree/querytreecreator.h b/searchlib/src/vespa/searchlib/query/tree/querytreecreator.h
index f306f6171ef..1c8367a4580 100644
--- a/searchlib/src/vespa/searchlib/query/tree/querytreecreator.h
+++ b/searchlib/src/vespa/searchlib/query/tree/querytreecreator.h
@@ -22,8 +22,7 @@ struct QueryTreeCreator {
         return StackDumpQueryCreator<NodeTypes>().create(iterator);
     }
 
-private:
-    QueryTreeCreator();
+    QueryTreeCreator() = delete;
 };
 
 }