Merge pull request #31184 from vespa-engine/balder/unify-code

Unify code

2 files changed, 19 insertions, 29 deletions

diff --git a/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.cpp b/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.cpp
index 3645496e4fb..41551ac1062 100644
--- a/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.cpp
+++ b/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.cpp
@@ -10,11 +10,11 @@ LOG_SETUP(".fef.matchdatabuilder");
 
 namespace search::fef::test {
 
-MatchDataBuilder::MatchDataBuilder(QueryEnvironment &queryEnv, MatchData &data) :
-    _queryEnv(queryEnv),
-    _data(data),
-    _index(),
-    _match()
+MatchDataBuilder::MatchDataBuilder(QueryEnvironment &queryEnv, MatchData &data)
+    : _queryEnv(queryEnv),
+      _data(data),
+      _index(),
+      _match()
 {
     // reset all match data objects.
     for (TermFieldHandle handle = 0; handle < _data.getNumTermFields(); ++handle) {
@@ -22,7 +22,7 @@ MatchDataBuilder::MatchDataBuilder(QueryEnvironment &queryEnv, MatchData &data)
     }
 }
 
-MatchDataBuilder::~MatchDataBuilder() {}
+MatchDataBuilder::~MatchDataBuilder() = default;
 
 TermFieldMatchData *
 MatchDataBuilder::getTermFieldMatchData(uint32_t termId, uint32_t fieldId)
@@ -59,7 +59,7 @@ MatchDataBuilder::addElement(const vespalib::string &fieldName, int32_t weight,
         LOG(error, "Field '%s' does not exist.", fieldName.c_str());
         return false;
     }
-    _index[info->id()].elements.push_back(MyElement(weight, length));
+    _index[info->id()].elements.emplace_back(weight, length);
     return true;
 }
 
@@ -77,8 +77,7 @@ MatchDataBuilder::addOccurence(const vespalib::string &fieldName, uint32_t termI
     }
     const ITermFieldData *tfd = _queryEnv.getTerm(termId)->lookupField(info->id());
     if (tfd == nullptr) {
-        LOG(error, "Field '%s' is not searched by the given term.",
-            fieldName.c_str());
+        LOG(error, "Field '%s' is not searched by the given term.", fieldName.c_str());
         return false;
     }
     _match[termId][info->id()].insert(Position(pos, element));
@@ -99,14 +98,13 @@ MatchDataBuilder::setWeight(const vespalib::string &fieldName, uint32_t termId,
     }
     const ITermFieldData *tfd = _queryEnv.getTerm(termId)->lookupField(info->id());
     if (tfd == nullptr) {
-        LOG(error, "Field '%s' is not searched by the given term.",
-            fieldName.c_str());
+        LOG(error, "Field '%s' is not searched by the given term.", fieldName.c_str());
         return false;
     }
     uint32_t eid = _index[info->id()].elements.size();
     _match[termId][info->id()].clear();
     _match[termId][info->id()].insert(Position(0, eid));
-    _index[info->id()].elements.push_back(MyElement(weight, 1));
+    _index[info->id()].elements.emplace_back(weight, 1);
     return true;
 }
 
@@ -142,19 +140,13 @@ MatchDataBuilder::apply(uint32_t docId)
             // For each occurence of that term, in that field, do
             for (const auto& occ : field_elem.second) {
                 // Append a term match position to the term match data.
-                match->appendPosition(TermFieldMatchDataPosition(
-                                              occ.eid,
-                                              occ.pos,
-                                              field.getWeight(occ.eid),
-                                              field.getLength(occ.eid)));
-                LOG(debug,
-                    "Added occurence of term '%u' in field '%s'"
-                    " at position '%u'.",
+                match->appendPosition(TermFieldMatchDataPosition(occ.eid, occ.pos,
+                                                                 field.getWeight(occ.eid),
+                                                                 field.getLength(occ.eid)));
+                LOG(debug, "Added occurence of term '%u' in field '%s' at position '%u'.",
                     termId, name.c_str(), occ.pos);
                 if (occ.pos >= field.getLength(occ.eid)) {
-                    LOG(warning,
-                        "Added occurence of term '%u' in field '%s'"
-                        " at position '%u' >= fieldLen '%u'.",
+                    LOG(warning, "Added occurence of term '%u' in field '%s' at position '%u' >= fieldLen '%u'.",
                         termId, name.c_str(), occ.pos, field.getLength(occ.eid));
                 }
             }
diff --git a/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.h b/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.h
index 0e5025efd37..753e1596520 100644
--- a/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.h
+++ b/searchlib/src/vespa/searchlib/fef/test/matchdatabuilder.h
@@ -13,7 +13,7 @@ public:
     struct MyElement {
         int32_t  weight;
         uint32_t length;
-        MyElement(int32_t w, uint32_t l) : weight(w), length(l) {}
+        MyElement(int32_t w, uint32_t l) noexcept : weight(w), length(l) {}
     };
     struct MyField {
         uint32_t fieldLength;
@@ -21,7 +21,7 @@ public:
         MyField() : fieldLength(0), elements() {}
         MyElement &getElement(uint32_t eid) {
             while (elements.size() <= eid) {
-                elements.push_back(MyElement(0, 0));
+                elements.emplace_back(0, 0);
             }
             return elements[eid];
         }
@@ -68,6 +68,8 @@ public:
      * @param data     The match data to build in.
      */
     MatchDataBuilder(QueryEnvironment &queryEnv, MatchData &data);
+    MatchDataBuilder(const MatchDataBuilder &) = delete;
+    MatchDataBuilder & operator=(const MatchDataBuilder &) = delete;
     ~MatchDataBuilder();
 
     /**
@@ -133,10 +135,6 @@ public:
     bool apply(uint32_t docId);
 
 private:
-    MatchDataBuilder(const MatchDataBuilder &);             // hide
-    MatchDataBuilder & operator=(const MatchDataBuilder &); // hide
-
-private:
     QueryEnvironment &_queryEnv;
     MatchData        &_data;
     IndexData         _index;