diff options
Diffstat (limited to 'searchlib/src/tests/queryeval')
21 files changed, 91 insertions, 91 deletions
diff --git a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp index e8c2a20a21a..e231af20361 100644 --- a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp @@ -21,26 +21,26 @@ class MyOr : public IntermediateBlueprint { private: public: - virtual HitEstimate combine(const std::vector<HitEstimate> &data) const { + virtual HitEstimate combine(const std::vector<HitEstimate> &data) const override { return max(data); } - virtual FieldSpecBaseList exposeFields() const { + virtual FieldSpecBaseList exposeFields() const override { return mixChildrenFields(); } - virtual void sort(std::vector<Blueprint*> &children) const { + virtual void sort(std::vector<Blueprint*> &children) const override { std::sort(children.begin(), children.end(), GreaterEstimate()); } - virtual bool inheritStrict(size_t i) const { + virtual bool inheritStrict(size_t i) const override { (void)i; return true; } virtual SearchIterator::UP createIntermediateSearch(const MultiSearch::Children &subSearches, - bool strict, MatchData &md) const + bool strict, MatchData &md) const override { return SearchIterator::UP(new MySearch("or", subSearches, &md, strict)); } @@ -57,7 +57,7 @@ private: public: virtual SearchIterator::UP createIntermediateSearch(const MultiSearch::Children &subSearches, - bool strict, MatchData &md) const + bool strict, MatchData &md) const override { return SearchIterator::UP(new MySearch("or", subSearches, &md, strict)); } @@ -73,21 +73,21 @@ class MyAnd : public AndBlueprint { private: public: - virtual HitEstimate combine(const std::vector<HitEstimate> &data) const { + virtual HitEstimate combine(const std::vector<HitEstimate> &data) const override { return min(data); } - virtual FieldSpecBaseList exposeFields() const { + virtual FieldSpecBaseList exposeFields() const override { return FieldSpecBaseList(); } - virtual bool inheritStrict(size_t i) const { + virtual bool inheritStrict(size_t i) const override { return (i == 0); } virtual SearchIterator::UP createIntermediateSearch(const MultiSearch::Children &subSearches, - bool strict, MatchData &md) const + bool strict, MatchData &md) const override { return SearchIterator::UP(new MySearch("and", subSearches, &md, strict)); } @@ -104,7 +104,7 @@ private: public: virtual SearchIterator::UP createIntermediateSearch(const MultiSearch::Children &subSearches, - bool strict, MatchData &md) const + bool strict, MatchData &md) const override { return SearchIterator::UP(new MySearch("and", subSearches, &md, strict)); } @@ -119,7 +119,7 @@ class OtherAndNot : public AndNotBlueprint public: virtual SearchIterator::UP createIntermediateSearch(const MultiSearch::Children &subSearches, - bool strict, MatchData &md) const + bool strict, MatchData &md) const override { return SearchIterator::UP(new MySearch("andnot", subSearches, &md, strict)); } @@ -136,7 +136,7 @@ struct MyTerm : SimpleLeafBlueprint { MyTerm(const FieldSpecBaseList &fields, uint32_t hitEstimate) : SimpleLeafBlueprint(fields) { setEstimate(HitEstimate(hitEstimate, false)); } - virtual SearchIterator::UP createLeafSearch(const search::fef::TermFieldMatchDataArray &, bool) const { + virtual SearchIterator::UP createLeafSearch(const search::fef::TermFieldMatchDataArray &, bool) const override { return SearchIterator::UP(); } }; @@ -180,7 +180,7 @@ public: void requireThatAsStringWorks(); void requireThatVisitMembersWorks(); void requireThatDocIdLimitInjectionWorks(); - int Main(); + int Main() override; }; SearchIterator::UP diff --git a/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp b/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp index 782e1ea5ea8..513100dc4d3 100644 --- a/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp @@ -16,7 +16,7 @@ public: void testEmptyBlueprint(); void testSimpleBlueprint(); void testFakeBlueprint(); - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/queryeval/blueprint/mysearch.h b/searchlib/src/tests/queryeval/blueprint/mysearch.h index 0ea91bd5703..d9593c84dc5 100644 --- a/searchlib/src/tests/queryeval/blueprint/mysearch.h +++ b/searchlib/src/tests/queryeval/blueprint/mysearch.h @@ -26,8 +26,8 @@ private: std::vector<uint32_t> _handles; protected: - virtual void doSeek(uint32_t) {} - virtual void doUnpack(uint32_t) {} + virtual void doSeek(uint32_t) override {} + virtual void doUnpack(uint32_t) override {} public: MySearch(const std::string &tag, bool leaf, bool strict) @@ -92,7 +92,7 @@ public: } } - virtual void visitMembers(vespalib::ObjectVisitor &visitor) const { + virtual void visitMembers(vespalib::ObjectVisitor &visitor) const override { visit(visitor, "_tag", _tag); visit(visitor, "_isLeaf", _isLeaf); visit(visitor, "_isStrict", _isStrict); @@ -111,7 +111,7 @@ class MyLeaf : public SimpleLeafBlueprint public: virtual SearchIterator::UP - createLeafSearch(const TFMDA &tfmda, bool strict) const + createLeafSearch(const TFMDA &tfmda, bool strict) const override { return SearchIterator::UP(new MySearch("leaf", tfmda, strict)); } diff --git a/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/booleanmatchiteratorwrapper_test.cpp b/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/booleanmatchiteratorwrapper_test.cpp index bd92acaa799..c40d3c90d1f 100644 --- a/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/booleanmatchiteratorwrapper_test.cpp +++ b/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/booleanmatchiteratorwrapper_test.cpp @@ -26,7 +26,7 @@ struct DummyItr : public SearchIterator { ++dtorCnt; } - void doSeek(uint32_t docid) { + void doSeek(uint32_t docid) override { ++seekCnt; if (docid <= 10) { setDocId(10); @@ -37,7 +37,7 @@ struct DummyItr : public SearchIterator { } } - void doUnpack(uint32_t docid) { + void doUnpack(uint32_t docid) override { ++unpackCnt; if (match != 0) { _unpackedDocId = docid; diff --git a/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp b/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp index 6c4860b6486..b221f57379f 100644 --- a/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp +++ b/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp @@ -84,11 +84,11 @@ struct MockSearch : public SearchIterator { SearchIterator::initRange(begin, end); setDocId(_initial); } - virtual void doSeek(uint32_t) { + virtual void doSeek(uint32_t) override { ++seekCnt; setAtEnd(); } - virtual void doUnpack(uint32_t) {} + virtual void doUnpack(uint32_t) override {} }; struct MockFixture { diff --git a/searchlib/src/tests/queryeval/equiv/equiv_test.cpp b/searchlib/src/tests/queryeval/equiv/equiv_test.cpp index d838ded85c9..48379789841 100644 --- a/searchlib/src/tests/queryeval/equiv/equiv_test.cpp +++ b/searchlib/src/tests/queryeval/equiv/equiv_test.cpp @@ -18,7 +18,7 @@ using search::fef::FieldPositionsIterator; class Test : public vespalib::TestApp { public: void testEquiv(); - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp b/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp index c4bd736e74c..70ed03716de 100644 --- a/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp +++ b/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp @@ -17,7 +17,7 @@ using namespace search::fef; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; void testTestFakeResult(); void testTerm(); void testPhrase(); diff --git a/searchlib/src/tests/queryeval/getnodeweight/getnodeweight_test.cpp b/searchlib/src/tests/queryeval/getnodeweight/getnodeweight_test.cpp index 949a1364061..0e9fcff0073 100644 --- a/searchlib/src/tests/queryeval/getnodeweight/getnodeweight_test.cpp +++ b/searchlib/src/tests/queryeval/getnodeweight/getnodeweight_test.cpp @@ -13,7 +13,7 @@ using namespace search::queryeval; class Test : public vespalib::TestApp { public: int32_t getWeight(const Node &node); - int Main(); + int Main() override; }; int32_t diff --git a/searchlib/src/tests/queryeval/monitoring_search_iterator/monitoring_search_iterator_test.cpp b/searchlib/src/tests/queryeval/monitoring_search_iterator/monitoring_search_iterator_test.cpp index 3f2a8b10ccc..7eda4e70c8f 100644 --- a/searchlib/src/tests/queryeval/monitoring_search_iterator/monitoring_search_iterator_test.cpp +++ b/searchlib/src/tests/queryeval/monitoring_search_iterator/monitoring_search_iterator_test.cpp @@ -23,12 +23,12 @@ struct HistorySearchIterator : public SearchIterator SearchHistory _history; mutable bool _getPostingInfoCalled; HistorySearchIterator() : _history(), _getPostingInfoCalled(false) {} - virtual void doSeek(uint32_t docId) { + virtual void doSeek(uint32_t docId) override { _history.seek("x", docId); setDocId(docId); } - virtual void doUnpack(uint32_t docId) { _history.unpack("x", docId); } - virtual const PostingInfo *getPostingInfo() const { + virtual void doUnpack(uint32_t docId) override { _history.unpack("x", docId); } + virtual const PostingInfo *getPostingInfo() const override { _getPostingInfoCalled = true; return NULL; } diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp index 8912be56351..4f99f01c290 100644 --- a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp +++ b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp @@ -21,7 +21,7 @@ class Test : public vespalib::TestApp { public: void benchmark(); - int Main(); + int Main() override; template <typename T> void testSearch(bool strict); private: diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_test.cpp b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_test.cpp index 6627dcb6b4b..0a6586a31d2 100644 --- a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_test.cpp +++ b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_test.cpp @@ -36,7 +36,7 @@ public: void testOptimizeAndOr(); template <typename T> void testSearch(bool strict); - int Main(); + int Main() override; private: void verifySelectiveUnpack(SearchIterator & s, const TermFieldMatchData * tfmd); void searchAndCompare(SearchIterator::UP s, uint32_t docIdLimit); diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp index d82565a9ec7..e414b10cb24 100644 --- a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp +++ b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp @@ -68,7 +68,7 @@ struct TestHeap : public WeakAndHeap ScoresHistory history; TestHeap(uint32_t scoresToTrack_) : WeakAndHeap(scoresToTrack_), history() {} - virtual void adjust(score_t *begin, score_t *end) { + virtual void adjust(score_t *begin, score_t *end) override { Scores scores; for (score_t *itr = begin; itr != end; ++itr) { scores.add(*itr); diff --git a/searchlib/src/tests/queryeval/queryeval.cpp b/searchlib/src/tests/queryeval/queryeval.cpp index e8eed9e50ff..c13f7ac7b1c 100644 --- a/searchlib/src/tests/queryeval/queryeval.cpp +++ b/searchlib/src/tests/queryeval/queryeval.cpp @@ -279,12 +279,12 @@ public: _accumRemove(0), _accumInsert(0) { } - virtual void onRemove(size_t index) { _accumRemove += index; } - virtual void onInsert(size_t index) { _accumInsert += index; } + virtual void onRemove(size_t index) override { _accumRemove += index; } + virtual void onInsert(size_t index) override { _accumInsert += index; } size_t _accumRemove; size_t _accumInsert; private: - virtual void doSeek(uint32_t docid) { (void) docid; } + virtual void doSeek(uint32_t docid) override { (void) docid; } }; TEST("testMultiSearch") { @@ -337,7 +337,7 @@ public: SearchContextParams().useBitVector(true)); } virtual SearchIterator::UP - createLeafSearch(const TermFieldMatchDataArray &tfmda, bool strict) const + createLeafSearch(const TermFieldMatchDataArray &tfmda, bool strict) const override { (void) tfmda; return _sc->createIterator(&_tfmd, strict); diff --git a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp index 6f87f6befb0..470b309db0f 100644 --- a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp +++ b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp @@ -39,7 +39,7 @@ struct MyTerm : public search::queryeval::SimpleLeafBlueprint { setEstimate(HitEstimate(hits, (hits == 0))); } virtual SearchIterator::UP createLeafSearch( - const search::fef::TermFieldMatchDataArray &, bool) const + const search::fef::TermFieldMatchDataArray &, bool) const override { return SearchIterator::UP(); } @@ -58,7 +58,7 @@ class Test : public vespalib::TestApp { void requireThatDoomIsPropagated(); public: - int Main(); + int Main() override; }; int diff --git a/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp b/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp index f6446c4b5cb..59f1c93bed0 100644 --- a/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp +++ b/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp @@ -25,11 +25,11 @@ private: SimpleResult _unpacked; protected: - virtual void doSeek(uint32_t docid) { + virtual void doSeek(uint32_t docid) override { _search->seek(docid); setDocId(_search->getDocId()); } - virtual void doUnpack(uint32_t docid) { + virtual void doUnpack(uint32_t docid) override { _unpacked.addHit(docid); _search->unpack(docid); } diff --git a/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp b/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp index 68d7dec0f87..f0f2752de5f 100644 --- a/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp +++ b/searchlib/src/tests/queryeval/sparse_vector_benchmark/sparse_vector_benchmark_test.cpp @@ -162,7 +162,7 @@ struct ModSearch : SearchIterator { uint32_t step; uint32_t limit; ModSearch(uint32_t step_in, uint32_t limit_in) : step(step_in), limit(limit_in) { setDocId(step); } - virtual void doSeek(uint32_t docid) { + virtual void doSeek(uint32_t docid) override { assert(docid > getDocId()); uint32_t hit = (docid / step) * step; if (hit < docid) { @@ -175,17 +175,17 @@ struct ModSearch : SearchIterator { setAtEnd(); } } - virtual void doUnpack(uint32_t) {} + virtual void doUnpack(uint32_t) override {} }; struct ModSearchFactory : ChildFactory { uint32_t bias; ModSearchFactory() : bias(1) {} explicit ModSearchFactory(int b) : bias(b) {} - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("ModSearch(%u)", bias); } - virtual SearchIterator *createChild(uint32_t idx, uint32_t limit) const { + virtual SearchIterator *createChild(uint32_t idx, uint32_t limit) const override { return new ModSearch(bias + idx, limit); } }; @@ -195,10 +195,10 @@ struct ModSearchFactory : ChildFactory { struct VespaWandFactory : SparseVectorFactory { uint32_t n; VespaWandFactory(uint32_t n_in) : n(n_in) {} - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("VespaWand(%u)", n); } - virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const { + virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const override { wand::Terms terms; for (size_t i = 0; i < childCnt; ++i) { terms.push_back(wand::Term(childFactory.createChild(i, limit), default_weight, limit / (i + 1))); @@ -210,10 +210,10 @@ struct VespaWandFactory : SparseVectorFactory { struct RiseWandFactory : SparseVectorFactory { uint32_t n; RiseWandFactory(uint32_t n_in) : n(n_in) {} - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("RiseWand(%u)", n); } - virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const { + virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const override { wand::Terms terms; for (size_t i = 0; i < childCnt; ++i) { terms.push_back(wand::Term(childFactory.createChild(i, limit), default_weight, limit / (i + 1))); @@ -224,10 +224,10 @@ struct RiseWandFactory : SparseVectorFactory { struct WeightedSetFactory : SparseVectorFactory { mutable TermFieldMatchData tfmd; - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("WeightedSet"); } - virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const { + virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const override { std::vector<SearchIterator*> terms; std::vector<int32_t> weights; for (size_t i = 0; i < childCnt; ++i) { @@ -240,10 +240,10 @@ struct WeightedSetFactory : SparseVectorFactory { struct DotProductFactory : SparseVectorFactory { mutable TermFieldMatchData tfmd; - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("DotProduct"); } - virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const { + virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const override { MatchDataLayout layout; std::vector<TermFieldHandle> handles; for (size_t i = 0; i < childCnt; ++i) { @@ -263,10 +263,10 @@ struct DotProductFactory : SparseVectorFactory { }; struct OrFactory : SparseVectorFactory { - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("Or"); } - virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const { + virtual SearchIterator *createSparseVector(ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const override { OrSearch::Children children; for (size_t i = 0; i < childCnt; ++i) { children.push_back(childFactory.createChild(i, limit)); @@ -278,19 +278,19 @@ struct OrFactory : SparseVectorFactory { //----------------------------------------------------------------------------- struct NoFilterStrategy : FilterStrategy { - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("NoFilter"); } - virtual SearchIterator *createRoot(SparseVectorFactory &vectorFactory, ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const { + virtual SearchIterator *createRoot(SparseVectorFactory &vectorFactory, ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const override { return vectorFactory.createSparseVector(childFactory, childCnt, limit); } }; struct PositiveFilterBeforeStrategy : FilterStrategy { - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("PositiveBefore"); } - virtual SearchIterator *createRoot(SparseVectorFactory &vectorFactory, ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const { + virtual SearchIterator *createRoot(SparseVectorFactory &vectorFactory, ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const override { AndSearch::Children children; children.push_back(new ModSearch(2, limit)); // <- 50% hits (hardcoded) children.push_back(vectorFactory.createSparseVector(childFactory, childCnt, limit)); @@ -299,10 +299,10 @@ struct PositiveFilterBeforeStrategy : FilterStrategy { }; struct NegativeFilterAfterStrategy : FilterStrategy { - virtual std::string name() const { + virtual std::string name() const override { return vespalib::make_string("NegativeAfter"); } - virtual SearchIterator *createRoot(SparseVectorFactory &vectorFactory, ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const { + virtual SearchIterator *createRoot(SparseVectorFactory &vectorFactory, ChildFactory &childFactory, uint32_t childCnt, uint32_t limit) const override { AndNotSearch::Children children; children.push_back(vectorFactory.createSparseVector(childFactory, childCnt, limit)); children.push_back(new ModSearch(2, limit)); // <- 50% hits (hardcoded) diff --git a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp index 5a3ddc04295..ac106025cb1 100644 --- a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp +++ b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp @@ -56,7 +56,7 @@ struct MyTerm : public SearchIterator { } } void doUnpack(uint32_t) override {} - void visitMembers(vespalib::ObjectVisitor &visitor) const { + void visitMembers(vespalib::ObjectVisitor &visitor) const override { visit(visitor, "hits", hits); visit(visitor, "strict", is_strict); } diff --git a/searchlib/src/tests/queryeval/weak_and/rise_wand.h b/searchlib/src/tests/queryeval/weak_and/rise_wand.h index f130f0d1012..60e1ec889b3 100644 --- a/searchlib/src/tests/queryeval/weak_and/rise_wand.h +++ b/searchlib/src/tests/queryeval/weak_and/rise_wand.h @@ -121,8 +121,8 @@ public: RiseWand(const Terms &terms, uint32_t n); virtual ~RiseWand(); void next(); - virtual void doSeek(uint32_t docid); - virtual void doUnpack(uint32_t docid); + virtual void doSeek(uint32_t docid) override; + virtual void doUnpack(uint32_t docid) override; }; typedef RiseWand<TermFreqScorer, std::greater_equal<uint64_t> > TermFrequencyRiseWand; diff --git a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp index 67fab2758ea..ed0e6f209fd 100644 --- a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp +++ b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp @@ -60,7 +60,7 @@ struct ModSearch : SearchIterator { SearchIterator::initRange(begin, end); setDocId(step); } - virtual void doSeek(uint32_t docid) { + virtual void doSeek(uint32_t docid) override { assert(docid > getDocId()); uint32_t skippedDocs = (docid - getDocId() - 1); uint32_t skippedHits = (skippedDocs / step); @@ -76,7 +76,7 @@ struct ModSearch : SearchIterator { setAtEnd(); } } - virtual void doUnpack(uint32_t docid) { + virtual void doUnpack(uint32_t docid) override { if (tfmd != NULL) { tfmd->reset(docid); search::fef::TermFieldMatchDataPosition pos; @@ -85,7 +85,7 @@ struct ModSearch : SearchIterator { } stats.unpack(); } - virtual const PostingInfo *getPostingInfo() const { return &info; } + virtual const PostingInfo *getPostingInfo() const override { return &info; } }; struct WandFactory { @@ -97,8 +97,8 @@ struct WandFactory { struct VespaWandFactory : WandFactory { uint32_t n; VespaWandFactory(uint32_t n_in) : n(n_in) {} - virtual std::string name() const { return make_string("VESPA WAND (n=%u)", n); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("VESPA WAND (n=%u)", n); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { return SearchIterator::UP(WeakAndSearch::create(terms, n, true)); } }; @@ -106,8 +106,8 @@ struct VespaWandFactory : WandFactory { struct VespaArrayWandFactory : WandFactory { uint32_t n; VespaArrayWandFactory(uint32_t n_in) : n(n_in) {} - virtual std::string name() const { return make_string("VESPA ARRAY WAND (n=%u)", n); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("VESPA ARRAY WAND (n=%u)", n); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { return SearchIterator::UP(WeakAndSearch::createArrayWand(terms, n, true)); } }; @@ -115,8 +115,8 @@ struct VespaArrayWandFactory : WandFactory { struct VespaHeapWandFactory : WandFactory { uint32_t n; VespaHeapWandFactory(uint32_t n_in) : n(n_in) {} - virtual std::string name() const { return make_string("VESPA HEAP WAND (n=%u)", n); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("VESPA HEAP WAND (n=%u)", n); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { return SearchIterator::UP(WeakAndSearch::createHeapWand(terms, n, true)); } }; @@ -125,8 +125,8 @@ struct VespaParallelWandFactory : public WandFactory { SharedWeakAndPriorityQueue scores; TermFieldMatchData rootMatchData; VespaParallelWandFactory(uint32_t n) : scores(n), rootMatchData() {} - virtual std::string name() const { return make_string("VESPA PWAND (n=%u)", scores.getScoresToTrack()); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("VESPA PWAND (n=%u)", scores.getScoresToTrack()); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { return SearchIterator::UP(ParallelWeakAndSearch::create(terms, PWMatchParams(scores, 0, 1, 1), PWRankParams(rootMatchData, MatchData::UP()), true)); @@ -135,8 +135,8 @@ struct VespaParallelWandFactory : public WandFactory { struct VespaParallelArrayWandFactory : public VespaParallelWandFactory { VespaParallelArrayWandFactory(uint32_t n) : VespaParallelWandFactory(n) {} - virtual std::string name() const { return make_string("VESPA ARRAY PWAND (n=%u)", scores.getScoresToTrack()); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("VESPA ARRAY PWAND (n=%u)", scores.getScoresToTrack()); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { return SearchIterator::UP(ParallelWeakAndSearch::createArrayWand(terms, PWMatchParams(scores, 0, 1, 1), PWRankParams(rootMatchData, MatchData::UP()), true)); @@ -145,8 +145,8 @@ struct VespaParallelArrayWandFactory : public VespaParallelWandFactory { struct VespaParallelHeapWandFactory : public VespaParallelWandFactory { VespaParallelHeapWandFactory(uint32_t n) : VespaParallelWandFactory(n) {} - virtual std::string name() const { return make_string("VESPA HEAP PWAND (n=%u)", scores.getScoresToTrack()); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("VESPA HEAP PWAND (n=%u)", scores.getScoresToTrack()); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { return SearchIterator::UP(ParallelWeakAndSearch::createHeapWand(terms, PWMatchParams(scores, 0, 1, 1), PWRankParams(rootMatchData, MatchData::UP()), true)); @@ -156,8 +156,8 @@ struct VespaParallelHeapWandFactory : public VespaParallelWandFactory { struct TermFrequencyRiseWandFactory : WandFactory { uint32_t n; TermFrequencyRiseWandFactory(uint32_t n_in) : n(n_in) {} - virtual std::string name() const { return make_string("RISE WAND TF (n=%u)", n); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("RISE WAND TF (n=%u)", n); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { return SearchIterator::UP(new rise::TermFrequencyRiseWand(terms, n)); } }; @@ -165,8 +165,8 @@ struct TermFrequencyRiseWandFactory : WandFactory { struct DotProductRiseWandFactory : WandFactory { uint32_t n; DotProductRiseWandFactory(uint32_t n_in) : n(n_in) {} - virtual std::string name() const { return make_string("RISE WAND DP (n=%u)", n); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("RISE WAND DP (n=%u)", n); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { return SearchIterator::UP(new rise::DotProductRiseWand(terms, n)); } }; @@ -176,8 +176,8 @@ struct FilterFactory : WandFactory { Stats stats; uint32_t n; FilterFactory(WandFactory &f, uint32_t n_in) : factory(f), n(n_in) {} - virtual std::string name() const { return make_string("Filter (mod=%u) [%s]", n, factory.name().c_str()); } - virtual SearchIterator::UP create(const wand::Terms &terms) { + virtual std::string name() const override { return make_string("Filter (mod=%u) [%s]", n, factory.name().c_str()); } + virtual SearchIterator::UP create(const wand::Terms &terms) override { AndNotSearch::Children children; children.push_back(factory.create(terms).release()); children.push_back(new ModSearch(stats, n, search::endDocId, n, NULL)); @@ -225,10 +225,10 @@ struct WandSetup : Setup { uint32_t weight; MatchData::UP matchData; WandSetup(WandFactory &f, uint32_t c, uint32_t l) : Setup(), factory(f), childCnt(c), limit(l), weight(100), matchData() {} - virtual std::string name() const { + virtual std::string name() const override { return make_string("Wand Setup (terms=%u,docs=%u) [%s]", childCnt, limit, factory.name().c_str()); } - virtual SearchIterator::UP create() { + virtual SearchIterator::UP create() override { MatchDataLayout layout; std::vector<TermFieldHandle> handles; for (size_t i = 0; i < childCnt; ++i) { diff --git a/searchlib/src/tests/queryeval/weak_and_scorers/weak_and_scorers_test.cpp b/searchlib/src/tests/queryeval/weak_and_scorers/weak_and_scorers_test.cpp index 2dec1762c27..55e299462b9 100644 --- a/searchlib/src/tests/queryeval/weak_and_scorers/weak_and_scorers_test.cpp +++ b/searchlib/src/tests/queryeval/weak_and_scorers/weak_and_scorers_test.cpp @@ -26,14 +26,14 @@ struct TestIterator : public SearchIterator _useInfo(useInfo), _unpackDocId(0) {} - virtual void doSeek(uint32_t docId) { + virtual void doSeek(uint32_t docId) override { (void) docId; } - virtual void doUnpack(uint32_t docId) { + virtual void doUnpack(uint32_t docId) override { _unpackDocId = docId; _tfmd.appendPosition(TermFieldMatchDataPosition(0, 0, _termWeight, 1)); } - virtual const PostingInfo *getPostingInfo() const { + virtual const PostingInfo *getPostingInfo() const override { return (_useInfo ? &_info : NULL); } static UP create(int32_t maxWeight, int32_t termWeight, bool useInfo) { diff --git a/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp b/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp index a819eb77118..d389bf7c4a1 100644 --- a/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp +++ b/searchlib/src/tests/queryeval/weighted_set_term/weighted_set_term_test.cpp @@ -104,11 +104,11 @@ struct MockSearch : public SearchIterator { SearchIterator::initRange(begin, end); setDocId(_initial); } - virtual void doSeek(uint32_t) { + virtual void doSeek(uint32_t) override { ++seekCnt; setAtEnd(); } - virtual void doUnpack(uint32_t) {} + virtual void doUnpack(uint32_t) override {} }; struct MockFixture { |