diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 11:52:50 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 12:35:27 +0200 |
commit | df577b2c1a7da715f46be30e475ac9260531db00 (patch) | |
tree | 77af2455aae67fd6a6cd2b496d4b78c5aa7082e6 /searchlib/src/tests/queryeval/blueprint | |
parent | 883ba0bd1f6fbbcc4e56a35038ac4c75e969e780 (diff) |
add override in searchlib module
Diffstat (limited to 'searchlib/src/tests/queryeval/blueprint')
3 files changed, 19 insertions, 19 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)); } |