diff options
| author | Geir Storli <geirst@yahooinc.com> | 2024-01-19 12:42:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 12:42:24 +0100 |
| commit | 461c4e60cdcb2e7a657ee05923477b584fd6792d (patch) | |
| tree | cc07919045c4e68548538b28ff4152488004134b /searchlib | |
| parent | 33c1f2ef901d694f278db6374e01a0ef04c4982e (diff) | |
| parent | e41e430a663fe507480d87bdffd84fa48cb9cc3c (diff) | |
Merge pull request #29979 from vespa-engine/toregge/make-search-streaming-queryterm-evaluate-hits-member-function-final
Make search::streaming::QueryTerm::evaluateHits() member function final.
Diffstat (limited to 'searchlib')
3 files changed, 1 insertions, 9 deletions
diff --git a/searchlib/src/vespa/searchlib/query/streaming/multi_term.cpp b/searchlib/src/vespa/searchlib/query/streaming/multi_term.cpp index dd34b9b7e73..f5a09892551 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/multi_term.cpp +++ b/searchlib/src/vespa/searchlib/query/streaming/multi_term.cpp @@ -51,11 +51,4 @@ MultiTerm::evaluate() const return false; } -const HitList& -MultiTerm::evaluateHits(HitList& hl) const -{ - hl.clear(); - return hl; -} - } diff --git a/searchlib/src/vespa/searchlib/query/streaming/multi_term.h b/searchlib/src/vespa/searchlib/query/streaming/multi_term.h index 3bb69e29693..6f795c31356 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/multi_term.h +++ b/searchlib/src/vespa/searchlib/query/streaming/multi_term.h @@ -32,7 +32,6 @@ public: MultiTerm* as_multi_term() noexcept override { return this; } void reset() override; bool evaluate() const override; - const HitList& evaluateHits(HitList& hl) const override; virtual void unpack_match_data(uint32_t docid, const fef::ITermData& td, fef::MatchData& match_data) = 0; const std::vector<std::unique_ptr<QueryTerm>>& get_terms() const noexcept { return _terms; } }; diff --git a/searchlib/src/vespa/searchlib/query/streaming/queryterm.h b/searchlib/src/vespa/searchlib/query/streaming/queryterm.h index cd2bdd7eaec..e7fe488ca89 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/queryterm.h +++ b/searchlib/src/vespa/searchlib/query/streaming/queryterm.h @@ -64,7 +64,7 @@ public: QueryTerm & operator = (QueryTerm &&) = delete; ~QueryTerm() override; bool evaluate() const override; - const HitList & evaluateHits(HitList & hl) const override; + const HitList & evaluateHits(HitList & hl) const final override; void reset() override; void getLeaves(QueryTermList & tl) override; void getLeaves(ConstQueryTermList & tl) const override; |