diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-05-16 14:57:46 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-05-16 14:57:46 +0000 |
commit | 79346d5d16c549347a15399505acaab96b4a5506 (patch) | |
tree | 13269d9b9918736b12d2ac9e48e2f42fe3dd52fd /searchlib | |
parent | 8fd57c5965cf715073acfc67f34bb028a8680330 (diff) |
Move the matchdata layout.
Diffstat (limited to 'searchlib')
3 files changed, 2 insertions, 6 deletions
diff --git a/searchlib/src/vespa/searchlib/query/tree/node.h b/searchlib/src/vespa/searchlib/query/tree/node.h index af9925e2ea3..7123d52a503 100644 --- a/searchlib/src/vespa/searchlib/query/tree/node.h +++ b/searchlib/src/vespa/searchlib/query/tree/node.h @@ -22,4 +22,3 @@ class Node { }; } - diff --git a/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.cpp index af6b59dd6ca..384dc0cd227 100644 --- a/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/equiv_blueprint.cpp @@ -44,7 +44,7 @@ EquivBlueprint::EquivBlueprint(FieldSpecBaseList fields, fef::MatchDataLayout subtree_mdl) : ComplexLeafBlueprint(std::move(fields)), _estimate(), - _layout(subtree_mdl), + _layout(std::move(subtree_mdl)), _terms(), _exactness() { diff --git a/searchlib/src/vespa/searchlib/queryeval/same_element_blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/same_element_blueprint.cpp index 3be28ab75de..9c3910b20f9 100644 --- a/searchlib/src/vespa/searchlib/queryeval/same_element_blueprint.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/same_element_blueprint.cpp @@ -3,8 +3,6 @@ #include "same_element_blueprint.h" #include "same_element_search.h" #include "field_spec.hpp" -#include "andsearch.h" -#include "emptysearch.h" #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/attribute/searchcontextelementiterator.h> #include <vespa/vespalib/objects/visit.hpp> @@ -66,8 +64,7 @@ SameElementBlueprint::fetchPostings(const ExecuteInfo &execInfo) std::unique_ptr<SameElementSearch> SameElementBlueprint::create_same_element_search(search::fef::TermFieldMatchData& tfmd, bool strict) const { - fef::MatchDataLayout my_layout = _layout; - fef::MatchData::UP md = my_layout.createMatchData(); + fef::MatchData::UP md = _layout.createMatchData(); std::vector<ElementIterator::UP> children(_terms.size()); for (size_t i = 0; i < _terms.size(); ++i) { const State &childState = _terms[i]->getState(); |