diff options
| author | Arne Juul <arnej@verizonmedia.com> | 2020-06-02 11:46:16 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@verizonmedia.com> | 2020-06-04 10:19:59 +0000 |
| commit | 67134e619715227e6cbe91f365213487ff1b1f34 (patch) | |
| tree | c912b02050ed980ea6715a0b171ad61e47e34a89 /searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp | |
| parent | c42ccbb874b581c7394a31dcb6a5e0e715d46e18 (diff) | |
use vector of UP as MultiSearch::Children
* add helper class for constructing MultiSearch::Children
(mostly for unit tests)
* rewrite as needed to adapt
Diffstat (limited to 'searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp')
| -rw-r--r-- | searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp index 6625a4a09ce..0672e51378e 100644 --- a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp @@ -39,11 +39,11 @@ public: return true; } - virtual SearchIterator::UP - createIntermediateSearch(const MultiSearch::Children &subSearches, + SearchIterator::UP + createIntermediateSearch(MultiSearch::Children subSearches, bool strict, MatchData &md) const override { - return SearchIterator::UP(new MySearch("or", subSearches, &md, strict)); + return SearchIterator::UP(new MySearch("or", std::move(subSearches), &md, strict)); } static MyOr& create() { return *(new MyOr()); } @@ -56,11 +56,11 @@ class OtherOr : public OrBlueprint { private: public: - virtual SearchIterator::UP - createIntermediateSearch(const MultiSearch::Children &subSearches, + SearchIterator::UP + createIntermediateSearch(MultiSearch::Children subSearches, bool strict, MatchData &md) const override { - return SearchIterator::UP(new MySearch("or", subSearches, &md, strict)); + return SearchIterator::UP(new MySearch("or", std::move(subSearches), &md, strict)); } static OtherOr& create() { return *(new OtherOr()); } @@ -86,11 +86,11 @@ public: return (i == 0); } - virtual SearchIterator::UP - createIntermediateSearch(const MultiSearch::Children &subSearches, + SearchIterator::UP + createIntermediateSearch(MultiSearch::Children subSearches, bool strict, MatchData &md) const override { - return SearchIterator::UP(new MySearch("and", subSearches, &md, strict)); + return SearchIterator::UP(new MySearch("and", std::move(subSearches), &md, strict)); } static MyAnd& create() { return *(new MyAnd()); } @@ -103,11 +103,11 @@ class OtherAnd : public AndBlueprint { private: public: - virtual SearchIterator::UP - createIntermediateSearch(const MultiSearch::Children &subSearches, + SearchIterator::UP + createIntermediateSearch(MultiSearch::Children subSearches, bool strict, MatchData &md) const override { - return SearchIterator::UP(new MySearch("and", subSearches, &md, strict)); + return SearchIterator::UP(new MySearch("and", std::move(subSearches), &md, strict)); } static OtherAnd& create() { return *(new OtherAnd()); } @@ -118,11 +118,11 @@ public: class OtherAndNot : public AndNotBlueprint { public: - virtual SearchIterator::UP - createIntermediateSearch(const MultiSearch::Children &subSearches, + SearchIterator::UP + createIntermediateSearch(MultiSearch::Children subSearches, bool strict, MatchData &md) const override { - return SearchIterator::UP(new MySearch("andnot", subSearches, &md, strict)); + return SearchIterator::UP(new MySearch("andnot", std::move(subSearches), &md, strict)); } static OtherAndNot& create() { return *(new OtherAndNot()); } |