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 | |
parent | 883ba0bd1f6fbbcc4e56a35038ac4c75e969e780 (diff) |
add override in searchlib module
134 files changed, 347 insertions, 346 deletions
diff --git a/searchlib/src/apps/docstore/benchmarkdatastore.cpp b/searchlib/src/apps/docstore/benchmarkdatastore.cpp index 12feaf9727d..2393a82b44c 100644 --- a/searchlib/src/apps/docstore/benchmarkdatastore.cpp +++ b/searchlib/src/apps/docstore/benchmarkdatastore.cpp @@ -18,7 +18,7 @@ class BenchmarkDataStoreApp : public FastOS_Application { void usage(void); int benchmark(const vespalib::string & directory, size_t numReads, size_t numThreads, size_t perChunk, const vespalib::string & readType); - int Main(void); + int Main(void) override; void read(size_t numReads, size_t perChunk, const IDataStore * dataStore); }; diff --git a/searchlib/src/apps/docstore/create-idx-from-dat.cpp b/searchlib/src/apps/docstore/create-idx-from-dat.cpp index da6b887c27c..2e85bb168cb 100644 --- a/searchlib/src/apps/docstore/create-idx-from-dat.cpp +++ b/searchlib/src/apps/docstore/create-idx-from-dat.cpp @@ -13,7 +13,7 @@ class CreateIdxFileFromDatApp : public FastOS_Application { void usage(void); int createIdxFile(const vespalib::string & datFileName, const vespalib::string & idxFileName); - int Main(void); + int Main(void) override; }; void diff --git a/searchlib/src/apps/docstore/documentstoreinspect.cpp b/searchlib/src/apps/docstore/documentstoreinspect.cpp index 3ea5b3fcd68..ffd23f30dba 100644 --- a/searchlib/src/apps/docstore/documentstoreinspect.cpp +++ b/searchlib/src/apps/docstore/documentstoreinspect.cpp @@ -14,7 +14,7 @@ class DocumentStoreInspectApp : public FastOS_Application void usage(void); int verify(const vespalib::string & directory); int dumpIdxFile(const vespalib::string & file); - int Main(void); + int Main(void) override; }; diff --git a/searchlib/src/apps/docstore/verifylogdatastore.cpp b/searchlib/src/apps/docstore/verifylogdatastore.cpp index 2d723e7e5c1..e586b1b4ed7 100644 --- a/searchlib/src/apps/docstore/verifylogdatastore.cpp +++ b/searchlib/src/apps/docstore/verifylogdatastore.cpp @@ -14,7 +14,7 @@ class VerifyLogDataStoreApp : public FastOS_Application { void usage(void); int verify(const vespalib::string & directory); - int Main(void); + int Main(void) override; }; diff --git a/searchlib/src/apps/expgolomb/expgolomb.cpp b/searchlib/src/apps/expgolomb/expgolomb.cpp index 1070a9dab8f..4d783d8eaa4 100644 --- a/searchlib/src/apps/expgolomb/expgolomb.cpp +++ b/searchlib/src/apps/expgolomb/expgolomb.cpp @@ -16,7 +16,7 @@ class ExpGolombApp : public FastOS_Application testExpGolomb64le(int kValue); int - Main(void); + Main(void) override; }; diff --git a/searchlib/src/apps/fileheaderinspect/fileheaderinspect.cpp b/searchlib/src/apps/fileheaderinspect/fileheaderinspect.cpp index 3f0801a3a3f..2407be0b4c2 100644 --- a/searchlib/src/apps/fileheaderinspect/fileheaderinspect.cpp +++ b/searchlib/src/apps/fileheaderinspect/fileheaderinspect.cpp @@ -28,7 +28,7 @@ private: public: Application(); ~Application(); - int Main(); + int Main() override; }; Application::Application() : diff --git a/searchlib/src/apps/loadattribute/loadattribute.cpp b/searchlib/src/apps/loadattribute/loadattribute.cpp index ea1a3697f4c..e82ab3ac645 100644 --- a/searchlib/src/apps/loadattribute/loadattribute.cpp +++ b/searchlib/src/apps/loadattribute/loadattribute.cpp @@ -24,7 +24,7 @@ private: void usage(); public: - int Main(); + int Main() override; }; void diff --git a/searchlib/src/apps/tests/biglogtest.cpp b/searchlib/src/apps/tests/biglogtest.cpp index 3b943d9fd17..04201fdedce 100644 --- a/searchlib/src/apps/tests/biglogtest.cpp +++ b/searchlib/src/apps/tests/biglogtest.cpp @@ -32,7 +32,7 @@ private: vespalib::RandomGen _randomgenerator; public: - int Main() { + int Main() override { TEST_INIT("big_logdatastore_test"); if (_argc > 0) { diff --git a/searchlib/src/apps/uniform/uniform.cpp b/searchlib/src/apps/uniform/uniform.cpp index 18bdcadbc20..356c5e832aa 100644 --- a/searchlib/src/apps/uniform/uniform.cpp +++ b/searchlib/src/apps/uniform/uniform.cpp @@ -36,7 +36,7 @@ class UniformApp : public FastOS_Application reportBits(void); int - Main(void); + Main(void) override; }; diff --git a/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp b/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp index e7b70dcf237..99049c0dea7 100644 --- a/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp +++ b/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp @@ -239,13 +239,13 @@ public: ~ShowPostingListSubApp(void); virtual void - usage(bool showHeader); + usage(bool showHeader) override; virtual bool - getOptions(void); + getOptions(void) override; virtual int - run(void); + run(void) override; void showPostingList(void); @@ -741,13 +741,13 @@ public: ~DumpWordsSubApp(void); virtual void - usage(bool showHeader); + usage(bool showHeader) override; virtual bool - getOptions(void); + getOptions(void) override; virtual int - run(void); + run(void) override; void dumpWords(void); @@ -923,7 +923,7 @@ public: usage(void); int - Main(void); + Main(void) override; }; diff --git a/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp b/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp index 7409ad4abbd..e97887c107e 100644 --- a/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp +++ b/searchlib/src/apps/vespa-ranking-expression-analyzer/vespa-ranking-expression-analyzer.cpp @@ -330,9 +330,9 @@ State::~State() {} //----------------------------------------------------------------------------- struct MyApp : public FastOS_Application { - int Main(); + int Main() override; int usage(); - virtual bool useProcessStarter() const { return false; } + virtual bool useProcessStarter() const override { return false; } }; int diff --git a/searchlib/src/tests/aggregator/perdocexpr.cpp b/searchlib/src/tests/aggregator/perdocexpr.cpp index 81fbc964d9e..b68370334c5 100644 --- a/searchlib/src/tests/aggregator/perdocexpr.cpp +++ b/searchlib/src/tests/aggregator/perdocexpr.cpp @@ -1228,7 +1228,7 @@ void testAggregationResult(AggregationResult & aggr, const AggrGetter & g, TEST("testAggregationResults") { struct SumGetter : AggrGetter { - virtual const ResultNode &operator()(const AggregationResult & r) const + virtual const ResultNode &operator()(const AggregationResult & r) const override { return static_cast<const SumAggregationResult &>(r).getSum(); } }; SumAggregationResult sum; diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp index b1786a36597..421c3ce7138 100644 --- a/searchlib/src/tests/attribute/attribute_test.cpp +++ b/searchlib/src/tests/attribute/attribute_test.cpp @@ -251,7 +251,7 @@ private: public: AttributeTest() { } - int Main(); + int Main() override; }; void AttributeTest::testBaseName() diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp index 6e1fc0ff80d..1f53bbc3ea1 100644 --- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp +++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp @@ -48,7 +48,7 @@ public: AttributeManagerTest() { } - int Main(); + int Main() override; }; diff --git a/searchlib/src/tests/attribute/attributesearcher.h b/searchlib/src/tests/attribute/attributesearcher.h index 0978411c974..e776f549219 100644 --- a/searchlib/src/tests/attribute/attributesearcher.h +++ b/searchlib/src/tests/attribute/attributesearcher.h @@ -72,7 +72,7 @@ public: { _status._numClients = 1; } - virtual void doRun() = 0; + virtual void doRun() override = 0; AttributeSearcherStatus & getStatus() { return _status; } void buildTermQuery(std::vector<char> & buffer, const vespalib::string & index, const char * term, bool prefix = false); }; @@ -114,7 +114,7 @@ public: { _status._numQueries = numQueries; } - virtual void doRun(); + virtual void doRun() override; }; template <typename T> @@ -192,7 +192,7 @@ public: { _status._numQueries = numQueries; } - virtual void doRun(); + virtual void doRun() override; }; void @@ -234,7 +234,7 @@ public: { _status._numQueries = numQueries; } - virtual void doRun(); + virtual void doRun() override; }; void diff --git a/searchlib/src/tests/attribute/attributeupdater.h b/searchlib/src/tests/attribute/attributeupdater.h index 2e5b1cc2622..72db4779c03 100644 --- a/searchlib/src/tests/attribute/attributeupdater.h +++ b/searchlib/src/tests/attribute/attributeupdater.h @@ -161,7 +161,7 @@ public: uint32_t minValueCount, uint32_t maxValueCount); ~AttributeUpdaterThread(); - virtual void doRun(); + virtual void doRun() override; }; template <typename Vector, typename T, typename BT> diff --git a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp index 47944548f32..9f30f1e0713 100644 --- a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp +++ b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp @@ -141,7 +141,7 @@ public: delete _threadPool; } } - int Main(); + int Main() override; }; diff --git a/searchlib/src/tests/attribute/comparator/comparator_test.cpp b/searchlib/src/tests/attribute/comparator/comparator_test.cpp index 2a4c3c6fb87..ccc565407b8 100644 --- a/searchlib/src/tests/attribute/comparator/comparator_test.cpp +++ b/searchlib/src/tests/attribute/comparator/comparator_test.cpp @@ -42,7 +42,7 @@ private: public: Test() {} - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp index 58db1d11fec..24a9d85a068 100644 --- a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp +++ b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp @@ -106,8 +106,8 @@ public: ~MemAttr(); // Implements IAttributeSaveTarget - virtual bool setup() { return true; } - virtual void close() {} + virtual bool setup() override { return true; } + virtual void close() override {} virtual IAttributeFileWriter &datWriter() override { return _datWriter; } virtual IAttributeFileWriter &idxWriter() override { return _idxWriter; } virtual IAttributeFileWriter &weightWriter() override { diff --git a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp index 63d12aaf242..7944e81ac55 100644 --- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp +++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp @@ -100,7 +100,7 @@ private: public: EnumStoreTest() {} - int Main(); + int Main() override; }; EnumStoreTest::Reader::Reader(uint32_t generation, const IndexVector & indices, const ExpectedVector & expected) diff --git a/searchlib/src/tests/attribute/extendattributes/extendattribute.cpp b/searchlib/src/tests/attribute/extendattributes/extendattribute.cpp index 0bb751d26ee..9e15f666130 100644 --- a/searchlib/src/tests/attribute/extendattributes/extendattribute.cpp +++ b/searchlib/src/tests/attribute/extendattributes/extendattribute.cpp @@ -18,7 +18,7 @@ private: void testExtendString(Attribute & attr); public: - int Main(); + int Main() override; }; template <typename Attribute> diff --git a/searchlib/src/tests/attribute/guard/attributeguard.cpp b/searchlib/src/tests/attribute/guard/attributeguard.cpp index 5c90caa094b..9eef5e93490 100644 --- a/searchlib/src/tests/attribute/guard/attributeguard.cpp +++ b/searchlib/src/tests/attribute/guard/attributeguard.cpp @@ -11,7 +11,7 @@ namespace search { class AttributeGuardTest : public vespalib::TestApp { public: - int Main(); + int Main() override; }; int diff --git a/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp index 89ca125c45e..20590a11da0 100644 --- a/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp +++ b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp @@ -26,17 +26,17 @@ class MyAttribute : public search::NotImplementedAttribute using MultiValueType = typename MvMapping::MultiValueType; using ConstArrayRef = vespalib::ConstArrayRef<MultiValueType>; MvMapping &_mvMapping; - virtual void onCommit() { } - virtual void onUpdateStat() { } - virtual void onShrinkLidSpace() { + virtual void onCommit() override { } + virtual void onUpdateStat() override { } + virtual void onShrinkLidSpace() override { uint32_t committedDocIdLimit = getCommittedDocIdLimit(); _mvMapping.shrink(committedDocIdLimit); setNumDocs(committedDocIdLimit); } - virtual void removeOldGenerations(generation_t firstUsed) { + virtual void removeOldGenerations(generation_t firstUsed) override { _mvMapping.trimHoldLists(firstUsed); } - virtual void onGenerationChange(generation_t generation) { + virtual void onGenerationChange(generation_t generation) override { _mvMapping.transferHoldLists(generation - 1); } @@ -46,13 +46,13 @@ public: _mvMapping(mvMapping) { } - virtual bool addDoc(DocId &doc) { + virtual bool addDoc(DocId &doc) override { _mvMapping.addDoc(doc); incNumDocs(); updateUncommittedDocIdLimit(doc); return false; } - virtual uint32_t clearDoc(uint32_t docId) { + virtual uint32_t clearDoc(uint32_t docId) override { assert(docId < _mvMapping.size()); _mvMapping.set(docId, ConstArrayRef()); return 1u; diff --git a/searchlib/src/tests/attribute/postinglist/postinglist.cpp b/searchlib/src/tests/attribute/postinglist/postinglist.cpp index 2bd02d433d5..271b062ebcd 100644 --- a/searchlib/src/tests/attribute/postinglist/postinglist.cpp +++ b/searchlib/src/tests/attribute/postinglist/postinglist.cpp @@ -228,7 +228,7 @@ public: { } - int Main(void); + int Main(void) override; }; diff --git a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp index 92effde5686..b2bc047553e 100644 --- a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp +++ b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.cpp @@ -170,7 +170,7 @@ private: void testDupValuesInIntArray(); void testDupValuesInStringArray(); public: - int Main(); + int Main() override; }; template <> diff --git a/searchlib/src/tests/attribute/runnable.h b/searchlib/src/tests/attribute/runnable.h index 5038c22a1a5..e36af939943 100644 --- a/searchlib/src/tests/attribute/runnable.h +++ b/searchlib/src/tests/attribute/runnable.h @@ -18,7 +18,7 @@ public: Runnable(uint32_t id) : _id(id), _cond(), _done(false), _stopped(false) { } - void Run(FastOS_ThreadInterface *, void *) { + void Run(FastOS_ThreadInterface *, void *) override { doRun(); vespalib::MonitorGuard guard(_cond); diff --git a/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp b/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp index bd781a37a5b..c9ebe399ab5 100644 --- a/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp +++ b/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp @@ -54,22 +54,22 @@ public: _map[attr->getName()] = attr; } - virtual AttributeGuard::UP getAttribute(const vespalib::string &name) const { + virtual AttributeGuard::UP getAttribute(const vespalib::string &name) const override { return AttributeGuard::UP(new AttributeGuard(lookup(name))); } - virtual AttributeGuard::UP getAttributeStableEnum(const vespalib::string &name) const { + virtual AttributeGuard::UP getAttributeStableEnum(const vespalib::string &name) const override { return AttributeGuard::UP(new AttributeEnumGuard(lookup(name))); } - virtual void getAttributeList(std::vector<AttributeGuard> &list) const { + virtual void getAttributeList(std::vector<AttributeGuard> &list) const override { Map::const_iterator pos = _map.begin(); for (; pos != _map.end(); ++pos) { list.push_back(pos->second); } } - virtual IAttributeContext::UP createContext() const { + virtual IAttributeContext::UP createContext() const override { return IAttributeContext::UP(new AttributeContext(*this)); } }; @@ -193,7 +193,7 @@ struct WS { class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; }; int diff --git a/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp b/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp index 6d36dc6bb63..6c8d67c7a61 100644 --- a/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp +++ b/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp @@ -62,7 +62,7 @@ class Test : public vespalib::TestApp { bool search(const Node &term, IAttributeManager &attribute_manager); public: - int Main(); + int Main() override; }; int diff --git a/searchlib/src/tests/attribute/searchcontext/searchcontext.cpp b/searchlib/src/tests/attribute/searchcontext/searchcontext.cpp index ae4d8b91387..618adb006d6 100644 --- a/searchlib/src/tests/attribute/searchcontext/searchcontext.cpp +++ b/searchlib/src/tests/attribute/searchcontext/searchcontext.cpp @@ -168,14 +168,14 @@ private: class AttributeIteratorTester : public IteratorTester { public: - virtual bool matches(const SearchIterator & base) const { + virtual bool matches(const SearchIterator & base) const override { return dynamic_cast<const AttributeIterator *>(&base) != NULL; } }; class FlagAttributeIteratorTester : public IteratorTester { public: - virtual bool matches(const SearchIterator & base) const { + virtual bool matches(const SearchIterator & base) const override { return (dynamic_cast<const FlagAttributeIterator *>(&base) != NULL) || (dynamic_cast<const BitVectorIterator *>(&base) != NULL) || (dynamic_cast<const queryeval::EmptySearch *>(&base) != NULL); @@ -184,7 +184,7 @@ private: class AttributePostingListIteratorTester : public IteratorTester { public: - virtual bool matches(const SearchIterator & base) const { + virtual bool matches(const SearchIterator & base) const override { return dynamic_cast<const AttributePostingListIterator *>(&base) != NULL || dynamic_cast<const queryeval::EmptySearch *>(&base) != NULL; @@ -280,7 +280,7 @@ private: public: SearchContextTest(); - int Main(); + int Main() override; }; diff --git a/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp b/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp index a8d53314745..0babb633404 100644 --- a/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp +++ b/searchlib/src/tests/attribute/sourceselector/sourceselector_test.cpp @@ -33,7 +33,7 @@ const uint32_t base_id = 42; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; private: void testSourceSelector(const DocSource *docSource, size_t sz, uint8_t defaultSource, ISourceSelector & selector); void testFixed(const DocSource *docSource, size_t sz); diff --git a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp index 207eb76510a..f1034806e36 100644 --- a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp +++ b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp @@ -46,7 +46,7 @@ private: void testSingleValue(Attribute & svsa, Config &cfg); public: - int Main(); + int Main() override; }; template <typename Attribute> diff --git a/searchlib/src/tests/bitcompression/expgolomb/expgolomb_test.cpp b/searchlib/src/tests/bitcompression/expgolomb/expgolomb_test.cpp index 001a420e83f..17e0641ccaf 100644 --- a/searchlib/src/tests/bitcompression/expgolomb/expgolomb_test.cpp +++ b/searchlib/src/tests/bitcompression/expgolomb/expgolomb_test.cpp @@ -65,7 +65,7 @@ public: { } - virtual uint64_t decode() + virtual uint64_t decode() override { unsigned int length; uint64_t val64; @@ -74,14 +74,14 @@ public: return val64; } - virtual void skip() + virtual void skip() override { unsigned int length; UC64_SKIPEXPGOLOMB(_dc._val, _dc._valI, _dc._preRead, _dc._cacheInt, _kValue, EC); } - virtual uint64_t decodeSmall() + virtual uint64_t decodeSmall() override { unsigned int length; uint64_t val64; @@ -90,7 +90,7 @@ public: return val64; } - virtual uint64_t decodeSmallApply() + virtual uint64_t decodeSmallApply() override { unsigned int length; uint64_t val64; @@ -99,7 +99,7 @@ public: return val64; } - virtual void skipSmall() + virtual void skipSmall() override { unsigned int length; UC64_SKIPEXPGOLOMB_SMALL(_dc._val, _dc._valI, _dc._preRead, @@ -135,7 +135,7 @@ public: { } - virtual uint64_t decode() + virtual uint64_t decode() override { unsigned int length; uint64_t val64; @@ -144,14 +144,14 @@ public: return val64; } - virtual void skip() + virtual void skip() override { unsigned int length; UC64_SKIPEXPGOLOMB(_dc._val, _dc._valI, _dc._preRead, _dc._cacheInt, kValue, EC); } - virtual uint64_t decodeSmall() + virtual uint64_t decodeSmall() override { unsigned int length; uint64_t val64; @@ -160,7 +160,7 @@ public: return val64; } - virtual uint64_t decodeSmallApply() + virtual uint64_t decodeSmallApply() override { unsigned int length; uint64_t val64; @@ -169,7 +169,7 @@ public: return val64; } - virtual void skipSmall() + virtual void skipSmall() override { unsigned int length; UC64_SKIPEXPGOLOMB_SMALL(_dc._val, _dc._valI, _dc._preRead, diff --git a/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp b/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp index c9b962495f4..400d16b3d86 100644 --- a/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp +++ b/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp @@ -25,7 +25,7 @@ private: public: BitVectorBenchmark(); ~BitVectorBenchmark(); - int Main(); + int Main() override; }; BitVectorBenchmark::BitVectorBenchmark() : diff --git a/searchlib/src/tests/btree/btreeaggregation_test.cpp b/searchlib/src/tests/btree/btreeaggregation_test.cpp index aa3ee432df5..ae9cb5b21c7 100644 --- a/searchlib/src/tests/btree/btreeaggregation_test.cpp +++ b/searchlib/src/tests/btree/btreeaggregation_test.cpp @@ -392,7 +392,7 @@ private: void requireThatSmallNodesWorks(); public: - int Main(); + int Main() override; }; diff --git a/searchlib/src/tests/btree/iteratespeed.cpp b/searchlib/src/tests/btree/iteratespeed.cpp index 719dc28c036..bc1be5b495c 100644 --- a/searchlib/src/tests/btree/iteratespeed.cpp +++ b/searchlib/src/tests/btree/iteratespeed.cpp @@ -39,7 +39,7 @@ class IterateSpeed : public FastOS_Application void usage(); int - Main(void); + Main(void) override; }; diff --git a/searchlib/src/tests/bytecomplens/bytecomp.cpp b/searchlib/src/tests/bytecomplens/bytecomp.cpp index 63aa2da15f6..78b5cbd24dd 100644 --- a/searchlib/src/tests/bytecomplens/bytecomp.cpp +++ b/searchlib/src/tests/bytecomplens/bytecomp.cpp @@ -13,7 +13,7 @@ private: void testRandomLengths(); public: - int Main() { + int Main() override { TEST_INIT("bytecomplens_test"); testRandomLengths(); TEST_FLUSH(); TEST_DONE(); diff --git a/searchlib/src/tests/datastore/datastore/datastore_test.cpp b/searchlib/src/tests/datastore/datastore/datastore_test.cpp index ae30a98d0fb..2c9b08f8a12 100644 --- a/searchlib/src/tests/datastore/datastore/datastore_test.cpp +++ b/searchlib/src/tests/datastore/datastore/datastore_test.cpp @@ -36,7 +36,7 @@ public: ParentType::transferHoldLists(generation); } - void trimElemHoldList(generation_t usedGen) { + void trimElemHoldList(generation_t usedGen) override { ParentType::trimElemHoldList(usedGen); } void incDead(EntryRef ref, uint64_t dead) { @@ -143,7 +143,7 @@ private: void requireThatWecanDisableElemHoldList(void); void requireThatBufferGrowthWorks(); public: - int Main(); + int Main() override; }; bool diff --git a/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp b/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp index 76f3597bda3..f3c2f73c78c 100644 --- a/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp +++ b/searchlib/src/tests/diskindex/bitvector/bitvector_test.cpp @@ -86,7 +86,7 @@ public: requireThatDictionaryHandlesMultipleEntries(bool directio, bool readmmap); Test(); - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp b/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp index 55d72f3aa58..adabe0e2679 100644 --- a/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp +++ b/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp @@ -63,7 +63,7 @@ private: void requireThatSearchIteratorsConforms(); public: Test(); - int Main(); + int Main() override; }; class Verifier : public SearchIteratorVerifier { diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp index 5bd731dd9ab..6bde0b965a6 100644 --- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp +++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp @@ -115,7 +115,7 @@ private: public: FieldWriterTest(void); ~FieldWriterTest(void); - int Main(void); + int Main(void) override; }; diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp index 90c71361d9a..f5f1f97d29b 100644 --- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp +++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp @@ -45,7 +45,7 @@ private: void requireThatFusionIsWorking(const vespalib::string &prefix, bool directio, bool readmmap); public: Test(); - int Main(); + int Main() override; }; namespace { diff --git a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp index 17999dbdb37..2d12b5c1782 100644 --- a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp +++ b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp @@ -219,7 +219,7 @@ public: usage(void); int - Main(void); + Main(void) override; void testWords(void); diff --git a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp index f8a7dd28720..649c230ba5c 100644 --- a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp +++ b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp @@ -85,7 +85,7 @@ public: } void - sync(SerialNum syncTo) + sync(SerialNum syncTo) override { _syncedTo = syncTo; } @@ -125,10 +125,10 @@ public: using MyVisitorBase::MyVisitorBase; virtual void - visit(uint32_t lid, const Document &doc); + visit(uint32_t lid, const Document &doc) override; virtual void - visit(uint32_t lid); + visit(uint32_t lid) override; }; @@ -159,7 +159,7 @@ public: using MyVisitorBase::MyVisitorBase; virtual void - visit(uint32_t lid, Document &doc); + visit(uint32_t lid, Document &doc) override; }; @@ -184,7 +184,7 @@ public: MyVisitorProgress(); virtual void - updateProgress(double progress); + updateProgress(double progress) override; virtual double getProgress() const; diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp index 15a70e742ec..f53423a4981 100644 --- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp +++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp @@ -24,7 +24,7 @@ class MyTlSyncer : public transactionlog::SyncProxy { public: MyTlSyncer(void) : _syncedTo(0) { } - void sync(SerialNum syncTo) { + void sync(SerialNum syncTo) override { _syncedTo = syncTo; } }; @@ -480,7 +480,7 @@ private: _actual.insert(lid); _vcs.verifyDoc(*doc, lid); } - bool allowVisitCaching() const { return _allowVisitCaching; } + bool allowVisitCaching() const override { return _allowVisitCaching; } private: VisitCacheStore &_vcs; vespalib::hash_set<uint32_t> _expected; diff --git a/searchlib/src/tests/engine/docsumapi/docsumapi_test.cpp b/searchlib/src/tests/engine/docsumapi/docsumapi_test.cpp index d96295bb7ad..b89bf6f093f 100644 --- a/searchlib/src/tests/engine/docsumapi/docsumapi_test.cpp +++ b/searchlib/src/tests/engine/docsumapi/docsumapi_test.cpp @@ -26,7 +26,7 @@ class Test : public vespalib::TestApp public: void convertToRequest(); void convertFromReply(); - int Main(); + int Main() override; }; document::GlobalId gid0("aaaaaaaaaaaa"); diff --git a/searchlib/src/tests/engine/monitorapi/monitorapi_test.cpp b/searchlib/src/tests/engine/monitorapi/monitorapi_test.cpp index 0df52cbe0d8..9198a4462c6 100644 --- a/searchlib/src/tests/engine/monitorapi/monitorapi_test.cpp +++ b/searchlib/src/tests/engine/monitorapi/monitorapi_test.cpp @@ -34,7 +34,7 @@ class Test : public vespalib::TestApp public: void convertToRequest(); void convertFromReply(); - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/engine/searchapi/searchapi_test.cpp b/searchlib/src/tests/engine/searchapi/searchapi_test.cpp index ce850c9e1e1..9cfc0d15678 100644 --- a/searchlib/src/tests/engine/searchapi/searchapi_test.cpp +++ b/searchlib/src/tests/engine/searchapi/searchapi_test.cpp @@ -35,7 +35,7 @@ public: void propertyNames(); void convertToRequest(); void convertFromReply(); - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/engine/transportserver/transportserver_test.cpp b/searchlib/src/tests/engine/transportserver/transportserver_test.cpp index 9a5e4f85d88..b7932ea2381 100644 --- a/searchlib/src/tests/engine/transportserver/transportserver_test.cpp +++ b/searchlib/src/tests/engine/transportserver/transportserver_test.cpp @@ -20,9 +20,9 @@ class SyncServer : public search::engine::SearchServer, public search::engine::MonitorServer { private: - virtual SearchReply::UP search(SearchRequest::Source request, SearchClient &client); - virtual DocsumReply::UP getDocsums(DocsumRequest::Source request, DocsumClient &client); - virtual MonitorReply::UP ping(MonitorRequest::UP request, MonitorClient &client); + virtual SearchReply::UP search(SearchRequest::Source request, SearchClient &client) override; + virtual DocsumReply::UP getDocsums(DocsumRequest::Source request, DocsumClient &client) override; + virtual MonitorReply::UP ping(MonitorRequest::UP request, MonitorClient &client) override; SyncServer(const SyncServer &); SyncServer &operator=(const SyncServer &); diff --git a/searchlib/src/tests/features/beta/beta_features.cpp b/searchlib/src/tests/features/beta/beta_features.cpp index 30b88e8a3e0..fcb769faef6 100644 --- a/searchlib/src/tests/features/beta/beta_features.cpp +++ b/searchlib/src/tests/features/beta/beta_features.cpp @@ -64,7 +64,7 @@ public: //--------------------------------------------------------------------------------------------------------------------- class Test : public FtTestApp { public: - int Main(); + int Main() override; void testJaroWinklerDistance(); void testProximity(); void testFlowCompleteness(); diff --git a/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp b/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp index 956599c81f6..34b10d19715 100644 --- a/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp +++ b/searchlib/src/tests/features/element_completeness/element_completeness_test.cpp @@ -55,7 +55,7 @@ struct IndexFixture { struct FeatureDumpFixture : public IDumpFeatureVisitor { std::vector<vespalib::string> expect; size_t dumped; - virtual void visitDumpFeature(const vespalib::string &name) { + virtual void visitDumpFeature(const vespalib::string &name) override { EXPECT_LESS(dumped, expect.size()); EXPECT_EQUAL(expect[dumped++], name); } diff --git a/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp b/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp index 6405ddf784a..7fa9e7c8bc2 100644 --- a/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp +++ b/searchlib/src/tests/features/element_similarity_feature/element_similarity_feature_test.cpp @@ -65,7 +65,7 @@ struct IndexFixture { struct FeatureDumpFixture : public IDumpFeatureVisitor { std::vector<vespalib::string> actual; FeatureDumpFixture() : IDumpFeatureVisitor(), actual() {} - virtual void visitDumpFeature(const vespalib::string &name) { + virtual void visitDumpFeature(const vespalib::string &name) override { actual.push_back(name); } }; diff --git a/searchlib/src/tests/features/featurebenchmark.cpp b/searchlib/src/tests/features/featurebenchmark.cpp index 43bda497333..40345b1c023 100644 --- a/searchlib/src/tests/features/featurebenchmark.cpp +++ b/searchlib/src/tests/features/featurebenchmark.cpp @@ -132,7 +132,7 @@ private: public: Benchmark() : _factory(), _timer(), _sample() {} - int Main(); + int Main() override; }; diff --git a/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp b/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp index 26af4149c04..51405064ac6 100644 --- a/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp +++ b/searchlib/src/tests/features/item_raw_score/item_raw_score_test.cpp @@ -37,7 +37,7 @@ struct IndexFixture { }; struct FeatureDumpFixture : public IDumpFeatureVisitor { - virtual void visitDumpFeature(const vespalib::string &) { + virtual void visitDumpFeature(const vespalib::string &) override { TEST_ERROR("no features should be dumped"); } FeatureDumpFixture() : IDumpFeatureVisitor() {} @@ -48,13 +48,13 @@ struct Labels { virtual ~Labels() {} }; struct NoLabel : public Labels { - virtual void inject(Properties &) const {} + virtual void inject(Properties &) const override {} }; struct SingleLabel : public Labels { vespalib::string label; uint32_t uid; SingleLabel(const vespalib::string &l, uint32_t x) : label(l), uid(x) {} - virtual void inject(Properties &p) const { + virtual void inject(Properties &p) const override { vespalib::asciistream key; key << "vespa.label." << label << ".id"; vespalib::asciistream value; diff --git a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp index 98722f40289..89d59406b55 100644 --- a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp +++ b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp @@ -37,7 +37,7 @@ struct IndexFixture { }; struct FeatureDumpFixture : public IDumpFeatureVisitor { - virtual void visitDumpFeature(const vespalib::string &) { + virtual void visitDumpFeature(const vespalib::string &) override { TEST_ERROR("no features should be dumped"); } FeatureDumpFixture() : IDumpFeatureVisitor() {} diff --git a/searchlib/src/tests/features/prod_features.h b/searchlib/src/tests/features/prod_features.h index 510f8cae230..5722a61a1f5 100644 --- a/searchlib/src/tests/features/prod_features.h +++ b/searchlib/src/tests/features/prod_features.h @@ -9,7 +9,7 @@ class Test : public FtTestApp { public: - int Main(); + int Main() override; void testFramework(); void testFtLib(); void testAge(); diff --git a/searchlib/src/tests/features/raw_score/raw_score_test.cpp b/searchlib/src/tests/features/raw_score/raw_score_test.cpp index ab7db84544f..1588e4dbe9f 100644 --- a/searchlib/src/tests/features/raw_score/raw_score_test.cpp +++ b/searchlib/src/tests/features/raw_score/raw_score_test.cpp @@ -36,7 +36,7 @@ struct IndexFixture { }; struct FeatureDumpFixture : public IDumpFeatureVisitor { - virtual void visitDumpFeature(const vespalib::string &) { + virtual void visitDumpFeature(const vespalib::string &) override { TEST_ERROR("no features should be dumped"); } FeatureDumpFixture() : IDumpFeatureVisitor() {} diff --git a/searchlib/src/tests/features/subqueries/subqueries_test.cpp b/searchlib/src/tests/features/subqueries/subqueries_test.cpp index d60de9af4e0..71b9e8fc8db 100644 --- a/searchlib/src/tests/features/subqueries/subqueries_test.cpp +++ b/searchlib/src/tests/features/subqueries/subqueries_test.cpp @@ -34,7 +34,7 @@ struct IndexFixture { }; struct FeatureDumpFixture : public IDumpFeatureVisitor { - virtual void visitDumpFeature(const vespalib::string &) { + virtual void visitDumpFeature(const vespalib::string &) override { TEST_ERROR("no features should be dumped"); } FeatureDumpFixture() : IDumpFeatureVisitor() {} diff --git a/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp b/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp index bf3336a8b33..a3e5808bffb 100644 --- a/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp +++ b/searchlib/src/tests/features/text_similarity_feature/text_similarity_feature_test.cpp @@ -59,7 +59,7 @@ struct IndexFixture { struct FeatureDumpFixture : public IDumpFeatureVisitor { std::vector<vespalib::string> expect; size_t dumped; - virtual void visitDumpFeature(const vespalib::string &name) { + virtual void visitDumpFeature(const vespalib::string &name) override { EXPECT_LESS(dumped, expect.size()); EXPECT_EQUAL(expect[dumped++], name); } diff --git a/searchlib/src/tests/fef/attributecontent/attributecontent_test.cpp b/searchlib/src/tests/fef/attributecontent/attributecontent_test.cpp index 66430994016..70708536345 100644 --- a/searchlib/src/tests/fef/attributecontent/attributecontent_test.cpp +++ b/searchlib/src/tests/fef/attributecontent/attributecontent_test.cpp @@ -20,7 +20,7 @@ private: void testFill(); public: - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp b/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp index bc04d1533f7..ef7d00f7cd8 100644 --- a/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp +++ b/searchlib/src/tests/fef/featurenameparser/featurenameparser_test.cpp @@ -38,7 +38,7 @@ public: const vespalib::string &base, ParamList pl, const vespalib::string &output); void testFile(const vespalib::string &name); - int Main(); + int Main() override; }; bool diff --git a/searchlib/src/tests/fef/fef_test.cpp b/searchlib/src/tests/fef/fef_test.cpp index dac63ac1b83..2a3626ee834 100644 --- a/searchlib/src/tests/fef/fef_test.cpp +++ b/searchlib/src/tests/fef/fef_test.cpp @@ -16,7 +16,7 @@ public: void testLayout(); void testObjectStore(); void testTermFieldMatchDataAppend(); - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/fef/parameter/parameter_test.cpp b/searchlib/src/tests/fef/parameter/parameter_test.cpp index 72b40308371..6efc5107f1e 100644 --- a/searchlib/src/tests/fef/parameter/parameter_test.cpp +++ b/searchlib/src/tests/fef/parameter/parameter_test.cpp @@ -41,7 +41,7 @@ private: void testParameters(); public: - int Main(); + int Main() override; }; bool diff --git a/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp b/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp index fb56230d018..7d868f96f2a 100644 --- a/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp +++ b/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp @@ -25,7 +25,7 @@ private: public: Benchmark() : _timer(), _sample(0) {} - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/fef/phrasesplitter/phrasesplitter_test.cpp b/searchlib/src/tests/fef/phrasesplitter/phrasesplitter_test.cpp index ce30f4bdb10..d8721a5d682 100644 --- a/searchlib/src/tests/fef/phrasesplitter/phrasesplitter_test.cpp +++ b/searchlib/src/tests/fef/phrasesplitter/phrasesplitter_test.cpp @@ -21,7 +21,7 @@ private: void testSplitterUpdate(); public: - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/fef/properties/properties_test.cpp b/searchlib/src/tests/fef/properties/properties_test.cpp index 7f5594ea821..b63cf82a54e 100644 --- a/searchlib/src/tests/fef/properties/properties_test.cpp +++ b/searchlib/src/tests/fef/properties/properties_test.cpp @@ -13,7 +13,7 @@ struct CopyVisitor : public IPropertiesVisitor Properties &dst; CopyVisitor(Properties &p) : dst(p) {} virtual void visitProperty(const Property::Value &key, - const Property &values) + const Property &values) override { for (uint32_t i = 0; i < values.size(); ++i) { dst.add(key, values.getAt(i)); diff --git a/searchlib/src/tests/fef/resolver/resolver_test.cpp b/searchlib/src/tests/fef/resolver/resolver_test.cpp index e83d02d2577..e7805f123ef 100644 --- a/searchlib/src/tests/fef/resolver/resolver_test.cpp +++ b/searchlib/src/tests/fef/resolver/resolver_test.cpp @@ -14,10 +14,10 @@ class BaseBlueprint : public Blueprint { public: BaseBlueprint() : Blueprint("base") { } virtual void visitDumpFeatures(const IIndexEnvironment &, - IDumpFeatureVisitor &) const {} - virtual Blueprint::UP createInstance() const { return Blueprint::UP(new BaseBlueprint()); } + IDumpFeatureVisitor &) const override {} + virtual Blueprint::UP createInstance() const override { return Blueprint::UP(new BaseBlueprint()); } virtual bool setup(const IIndexEnvironment & indexEnv, - const ParameterList & params) { + const ParameterList & params) override { (void) indexEnv; (void) params; describeOutput("foo", "foo"); describeOutput("bar", "bar"); @@ -37,10 +37,10 @@ class CombineBlueprint : public Blueprint { public: CombineBlueprint() : Blueprint("combine") { } virtual void visitDumpFeatures(const IIndexEnvironment &, - IDumpFeatureVisitor &) const {} - virtual Blueprint::UP createInstance() const { return Blueprint::UP(new CombineBlueprint()); } + IDumpFeatureVisitor &) const override {} + virtual Blueprint::UP createInstance() const override { return Blueprint::UP(new CombineBlueprint()); } virtual bool setup(const IIndexEnvironment & indexEnv, - const ParameterList & params) { + const ParameterList & params) override { (void) indexEnv; (void) params; defineInput("base.foo"); defineInput("base.bar"); @@ -59,7 +59,7 @@ private: void requireThatWeGetUniqueBlueprints(); public: Test(); - int Main(); + int Main() override; }; Test::Test() : diff --git a/searchlib/src/tests/fef/table/table_test.cpp b/searchlib/src/tests/fef/table/table_test.cpp index 7df91c6ee5d..a049df231cc 100644 --- a/searchlib/src/tests/fef/table/table_test.cpp +++ b/searchlib/src/tests/fef/table/table_test.cpp @@ -29,7 +29,7 @@ private: const std::string _tables2Dir; public: TableTest(); - int Main(); + int Main() override; }; TableTest::TableTest() : diff --git a/searchlib/src/tests/fef/termmatchdatamerger/termmatchdatamerger_test.cpp b/searchlib/src/tests/fef/termmatchdatamerger/termmatchdatamerger_test.cpp index 14b74498f2d..2ce802ea8a2 100644 --- a/searchlib/src/tests/fef/termmatchdatamerger/termmatchdatamerger_test.cpp +++ b/searchlib/src/tests/fef/termmatchdatamerger/termmatchdatamerger_test.cpp @@ -30,7 +30,7 @@ public: void testMergeMultifield(); void testMergeDuplicates(); void testMergeFieldLength(); - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/fileheadertk/fileheadertk_test.cpp b/searchlib/src/tests/fileheadertk/fileheadertk_test.cpp index 14c5d0ed6f6..eb0bd9e32b6 100644 --- a/searchlib/src/tests/fileheadertk/fileheadertk_test.cpp +++ b/searchlib/src/tests/fileheadertk/fileheadertk_test.cpp @@ -13,7 +13,7 @@ private: void testVersionTags(); public: - int Main() { + int Main() override { TEST_INIT("fileheadertk_test"); testVersionTags(); TEST_FLUSH(); diff --git a/searchlib/src/tests/grouping/grouping_test.cpp b/searchlib/src/tests/grouping/grouping_test.cpp index fec91a62d17..034f14c92d1 100644 --- a/searchlib/src/tests/grouping/grouping_test.cpp +++ b/searchlib/src/tests/grouping/grouping_test.cpp @@ -161,7 +161,7 @@ public: void testFixedWidthBuckets(); void testThatNanIsConverted(); void testNanSorting(); - int Main(); + int Main() override; private: void testAggregationSimpleSum(AggregationContext & ctx, const AggregationResult & aggr, const ResultNode & ir, const ResultNode & fr, const ResultNode & sr); class CheckAttributeReferences : public vespalib::ObjectOperation, public vespalib::ObjectPredicate @@ -170,12 +170,12 @@ private: CheckAttributeReferences() : _numrefs(0) { } int _numrefs; private: - virtual void execute(vespalib::Identifiable &obj) { + virtual void execute(vespalib::Identifiable &obj) override { if (static_cast<AttributeNode &>(obj).getAttribute() != NULL) { _numrefs++; } } - virtual bool check(const vespalib::Identifiable &obj) const { return obj.inherits(AttributeNode::classId); } + virtual bool check(const vespalib::Identifiable &obj) const override { return obj.inherits(AttributeNode::classId); } }; }; diff --git a/searchlib/src/tests/groupingengine/groupingengine_benchmark.cpp b/searchlib/src/tests/groupingengine/groupingengine_benchmark.cpp index 24eda69ea84..e937dbad017 100644 --- a/searchlib/src/tests/groupingengine/groupingengine_benchmark.cpp +++ b/searchlib/src/tests/groupingengine/groupingengine_benchmark.cpp @@ -145,14 +145,14 @@ private: CheckAttributeReferences() : _numrefs(0) { } int _numrefs; private: - virtual void execute(vespalib::Identifiable &obj) { + virtual void execute(vespalib::Identifiable &obj) override { if (static_cast<AttributeNode &>(obj).getAttribute() != NULL) { _numrefs++; } } - virtual bool check(const vespalib::Identifiable &obj) const { return obj.inherits(AttributeNode::classId); } + virtual bool check(const vespalib::Identifiable &obj) const override { return obj.inherits(AttributeNode::classId); } }; - int Main(); + int Main() override; }; //----------------------------------------------------------------------------- diff --git a/searchlib/src/tests/groupingengine/groupingengine_test.cpp b/searchlib/src/tests/groupingengine/groupingengine_test.cpp index d3f1df8c501..48ad5f0c6d8 100644 --- a/searchlib/src/tests/groupingengine/groupingengine_test.cpp +++ b/searchlib/src/tests/groupingengine/groupingengine_test.cpp @@ -164,7 +164,7 @@ public: void testThatNanIsConverted(); void testNanSorting(); void testGroupingEngineFromRequest(); - int Main(); + int Main() override; private: bool verifyEqual(const Group & a, const Group & b); void testAggregationSimpleSum(AggregationContext & ctx, const AggregationResult & aggr, const ResultNode & ir, const ResultNode & fr, const ResultNode & sr); @@ -174,12 +174,12 @@ private: CheckAttributeReferences() : _numrefs(0) { } int _numrefs; private: - virtual void execute(vespalib::Identifiable &obj) { + virtual void execute(vespalib::Identifiable &obj) override { if (static_cast<AttributeNode &>(obj).getAttribute() != NULL) { _numrefs++; } } - virtual bool check(const vespalib::Identifiable &obj) const { return obj.inherits(AttributeNode::classId); } + virtual bool check(const vespalib::Identifiable &obj) const override { return obj.inherits(AttributeNode::classId); } }; }; diff --git a/searchlib/src/tests/hitcollector/hitcollector_test.cpp b/searchlib/src/tests/hitcollector/hitcollector_test.cpp index edb2ecdcaaa..1a5f230a0c1 100644 --- a/searchlib/src/tests/hitcollector/hitcollector_test.cpp +++ b/searchlib/src/tests/hitcollector/hitcollector_test.cpp @@ -21,7 +21,7 @@ struct BasicScorer : public HitCollector::DocumentScorer { feature_t _scoreDelta; BasicScorer(feature_t scoreDelta) : _scoreDelta(scoreDelta) {} - virtual feature_t score(uint32_t docId) { + virtual feature_t score(uint32_t docId) override { return docId + _scoreDelta; } }; @@ -30,7 +30,7 @@ struct PredefinedScorer : public HitCollector::DocumentScorer { ScoreMap _scores; PredefinedScorer(const ScoreMap &scores) : _scores(scores) {} - virtual feature_t score(uint32_t docId) { + virtual feature_t score(uint32_t docId) override { feature_t retval = 0.0; auto itr = _scores.find(docId); if (itr != _scores.end()) { @@ -167,14 +167,14 @@ struct Fixture { struct AscendingScoreFixture : Fixture { AscendingScoreFixture() : Fixture() {} - virtual HitRank calculateScore(uint32_t i) { + virtual HitRank calculateScore(uint32_t i) override { return i + 100; } }; struct DescendingScoreFixture : Fixture { DescendingScoreFixture() : Fixture() {} - virtual HitRank calculateScore(uint32_t i) { + virtual HitRank calculateScore(uint32_t i) override { return 100 - i; } }; diff --git a/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp b/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp index dee07c3d366..63b1b78339e 100644 --- a/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp +++ b/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp @@ -40,7 +40,7 @@ class Test : public vespalib::TestApp { private: void testBuilder(); public: - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/memoryindex/btree/btree_test.cpp b/searchlib/src/tests/memoryindex/btree/btree_test.cpp index af580d8251e..b3f49a68424 100644 --- a/searchlib/src/tests/memoryindex/btree/btree_test.cpp +++ b/searchlib/src/tests/memoryindex/btree/btree_test.cpp @@ -178,7 +178,7 @@ private: void requireThatIteratorDistanceWorks(); public: - int Main(); + int Main() override; }; template <typename LeafNodeType> diff --git a/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp b/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp index 817d024c60f..93b78bd1b10 100644 --- a/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp +++ b/searchlib/src/tests/memoryindex/btree/frozenbtree_test.cpp @@ -123,7 +123,7 @@ public: { } - int Main(void); + int Main(void) override; }; diff --git a/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp b/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp index b7207966ece..9c119b71876 100644 --- a/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp +++ b/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp @@ -47,7 +47,7 @@ public: Test(void); int - Main(void); + Main(void) override; }; diff --git a/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp b/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp index fcf96d5afe9..dfe1438bcb5 100644 --- a/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp +++ b/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp @@ -15,7 +15,7 @@ private: void requireThatWordsCanBeAddedAndRetrieved(); void requireThatAddWordTriggersChangeOfBuffer(); public: - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp b/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp index 47a49d25f5f..048851f5d94 100644 --- a/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp +++ b/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp @@ -69,7 +69,7 @@ public: {} virtual void - startWord(const vespalib::stringref &word) + startWord(const vespalib::stringref &word) override { assert(_insideField); assert(!_insideWord); @@ -81,7 +81,7 @@ public: } virtual void - endWord(void) + endWord(void) override { assert(_insideWord); assert(!_insideDoc); @@ -91,7 +91,7 @@ public: } virtual void - startField(uint32_t fieldId) + startField(uint32_t fieldId) override { assert(!_insideField); if (!_firstField) _ss << ","; @@ -101,7 +101,7 @@ public: } virtual void - endField() + endField() override { assert(_insideField); assert(!_insideWord); @@ -111,7 +111,7 @@ public: } virtual void - startDocument(uint32_t docId) + startDocument(uint32_t docId) override { assert(_insideWord); assert(!_insideDoc); @@ -122,7 +122,7 @@ public: } virtual void - endDocument(void) + endDocument(void) override { assert(_insideDoc); assert(!_insideElem); @@ -134,7 +134,7 @@ public: virtual void startElement(uint32_t elementId, int32_t weight, - uint32_t elementLen) + uint32_t elementLen) override { assert(_insideDoc); assert(!_insideElem); @@ -147,7 +147,7 @@ public: } virtual void - endElement(void) + endElement(void) override { assert(_insideElem); _ss << "]"; @@ -156,7 +156,7 @@ public: } virtual void - addOcc(const WordDocElementWordPosFeatures &features) + addOcc(const WordDocElementWordPosFeatures &features) override { assert(_insideElem); if (!_firstPos) _ss << ","; diff --git a/searchlib/src/tests/nativerank/nativerank.cpp b/searchlib/src/tests/nativerank/nativerank.cpp index 713b271dd3c..4c03f14e141 100644 --- a/searchlib/src/tests/nativerank/nativerank.cpp +++ b/searchlib/src/tests/nativerank/nativerank.cpp @@ -56,7 +56,7 @@ private: void testNativeRank(); public: - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/nearsearch/nearsearch_test.cpp b/searchlib/src/tests/nearsearch/nearsearch_test.cpp index 8a20a6a27f8..90565ab1e1e 100644 --- a/searchlib/src/tests/nearsearch/nearsearch_test.cpp +++ b/searchlib/src/tests/nearsearch/nearsearch_test.cpp @@ -114,7 +114,7 @@ private: bool testNearSearch(MyQuery &query, uint32_t matchId); public: - int Main(); + int Main() override; void testBasicNear(); void testRepeatedTerms(); }; diff --git a/searchlib/src/tests/postinglistbm/andstress.cpp b/searchlib/src/tests/postinglistbm/andstress.cpp index f3fabde0d61..69aa463b46d 100644 --- a/searchlib/src/tests/postinglistbm/andstress.cpp +++ b/searchlib/src/tests/postinglistbm/andstress.cpp @@ -129,7 +129,7 @@ public: ~AndStressWorker(void); virtual void - Run(FastOS_ThreadInterface *thisThread, void *arg); + Run(FastOS_ThreadInterface *thisThread, void *arg) override; }; diff --git a/searchlib/src/tests/postinglistbm/postinglistbm.cpp b/searchlib/src/tests/postinglistbm/postinglistbm.cpp index 346243099cd..ff09a99ba99 100644 --- a/searchlib/src/tests/postinglistbm/postinglistbm.cpp +++ b/searchlib/src/tests/postinglistbm/postinglistbm.cpp @@ -59,7 +59,7 @@ private: public: PostingListBM(void); ~PostingListBM(void); - int Main(void); + int Main(void) override; }; diff --git a/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp index 0f7802d63b0..26d4050f440 100644 --- a/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp +++ b/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp @@ -15,8 +15,8 @@ using namespace search::predicate; namespace { struct DummyDocIdLimitProvider : public DocIdLimitProvider { - virtual uint32_t getDocIdLimit() const { return 10000; } - virtual uint32_t getCommittedDocIdLimit() const { return 10000; } + virtual uint32_t getDocIdLimit() const override { return 10000; } + virtual uint32_t getCommittedDocIdLimit() const override { return 10000; } }; vespalib::GenerationHandler generation_handler; diff --git a/searchlib/src/tests/predicate/predicate_index_test.cpp b/searchlib/src/tests/predicate/predicate_index_test.cpp index 5a6b6240e65..cf5c1d6bfb5 100644 --- a/searchlib/src/tests/predicate/predicate_index_test.cpp +++ b/searchlib/src/tests/predicate/predicate_index_test.cpp @@ -19,8 +19,8 @@ using std::vector; namespace { struct DummyDocIdLimitProvider : public DocIdLimitProvider { - virtual uint32_t getDocIdLimit() const { return 10000; } - virtual uint32_t getCommittedDocIdLimit() const { return 10000; } + virtual uint32_t getDocIdLimit() const override { return 10000; } + virtual uint32_t getCommittedDocIdLimit() const override { return 10000; } }; vespalib::GenerationHandler generation_handler; @@ -256,7 +256,7 @@ struct DocIdLimitFinder : SimpleIndexDeserializeObserver<> { { doc_id_limit = 0u; } - void notifyInsert(uint64_t, uint32_t doc_id, uint32_t) { + void notifyInsert(uint64_t, uint32_t doc_id, uint32_t) override { _doc_id_limit = std::max(_doc_id_limit, doc_id); } }; diff --git a/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp index 18feb30106f..831e24026ec 100644 --- a/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp +++ b/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp @@ -14,8 +14,8 @@ using namespace search::predicate; namespace { struct DummyDocIdLimitProvider : public DocIdLimitProvider { - virtual uint32_t getDocIdLimit() const { return 10000; } - virtual uint32_t getCommittedDocIdLimit() const { return 10000; } + virtual uint32_t getDocIdLimit() const override { return 10000; } + virtual uint32_t getCommittedDocIdLimit() const override { return 10000; } }; vespalib::GenerationHandler generation_handler; diff --git a/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp index 1751c725044..90e34c804e7 100644 --- a/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp +++ b/searchlib/src/tests/predicate/predicate_zero_constraint_posting_list_test.cpp @@ -14,8 +14,8 @@ using namespace search::predicate; namespace { struct DummyDocIdLimitProvider : public DocIdLimitProvider { - virtual uint32_t getDocIdLimit() const { return 10000; } - virtual uint32_t getCommittedDocIdLimit() const { return 10000; } + virtual uint32_t getDocIdLimit() const override { return 10000; } + virtual uint32_t getCommittedDocIdLimit() const override { return 10000; } }; vespalib::GenerationHandler generation_handler; diff --git a/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp index 5946bc926d0..dfa75d48019 100644 --- a/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp +++ b/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp @@ -16,8 +16,8 @@ using std::vector; namespace { struct DummyDocIdLimitProvider : public DocIdLimitProvider { - virtual uint32_t getDocIdLimit() const { return 10000; } - virtual uint32_t getCommittedDocIdLimit() const { return 10000; } + virtual uint32_t getDocIdLimit() const override { return 10000; } + virtual uint32_t getCommittedDocIdLimit() const override { return 10000; } }; vespalib::GenerationHandler generation_handler; diff --git a/searchlib/src/tests/predicate/simple_index_test.cpp b/searchlib/src/tests/predicate/simple_index_test.cpp index f8a1d3f1366..933f21ebf3c 100644 --- a/searchlib/src/tests/predicate/simple_index_test.cpp +++ b/searchlib/src/tests/predicate/simple_index_test.cpp @@ -24,21 +24,22 @@ struct MyData { }; struct MyDataSerializer : PostingSerializer<MyData> { - void serialize(const MyData &data, vespalib::DataBuffer& buffer) const { + void serialize(const MyData &data, vespalib::DataBuffer& buffer) const override { buffer.writeInt32(data.data); } }; struct MyDataDeserializer : PostingDeserializer<MyData> { - MyData deserialize(vespalib::DataBuffer& buffer) { return {buffer.readInt32()}; + MyData deserialize(vespalib::DataBuffer& buffer) override { + return {buffer.readInt32()}; } }; struct SimpleDocIdLimitProvider : public DocIdLimitProvider { uint32_t _doc_id_limit = 1; uint32_t _committed_doc_id_limit = 1; - virtual uint32_t getDocIdLimit() const { return _doc_id_limit; } - virtual uint32_t getCommittedDocIdLimit() const { return _committed_doc_id_limit; } + virtual uint32_t getDocIdLimit() const override { return _doc_id_limit; } + virtual uint32_t getCommittedDocIdLimit() const override { return _committed_doc_id_limit; } }; constexpr uint64_t key = 0x123456; @@ -153,7 +154,7 @@ TEST_F("require that SimpleIndex can insert and remove many values.", Fixture) { struct MyObserver : SimpleIndexDeserializeObserver<> { std::map<uint32_t, uint64_t> features; - void notifyInsert(uint64_t my_key, uint32_t my_doc_id, uint32_t) { + void notifyInsert(uint64_t my_key, uint32_t my_doc_id, uint32_t) override { features[my_doc_id] = my_key; } bool hasSeenDoc(uint32_t doc) { diff --git a/searchlib/src/tests/query/customtypevisitor_test.cpp b/searchlib/src/tests/query/customtypevisitor_test.cpp index c9da2757d81..75abcc810b2 100644 --- a/searchlib/src/tests/query/customtypevisitor_test.cpp +++ b/searchlib/src/tests/query/customtypevisitor_test.cpp @@ -25,7 +25,7 @@ class Test : public vespalib::TestApp { template <class T> void requireThatNodeIsVisited(); public: - int Main(); + int Main() override; }; template <class Base> @@ -90,27 +90,27 @@ public: template <typename T> void setVisited() { isVisited<T>() = true; } - virtual void visit(MyAnd &) { setVisited<MyAnd>(); } - virtual void visit(MyAndNot &) { setVisited<MyAndNot>(); } - virtual void visit(MyEquiv &) { setVisited<MyEquiv>(); } - virtual void visit(MyNumberTerm &) { setVisited<MyNumberTerm>(); } - virtual void visit(MyLocationTerm &) { setVisited<MyLocationTerm>(); } - virtual void visit(MyNear &) { setVisited<MyNear>(); } - virtual void visit(MyONear &) { setVisited<MyONear>(); } - virtual void visit(MyOr &) { setVisited<MyOr>(); } - virtual void visit(MyPhrase &) { setVisited<MyPhrase>(); } - virtual void visit(MyPrefixTerm &) { setVisited<MyPrefixTerm>(); } - virtual void visit(MyRangeTerm &) { setVisited<MyRangeTerm>(); } - virtual void visit(MyRank &) { setVisited<MyRank>(); } - virtual void visit(MyStringTerm &) { setVisited<MyStringTerm>(); } - virtual void visit(MySubstrTerm &) { setVisited<MySubstrTerm>(); } - virtual void visit(MySuffixTerm &) { setVisited<MySuffixTerm>(); } - virtual void visit(MyWeakAnd &) { setVisited<MyWeakAnd>(); } - virtual void visit(MyWeightedSetTerm &) { setVisited<MyWeightedSetTerm>(); } - virtual void visit(MyDotProduct &) { setVisited<MyDotProduct>(); } - virtual void visit(MyWandTerm &) { setVisited<MyWandTerm>(); } - virtual void visit(MyPredicateQuery &) { setVisited<MyPredicateQuery>(); } - virtual void visit(MyRegExpTerm &) { setVisited<MyRegExpTerm>(); } + virtual void visit(MyAnd &) override { setVisited<MyAnd>(); } + virtual void visit(MyAndNot &) override { setVisited<MyAndNot>(); } + virtual void visit(MyEquiv &) override { setVisited<MyEquiv>(); } + virtual void visit(MyNumberTerm &) override { setVisited<MyNumberTerm>(); } + virtual void visit(MyLocationTerm &) override { setVisited<MyLocationTerm>(); } + virtual void visit(MyNear &) override { setVisited<MyNear>(); } + virtual void visit(MyONear &) override { setVisited<MyONear>(); } + virtual void visit(MyOr &) override { setVisited<MyOr>(); } + virtual void visit(MyPhrase &) override { setVisited<MyPhrase>(); } + virtual void visit(MyPrefixTerm &) override { setVisited<MyPrefixTerm>(); } + virtual void visit(MyRangeTerm &) override { setVisited<MyRangeTerm>(); } + virtual void visit(MyRank &) override { setVisited<MyRank>(); } + virtual void visit(MyStringTerm &) override { setVisited<MyStringTerm>(); } + virtual void visit(MySubstrTerm &) override { setVisited<MySubstrTerm>(); } + virtual void visit(MySuffixTerm &) override { setVisited<MySuffixTerm>(); } + virtual void visit(MyWeakAnd &) override { setVisited<MyWeakAnd>(); } + virtual void visit(MyWeightedSetTerm &) override { setVisited<MyWeightedSetTerm>(); } + virtual void visit(MyDotProduct &) override { setVisited<MyDotProduct>(); } + virtual void visit(MyWandTerm &) override { setVisited<MyWandTerm>(); } + virtual void visit(MyPredicateQuery &) override { setVisited<MyPredicateQuery>(); } + virtual void visit(MyRegExpTerm &) override { setVisited<MyRegExpTerm>(); } }; template <class T> diff --git a/searchlib/src/tests/query/query-old.cpp b/searchlib/src/tests/query/query-old.cpp index db4b7f87895..ddfd19fbd76 100644 --- a/searchlib/src/tests/query/query-old.cpp +++ b/searchlib/src/tests/query/query-old.cpp @@ -222,7 +222,7 @@ TEST("testQueryLanguage") { class AllowRewrite : public QueryNodeResultFactory { public: - virtual bool getRewriteFloatTerms() const { return true; } + virtual bool getRewriteFloatTerms() const override { return true; } }; const char TERM_UNIQ = ParseItem::ITEM_TERM | ParseItem::IF_UNIQUEID; diff --git a/searchlib/src/tests/query/query_visitor_test.cpp b/searchlib/src/tests/query/query_visitor_test.cpp index b98e14604e3..c54b9580ea8 100644 --- a/searchlib/src/tests/query/query_visitor_test.cpp +++ b/searchlib/src/tests/query/query_visitor_test.cpp @@ -22,7 +22,7 @@ class Test : public vespalib::TestApp { template <class T> void checkVisit(T *node); public: - int Main(); + int Main() override; }; int @@ -44,29 +44,29 @@ public: return b; } - virtual void visit(And &) { isVisited<And>() = true; } - virtual void visit(AndNot &) { isVisited<AndNot>() = true; } - virtual void visit(Equiv &) { isVisited<Equiv>() = true; } - virtual void visit(NumberTerm &) { isVisited<NumberTerm>() = true; } - virtual void visit(LocationTerm &) { isVisited<LocationTerm>() = true; } - virtual void visit(Near &) { isVisited<Near>() = true; } - virtual void visit(ONear &) { isVisited<ONear>() = true; } - virtual void visit(Or &) { isVisited<Or>() = true; } - virtual void visit(Phrase &) { isVisited<Phrase>() = true; } - virtual void visit(PrefixTerm &) { isVisited<PrefixTerm>() = true; } - virtual void visit(RangeTerm &) { isVisited<RangeTerm>() = true; } - virtual void visit(Rank &) { isVisited<Rank>() = true; } - virtual void visit(StringTerm &) { isVisited<StringTerm>() = true; } - virtual void visit(SubstringTerm &) { isVisited<SubstringTerm>() = true; } - virtual void visit(SuffixTerm &) { isVisited<SuffixTerm>() = true; } - virtual void visit(WeakAnd &) { isVisited<WeakAnd>() = true; } - virtual void visit(WeightedSetTerm &) + virtual void visit(And &) override { isVisited<And>() = true; } + virtual void visit(AndNot &) override { isVisited<AndNot>() = true; } + virtual void visit(Equiv &) override { isVisited<Equiv>() = true; } + virtual void visit(NumberTerm &) override { isVisited<NumberTerm>() = true; } + virtual void visit(LocationTerm &) override { isVisited<LocationTerm>() = true; } + virtual void visit(Near &) override { isVisited<Near>() = true; } + virtual void visit(ONear &) override { isVisited<ONear>() = true; } + virtual void visit(Or &) override { isVisited<Or>() = true; } + virtual void visit(Phrase &) override { isVisited<Phrase>() = true; } + virtual void visit(PrefixTerm &) override { isVisited<PrefixTerm>() = true; } + virtual void visit(RangeTerm &) override { isVisited<RangeTerm>() = true; } + virtual void visit(Rank &) override { isVisited<Rank>() = true; } + virtual void visit(StringTerm &) override { isVisited<StringTerm>() = true; } + virtual void visit(SubstringTerm &) override { isVisited<SubstringTerm>() = true; } + virtual void visit(SuffixTerm &) override { isVisited<SuffixTerm>() = true; } + virtual void visit(WeakAnd &) override { isVisited<WeakAnd>() = true; } + virtual void visit(WeightedSetTerm &) override { isVisited<WeightedSetTerm>() = true; } - virtual void visit(DotProduct &) { isVisited<DotProduct>() = true; } - virtual void visit(WandTerm &) { isVisited<WandTerm>() = true; } - virtual void visit(PredicateQuery &) + virtual void visit(DotProduct &) override { isVisited<DotProduct>() = true; } + virtual void visit(WandTerm &) override { isVisited<WandTerm>() = true; } + virtual void visit(PredicateQuery &) override { isVisited<PredicateQuery>() = true; } - virtual void visit(RegExpTerm &) { isVisited<RegExpTerm>() = true; } + virtual void visit(RegExpTerm &) override { isVisited<RegExpTerm>() = true; } }; template <class T> diff --git a/searchlib/src/tests/query/templatetermvisitor_test.cpp b/searchlib/src/tests/query/templatetermvisitor_test.cpp index 369266f5b2d..5415884aa31 100644 --- a/searchlib/src/tests/query/templatetermvisitor_test.cpp +++ b/searchlib/src/tests/query/templatetermvisitor_test.cpp @@ -21,7 +21,7 @@ class Test : public vespalib::TestApp { void requireThatAllTermsCanBeVisited(); public: - int Main(); + int Main() override; }; int 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 { diff --git a/searchlib/src/tests/ranksetup/ranksetup_test.cpp b/searchlib/src/tests/ranksetup/ranksetup_test.cpp index ba676ac8e2a..46e646b6493 100644 --- a/searchlib/src/tests/ranksetup/ranksetup_test.cpp +++ b/searchlib/src/tests/ranksetup/ranksetup_test.cpp @@ -54,7 +54,7 @@ class DumpFeatureVisitor : public IDumpFeatureVisitor { public: DumpFeatureVisitor() {} - virtual void visitDumpFeature(const vespalib::string & name) { + virtual void visitDumpFeature(const vespalib::string & name) override { std::cout << "dump feature: " << name << std::endl; } }; @@ -247,7 +247,7 @@ private: public: RankSetupTest(); - int Main(); + int Main() override; }; diff --git a/searchlib/src/tests/sort/sort_test.cpp b/searchlib/src/tests/sort/sort_test.cpp index 68c3aa4d768..1f637fb8dc6 100644 --- a/searchlib/src/tests/sort/sort_test.cpp +++ b/searchlib/src/tests/sort/sort_test.cpp @@ -21,7 +21,7 @@ using vespalib::ConstBufferRef; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; void testUnsignedIntegerSort(); template <typename T> void testSignedIntegerSort(); diff --git a/searchlib/src/tests/sort/sortbenchmark.cpp b/searchlib/src/tests/sort/sortbenchmark.cpp index f028c81ff7a..8a52a07c859 100644 --- a/searchlib/src/tests/sort/sortbenchmark.cpp +++ b/searchlib/src/tests/sort/sortbenchmark.cpp @@ -13,7 +13,7 @@ class Test : public vespalib::TestApp public: typedef std::vector<uint32_t> V; std::vector< std::vector<uint32_t> > _data; - int Main(); + int Main() override; void generateVectors(size_t numVectors, size_t values); V merge(); void twoWayMerge(); diff --git a/searchlib/src/tests/sort/uca.cpp b/searchlib/src/tests/sort/uca.cpp index 121e53a9e7c..c4802f5d3ce 100644 --- a/searchlib/src/tests/sort/uca.cpp +++ b/searchlib/src/tests/sort/uca.cpp @@ -20,7 +20,7 @@ using icu::Collator; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; void testFromDat(); }; diff --git a/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h b/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h index e661431209c..121653a89d1 100644 --- a/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h +++ b/searchlib/src/tests/stackdumpiterator/stackdumpiteratortest.h @@ -8,7 +8,7 @@ class StackDumpIteratorTest : public FastOS_Application { - int Main(); + int Main() override; void Usage(char *progname); bool ShowResult(int testNo, search::SimpleQueryStackDumpIterator &actual, search::SimpleQueryStack &correct, unsigned int expected); bool RunTest(int i, bool verify); diff --git a/searchlib/src/tests/stringenum/stringenum_test.cpp b/searchlib/src/tests/stringenum/stringenum_test.cpp index 8c6ef64dbe3..264fd964a04 100644 --- a/searchlib/src/tests/stringenum/stringenum_test.cpp +++ b/searchlib/src/tests/stringenum/stringenum_test.cpp @@ -18,7 +18,7 @@ class MyApp : public vespalib::TestApp { public: void CheckLookup( search::util::StringEnum *strEnum, const char *str, int value); - int Main(); + int Main() override; MyApp(void) {} }; diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp index 249544984ab..bd0053827d2 100644 --- a/searchlib/src/tests/transactionlog/translogclient_test.cpp +++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp @@ -31,7 +31,7 @@ vespalib::string myhex(const void * b, size_t sz) class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; private: bool createDomainTest(TransLogClient & tls, const vespalib::string & name, size_t preExistingDomains=0); TransLogClient::Session::UP openDomainTest(TransLogClient & tls, const vespalib::string & name); @@ -61,9 +61,9 @@ TEST_APPHOOK(Test); class CallBackTest : public TransLogClient::Subscriber::Callback { private: - virtual RPC::Result receive(const Packet & packet); - virtual void inSync() { _inSync = true; } - virtual void eof() { _eof = true; } + virtual RPC::Result receive(const Packet & packet) override; + virtual void inSync() override { _inSync = true; } + virtual void eof() override { _eof = true; } typedef std::map<SerialNum, ByteBuffer> PacketMap; PacketMap _packetMap; public: @@ -93,9 +93,9 @@ RPC::Result CallBackTest::receive(const Packet & p) class CallBackManyTest : public TransLogClient::Subscriber::Callback { private: - virtual RPC::Result receive(const Packet & packet); - virtual void inSync() { _inSync = true; } - virtual void eof() { _eof = true; } + virtual RPC::Result receive(const Packet & packet) override; + virtual void inSync() override { _inSync = true; } + virtual void eof() override { _eof = true; } public: CallBackManyTest(size_t start) : _inSync(false), _eof(false), _count(start), _value(start) { } void clear() { _inSync = false; _eof = false; _count = 0; _value = 0; } @@ -125,9 +125,9 @@ class CallBackUpdate : public TransLogClient::Subscriber::Callback public: typedef std::map<SerialNum, Identifiable *> PacketMap; private: - virtual RPC::Result receive(const Packet & packet); - virtual void inSync() { _inSync = true; } - virtual void eof() { _eof = true; } + virtual RPC::Result receive(const Packet & packet) override; + virtual void inSync() override { _inSync = true; } + virtual void eof() override { _eof = true; } PacketMap _packetMap; public: CallBackUpdate() : _inSync(false), _eof(false) { } @@ -174,9 +174,9 @@ RPC::Result CallBackUpdate::receive(const Packet & packet) class CallBackStatsTest : public TransLogClient::Session::Callback { private: - virtual RPC::Result receive(const Packet & packet); - virtual void inSync() { _inSync = true; } - virtual void eof() { _eof = true; } + virtual RPC::Result receive(const Packet & packet) override; + virtual void inSync() override { _inSync = true; } + virtual void eof() override { _eof = true; } public: CallBackStatsTest() : _inSync(false), _eof(false), _count(0), _inOrder(0), diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp index c11aa62cd21..3719c5da1c7 100644 --- a/searchlib/src/tests/transactionlogstress/translogstress.cpp +++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp @@ -208,7 +208,7 @@ public: FeederThread(const std::string & tlsSpec, const std::string & domain, const EntryGenerator & generator, uint32_t feedRate, size_t packetSize); ~FeederThread(); - virtual void doRun(); + virtual void doRun() override; SerialNumRange getRange() const { return SerialNumRange(1, _lastCommited); } }; @@ -306,9 +306,9 @@ public: _tlsSpec(tlsSpec), _domain(domain), _client(tlsSpec), _generator(generator), _name(name), _id(id), _validate(validate) {} virtual ~Agent() {} - virtual RPC::Result receive(const Packet & packet) = 0; - virtual void inSync() {} - virtual void eof() {} + virtual RPC::Result receive(const Packet & packet) override = 0; + virtual void inSync() override {} + virtual void eof() override {} virtual void failed() {} }; @@ -342,7 +342,7 @@ public: return _next; } SerialNumRange getRange() const { return SerialNumRange(_from, _next - 1); } - virtual RPC::Result receive(const Packet & packet); + virtual RPC::Result receive(const Packet & packet) override; }; void @@ -445,8 +445,8 @@ public: } } SerialNum getFrom() { return _from; } - virtual RPC::Result receive(const Packet & packet); - virtual void eof() { + virtual RPC::Result receive(const Packet & packet) override; + virtual void eof() override { LOG(info, "VisitorAgent[%u]: eof", _id); setState(FINISHED); } @@ -555,7 +555,7 @@ public: uint32_t runningVisitors(); std::vector<std::shared_ptr<SubscriberAgent> > & getSubscribers() { return _subscribers; } std::vector<std::shared_ptr<VisitorAgent> > & getVisitors() { return _visitors; } - virtual void doRun(); + virtual void doRun() override; }; @@ -692,7 +692,7 @@ private: void usage(); public: - int Main(); + int Main() override; }; void diff --git a/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp b/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp index d5c77fb28e4..3aa3b89b19a 100644 --- a/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp +++ b/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp @@ -9,7 +9,7 @@ using namespace search; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; }; int diff --git a/searchlib/src/vespa/searchlib/attribute/enumattribute.h b/searchlib/src/vespa/searchlib/attribute/enumattribute.h index 6dcfa0859ac..94e5da62967 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/enumattribute.h @@ -61,7 +61,7 @@ protected: virtual EnumType getFromEnum(EnumHandle e) const { return _enumStore.getValue(e); } virtual void fillPostings(LoadedVector & loaded) { (void) loaded; } - virtual void fillEnum(LoadedVector & loaded); + virtual void fillEnum(LoadedVector & loaded) override; virtual void fillEnum0(const void *src, diff --git a/searchlib/src/vespa/searchlib/attribute/flagattribute.h b/searchlib/src/vespa/searchlib/attribute/flagattribute.h index 08a2bff797a..ea73ecb7c51 100644 --- a/searchlib/src/vespa/searchlib/attribute/flagattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/flagattribute.h @@ -41,6 +41,7 @@ public: private: virtual bool onAddDoc(DocId doc) override; + void onAddDocs(DocId docIdLimit) override; void ensureGuardBit(BitVector & bv); void ensureGuardBit(); diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.h b/searchlib/src/vespa/searchlib/attribute/multienumattribute.h index bc684d41faf..d915bfa6f62 100644 --- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.h @@ -58,7 +58,7 @@ protected: this->getEnumStore().freezeTree(); } - virtual void fillValues(LoadedVector & loaded); + virtual void fillValues(LoadedVector & loaded) override; void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs, LoadedEnumAttributeVector &loaded) override; void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs, EnumVector &enumHist) override; virtual void mergeMemoryStats(MemoryUsage & total) { (void) total; } diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h index c007e19351a..6afede8d3b4 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.h @@ -60,7 +60,7 @@ protected: } public: - virtual uint32_t getRawValues(DocId doc, const WType * & values) const final { + virtual uint32_t getRawValues(DocId doc, const WType * & values) const final override { return get(doc, values); } /* diff --git a/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h b/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h index 7339b8ce584..12b1098bbb3 100644 --- a/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multivalueattribute.h @@ -21,7 +21,7 @@ protected: typedef typename B::DocId DocId; typedef typename B::Change Change; typedef typename B::ChangeVector ChangeVector; - typedef typename B::ChangeVector::const_iterator ChangeVectorIterator; + typedef typename B::ChangeVector::const_iterator ChangeVectorIterator; using MultiValueType = M; using MultiValueMapping = attribute::MultiValueMapping<MultiValueType>; @@ -48,7 +48,7 @@ protected: * Can be overridden by subclasses that need to resize structures as a result of this. * Should return true if underlying structures were resized. **/ - virtual bool onAddDoc(DocId doc) { (void) doc; return false; } + virtual bool onAddDoc(DocId doc) override { (void) doc; return false; } AddressSpace getMultiValueAddressSpaceUsage() const override; diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h index 1b625b697ed..1843bde4d54 100644 --- a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.h @@ -83,7 +83,7 @@ protected: } virtual void mergeMemoryStats(MemoryUsage & total) { (void) total; } - virtual void fillValues(LoadedVector & loaded); + virtual void fillValues(LoadedVector & loaded) override; void fillEnumIdx(ReaderBase &attrReader, const EnumStoreBase::IndexVector &eidxs, @@ -101,7 +101,7 @@ protected: * * Should return true if underlying structures were resized. **/ - virtual bool onAddDoc(DocId doc); + virtual bool onAddDoc(DocId doc) override; public: SingleValueEnumAttribute(const vespalib::string & baseFileName, const AttributeVector::Config & cfg); diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.cpp b/searchlib/src/vespa/searchlib/attribute/stringbase.cpp index 77f111c2eb4..3c86f0ebd70 100644 --- a/searchlib/src/vespa/searchlib/attribute/stringbase.cpp +++ b/searchlib/src/vespa/searchlib/attribute/stringbase.cpp @@ -471,7 +471,6 @@ StringAttribute::onAddDoc(DocId doc) return false; } - void StringAttribute::fillPostings(LoadedVector & loaded) { (void) loaded; diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.h b/searchlib/src/vespa/searchlib/attribute/stringbase.h index c1ff0134f36..975352cdab9 100644 --- a/searchlib/src/vespa/searchlib/attribute/stringbase.h +++ b/searchlib/src/vespa/searchlib/attribute/stringbase.h @@ -67,7 +67,7 @@ protected: bool onLoadEnumerated(ReaderBase &attrReader); - virtual bool onAddDoc(DocId doc); + virtual bool onAddDoc(DocId doc) override; virtual MemoryUsage getChangeVectorMemoryUsage() const override; private: diff --git a/searchlib/src/vespa/searchlib/common/packets.h b/searchlib/src/vespa/searchlib/common/packets.h index 6fffd3efa36..00ebc6a7673 100644 --- a/searchlib/src/vespa/searchlib/common/packets.h +++ b/searchlib/src/vespa/searchlib/common/packets.h @@ -135,10 +135,10 @@ public: FS4PersistentPacketStreamer(FS4PacketFactory::CreatePacket_t cp); bool GetPacketInfo(FNET_DataBuffer *src, uint32_t *plen, - uint32_t *pcode, uint32_t *chid, bool *broken); + uint32_t *pcode, uint32_t *chid, bool *broken) override; FNET_Packet *Decode(FNET_DataBuffer *src, uint32_t plen, - uint32_t pcode, FNET_Context context); - void Encode(FNET_Packet *packet, uint32_t chid, FNET_DataBuffer *dst); + uint32_t pcode, FNET_Context context) override; + void Encode(FNET_Packet *packet, uint32_t chid, FNET_DataBuffer *dst) override; void SetConservativeMode(bool cons) { _conservative = cons; } void SetCompressionLimit(unsigned int limit) { _compressionLimit = limit; } diff --git a/searchlib/src/vespa/searchlib/test/initrange.cpp b/searchlib/src/vespa/searchlib/test/initrange.cpp index c3623aa7364..3c226469eb7 100644 --- a/searchlib/src/vespa/searchlib/test/initrange.cpp +++ b/searchlib/src/vespa/searchlib/test/initrange.cpp @@ -40,7 +40,7 @@ public: } } - void doUnpack(uint32_t docid) { (void) docid; } + void doUnpack(uint32_t docid) override { (void) docid; } vespalib::Trinary is_strict() const override { return _strict ? vespalib::Trinary::True : vespalib::Trinary::False; diff --git a/searchlib/src/vespa/searchlib/test/searchiteratorverifier.cpp b/searchlib/src/vespa/searchlib/test/searchiteratorverifier.cpp index b146c3be55a..0ea34964b65 100644 --- a/searchlib/src/vespa/searchlib/test/searchiteratorverifier.cpp +++ b/searchlib/src/vespa/searchlib/test/searchiteratorverifier.cpp @@ -49,7 +49,7 @@ public: } } - void doUnpack(uint32_t docid) { (void) docid; } + void doUnpack(uint32_t docid) override { (void) docid; } vespalib::Trinary is_strict() const override { return _strict ? vespalib::Trinary::True : vespalib::Trinary::False; |