Inline frequent methods.

4 files changed, 18 insertions, 38 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/attributeiterators.cpp b/searchlib/src/vespa/searchlib/attribute/attributeiterators.cpp
index 3f86a7f57db..56b863ee9cf 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributeiterators.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributeiterators.cpp
@@ -23,13 +23,6 @@ AttributeIteratorBase::visitMembers(vespalib::ObjectVisitor &visitor) const
     visit(visitor, "tfmd.docId", _matchData->getDocId());
 }
 
-FilterAttributeIterator::FilterAttributeIterator(const attribute::ISearchContext &baseSearchCtx,
-                                                 fef::TermFieldMatchData *matchData)
-    : AttributeIteratorBase(baseSearchCtx, matchData)
-{
-    _matchPosition->setElementWeight(1);
-}
-
 void
 AttributeIterator::visitMembers(vespalib::ObjectVisitor &visitor) const
 {
@@ -44,20 +37,6 @@ FlagAttributeIterator::doUnpack(uint32_t docId)
     _matchData->resetOnlyDocId(docId);
 }
 
-AttributePostingListIterator::AttributePostingListIterator(const attribute::ISearchContext &baseSearchCtx,
-                                                           bool hasWeight,
-                                                           TermFieldMatchData *matchData)
-    : AttributeIteratorBase(baseSearchCtx, matchData),
-      _hasWeight(hasWeight)
-{
-}
-
-FilterAttributePostingListIterator::
-FilterAttributePostingListIterator(const attribute::ISearchContext &baseSearchCtx, TermFieldMatchData *matchData)
-    : AttributeIteratorBase(baseSearchCtx, matchData)
-{
-}
-
 void
 AttributeIterator::doUnpack(uint32_t docId)
 {
diff --git a/searchlib/src/vespa/searchlib/attribute/attributeiterators.h b/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
index 0fbcab03ec0..4d612579d76 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributeiterators.h
@@ -67,7 +67,11 @@ class FilterAttributeIterator : public AttributeIteratorBase
 {
 public:
     FilterAttributeIterator(const attribute::ISearchContext &baseSearchCtx,
-                            fef::TermFieldMatchData *matchData);
+                            fef::TermFieldMatchData *matchData)
+        : AttributeIteratorBase(baseSearchCtx, matchData)
+    {
+        _matchPosition->setElementWeight(1);
+    }
 protected:
     void doUnpack(uint32_t docId) override;
 };
@@ -167,7 +171,10 @@ class AttributePostingListIterator : public AttributeIteratorBase
 {
 public:
     AttributePostingListIterator(const attribute::ISearchContext &baseSearchCtx,
-                                 bool hasWeight, fef::TermFieldMatchData *matchData);
+                                 bool hasWeight, fef::TermFieldMatchData *matchData)
+        : AttributeIteratorBase(baseSearchCtx, matchData),
+          _hasWeight(hasWeight)
+    {}
     Trinary is_strict() const override { return Trinary::True; }
 protected:
     bool  _hasWeight;
@@ -177,7 +184,9 @@ protected:
 class FilterAttributePostingListIterator : public AttributeIteratorBase
 {
 public:
-    FilterAttributePostingListIterator(const attribute::ISearchContext &baseSearchCtx, fef::TermFieldMatchData *matchData);
+    FilterAttributePostingListIterator(const attribute::ISearchContext &baseSearchCtx, fef::TermFieldMatchData *matchData)
+        : AttributeIteratorBase(baseSearchCtx, matchData)
+    {}
     Trinary is_strict() const override { return Trinary::True; }
 };
 
diff --git a/searchlib/src/vespa/searchlib/queryeval/searchiterator.cpp b/searchlib/src/vespa/searchlib/queryeval/searchiterator.cpp
index c4a308a17f6..9450aceb2be 100644
--- a/searchlib/src/vespa/searchlib/queryeval/searchiterator.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/searchiterator.cpp
@@ -11,18 +11,6 @@
 
 namespace search::queryeval {
 
-SearchIterator::SearchIterator() :
-    _docid(0),
-    _endid(0)
-{ }
-
-void
-SearchIterator::initRange(uint32_t beginid, uint32_t endid)
-{
-    _docid = beginid - 1;
-    _endid = endid;
-}
-
 BitVector::UP
 SearchIterator::get_hits(uint32_t begin_id)
 {
diff --git a/searchlib/src/vespa/searchlib/queryeval/searchiterator.h b/searchlib/src/vespa/searchlib/queryeval/searchiterator.h
index d2a5ed1e5f9..27494e08f90 100644
--- a/searchlib/src/vespa/searchlib/queryeval/searchiterator.h
+++ b/searchlib/src/vespa/searchlib/queryeval/searchiterator.h
@@ -4,6 +4,7 @@
 
 #include "posting_info.h"
 #include "begin_and_end_id.h"
+#include <vespa/searchlib/fef/termfieldmatchdataposition.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/trinary.h>
 #include <memory>
@@ -118,7 +119,10 @@ public:
      * @param beginId This is the first valid docId and the lowest that will be given to doSeek.
      * @param endId This is the first docid after the valid range.
      */ 
-    virtual void initRange(uint32_t begin_id, uint32_t end_id);
+    virtual void initRange(uint32_t begin_id, uint32_t end_id) {
+        _docid = begin_id - 1;
+        _endid = end_id;
+    }
 
     /**
      * Will initialize the full range.
@@ -177,7 +181,7 @@ public:
     /**
      * The constructor sets the current document id to @ref beginId.
      **/
-    SearchIterator();
+    SearchIterator() : _docid(0), _endid(0) { }
     SearchIterator(const SearchIterator &) = delete;
     SearchIterator &operator=(const SearchIterator &) = delete;