diff options
| author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 11:53:02 +0200 |
|---|---|---|
| committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 12:35:35 +0200 |
| commit | d0bedbb2032bd0ce14067f92deb2ef4cf0f48806 (patch) | |
| tree | a3004253b505fa37825664dafc91eab809aef2ce | |
| parent | 5c6fcf8f1fa84dbff2cd202de019b0b60e51909f (diff) | |
add override in searchcore module
164 files changed, 795 insertions, 804 deletions
diff --git a/searchcore/src/apps/fdispatch/fdispatch.cpp b/searchcore/src/apps/fdispatch/fdispatch.cpp index efca70b2b6a..799c42887da 100644 --- a/searchcore/src/apps/fdispatch/fdispatch.cpp +++ b/searchcore/src/apps/fdispatch/fdispatch.cpp @@ -38,7 +38,7 @@ protected: bool GetOptions(int *exitCode); public: - int Main(); + int Main() override; FastS_FDispatchApp(void); ~FastS_FDispatchApp(void); }; diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp index d3b4c21900e..b24a94f0bea 100644 --- a/searchcore/src/apps/proton/proton.cpp +++ b/searchcore/src/apps/proton/proton.cpp @@ -32,7 +32,7 @@ private: void setupSignals(); Params parseParams(); public: - int Main(); + int Main() override; }; void @@ -102,9 +102,9 @@ public: PersistenceProvider *downPersistence); ~ProtonServiceLayerProcess() { shutdown(); } - virtual void shutdown(); - virtual void setupProvider(); - virtual storage::spi::PersistenceProvider& getProvider(); + virtual void shutdown() override; + virtual void setupProvider() override; + virtual storage::spi::PersistenceProvider& getProvider() override; void setMetricManager(metrics::MetricManager& mm) { // The service layer will call init(...) and stop() on the metric diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index 85495da1ee0..f7d40d766a8 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -279,7 +279,7 @@ protected: class MyPersistenceEngineOwner : public IPersistenceEngineOwner { virtual void - setClusterState(const storage::spi::ClusterState &calc) + setClusterState(const storage::spi::ClusterState &calc) override { (void) calc; } @@ -367,7 +367,7 @@ public: { } virtual PersistenceProvider::UP getPersistenceImplementation(const DocumentTypeRepo::SP &repo, - const DocumenttypesConfig &typesCfg) { + const DocumenttypesConfig &typesCfg) override { ConfigFactory cfgFactory(repo, DocumenttypesConfigSP(new DocumenttypesConfig(typesCfg)), _schemaFactory); _docDbRepo.reset(new DocumentDBRepo(cfgFactory, _docDbFactory)); PersistenceEngine::UP engine(new MyPersistenceEngine(_engineOwner, @@ -378,12 +378,12 @@ public: return PersistenceProvider::UP(engine.release()); } - virtual void clear() { + virtual void clear() override { FastOS_FileInterface::EmptyAndRemoveDirectory(_baseDir.c_str()); } - virtual bool hasPersistence() const { return true; } - virtual bool supportsActiveState() const { return true; } + virtual bool hasPersistence() const override { return true; } + virtual bool supportsActiveState() const override { return true; } }; diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp index e1f2716ac16..87c85f99752 100644 --- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp +++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp @@ -56,13 +56,13 @@ public: const ImportedFieldsConfig &importedFieldsCfg); int usage(); - int Main(); + int Main() override; }; struct DummyConstantValueRepo : IConstantValueRepo { const RankingConstantsConfig &cfg; DummyConstantValueRepo(const RankingConstantsConfig &cfg_in) : cfg(cfg_in) {} - virtual vespalib::eval::ConstantValue::UP getConstant(const vespalib::string &name) const { + virtual vespalib::eval::ConstantValue::UP getConstant(const vespalib::string &name) const override { for (const auto &entry: cfg.constant) { if (entry.name == name) { const auto &engine = DefaultTensorEngine::ref(); diff --git a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp index bb26c0d88ec..423a3f509c0 100644 --- a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp +++ b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp @@ -56,7 +56,7 @@ private: size_t _numDocs; void handleDocumentPut(document::Document::SP doc); - virtual void handleMessage(mbus::Message::UP message); + virtual void handleMessage(mbus::Message::UP message) override; public: FeedHandler(document::DocumentTypeRepo::SP repo, OutputFile &idx, OutputFile &dat); @@ -121,8 +121,8 @@ FeedHandler::~FeedHandler() class App : public FastOS_Application { public: - virtual bool useProcessStarter() const { return true; } - virtual int Main(); + virtual bool useProcessStarter() const override { return true; } + virtual int Main() override; }; template <typename CFG> diff --git a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp index f57e464fae6..7b7527da6ef 100644 --- a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp +++ b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp @@ -232,21 +232,19 @@ public: ~RandTextFieldGenerator(void); virtual void - setup(void); + setup(void) override; virtual void - clear(void); + clear(void) override; virtual void - deleteHistogram(const string &baseDir, - const string &name); + deleteHistogram(const string &baseDir, const string &name) override; virtual void - writeHistogram(const string &baseDir, - const string &name); + writeHistogram(const string &baseDir, const string &name) override; virtual void - generate(vespalib::asciistream &doc, uint32_t id); + generate(vespalib::asciistream &doc, uint32_t id) override; }; @@ -368,13 +366,13 @@ public: ~ModTextFieldGenerator(void); virtual void - clear(void); + clear(void) override; virtual void writeHistogram(const string &name); virtual void - generate(vespalib::asciistream &doc, uint32_t id); + generate(vespalib::asciistream &doc, uint32_t id) override; }; @@ -432,13 +430,13 @@ public: ~IdTextFieldGenerator(void); virtual void - clear(void); + clear(void) override; virtual void writeHistogram(const string &name); virtual void - generate(vespalib::asciistream &doc, uint32_t id); + generate(vespalib::asciistream &doc, uint32_t id) override; }; @@ -491,13 +489,13 @@ public: ~RandIntFieldGenerator(void); virtual void - clear(void); + clear(void) override; virtual void writeHistogram(const string &name); virtual void - generate(vespalib::asciistream &doc, uint32_t id); + generate(vespalib::asciistream &doc, uint32_t id) override; }; @@ -755,13 +753,13 @@ public: } virtual void - usage(bool showHeader); + usage(bool showHeader) override; virtual bool - getOptions(void); + getOptions(void) override; virtual int - run(void); + run(void) override; }; @@ -923,7 +921,7 @@ public: usage(void); int - Main(void); + Main(void) override; }; diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp index 8c57758f67a..626bbb3b3f4 100644 --- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp +++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp @@ -214,7 +214,7 @@ public: } - int Main() + int Main() override { if (_argc < 3) { return usage(); diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp index 6a984c7c9a1..73e1fcd09a5 100644 --- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp +++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp @@ -31,7 +31,7 @@ typedef std::unique_ptr<IReplayPacketHandler> IReplayPacketHandlerUP; struct DummyFileHeaderContext : public FileHeaderContext { typedef std::unique_ptr<DummyFileHeaderContext> UP; - virtual void addTags(vespalib::GenericHeader &, const vespalib::string &) const {} + virtual void addTags(vespalib::GenericHeader &, const vespalib::string &) const override {} }; @@ -115,12 +115,12 @@ struct DummyStreamHandler : public NewConfigOperation::IStreamHandler { } virtual void - serializeConfig(SerialNum, vespalib::nbostream &) + serializeConfig(SerialNum, vespalib::nbostream &) override { } virtual void - deserializeConfig(SerialNum, vespalib::nbostream &is) + deserializeConfig(SerialNum, vespalib::nbostream &is) override { _cfs.clear(); uint32_t numConfigs; @@ -173,11 +173,11 @@ public: _counter(0) { } - virtual void replay(const PutOperation &op) { print(op); } - virtual void replay(const RemoveOperation &op) { print(op); } - virtual void replay(const UpdateOperation &op) { print(op); } - virtual void replay(const NoopOperation &op) { print(op); } - virtual void replay(const NewConfigOperation &op) + virtual void replay(const PutOperation &op) override { print(op); } + virtual void replay(const RemoveOperation &op) override { print(op); } + virtual void replay(const UpdateOperation &op) override { print(op); } + virtual void replay(const NoopOperation &op) override { print(op); } + virtual void replay(const NewConfigOperation &op) override { print(op); typedef std::map<std::string, ConfigFile>::const_iterator I; @@ -187,20 +187,20 @@ public: } } - virtual void replay(const WipeHistoryOperation &op) { print(op); } - virtual void replay(const DeleteBucketOperation &op) { print(op); } - virtual void replay(const SplitBucketOperation &op) { print(op); } - virtual void replay(const JoinBucketsOperation &op) { print(op); } - virtual void replay(const PruneRemovedDocumentsOperation &op) { print(op); } - virtual void replay(const SpoolerReplayStartOperation &op) { print(op); } - virtual void replay(const SpoolerReplayCompleteOperation &op) { print(op); } - virtual void replay(const MoveOperation &op) { print(op); } - virtual void replay(const CreateBucketOperation &op) { print(op); } - virtual void replay(const CompactLidSpaceOperation &op) { print(op); } - virtual NewConfigOperation::IStreamHandler &getNewConfigStreamHandler() { + virtual void replay(const WipeHistoryOperation &op) override { print(op); } + virtual void replay(const DeleteBucketOperation &op) override { print(op); } + virtual void replay(const SplitBucketOperation &op) override { print(op); } + virtual void replay(const JoinBucketsOperation &op) override { print(op); } + virtual void replay(const PruneRemovedDocumentsOperation &op) override { print(op); } + virtual void replay(const SpoolerReplayStartOperation &op) override { print(op); } + virtual void replay(const SpoolerReplayCompleteOperation &op) override { print(op); } + virtual void replay(const MoveOperation &op) override { print(op); } + virtual void replay(const CreateBucketOperation &op) override { print(op); } + virtual void replay(const CompactLidSpaceOperation &op) override { print(op); } + virtual NewConfigOperation::IStreamHandler &getNewConfigStreamHandler() override { return _streamHandler; } - virtual document::DocumentTypeRepo &getDeserializeRepo() { + virtual document::DocumentTypeRepo &getDeserializeRepo() override { return _repo; } }; @@ -245,7 +245,7 @@ public: _verbose(verbose) { } - virtual void replay(const PutOperation &op) { + virtual void replay(const PutOperation &op) override { print(op); if (op.getDocument().get() != NULL) { if (_printXml) { @@ -255,10 +255,10 @@ public: } } } - virtual void replay(const RemoveOperation &op) { + virtual void replay(const RemoveOperation &op) override { print(op); } - virtual void replay(const UpdateOperation &op) { + virtual void replay(const UpdateOperation &op) override { print(op); if (op.getUpdate().get() != NULL) { if (_printXml) { @@ -268,17 +268,17 @@ public: } } } - virtual void replay(const NoopOperation &) { } - virtual void replay(const NewConfigOperation &) { } - virtual void replay(const WipeHistoryOperation &) { } - virtual void replay(const DeleteBucketOperation &) { } - virtual void replay(const SplitBucketOperation &) { } - virtual void replay(const JoinBucketsOperation &) { } - virtual void replay(const PruneRemovedDocumentsOperation &) { } - virtual void replay(const SpoolerReplayStartOperation &) { } - virtual void replay(const SpoolerReplayCompleteOperation &) { } - virtual void replay(const MoveOperation &) { } - virtual void replay(const CreateBucketOperation &) { } + virtual void replay(const NoopOperation &) override { } + virtual void replay(const NewConfigOperation &) override { } + virtual void replay(const WipeHistoryOperation &) override { } + virtual void replay(const DeleteBucketOperation &) override { } + virtual void replay(const SplitBucketOperation &) override { } + virtual void replay(const JoinBucketsOperation &) override { } + virtual void replay(const PruneRemovedDocumentsOperation &) override { } + virtual void replay(const SpoolerReplayStartOperation &) override { } + virtual void replay(const SpoolerReplayCompleteOperation &) override { } + virtual void replay(const MoveOperation &) override { } + virtual void replay(const CreateBucketOperation &) override { } }; @@ -299,7 +299,7 @@ public: _eof(false) { } - virtual RPC::Result receive(const Packet &packet) { + virtual RPC::Result receive(const Packet &packet) override { vespalib::nbostream_longlivedbuf handle(packet.getHandle().c_str(), packet.getHandle().size()); try { while (handle.size() > 0) { @@ -314,8 +314,8 @@ public: } return RPC::OK; } - virtual void inSync() { } - virtual void eof() { _eof = true; } + virtual void inSync() override { } + virtual void eof() override { _eof = true; } bool isEof() const { return _eof; } }; @@ -383,7 +383,7 @@ public: _client(vespalib::make_string("tcp/localhost:%d", _bopts.listenPort)) { } - virtual int run() = 0; + virtual int run() override = 0; }; @@ -398,7 +398,7 @@ struct ListDomainsOptions : public BaseOptions _opts.setSyntaxMessage("Utility to list all domains in a tls"); } static std::string command() { return "listdomains"; } - virtual Utility::UP createUtility() const; + virtual Utility::UP createUtility() const override; }; /** @@ -411,7 +411,7 @@ public: : BaseUtility(opts) { } - virtual int run() { + virtual int run() override { std::cout << ListDomainsOptions::command() << ": " << _bopts.toString() << std::endl; std::vector<vespalib::string> domains; @@ -449,13 +449,13 @@ struct DumpOperationsOptions : public BaseOptions DumpOperationsOptions(int argc, const char* const* argv); ~DumpOperationsOptions(); static std::string command() { return "dumpoperations"; } - virtual std::string toString() const { + virtual std::string toString() const override { return vespalib::make_string("%s, domain=%s, first=%" PRIu64 ", last=%" PRIu64 ", configdir=%s", BaseOptions::toString().c_str(), domainName.c_str(), firstSerialNum, lastSerialNum, configDir.c_str()); } - virtual Utility::UP createUtility() const; + virtual Utility::UP createUtility() const override; }; DumpOperationsOptions::DumpOperationsOptions(int argc, const char* const* argv) @@ -505,7 +505,7 @@ public: _oopts(oopts) { } - virtual int run() { + virtual int run() override { std::cout << DumpOperationsOptions::command() << ": " << _oopts.toString() << std::endl; return doRun(); } @@ -528,18 +528,18 @@ struct DumpDocumentsOptions : public DumpOperationsOptions DumpDocumentsOptions(int argc, const char* const* argv); ~DumpDocumentsOptions(); static std::string command() { return "dumpdocuments"; } - virtual void parse() { + virtual void parse() override { DumpOperationsOptions::parse(); if (format != "xml" && format != "text") { throw vespalib::InvalidCommandLineArgumentsException("Expected 'format' to be 'xml' or 'text'"); } } - virtual std::string toString() const { + virtual std::string toString() const override { return vespalib::make_string("%s, format=%s, verbose=%s", DumpOperationsOptions::toString().c_str(), format.c_str(), (verbose ? "true" : "false")); } - virtual Utility::UP createUtility() const; + virtual Utility::UP createUtility() const override; }; DumpDocumentsOptions::DumpDocumentsOptions(int argc, const char* const* argv) @@ -559,7 +559,7 @@ class DumpDocumentsUtility : public DumpOperationsUtility { protected: const DumpDocumentsOptions &_dopts; - virtual IReplayPacketHandlerUP createHandler(DocumentTypeRepo &repo) { + virtual IReplayPacketHandlerUP createHandler(DocumentTypeRepo &repo) override { return IReplayPacketHandlerUP(new DocumentPrinter(repo, _dopts.format == "xml", _dopts.verbose)); } @@ -569,7 +569,7 @@ public: _dopts(dopts) { } - virtual int run() { + virtual int run() override { std::cout << DumpDocumentsOptions::command() << ": " << _oopts.toString() << std::endl; return doRun(); } @@ -615,7 +615,7 @@ private: public: App(); ~App(); - int Main(); + int Main() override; }; App::App() {} diff --git a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp index 234edd7d45a..dd539233489 100644 --- a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp +++ b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp @@ -139,7 +139,7 @@ private: public: Test(); - int Main(); + int Main() override; }; namespace { diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp index 12abe0eb3b5..638eb40c3dc 100644 --- a/searchcore/src/tests/grouping/grouping.cpp +++ b/searchcore/src/tests/grouping/grouping.cpp @@ -41,15 +41,15 @@ public: return _vectors.find(name)->second; } virtual const IAttributeVector * - getAttribute(const string &name) const { + getAttribute(const string &name) const override { return get(name); } virtual const IAttributeVector * - getAttributeStableEnum(const string &name) const { + getAttributeStableEnum(const string &name) const override { return get(name); } virtual void - getAttributeList(std::vector<const IAttributeVector *> & list) const { + getAttributeList(std::vector<const IAttributeVector *> & list) const override { Map::const_iterator pos = _vectors.begin(); Map::const_iterator end = _vectors.end(); for (; pos != end; ++pos) { diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp index be8aedb072b..50502767395 100644 --- a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp +++ b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp @@ -56,7 +56,7 @@ public: } virtual void - run(void) + run(void) override { _task->run(); _gate->countDown(); @@ -227,7 +227,7 @@ private: void requireThatFlushedAttributeCanBeLoaded(); public: int - Main(void); + Main(void) override; }; diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp index d82eaa747db..6030c9c6fad 100644 --- a/searchcore/src/tests/proton/common/cachedselect_test.cpp +++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp @@ -195,7 +195,7 @@ public: } virtual uint32_t - get(AttributeVector::DocId doc, largeint_t *v, uint32_t sz) const + get(AttributeVector::DocId doc, largeint_t *v, uint32_t sz) const override { ++_gets; return SvIntAttr::get(doc, v, sz); diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index c9eb60973b9..e0e0c477753 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -381,7 +381,7 @@ private: public: Test(); - int Main(); + int Main() override; }; diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp index 13f0cd1cd2b..487e84c02d6 100644 --- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp +++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp @@ -196,7 +196,7 @@ class Test : public vespalib::TestApp { void setSpanTree(StringFieldValue & value, SpanTree::UP tree); public: Test(); - int Main(); + int Main() override; }; DocumenttypesConfig getDocumenttypesConfig() { diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp index 71ee6961fff..1910161cd32 100644 --- a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp @@ -65,7 +65,7 @@ struct MyChangedHandler : public IBucketStateChangedHandler MyChangedHandler() : _bucket(), _state(BucketInfo::NOT_ACTIVE) {} virtual void notifyBucketStateChanged(const document::BucketId &bucketId, - storage::spi::BucketInfo::ActiveState newState) { + storage::spi::BucketInfo::ActiveState newState) override { _bucket = bucketId; _state = newState; } @@ -75,7 +75,7 @@ struct MyChangedHandler : public IBucketStateChangedHandler struct MyModifiedHandler : public IBucketModifiedHandler { virtual void - notifyBucketModified(const BucketId &bucket) + notifyBucketModified(const BucketId &bucket) override { (void) bucket; } diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp b/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp index 3c0fe62e228..c66e9f49274 100644 --- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp @@ -18,7 +18,7 @@ struct MyClusterStateChangedHandler : public IClusterStateChangedHandler { IBucketStateCalculator::SP _calc; virtual void - notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc) { + notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc) override { _calc = newCalc; } }; diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp index 72276e9dfcb..61796df8468 100644 --- a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp @@ -17,8 +17,8 @@ typedef std::vector<IFeedView::SP> FeedViewVector; struct MyStreamHandler : public NewConfigOperation::IStreamHandler { - virtual void serializeConfig(SerialNum, vespalib::nbostream &) {} - virtual void deserializeConfig(SerialNum, vespalib::nbostream &) {} + virtual void serializeConfig(SerialNum, vespalib::nbostream &) override {} + virtual void deserializeConfig(SerialNum, vespalib::nbostream &) override {} }; @@ -69,21 +69,21 @@ struct MyFeedView : public test::DummyFeedView } // Implements IFeedView - virtual const DocumentMetaStore *getDocumentMetaStorePtr() const { return &_metaStore; } - virtual void preparePut(PutOperation &) { ++_preparePut; } - virtual void handlePut(FeedToken *, const PutOperation &) { ++_handlePut; } - virtual void prepareUpdate(UpdateOperation &) { ++_prepareUpdate; } - virtual void handleUpdate(FeedToken *, const UpdateOperation &) { ++_handleUpdate; } - virtual void prepareRemove(RemoveOperation &) { ++_prepareRemove; } - virtual void handleRemove(FeedToken *, const RemoveOperation &) { ++_handleRemove; } - virtual void prepareDeleteBucket(DeleteBucketOperation &) { ++_prepareDeleteBucket; } - virtual void handleDeleteBucket(const DeleteBucketOperation &) + virtual const DocumentMetaStore *getDocumentMetaStorePtr() const override { return &_metaStore; } + virtual void preparePut(PutOperation &) override { ++_preparePut; } + virtual void handlePut(FeedToken *, const PutOperation &) override { ++_handlePut; } + virtual void prepareUpdate(UpdateOperation &) override { ++_prepareUpdate; } + virtual void handleUpdate(FeedToken *, const UpdateOperation &) override { ++_handleUpdate; } + virtual void prepareRemove(RemoveOperation &) override { ++_prepareRemove; } + virtual void handleRemove(FeedToken *, const RemoveOperation &) override { ++_handleRemove; } + virtual void prepareDeleteBucket(DeleteBucketOperation &) override { ++_prepareDeleteBucket; } + virtual void handleDeleteBucket(const DeleteBucketOperation &) override { ++_handleDeleteBucket; } - virtual void prepareMove(MoveOperation &) { ++_prepareMove; } - virtual void handleMove(const MoveOperation &) { ++_handleMove; } - virtual void heartBeat(SerialNum) { ++_heartBeat; } - virtual void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &) { ++_handlePrune; } - virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) { + virtual void prepareMove(MoveOperation &) override { ++_prepareMove; } + virtual void handleMove(const MoveOperation &) override { ++_handleMove; } + virtual void heartBeat(SerialNum) override { ++_heartBeat; } + virtual void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &) override { ++_handlePrune; } + virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) override { _wantedLidLimit = op.getLidLimit(); } }; diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp index 60f04bb0fa7..0cd11a9f9c4 100644 --- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp +++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp @@ -59,7 +59,7 @@ const vespalib::string DOC_TYPE("invalid"); class IndexManagerDummyReconfigurer : public searchcorespi::IIndexManager::Reconfigurer { - virtual bool reconfigure(vespalib::Closure0<bool>::UP closure) { + virtual bool reconfigure(vespalib::Closure0<bool>::UP closure) override { bool ret = true; if (closure.get() != NULL) ret = closure->call(); // Perform index manager reconfiguration now diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index e6a49455c41..ea201dfd251 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -85,18 +85,18 @@ struct MySubDBOwner : public IDocumentSubDBOwner struct MySyncProxy : public SyncProxy { - virtual void sync(SerialNum) {} + virtual void sync(SerialNum) override {} }; struct MyGetSerialNum : public IGetSerialNum { - virtual SerialNum getSerialNum() const { return 0u; } + virtual SerialNum getSerialNum() const override { return 0u; } }; struct MyFileHeaderContext : public FileHeaderContext { - virtual void addTags(vespalib::GenericHeader &, const vespalib::string &) const {} + virtual void addTags(vespalib::GenericHeader &, const vespalib::string &) const override {} }; struct MyMetricsWireService : public DummyWireService diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp index ab0acb1d77c..c70c2c28001 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp @@ -53,7 +53,7 @@ struct MyMoveHandler : public IDocumentMoveHandler _moves(), _numCachedBuckets() {} - virtual void handleMove(MoveOperation &op) { + virtual void handleMove(MoveOperation &op) override { _moves.push_back(op); if (_bucketDb.takeGuard()->isCachedBucket(op.getBucketId())) { ++_numCachedBuckets; @@ -73,16 +73,16 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest MyDocumentRetriever(DocumentTypeRepo::SP repo) : _repo(repo), _docs() { _docs.push_back(Document::SP()); // lid 0 invalid } - virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const { return *_repo; } + virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const override { return *_repo; } virtual void getBucketMetaData(const storage::spi::Bucket &, - DocumentMetaData::Vector &) const {} - virtual DocumentMetaData getDocumentMetaData(const DocumentId &) const { return DocumentMetaData(); } - virtual Document::UP getDocument(DocumentIdT lid) const { + DocumentMetaData::Vector &) const override {} + virtual DocumentMetaData getDocumentMetaData(const DocumentId &) const override { return DocumentMetaData(); } + virtual Document::UP getDocument(DocumentIdT lid) const override { return Document::UP(_docs[lid]->clone()); } virtual CachedSelect::SP - parseSelect(const vespalib::string &) const + parseSelect(const vespalib::string &) const override { return CachedSelect::SP(); } @@ -92,7 +92,7 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest struct MyBucketModifiedHandler : public IBucketModifiedHandler { BucketIdVector _modified; - virtual void notifyBucketModified(const BucketId &bucket) { + virtual void notifyBucketModified(const BucketId &bucket) override { BucketIdVector::const_iterator itr = std::find(_modified.begin(), _modified.end(), bucket); ASSERT_TRUE(itr == _modified.end()); _modified.push_back(bucket); diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp index 6be31b8a5fb..6e2df00b162 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp @@ -108,16 +108,16 @@ struct MyOwner : public IFeedHandlerOwner wipe_history_count(0) { } - virtual void performWipeHistory() { ++wipe_history_count; } - virtual void onTransactionLogReplayDone() { + virtual void performWipeHistory() override { ++wipe_history_count; } + virtual void onTransactionLogReplayDone() override { LOG(info, "MyOwner::onTransactionLogReplayDone()"); } - virtual void enterRedoReprocessState() {} - virtual void onPerformPrune(SerialNum) {} - virtual bool isFeedBlockedByRejectedConfig() { return rejected_config; } + virtual void enterRedoReprocessState() override {} + virtual void onPerformPrune(SerialNum) override {} + virtual bool isFeedBlockedByRejectedConfig() override { return rejected_config; } virtual bool - getAllowPrune(void) const + getAllowPrune(void) const override { return _allowPrune; } @@ -141,8 +141,8 @@ struct MyResourceWriteFilter : public IResourceWriteFilter struct MyReplayConfig : public IReplayConfig { - virtual void replayConfig(SerialNum) {} - virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) {} + virtual void replayConfig(SerialNum) override {} + virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) override {} }; void ackToken(FeedToken *token) { @@ -202,7 +202,7 @@ struct MyFeedView : public test::DummyFeedView { MyFeedView(const DocumentTypeRepo::SP &dtr); ~MyFeedView(); void resetPutLatch(uint32_t count) { putLatch.reset(new vespalib::CountDownLatch(count)); } - virtual void preparePut(PutOperation &op) { + virtual void preparePut(PutOperation &op) override { prepareDocumentOperation(op, op.getDocument()->getId().getGlobalId()); } void prepareDocumentOperation(DocumentOperation &op, const GlobalId &gid) { @@ -213,7 +213,7 @@ struct MyFeedView : public test::DummyFeedView { op.setPrevTimestamp(entry->_prevTimestamp); } } - virtual void handlePut(FeedToken *token, const PutOperation &putOp) { + virtual void handlePut(FeedToken *token, const PutOperation &putOp) override { LOG(info, "MyFeedView::handlePut(): docId(%s), putCount(%u), putLatchCount(%u)", putOp.getDocument()->getId().toString().c_str(), put_count, (putLatch.get() != NULL ? putLatch->getCount() : 0u)); @@ -228,21 +228,21 @@ struct MyFeedView : public test::DummyFeedView { } ackToken(token); } - virtual void prepareUpdate(UpdateOperation &op) { + virtual void prepareUpdate(UpdateOperation &op) override { prepareDocumentOperation(op, op.getUpdate()->getId().getGlobalId()); } - virtual void handleUpdate(FeedToken *token, const UpdateOperation &op) { + virtual void handleUpdate(FeedToken *token, const UpdateOperation &op) override { ++update_count; update_serial = op.getSerialNum(); ackToken(token); } - virtual void handleRemove(FeedToken *token, const RemoveOperation &) + virtual void handleRemove(FeedToken *token, const RemoveOperation &) override { ++remove_count; ackToken(token); } - virtual void handleMove(const MoveOperation &) { ++move_count; } - virtual void heartBeat(SerialNum) { ++heartbeat_count; } + virtual void handleMove(const MoveOperation &) override { ++move_count; } + virtual void heartBeat(SerialNum) override { ++heartbeat_count; } virtual void handlePruneRemovedDocuments( - const PruneRemovedDocumentsOperation &) { ++prune_removed_count; } - virtual const ISimpleDocumentMetaStore *getDocumentMetaStorePtr() const { + const PruneRemovedDocumentsOperation &) override { ++prune_removed_count; } + virtual const ISimpleDocumentMetaStore *getDocumentMetaStorePtr() const override { return NULL; } }; @@ -310,7 +310,7 @@ struct MyTransport : public FeedToken::ITransport { bool documentWasFound; MyTransport(); ~MyTransport(); - virtual void send(Reply::UP, ResultUP res, bool documentWasFound_, double) { + virtual void send(Reply::UP, ResultUP res, bool documentWasFound_, double) override { result = std::move(res); documentWasFound = documentWasFound_; gate.countDown(); @@ -415,11 +415,11 @@ struct MyTlsWriter : TlsWriter { bool erase_return; MyTlsWriter() : store_count(0), erase_count(0), erase_return(true) {} - virtual void storeOperation(const FeedOperation &) { ++store_count; } - virtual bool erase(SerialNum) { ++erase_count; return erase_return; } + virtual void storeOperation(const FeedOperation &) override { ++store_count; } + virtual bool erase(SerialNum) override { ++erase_count; return erase_return; } virtual SerialNum - sync(SerialNum syncTo) + sync(SerialNum syncTo) override { return syncTo; } @@ -481,21 +481,21 @@ struct FeedHandlerFixture struct MyConfigStore : ConfigStore { - virtual SerialNum getBestSerialNum() const { return 1; } - virtual SerialNum getOldestSerialNum() const { return 1; } + virtual SerialNum getBestSerialNum() const override { return 1; } + virtual SerialNum getOldestSerialNum() const override { return 1; } virtual void saveConfig(const DocumentDBConfig &, - const search::index::Schema &, SerialNum) {} + const search::index::Schema &, SerialNum) override {} virtual void loadConfig(const DocumentDBConfig &, SerialNum, DocumentDBConfig::SP &, - search::index::Schema::SP &) {} - virtual void removeInvalid() {} - void prune(SerialNum) {} - virtual bool hasValidSerial(SerialNum) const { return true; } - virtual SerialNum getPrevValidSerial(SerialNum) const { return 1; } + search::index::Schema::SP &) override {} + virtual void removeInvalid() override {} + void prune(SerialNum) override {} + virtual bool hasValidSerial(SerialNum) const override { return true; } + virtual SerialNum getPrevValidSerial(SerialNum) const override { return 1; } virtual void saveWipeHistoryConfig(SerialNum, - fastos::TimeStamp) {} - virtual void serializeConfig(SerialNum, vespalib::nbostream &) {} - virtual void deserializeConfig(SerialNum, vespalib::nbostream &) {} + fastos::TimeStamp) override {} + virtual void serializeConfig(SerialNum, vespalib::nbostream &) override {} + virtual void deserializeConfig(SerialNum, vespalib::nbostream &) override {} virtual void setProtonConfig(const ProtonConfigSP &) override { } }; diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index 255dab72d83..bdc0fc5f15c 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -228,7 +228,7 @@ struct MyDocumentStore : public test::DummyDocumentStore _lastSyncToken(0), _compactLidSpaceLidLimit(0) {} - virtual Document::UP read(DocumentIdT lid, const document::DocumentTypeRepo &) const { + virtual Document::UP read(DocumentIdT lid, const document::DocumentTypeRepo &) const override { DocMap::const_iterator itr = _docs.find(lid); if (itr != _docs.end()) { Document::UP retval(itr->second->clone()); @@ -236,18 +236,18 @@ struct MyDocumentStore : public test::DummyDocumentStore } return Document::UP(); } - virtual void write(uint64_t syncToken, const document::Document& doc, DocumentIdT lid) { + virtual void write(uint64_t syncToken, const document::Document& doc, DocumentIdT lid) override { _lastSyncToken = syncToken; _docs[lid] = Document::SP(doc.clone()); } - virtual void remove(uint64_t syncToken, DocumentIdT lid) { + virtual void remove(uint64_t syncToken, DocumentIdT lid) override { _lastSyncToken = syncToken; _docs.erase(lid); } - virtual uint64_t initFlush(uint64_t syncToken) { + virtual uint64_t initFlush(uint64_t syncToken) override { return syncToken; } - virtual uint64_t lastSyncToken() const { return _lastSyncToken; } + virtual uint64_t lastSyncToken() const override { return _lastSyncToken; } virtual void compactLidSpace(uint32_t wantedDocLidLimit) override { _compactLidSpaceLidLimit = wantedDocLidLimit; } @@ -257,7 +257,7 @@ struct MySummaryManager : public test::DummySummaryManager { MyDocumentStore _store; MySummaryManager() : _store() {} - virtual search::IDocumentStore &getBackingStore() { return _store; } + virtual search::IDocumentStore &getBackingStore() override { return _store; } }; struct MySummaryAdapter : public test::MockSummaryAdapter @@ -405,7 +405,7 @@ struct MyTransport : public FeedToken::ITransport virtual void send(mbus::Reply::UP reply, ResultUP result, bool documentWasFound, - double latency_ms) { + double latency_ms) override { (void) reply; (void) documentWasFound, (void) latency_ms; lastResult = std::move(result); _tracer.traceAck(lastResult); @@ -421,7 +421,7 @@ struct MyResultHandler : public IGenericResultHandler { vespalib::Gate _gate; MyResultHandler() : _gate() {} - virtual void handle(const storage::spi::Result &) { + virtual void handle(const storage::spi::Result &) override { _gate.countDown(); } void await() { _gate.await(); } @@ -738,7 +738,7 @@ struct SearchableFeedViewFixture : public FixtureBase { runInMaster([&]() { _lidReuseDelayer.setHasIndexedOrAttributeFields(true); }); } - virtual IFeedView &getFeedView() { return fv; } + virtual IFeedView &getFeedView() override { return fv; } }; struct FastAccessFeedViewFixture : public FixtureBase @@ -757,7 +757,7 @@ struct FastAccessFeedViewFixture : public FixtureBase FastAccessFeedView::Context(aw, _docIdLimit)) { } - virtual IFeedView &getFeedView() { return fv; } + virtual IFeedView &getFeedView() override { return fv; } }; void diff --git a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp index e483bc35b96..19f938188d3 100644 --- a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp +++ b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp @@ -38,7 +38,7 @@ struct MyMaintenanceJob : public IMaintenanceJob void block() { setBlocked(true); } - virtual bool run() { + virtual bool run() override { _runGates[_runIdx++]->await(5000); return _runIdx == _runGates.size(); } diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp index f056dee6927..542b66b3978 100644 --- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp +++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp @@ -42,12 +42,12 @@ struct MyScanIterator : public IDocumentScanIterator LidVector::const_iterator _itr; bool _validItr; MyScanIterator(const LidVector &lids) : _lids(lids), _itr(_lids.begin()), _validItr(true) {} - virtual bool valid() const { + virtual bool valid() const override { return _validItr; } virtual search::DocumentMetaData next(uint32_t compactLidLimit, uint32_t maxDocsToScan, - bool retry) { + bool retry) override { if (!retry && _itr != _lids.begin()) { ++_itr; } @@ -78,29 +78,29 @@ struct MyHandler : public ILidSpaceCompactionHandler MyHandler(); ~MyHandler(); - virtual vespalib::string getName() const { + virtual vespalib::string getName() const override { return "myhandler"; } - virtual uint32_t getSubDbId() const { return 2; } - virtual LidUsageStats getLidStatus() const { + virtual uint32_t getSubDbId() const override { return 2; } + virtual LidUsageStats getLidStatus() const override { ASSERT_TRUE(_handleMoveCnt < _stats.size()); return _stats[_handleMoveCnt]; } - virtual IDocumentScanIterator::UP getIterator() const { + virtual IDocumentScanIterator::UP getIterator() const override { ASSERT_TRUE(_iteratorCnt < _lids.size()); return IDocumentScanIterator::UP(new MyScanIterator(_lids[_iteratorCnt++])); } virtual MoveOperation::UP createMoveOperation(const search::DocumentMetaData &document, - uint32_t moveToLid) const { + uint32_t moveToLid) const override { ASSERT_TRUE(document.lid > moveToLid); _moveFromLid = document.lid; _moveToLid = moveToLid; return MoveOperation::UP(new MoveOperation()); } - virtual void handleMove(const MoveOperation &) { + virtual void handleMove(const MoveOperation &) override { ++_handleMoveCnt; } - virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) { + virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) override { _wantedSubDbId = op.getSubDbId(); _wantedLidLimit = op.getLidLimit(); } @@ -125,7 +125,7 @@ struct MyStorer : public IOperationStorer : _moveCnt(0), _compactCnt(0) {} - virtual void storeOperation(FeedOperation &op) { + virtual void storeOperation(FeedOperation &op) override { if (op.getType() == FeedOperation::MOVE) { ++ _moveCnt; } else if (op.getType() == FeedOperation::COMPACT_LID_SPACE) { @@ -191,7 +191,7 @@ struct MyDocumentStore : public test::DummyDocumentStore mutable uint32_t _readLid; MyDocumentStore() : _readDoc(), _readLid(0) {} virtual document::Document::UP - read(search::DocumentIdT lid, const document::DocumentTypeRepo &) const { + read(search::DocumentIdT lid, const document::DocumentTypeRepo &) const override { _readLid = lid; return Document::UP(_readDoc->clone()); } @@ -201,7 +201,7 @@ struct MySummaryManager : public test::DummySummaryManager { MyDocumentStore _store; MySummaryManager() : _store() {} - virtual search::IDocumentStore &getBackingStore() { return _store; } + virtual search::IDocumentStore &getBackingStore() override { return _store; } }; struct MySubDb : public test::DummyDocumentSubDb @@ -209,7 +209,7 @@ struct MySubDb : public test::DummyDocumentSubDb DocumentTypeRepo::SP _repo; MySubDb(const DocumentTypeRepo::SP &repo, std::shared_ptr<BucketDBOwner> bucketDB); ~MySubDb(); - virtual IFeedView::SP getFeedView() const { + virtual IFeedView::SP getFeedView() const override { return IFeedView::SP(new MyFeedView(_repo)); } }; diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index e062c114ebf..63b23cebb6e 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -139,31 +139,31 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest } virtual const document::DocumentTypeRepo & - getDocumentTypeRepo(void) const + getDocumentTypeRepo(void) const override { abort(); } virtual void getBucketMetaData(const storage::spi::Bucket &, - DocumentMetaData::Vector &) const + DocumentMetaData::Vector &) const override { abort(); } virtual DocumentMetaData - getDocumentMetaData(const DocumentId &) const + getDocumentMetaData(const DocumentId &) const override { return DocumentMetaData(); } virtual Document::UP - getDocument(DocumentIdT lid) const + getDocument(DocumentIdT lid) const override { return _subDB.getDocument(lid); } virtual CachedSelect::SP - parseSelect(const vespalib::string &) const + parseSelect(const vespalib::string &) const override { return CachedSelect::SP(); } @@ -173,7 +173,7 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest struct MyBucketModifiedHandler : public IBucketModifiedHandler { BucketIdVector _modified; - virtual void notifyBucketModified(const BucketId &bucket) { + virtual void notifyBucketModified(const BucketId &bucket) override { BucketIdVector::const_iterator itr = std::find(_modified.begin(), _modified.end(), bucket); _modified.push_back(bucket); } @@ -185,7 +185,7 @@ struct MySessionCachePruner : public ISessionCachePruner { bool isInvoked; MySessionCachePruner() : isInvoked(false) { } - void pruneTimedOutSessions(fastos::TimeStamp current) { + void pruneTimedOutSessions(fastos::TimeStamp current) override { (void) current; isInvoked = true; } @@ -213,16 +213,16 @@ public: isExecutorThread(void); virtual void - handleMove(MoveOperation &op); + handleMove(MoveOperation &op) override; virtual void - performPruneRemovedDocuments(PruneRemovedDocumentsOperation &op); + performPruneRemovedDocuments(PruneRemovedDocumentsOperation &op) override; virtual void - heartBeat(void); + heartBeat(void) override; virtual void - wipeOldRemovedFields(TimeStamp wipeTimeLimit); + wipeOldRemovedFields(TimeStamp wipeTimeLimit) override; void setSubDBs(const std::vector<MyDocumentSubDB *> &subDBs); @@ -235,7 +235,7 @@ public: // Implements IOperationStorer virtual void - storeOperation(FeedOperation &op); + storeOperation(FeedOperation &op) override; uint32_t getHeartBeats(void) @@ -304,7 +304,7 @@ struct MySimpleJob : public IMaintenanceJob { } void block() { setBlocked(true); } - virtual bool run() { + virtual bool run() override { LOG(info, "MySimpleJob::run()"); _latch.countDown(); ++_runCnt; @@ -320,7 +320,7 @@ struct MySplitJob : public MySimpleJob : MySimpleJob(delay, interval, finishCount) { } - virtual bool run() { + virtual bool run() override { LOG(info, "MySplitJob::run()"); _latch.countDown(); ++_runCnt; @@ -339,7 +339,7 @@ struct MyLongRunningJob : public IMaintenanceJob { } void block() { setBlocked(true); } - virtual bool run() { + virtual bool run() override { _firstRun.countDown(); usleep(10000); return false; diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp index fc5d28f1b84..d247c313ad4 100644 --- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp +++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp @@ -76,7 +76,7 @@ public: } virtual bool - operator()(const GlobalId &lhs, const GlobalId &rhs) const + operator()(const GlobalId &lhs, const GlobalId &rhs) const override { return _comp(rhs, lhs); } diff --git a/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp b/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp index 72098a94ad4..86bbf2ba94a 100644 --- a/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp +++ b/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp @@ -66,7 +66,7 @@ class Test : public vespalib::TestApp { const string &term, uint32_t doc_id); public: - int Main(); + int Main() override; }; #define TEST_CALL(func) \ diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp index 88cace47390..f7832d7e4dc 100644 --- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp +++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp @@ -55,8 +55,8 @@ namespace { struct MyStreamHandler : NewConfigOperation::IStreamHandler { typedef NewConfigOperation::SerialNum SerialNum; - virtual void serializeConfig(SerialNum, vespalib::nbostream &) {} - virtual void deserializeConfig(SerialNum, vespalib::nbostream &) {} + virtual void serializeConfig(SerialNum, vespalib::nbostream &) override {} + virtual void deserializeConfig(SerialNum, vespalib::nbostream &) override {} }; diff --git a/searchcore/src/tests/proton/feedtoken/feedtoken.cpp b/searchcore/src/tests/proton/feedtoken/feedtoken.cpp index 074c9284c06..07ff79c1c09 100644 --- a/searchcore/src/tests/proton/feedtoken/feedtoken.cpp +++ b/searchcore/src/tests/proton/feedtoken/feedtoken.cpp @@ -21,7 +21,7 @@ public: // empty } - void send(mbus::Reply::UP reply, ResultUP, bool, double latency_ms) { + void send(mbus::Reply::UP reply, ResultUP, bool, double latency_ms) override { _receptor.handleReply(std::move(reply)); _latency_ms = latency_ms; } @@ -45,7 +45,7 @@ private: void testTrace(); public: - int Main() { + int Main() override { TEST_INIT("feedtoken_test"); testAck(); TEST_FLUSH(); diff --git a/searchcore/src/tests/proton/flushengine/flushengine.cpp b/searchcore/src/tests/proton/flushengine/flushengine.cpp index d7c528a3402..681501c9796 100644 --- a/searchcore/src/tests/proton/flushengine/flushengine.cpp +++ b/searchcore/src/tests/proton/flushengine/flushengine.cpp @@ -46,7 +46,7 @@ public: } Task::UP - execute(Task::UP task) + execute(Task::UP task) override { task->run(); _done.countDown(); @@ -222,7 +222,7 @@ public: // empty } - void run() { + void run() override { _start.countDown(); if (_proceed != NULL) { _proceed->await(); @@ -232,7 +232,7 @@ public: } virtual search::SerialNum - getFlushSerial(void) const + getFlushSerial(void) const override { return 0u; } @@ -318,7 +318,7 @@ public: } virtual MemoryGain - getApproxMemoryGain() const + getApproxMemoryGain() const override { LOG_ASSERT(_mgain == false); _mgain = true; @@ -326,7 +326,7 @@ public: } virtual search::SerialNum - getFlushedSerialNum() const + getFlushedSerialNum() const override { LOG_ASSERT(_serial == false); _serial = true; @@ -415,12 +415,12 @@ public: _done(done), _name(name) { } - void run() { + void run() override { _list.push_back(_name); _done.countDown(); } virtual search::SerialNum - getFlushSerial(void) const + getFlushSerial(void) const override { return 0u; } diff --git a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp index e462ba17dba..594b718296c 100644 --- a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp +++ b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp @@ -25,7 +25,7 @@ class Test : public vespalib::TestApp { void requireThatRemoveDontTouchNewIndexes(); public: - int Main(); + int Main() override; }; const string index_dir = "test_data"; diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp index b29e742371c..53db6f44c91 100644 --- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp +++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp @@ -98,7 +98,7 @@ public: _threadingService) { } - int Main(); + int Main() override; }; int diff --git a/searchcore/src/tests/proton/index/indexcollection_test.cpp b/searchcore/src/tests/proton/index/indexcollection_test.cpp index 1b1bfb72cdb..b6c98e1631e 100644 --- a/searchcore/src/tests/proton/index/indexcollection_test.cpp +++ b/searchcore/src/tests/proton/index/indexcollection_test.cpp @@ -34,7 +34,7 @@ class Test : public vespalib::TestApp, void requireThatSearchablesCanBeReplaced(IndexCollection::UP fsc); void requireThatReplaceAndRenumberUpdatesCollectionAfterFusion(); IndexCollection::UP createWarmup(const IndexCollection::SP & prev, const IndexCollection::SP & next); - virtual void warmupDone(ISearchableIndexCollection::SP current) { + virtual void warmupDone(ISearchableIndexCollection::SP current) override { (void) current; } @@ -47,7 +47,7 @@ public: _warmup(new FakeIndexSearchable) {} - int Main(); + int Main() override; }; diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp index 791e8c2619c..618467fd966 100644 --- a/searchcore/src/tests/proton/index/indexmanager_test.cpp +++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp @@ -64,7 +64,7 @@ namespace { class IndexManagerDummyReconfigurer : public searchcorespi::IIndexManager::Reconfigurer { virtual bool - reconfigure(vespalib::Closure0<bool>::UP closure) + reconfigure(vespalib::Closure0<bool>::UP closure) override { bool ret = true; if (closure.get() != NULL) diff --git a/searchcore/src/tests/proton/initializer/task_runner_test.cpp b/searchcore/src/tests/proton/initializer/task_runner_test.cpp index ef18130c1a8..8167d9f5242 100644 --- a/searchcore/src/tests/proton/initializer/task_runner_test.cpp +++ b/searchcore/src/tests/proton/initializer/task_runner_test.cpp @@ -44,7 +44,7 @@ public: { } - virtual void run() { _log.append(_name); } + virtual void run() override { _log.append(_name); } }; diff --git a/searchcore/src/tests/proton/matchengine/matchengine.cpp b/searchcore/src/tests/proton/matchengine/matchengine.cpp index b739e9954aa..e03f283d758 100644 --- a/searchcore/src/tests/proton/matchengine/matchengine.cpp +++ b/searchcore/src/tests/proton/matchengine/matchengine.cpp @@ -19,14 +19,14 @@ public: const std::string & name = "my", const std::string & reply = "myreply") : _numHits(numHits), _name(name), _reply(reply) {} - virtual DocsumReply::UP getDocsums(const DocsumRequest &) { + virtual DocsumReply::UP getDocsums(const DocsumRequest &) override { return DocsumReply::UP(new DocsumReply); } virtual search::engine::SearchReply::UP match( const ISearchHandler::SP &, const search::engine::SearchRequest &, - vespalib::ThreadBundle &) const { + vespalib::ThreadBundle &) const override { SearchReply::UP retval(new SearchReply); for (size_t i = 0; i < _numHits; ++i) { retval->hits.push_back(SearchReply::Hit()); @@ -43,7 +43,7 @@ private: public: LocalSearchClient(); ~LocalSearchClient(); - void searchDone(SearchReply::UP reply) { + void searchDone(SearchReply::UP reply) override { vespalib::MonitorGuard guard(_monitor); _reply = std::move(reply); guard.broadcast(); @@ -122,7 +122,7 @@ struct ObserveBundleMatchHandler : MySearchHandler { virtual search::engine::SearchReply::UP match( const ISearchHandler::SP &, const search::engine::SearchRequest &, - vespalib::ThreadBundle &threadBundle) const + vespalib::ThreadBundle &threadBundle) const override { bundleSize = threadBundle.size(); return SearchReply::UP(new SearchReply); diff --git a/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp b/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp index f7bf6b44b00..7ddee5d4490 100644 --- a/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp +++ b/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp @@ -204,7 +204,7 @@ struct RangeChecker : vespalib::Rendezvous<WorkTracker,bool> { size_t docid_limit; RangeChecker(size_t num_threads, size_t docid_limit_in) : vespalib::Rendezvous<WorkTracker,bool>(num_threads), docid_limit(docid_limit_in) {} - virtual void mingle() { + virtual void mingle() override { std::vector<DocidRange> ranges; for (size_t i = 0; i < size(); ++i) { ranges.insert(ranges.end(), in(i).ranges.begin(), in(i).ranges.end()); diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp index d745f0dd7c9..fc3184623da 100644 --- a/searchcore/src/tests/proton/matching/matching_test.cpp +++ b/searchcore/src/tests/proton/matching/matching_test.cpp @@ -80,15 +80,15 @@ public: return _vectors.find(name)->second; } virtual const IAttributeVector * - getAttribute(const string &name) const { + getAttribute(const string &name) const override { return get(name); } virtual const IAttributeVector * - getAttributeStableEnum(const string &name) const { + getAttributeStableEnum(const string &name) const override { return get(name); } virtual void - getAttributeList(std::vector<const IAttributeVector *> & list) const { + getAttributeList(std::vector<const IAttributeVector *> & list) const override { Map::const_iterator pos = _vectors.begin(); Map::const_iterator end = _vectors.end(); for (; pos != end; ++pos) { @@ -277,11 +277,11 @@ struct MyWorld { MySearchHandler(Matcher::SP matcher) : _matcher(matcher) {} - virtual DocsumReply::UP getDocsums(const DocsumRequest &) + virtual DocsumReply::UP getDocsums(const DocsumRequest &) override { return DocsumReply::UP(); } virtual SearchReply::UP match(const ISearchHandler::SP &, const SearchRequest &, - vespalib::ThreadBundle &) const + vespalib::ThreadBundle &) const override { return SearchReply::UP(); } }; diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp index 1426a2d85af..12e6ceaddab 100644 --- a/searchcore/src/tests/proton/matching/query_test.cpp +++ b/searchcore/src/tests/proton/matching/query_test.cpp @@ -107,7 +107,7 @@ class Test : public vespalib::TestApp { void requireThatBlackListBlueprintCanBeUsed(); public: - int Main(); + int Main() override; }; #define TEST_CALL(func) \ @@ -225,19 +225,19 @@ public: EXPECT_EQUAL((double)estimatedHitCount / doc_count, n.field(0).getDocFreq()); } - virtual void visit(ProtonNumberTerm &n) { checkNode(n, 1, false); } - virtual void visit(ProtonLocationTerm &n) { checkNode(n, 0, true); } - virtual void visit(ProtonPrefixTerm &n) { checkNode(n, 1, false); } - virtual void visit(ProtonRangeTerm &n) { checkNode(n, 2, false); } - virtual void visit(ProtonStringTerm &n) { checkNode(n, 2, false); } - virtual void visit(ProtonSubstringTerm &n) { checkNode(n, 0, true); } - virtual void visit(ProtonSuffixTerm &n) { checkNode(n, 2, false); } - virtual void visit(ProtonPhrase &n) { checkNode(n, 0, true); } - virtual void visit(ProtonWeightedSetTerm &) {} - virtual void visit(ProtonDotProduct &) {} - virtual void visit(ProtonWandTerm &) {} - virtual void visit(ProtonPredicateQuery &) {} - virtual void visit(ProtonRegExpTerm &) {} + virtual void visit(ProtonNumberTerm &n) override { checkNode(n, 1, false); } + virtual void visit(ProtonLocationTerm &n) override { checkNode(n, 0, true); } + virtual void visit(ProtonPrefixTerm &n) override { checkNode(n, 1, false); } + virtual void visit(ProtonRangeTerm &n) override { checkNode(n, 2, false); } + virtual void visit(ProtonStringTerm &n) override { checkNode(n, 2, false); } + virtual void visit(ProtonSubstringTerm &n) override { checkNode(n, 0, true); } + virtual void visit(ProtonSuffixTerm &n) override { checkNode(n, 2, false); } + virtual void visit(ProtonPhrase &n) override { checkNode(n, 0, true); } + virtual void visit(ProtonWeightedSetTerm &) override {} + virtual void visit(ProtonDotProduct &) override {} + virtual void visit(ProtonWandTerm &) override {} + virtual void visit(ProtonPredicateQuery &) override {} + virtual void visit(ProtonRegExpTerm &) override {} }; void Test::requireThatTermsAreLookedUp() { @@ -357,12 +357,12 @@ class SetUpTermDataTestCheckerVisitor int Main() { return 0; } public: - virtual void visit(ProtonNumberTerm &) {} - virtual void visit(ProtonLocationTerm &) {} - virtual void visit(ProtonPrefixTerm &) {} - virtual void visit(ProtonRangeTerm &) {} + virtual void visit(ProtonNumberTerm &) override {} + virtual void visit(ProtonLocationTerm &) override {} + virtual void visit(ProtonPrefixTerm &) override {} + virtual void visit(ProtonRangeTerm &) override {} - virtual void visit(ProtonStringTerm &n) { + virtual void visit(ProtonStringTerm &n) override { const ITermData &term_data = n; EXPECT_EQUAL(string_weight.percent(), term_data.getWeight().percent()); @@ -378,17 +378,17 @@ public: } } - virtual void visit(ProtonSubstringTerm &) {} - virtual void visit(ProtonSuffixTerm &) {} - virtual void visit(ProtonPhrase &n) { + virtual void visit(ProtonSubstringTerm &) override {} + virtual void visit(ProtonSuffixTerm &) override {} + virtual void visit(ProtonPhrase &n) override { const ITermData &term_data = n; EXPECT_EQUAL(2u, term_data.getPhraseLength()); } - virtual void visit(ProtonWeightedSetTerm &) {} - virtual void visit(ProtonDotProduct &) {} - virtual void visit(ProtonWandTerm &) {} - virtual void visit(ProtonPredicateQuery &) {} - virtual void visit(ProtonRegExpTerm &) {} + virtual void visit(ProtonWeightedSetTerm &) override {} + virtual void visit(ProtonDotProduct &) override {} + virtual void visit(ProtonWandTerm &) override {} + virtual void visit(ProtonPredicateQuery &) override {} + virtual void visit(ProtonRegExpTerm &) override {} }; void Test::requireThatTermDataIsFilledIn() { diff --git a/searchcore/src/tests/proton/matching/termdataextractor_test.cpp b/searchcore/src/tests/proton/matching/termdataextractor_test.cpp index 502553bfa69..43f0823d89f 100644 --- a/searchcore/src/tests/proton/matching/termdataextractor_test.cpp +++ b/searchcore/src/tests/proton/matching/termdataextractor_test.cpp @@ -47,7 +47,7 @@ class Test : public vespalib::TestApp { void requireThatNegativeTermsAreSkipped(); public: - int Main(); + int Main() override; }; int diff --git a/searchcore/src/tests/proton/metrics/job_tracked_flush/job_tracked_flush_test.cpp b/searchcore/src/tests/proton/metrics/job_tracked_flush/job_tracked_flush_test.cpp index cf35ba0b505..edff0c4e2e4 100644 --- a/searchcore/src/tests/proton/metrics/job_tracked_flush/job_tracked_flush_test.cpp +++ b/searchcore/src/tests/proton/metrics/job_tracked_flush/job_tracked_flush_test.cpp @@ -28,10 +28,10 @@ struct MyFlushTask : public searchcorespi::FlushTask MyFlushTask(Gate &execGate) : _execGate(execGate) {} // Implements searchcorespi::FlushTask - virtual void run() { + virtual void run() override { _execGate.await(5000); } - virtual search::SerialNum getFlushSerial() const { return 5; } + virtual search::SerialNum getFlushSerial() const override { return 5; } }; struct MyFlushTarget : public test::DummyFlushTarget @@ -48,7 +48,7 @@ struct MyFlushTarget : public test::DummyFlushTarget {} // Implements searchcorespi::IFlushTarget - virtual FlushTask::UP initFlush(SerialNum currentSerial) { + virtual FlushTask::UP initFlush(SerialNum currentSerial) override { if (currentSerial > 0) { _initFlushSerial = currentSerial; _initGate.await(5000); diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp index 115394f61c8..07a86c0ccd2 100644 --- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp +++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp @@ -119,16 +119,16 @@ struct MyDocumentRetriever : DocumentRetrieverBaseForTest { MyDocumentRetriever(const Document *d, Timestamp ts, DocumentId &last_id) : repo(), document(d), timestamp(ts), last_doc_id(last_id) {} - virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const { + virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const override { return repo; } virtual void getBucketMetaData(const storage::spi::Bucket &, - search::DocumentMetaData::Vector &v) const { + search::DocumentMetaData::Vector &v) const override { if (document != 0) { v.push_back(getDocumentMetaData(document->getId())); } } - virtual DocumentMetaData getDocumentMetaData(const DocumentId &id) const { + virtual DocumentMetaData getDocumentMetaData(const DocumentId &id) const override { last_doc_id = id; if (document != 0) { return DocumentMetaData(1, timestamp, document::BucketId(1), @@ -136,7 +136,7 @@ struct MyDocumentRetriever : DocumentRetrieverBaseForTest { } return DocumentMetaData(); } - virtual document::Document::UP getDocument(search::DocumentIdT) const { + virtual document::Document::UP getDocument(search::DocumentIdT) const override { if (document != 0) { return Document::UP(document->clone()); } @@ -144,7 +144,7 @@ struct MyDocumentRetriever : DocumentRetrieverBaseForTest { } virtual CachedSelect::SP - parseSelect(const vespalib::string &) const + parseSelect(const vespalib::string &) const override { return CachedSelect::SP(); } @@ -206,66 +206,66 @@ struct MyHandler : public IPersistenceHandler, IBucketFreezer { token.ack(); } - virtual void initialize() { initialized = true; } + virtual void initialize() override { initialized = true; } virtual void handlePut(FeedToken token, const Bucket& bucket, - Timestamp timestamp, const document::Document::SP& doc) { + Timestamp timestamp, const document::Document::SP& doc) override { token.setResult(ResultUP(new storage::spi::Result()), false); handle(token, bucket, timestamp, doc->getId()); } virtual void handleUpdate(FeedToken token, const Bucket& bucket, - Timestamp timestamp, const document::DocumentUpdate::SP& upd) { + Timestamp timestamp, const document::DocumentUpdate::SP& upd) override { token.setResult(ResultUP(new storage::spi::UpdateResult(existingTimestamp)), existingTimestamp > 0); handle(token, bucket, timestamp, upd->getId()); } virtual void handleRemove(FeedToken token, const Bucket& bucket, - Timestamp timestamp, const DocumentId& id) { + Timestamp timestamp, const DocumentId& id) override { bool wasFound = existingTimestamp > 0; token.setResult(ResultUP(new storage::spi::RemoveResult(wasFound)), wasFound); handle(token, bucket, timestamp, id); } - virtual void handleListBuckets(IBucketIdListResultHandler &resultHandler) { + virtual void handleListBuckets(IBucketIdListResultHandler &resultHandler) override { resultHandler.handle(BucketIdListResult(bucketList)); } virtual void handleSetClusterState(const ClusterState &calc, - IGenericResultHandler &resultHandler) { + IGenericResultHandler &resultHandler) override { lastCalc = &calc; resultHandler.handle(Result()); } virtual void handleSetActiveState(const Bucket &bucket, storage::spi::BucketInfo::ActiveState newState, - IGenericResultHandler &resultHandler) { + IGenericResultHandler &resultHandler) override { lastBucket = bucket; lastBucketState = newState; resultHandler.handle(bucketStateResult); } virtual void handleGetBucketInfo(const Bucket &, - IBucketInfoResultHandler &resultHandler) { + IBucketInfoResultHandler &resultHandler) override { resultHandler.handle(BucketInfoResult(bucketInfo)); } virtual void handleCreateBucket(FeedToken token, - const storage::spi::Bucket &) + const storage::spi::Bucket &) override { token.setResult(ResultUP(new Result(_createBucketResult)), true); token.ack(); } virtual void handleDeleteBucket(FeedToken token, - const storage::spi::Bucket &) { + const storage::spi::Bucket &) override { token.setResult(ResultUP(new Result(deleteBucketResult)), true); token.ack(); } - virtual void handleGetModifiedBuckets(IBucketIdListResultHandler &resultHandler) { + virtual void handleGetModifiedBuckets(IBucketIdListResultHandler &resultHandler) override { resultHandler.handle(BucketIdListResult(modBucketList)); } @@ -273,7 +273,7 @@ struct MyHandler : public IPersistenceHandler, IBucketFreezer { handleSplit(FeedToken token, const storage::spi::Bucket &source, const storage::spi::Bucket &target1, - const storage::spi::Bucket &target2) + const storage::spi::Bucket &target2) override { (void) source; (void) target1; @@ -397,7 +397,7 @@ Selection selection(doc_sel); class SimplePersistenceEngineOwner : public IPersistenceEngineOwner { virtual void - setClusterState(const storage::spi::ClusterState &calc) + setClusterState(const storage::spi::ClusterState &calc) override { (void) calc; } diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp index 651cd30ce68..7cae854674d 100644 --- a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp +++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp @@ -61,7 +61,7 @@ struct MyGidToLidMapperFactory : public search::IGidToLidMapperFactory _map.insert({toGid(doc2), 17}); } - virtual std::unique_ptr<search::IGidToLidMapper> getMapper() const { + virtual std::unique_ptr<search::IGidToLidMapper> getMapper() const override { return std::make_unique<MyGidToLidMapper>(_map); } }; diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp index 2604c20cf68..aeb6d9a3587 100644 --- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp +++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp @@ -37,10 +37,10 @@ struct MyReprocessingHandler : public IReprocessingHandler IReprocessingReader::SP _reader; std::vector<IReprocessingRewriter::SP> _rewriters; MyReprocessingHandler() : _reader(), _rewriters() {} - virtual void addReader(const IReprocessingReader::SP &reader) { + virtual void addReader(const IReprocessingReader::SP &reader) override { _reader = reader; } - virtual void addRewriter(const IReprocessingRewriter::SP &rewriter) { + virtual void addRewriter(const IReprocessingRewriter::SP &rewriter) override { _rewriters.push_back(rewriter); } }; @@ -99,7 +99,7 @@ struct MyDocTypeInspector : public IDocumentTypeInspector _newCfg(newCfg) { } - virtual bool hasUnchangedField(const vespalib::string &name) const { + virtual bool hasUnchangedField(const vespalib::string &name) const override { return _oldCfg._fields.count(name) > 0 && _newCfg._fields.count(name) > 0; } diff --git a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/document_reprocessing_handler_test.cpp b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/document_reprocessing_handler_test.cpp index 1848ad8fc74..fb1434d4a0c 100644 --- a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/document_reprocessing_handler_test.cpp +++ b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/document_reprocessing_handler_test.cpp @@ -19,11 +19,10 @@ struct MyProcessor : public ReprocessingType DocumentId _docId; MyProcessor() : _lid(0), _docId() {} - virtual void handleExisting(uint32_t lid, DocumentType doc) { + virtual void handleExisting(uint32_t lid, DocumentType doc) override { _lid = lid; _docId = doc.getId(); } - virtual void done() { } }; typedef MyProcessor<IReprocessingReader, const Document &> MyReader; diff --git a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp index c4c462ecfa1..4d9cbd307ba 100644 --- a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp +++ b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp @@ -44,7 +44,7 @@ struct MyTask : public IReprocessingTask } virtual void - run() + run() override { ASSERT_EQUAL(_initProgress, _runner.getProgress()); _myProgress = 0.5; @@ -54,7 +54,7 @@ struct MyTask : public IReprocessingTask } virtual Progress - getProgress(void) const + getProgress(void) const override { return Progress(_myProgress, _weight); } diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp index 527e5eedbc4..9f8f7fd9e4a 100644 --- a/searchcore/src/tests/proton/server/feedstates_test.cpp +++ b/searchcore/src/tests/proton/server/feedstates_test.cpp @@ -41,9 +41,9 @@ struct MyFeedView : public test::DummyFeedView { MyFeedView(); ~MyFeedView(); - virtual const DocumentTypeRepo::SP &getDocumentTypeRepo() const + virtual const DocumentTypeRepo::SP &getDocumentTypeRepo() const override { return repo_sp; } - virtual void handleRemove(FeedToken *, const RemoveOperation &) + virtual void handleRemove(FeedToken *, const RemoveOperation &) override { ++remove_handled; } }; @@ -51,12 +51,12 @@ MyFeedView::MyFeedView() : repo_sp(repo.getTypeRepoSp()), remove_handled(0) {} MyFeedView::~MyFeedView() {} struct MyReplayConfig : IReplayConfig { - virtual void replayConfig(SerialNum) {} - virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) {} + virtual void replayConfig(SerialNum) override {} + virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) override {} }; struct InstantExecutor : vespalib::Executor { - virtual Task::UP execute(Task::UP task) { + virtual Task::UP execute(Task::UP task) override { task->run(); return Task::UP(); } diff --git a/searchcore/src/tests/proton/server/health_adapter/health_adapter_test.cpp b/searchcore/src/tests/proton/server/health_adapter/health_adapter_test.cpp index 1957d8fbf33..866ba2c77c0 100644 --- a/searchcore/src/tests/proton/server/health_adapter/health_adapter_test.cpp +++ b/searchcore/src/tests/proton/server/health_adapter/health_adapter_test.cpp @@ -14,7 +14,7 @@ struct MyStatusProducer : public StatusProducer { list.push_back(StatusReport::SP(new StatusReport(StatusReport::Params(comp). state(state).message(msg)))); } - virtual StatusReport::List getStatusReports() const { + virtual StatusReport::List getStatusReports() const override { return list; } }; diff --git a/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp b/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp index 513ad5a03dd..a696855dd72 100644 --- a/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp +++ b/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp @@ -11,7 +11,7 @@ using namespace proton; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; }; int diff --git a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp index a3e5e478c4c..74e43fd4c9c 100644 --- a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp +++ b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp @@ -25,14 +25,14 @@ class MyFlushHandler : public IFlushHandler { public: MyFlushHandler(const vespalib::string &name) : IFlushHandler(name) {} // Implements IFlushHandler - virtual std::vector<IFlushTarget::SP> getFlushTargets() { + virtual std::vector<IFlushTarget::SP> getFlushTargets() override { return std::vector<IFlushTarget::SP>(); } - virtual SerialNum getCurrentSerialNumber() const { return 0; } - virtual void flushDone(SerialNum oldestSerial) { (void) oldestSerial; } + virtual SerialNum getCurrentSerialNumber() const override { return 0; } + virtual void flushDone(SerialNum oldestSerial) override { (void) oldestSerial; } virtual void - syncTls(search::SerialNum syncTo) + syncTls(search::SerialNum syncTo) override { (void) syncTo; } diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp index d618bb65f84..dae8cce36e4 100644 --- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp +++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp @@ -38,7 +38,7 @@ public: MySearchHandler(const std::string & name = "my", const stringref & reply = MYREPLY) : _name(name), _reply(reply) {} - virtual DocsumReply::UP getDocsums(const DocsumRequest & request) { + virtual DocsumReply::UP getDocsums(const DocsumRequest & request) override { return (request.useRootSlime()) ? std::make_unique<DocsumReply>(createSlimeReply(request.hits.size())) : createOldDocSum(request); @@ -71,7 +71,7 @@ public: virtual search::engine::SearchReply::UP match( const ISearchHandler::SP &, const search::engine::SearchRequest &, - vespalib::ThreadBundle &) const { + vespalib::ThreadBundle &) const override { return SearchReply::UP(new SearchReply); } }; @@ -84,7 +84,7 @@ private: public: MyDocsumClient(); ~MyDocsumClient(); - void getDocsumsDone(DocsumReply::UP reply) { + void getDocsumsDone(DocsumReply::UP reply) override { vespalib::MonitorGuard guard(_monitor); _reply = std::move(reply); guard.broadcast(); @@ -116,7 +116,7 @@ private: void requireThatSlimeInterfaceWorksFine(); void requireThatRPCInterfaceWorks(); public: - int Main(); + int Main() override; }; DocsumRequest::UP diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/search.h b/searchcore/src/vespa/searchcore/fdispatch/common/search.h index b823dfdf31a..52c30b7a9d7 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/common/search.h +++ b/searchcore/src/vespa/searchcore/fdispatch/common/search.h @@ -274,30 +274,30 @@ public: } - virtual uint32_t GetDataSetID() + virtual uint32_t GetDataSetID() override { return _dataSetID; } - virtual FastS_SearchInfo *GetSearchInfo() + virtual FastS_SearchInfo *GetSearchInfo() override { return &_searchInfo; } - virtual RetCode setSearchRequest(const search::engine::SearchRequest * request) + virtual RetCode setSearchRequest(const search::engine::SearchRequest * request) override { _queryArgs = request; return RET_OK; } - virtual RetCode SetGetDocsumArgs(search::docsummary::GetDocsumArgs *docsumArgs) + virtual RetCode SetGetDocsumArgs(search::docsummary::GetDocsumArgs *docsumArgs) override { _docsumArgs = docsumArgs; return RET_OK; } virtual RetCode Search(uint32_t searchOffset, - uint32_t maxhits, uint32_t minhits = 0) + uint32_t maxhits, uint32_t minhits = 0) override { (void) minhits; _searchInfo._searchOffset = searchOffset; @@ -305,50 +305,50 @@ public: return RET_OK; } - virtual RetCode ProcessQueryDone() + virtual RetCode ProcessQueryDone() override { return RET_OK; } - virtual FastS_QueryResult *GetQueryResult() + virtual FastS_QueryResult *GetQueryResult() override { return &_queryResult; } - virtual RetCode GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) + virtual RetCode GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) override { (void) hits; (void) hitcnt; return RET_OK; } - virtual RetCode ProcessDocsumsDone() + virtual RetCode ProcessDocsumsDone() override { return RET_OK; } - virtual FastS_DocsumsResult *GetDocsumsResult() + virtual FastS_DocsumsResult *GetDocsumsResult() override { return &_docsumsResult; } - virtual search::engine::ErrorCode GetErrorCode() + virtual search::engine::ErrorCode GetErrorCode() override { return _errorCode; } - virtual const char *GetErrorMessage() + virtual const char *GetErrorMessage() override { if (_errorMessage != NULL) return _errorMessage; return search::engine::getStringFromErrorCode(_errorCode); } - virtual void Interrupt() + virtual void Interrupt() override { } - virtual void Free() + virtual void Free() override { delete this; } @@ -373,10 +373,10 @@ public: } virtual ~FastS_FailedSearch() {} - virtual bool IsAsync() { return _async; } + virtual bool IsAsync() override { return _async; } virtual RetCode SetAsyncArgs(FastS_ISearchOwner *owner, - FastS_SearchContext context) + FastS_SearchContext context) override { (void) owner; (void) context; @@ -392,10 +392,10 @@ public: FastS_SyncSearch(uint32_t dataSetID) : FastS_SearchBase(dataSetID) {} - bool IsAsync() { return false; } + bool IsAsync() override { return false; } virtual RetCode SetAsyncArgs(FastS_ISearchOwner *, - FastS_SearchContext) + FastS_SearchContext) override { return RET_ERROR; } @@ -419,10 +419,10 @@ public: _searchOwner(NULL), _searchContext(FastS_SearchContext()) {} - bool IsAsync() { return true; } + bool IsAsync() override { return true; } virtual RetCode SetAsyncArgs(FastS_ISearchOwner *owner, - FastS_SearchContext context) + FastS_SearchContext context) override { _searchOwner = owner; _searchContext = context; @@ -445,24 +445,24 @@ public: explicit FastS_SearchAdapter(FastS_ISearch *search); virtual ~FastS_SearchAdapter(); - virtual bool IsAsync(); - virtual uint32_t GetDataSetID(); - virtual FastS_SearchInfo *GetSearchInfo(); + virtual bool IsAsync() override; + virtual uint32_t GetDataSetID() override; + virtual FastS_SearchInfo *GetSearchInfo() override; virtual RetCode SetAsyncArgs(FastS_ISearchOwner *owner, - FastS_SearchContext context); - virtual RetCode setSearchRequest(const search::engine::SearchRequest * request); - virtual RetCode SetGetDocsumArgs(search::docsummary::GetDocsumArgs *docsumArgs); + FastS_SearchContext context) override; + virtual RetCode setSearchRequest(const search::engine::SearchRequest * request) override; + virtual RetCode SetGetDocsumArgs(search::docsummary::GetDocsumArgs *docsumArgs) override; virtual RetCode Search(uint32_t searchOffset, - uint32_t maxhits, uint32_t minhits = 0); - virtual RetCode ProcessQueryDone(); - virtual FastS_QueryResult *GetQueryResult(); - virtual RetCode GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt); - virtual RetCode ProcessDocsumsDone(); - virtual FastS_DocsumsResult *GetDocsumsResult(); - virtual search::engine::ErrorCode GetErrorCode(); - virtual const char *GetErrorMessage(); - virtual void Interrupt(); - virtual void Free(); + uint32_t maxhits, uint32_t minhits = 0) override; + virtual RetCode ProcessQueryDone() override; + virtual FastS_QueryResult *GetQueryResult() override; + virtual RetCode GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) override; + virtual RetCode ProcessDocsumsDone() override; + virtual FastS_DocsumsResult *GetDocsumsResult() override; + virtual search::engine::ErrorCode GetErrorCode() override; + virtual const char *GetErrorMessage() override; + virtual void Interrupt() override; + virtual void Free() override; }; //---------------------------------------------------------------- @@ -490,18 +490,18 @@ public: void Wait() { _cond.Wait(); } void Signal() { _cond.Signal(); } - virtual void DoneQuery(FastS_ISearch *, FastS_SearchContext); - virtual void DoneDocsums(FastS_ISearch *, FastS_SearchContext); + virtual void DoneQuery(FastS_ISearch *, FastS_SearchContext) override; + virtual void DoneDocsums(FastS_ISearch *, FastS_SearchContext) override; void WaitQueryDone(); void WaitDocsumsDone(); - virtual bool IsAsync(); + virtual bool IsAsync() override; virtual RetCode SetAsyncArgs(FastS_ISearchOwner *owner, - FastS_SearchContext context); + FastS_SearchContext context) override; virtual RetCode Search(uint32_t searchOffset, - uint32_t maxhits, uint32_t minhits = 0); - virtual RetCode GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt); + uint32_t maxhits, uint32_t minhits = 0) override; + virtual RetCode GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) override; }; //---------------------------------------------------------------- diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/docsumadapter.h b/searchcore/src/vespa/searchcore/fdispatch/program/docsumadapter.h index a168ca1e5a1..f36480587f5 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/program/docsumadapter.h +++ b/searchcore/src/vespa/searchcore/fdispatch/program/docsumadapter.h @@ -39,7 +39,7 @@ private: void writeLog(); void cleanup(); - virtual void Run(FastOS_ThreadInterface *, void *); + virtual void Run(FastOS_ThreadInterface *, void *) override; public: DocsumAdapter(FastS_AppContext *appCtx, diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/engineadapter.h b/searchcore/src/vespa/searchcore/fdispatch/program/engineadapter.h index 2667664a7db..d081e2f662b 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/program/engineadapter.h +++ b/searchcore/src/vespa/searchcore/fdispatch/program/engineadapter.h @@ -38,9 +38,9 @@ public: EngineAdapter(FastS_AppContext *appCtx, FastOS_ThreadPool *threadPool); - 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; }; } // namespace fdispatch diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h index fd13188b540..00c10d5cfa9 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h +++ b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.h @@ -35,7 +35,7 @@ private: FastS_FNETAdapter &self; MyTask(FNET_Scheduler *scheduler, FastS_FNETAdapter &self_in) : FNET_Task(scheduler), self(self_in) {} - virtual void PerformTask() { + virtual void PerformTask() override { self.perform(); ScheduleNow(); } @@ -88,16 +88,16 @@ private: unsigned int _checkLimit; int _healthPort; std::atomic<bool> _needRestart; - void configure(std::unique_ptr<FdispatchrcConfig> cfg); + void configure(std::unique_ptr<FdispatchrcConfig> cfg) override; public: // Implements FastS_AppContext - virtual FNET_Transport *GetFNETTransport(); - virtual FNET_Scheduler *GetFNETScheduler(); - virtual FastS_NodeManager *GetNodeManager(); - virtual FastS_DataSetCollection *GetDataSetCollection(); - virtual FastOS_ThreadPool *GetThreadPool(); - virtual void logPerformance(); - virtual uint32_t getDispatchLevel(); + virtual FNET_Transport *GetFNETTransport() override; + virtual FNET_Scheduler *GetFNETScheduler() override; + virtual FastS_NodeManager *GetNodeManager() override; + virtual FastS_DataSetCollection *GetDataSetCollection() override; + virtual FastOS_ThreadPool *GetThreadPool() override; + virtual void logPerformance() override; + virtual uint32_t getDispatchLevel() override; bool CheckTempFail(void); bool Failed(void); bool Init(void); diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/rpc.h b/searchcore/src/vespa/searchcore/fdispatch/program/rpc.h index 341e9765d10..dad78a00b13 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/program/rpc.h +++ b/searchcore/src/vespa/searchcore/fdispatch/program/rpc.h @@ -17,11 +17,11 @@ public: // Register RPC Methods - virtual void RegisterMethods(FRT_ReflectionBuilder *rb); + virtual void RegisterMethods(FRT_ReflectionBuilder *rb) override; // methods registered by superclass - virtual void RPC_GetNodeType(FRT_RPCRequest *req); + virtual void RPC_GetNodeType(FRT_RPCRequest *req) override; // methods registered by us diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/searchadapter.h b/searchcore/src/vespa/searchcore/fdispatch/program/searchadapter.h index 62667f1cb14..bcbe0c5e75c 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/program/searchadapter.h +++ b/searchcore/src/vespa/searchcore/fdispatch/program/searchadapter.h @@ -35,7 +35,7 @@ private: void writeLog(); void cleanup(); - virtual void Run(FastOS_ThreadInterface *, void *); + virtual void Run(FastOS_ThreadInterface *, void *) override; public: SearchAdapter(FastS_AppContext *appCtx, diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_dataset.h b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_dataset.h index 9f55f336f43..7f5fbd50298 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_dataset.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_dataset.h @@ -36,7 +36,7 @@ public: _dataset(dataset), _delay(delay) {} - void PerformTask(); + void PerformTask() override; }; @@ -55,16 +55,16 @@ public: FNET_Transport *GetTransport() { return _transport; } // typesafe down-cast - virtual FastS_FNET_DataSet *GetFNETDataSet() { return this; } + virtual FastS_FNET_DataSet *GetFNETDataSet() override { return this; } // common dataset API - virtual bool AddEngine(FastS_EngineDesc *desc); - virtual void ConfigDone(FastS_DataSetCollection *); - virtual void ScheduleCheckBad(); + virtual bool AddEngine(FastS_EngineDesc *desc) override; + virtual void ConfigDone(FastS_DataSetCollection *) override; + virtual void ScheduleCheckBad() override; virtual FastS_ISearch *CreateSearch(FastS_DataSetCollection *dsc, FastS_TimeKeeper *timeKeeper, - bool async); - virtual void Free(); + bool async) override; + virtual void Free() override; bool isGoodRow(uint32_t rowId); }; diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.h b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.h index 39fed5db513..068c072e844 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_engine.h @@ -16,7 +16,7 @@ class FastS_StaticMonitorQuery : public FS4Packet_MONITORQUERYX FastOS_Mutex _lock; int _refcnt; public: - virtual void Free(); + virtual void Free() override; bool getBusy(void) const { @@ -56,7 +56,7 @@ public: WarnTask(FNET_Scheduler *scheduler, FastS_FNET_Engine *engine) : FNET_Task(scheduler), _engine(engine) {} - virtual void PerformTask(); + virtual void PerformTask() override; }; friend class FastS_FNET_Engine::WarnTask; @@ -72,7 +72,7 @@ public: ConnectTask(FNET_Scheduler *scheduler, FastS_FNET_Engine *engine) : FNET_Task(scheduler), _engine(engine) {} - virtual void PerformTask(); + virtual void PerformTask() override; }; friend class FastS_FNET_Engine::ConnectTask; @@ -104,19 +104,19 @@ public: // handle FNET admin packets //-------------------------- - virtual HP_RetCode HandlePacket(FNET_Packet *packet, FNET_Context); + virtual HP_RetCode HandlePacket(FNET_Packet *packet, FNET_Context) override; // common engine API //------------------ - virtual void LockEngine() { _lock.Lock(); } - virtual void UnlockEngine() { _lock.Unlock(); } - virtual void Ping(); - virtual void HandleClearedBad(); - virtual void HandleUp(); + virtual void LockEngine() override { _lock.Lock(); } + virtual void UnlockEngine() override { _lock.Unlock(); } + virtual void Ping() override; + virtual void HandleClearedBad() override; + virtual void HandleUp() override; // typesafe "down"-cast //--------------------- - virtual FastS_FNET_Engine *GetFNETEngine() { return this; } + virtual FastS_FNET_Engine *GetFNETEngine() override { return this; } const char *getHostName() const { return _hostName.c_str(); } int getPortNumber() const { return _portNumber; } diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h index eaa166daba8..af747d887e0 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h @@ -154,7 +154,7 @@ public: return (_channel == NULL) ? packet->Free(), false : _channel->Send(packet); } - virtual HP_RetCode HandlePacket(FNET_Packet *packet, FNET_Context context); + virtual HP_RetCode HandlePacket(FNET_Packet *packet, FNET_Context context) override; }; @@ -206,7 +206,7 @@ public: Timeout(FNET_Scheduler *scheduler, FastS_FNET_Search *search) : FNET_Task(scheduler), _search(search) {} - void PerformTask(); + void PerformTask() override; }; enum FNETMode { @@ -311,12 +311,12 @@ public: // *** API methods -- BEGIN *** - virtual FastS_SearchInfo *GetSearchInfo() { return _util.GetSearchInfo(); } + virtual FastS_SearchInfo *GetSearchInfo() override { return _util.GetSearchInfo(); } - virtual RetCode Search(uint32_t searchOffset, uint32_t maxhits, uint32_t minhits = 0); - virtual RetCode ProcessQueryDone(); - virtual RetCode GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt); - virtual RetCode ProcessDocsumsDone(); + virtual RetCode Search(uint32_t searchOffset, uint32_t maxhits, uint32_t minhits = 0) override; + virtual RetCode ProcessQueryDone() override; + virtual RetCode GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) override; + virtual RetCode ProcessDocsumsDone() override; // *** API methods -- END *** @@ -387,7 +387,7 @@ public: _search.SetAsyncArgs(this, FastS_SearchContext()); } virtual ~FastS_Sync_FNET_Search(); - virtual void Free() { delete this; } + virtual void Free() override { delete this; } }; //----------------------------------------------------------------- diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h index c51ec6b1e09..8543456b4f6 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h @@ -51,7 +51,7 @@ private: protected: void SetFailed() { _failed = true; } - void configure(std::unique_ptr<PartitionsConfig> cfg); + void configure(std::unique_ptr<PartitionsConfig> cfg) override; public: FastS_NodeManager(vespalib::SimpleComponentConfigProducer &componentConfig, diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h b/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h index 9f7b4cf034f..62aa7b33166 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h @@ -189,7 +189,7 @@ public: void LinkInPart_HasLock(FastS_EngineBase *engine); void LinkOutPart_HasLock(FastS_EngineBase *engine); - virtual ChildInfo getChildInfo() const; + virtual ChildInfo getChildInfo() const override; uint32_t getMPP(void) const { return _partMap._mpp; } double getMonitorInterval(void) const { return _monitorInterval; } @@ -204,13 +204,13 @@ public: // API //---- - virtual uint32_t CalculateQueueLens_HasLock(uint32_t &dispatchnodes); - virtual bool AreEnginesReady(); + virtual uint32_t CalculateQueueLens_HasLock(uint32_t &dispatchnodes) override; + virtual bool AreEnginesReady() override; virtual void Ping(); // Downcast //--------- - virtual FastS_PlainDataSet * GetPlainDataSet(void) { return this; } + virtual FastS_PlainDataSet * GetPlainDataSet(void) override { return this; } template <class FUN> FUN ForEachEngine(FUN fun) { diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/query.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/query.cpp index bce23483a56..a7db4c21bd8 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/query.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/query.cpp @@ -102,7 +102,7 @@ public: virtual void visitProperty(const search::fef::Property::Value &key, - const search::fef::Property &values) + const search::fef::Property &values) override { // Account for std::map element size _size += _mapFuzz; diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_factory.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_factory.h index 6fccb7f8cfd..92ad73cefdd 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_factory.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_factory.h @@ -18,10 +18,10 @@ public: // Implements IAttributeFactory virtual AttributeVectorSP create(const vespalib::string &name, - const search::attribute::Config &cfg) const; + const search::attribute::Config &cfg) const override; virtual void setupEmpty(const AttributeVectorSP &vec, - search::SerialNum serialNum) const; + search::SerialNum serialNum) const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/attribute/document_field_populator.h b/searchcore/src/vespa/searchcore/proton/attribute/document_field_populator.h index dcb543f84eb..36de783cd0f 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/document_field_populator.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/document_field_populator.h @@ -32,7 +32,7 @@ public: } // Implements IReprocessingRewriter - virtual void handleExisting(uint32_t lid, document::Document &doc); + virtual void handleExisting(uint32_t lid, document::Document &doc) override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h index 05b842ee30a..25cccc230dc 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h @@ -32,20 +32,20 @@ public: ~FilterAttributeManager(); // Implements search::IAttributeManager - virtual search::AttributeGuard::UP getAttribute(const vespalib::string &name) const; - virtual void getAttributeList(std::vector<search::AttributeGuard> &list) const; - virtual search::SerialNum getFlushedSerialNum(const vespalib::string &name) const; - virtual search::AttributeGuard::UP getAttributeStableEnum(const vespalib::string &) const; - virtual search::attribute::IAttributeContext::UP createContext() const; + virtual search::AttributeGuard::UP getAttribute(const vespalib::string &name) const override; + virtual void getAttributeList(std::vector<search::AttributeGuard> &list) const override; + virtual search::SerialNum getFlushedSerialNum(const vespalib::string &name) const override; + virtual search::AttributeGuard::UP getAttributeStableEnum(const vespalib::string &) const override; + virtual search::attribute::IAttributeContext::UP createContext() const override; // Implements proton::IAttributeManager - virtual IAttributeManager::SP create(const AttributeCollectionSpec &) const; - virtual std::vector<searchcorespi::IFlushTarget::SP> getFlushTargets() const; - virtual search::SerialNum getOldestFlushedSerialNumber() const; - virtual search::SerialNum getNewestFlushedSerialNumber() const; - virtual void getAttributeListAll(std::vector<search::AttributeGuard> &) const; + virtual IAttributeManager::SP create(const AttributeCollectionSpec &) const override; + virtual std::vector<searchcorespi::IFlushTarget::SP> getFlushTargets() const override; + virtual search::SerialNum getOldestFlushedSerialNumber() const override; + virtual search::SerialNum getNewestFlushedSerialNumber() const override; + virtual void getAttributeListAll(std::vector<search::AttributeGuard> &) const override; virtual void wipeHistory(search::SerialNum wipeSerial) override; - virtual const IAttributeFactory::SP &getFactory() const; + virtual const IAttributeFactory::SP &getFactory() const override; virtual search::ISequencedTaskExecutor & getAttributeFieldWriter() const override; virtual search::AttributeVector * getWritableAttribute(const vespalib::string &name) const override; diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp index 27aaefe7a0a..e3c27c752b0 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp @@ -50,10 +50,10 @@ public: void updateStats(); bool cleanUp(AttributeDirectory::Writer &writer); // Implements vespalib::Executor::Task - virtual void run(); + virtual void run() override; virtual SerialNum - getFlushSerial(void) const + getFlushSerial(void) const override { return _syncToken; } diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h index d817c9ce8af..5ade5cac31f 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h @@ -68,12 +68,12 @@ public: void setCleanUpAfterFlush(bool cleanUp) { _cleanUpAfterFlush = cleanUp; } // Implements IFlushTarget - virtual MemoryGain getApproxMemoryGain() const; - virtual DiskGain getApproxDiskGain() const; - virtual Time getLastFlushTime() const; - virtual SerialNum getFlushedSerialNum() const; - virtual Task::UP initFlush(SerialNum currentSerial); - virtual FlushStats getLastFlushStats() const { return _lastStats; } + virtual MemoryGain getApproxMemoryGain() const override; + virtual DiskGain getApproxDiskGain() const override; + virtual Time getLastFlushTime() const override; + virtual SerialNum getFlushedSerialNum() const override; + virtual Task::UP initFlush(SerialNum currentSerial) override; + virtual FlushStats getLastFlushStats() const override { return _lastStats; } virtual uint64_t getApproxBytesToWriteToDisk() const override; }; diff --git a/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.h b/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.h index 0f9716727a8..a5d35eebad2 100644 --- a/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.h +++ b/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.h @@ -18,14 +18,14 @@ public: const search::AttributeVector::SP &attribute); virtual std::unique_ptr<document::select::Value> - getValue(const document::select::Context &context) const; + getValue(const document::select::Context &context) const override; virtual std::unique_ptr<document::select::Value> traceValue(const document::select::Context &context, - std::ostream& out) const; + std::ostream& out) const override; document::select::ValueNode::UP - clone(void) const + clone(void) const override { return wrapParens(new AttributeFieldValueNode(getDocType(), getFieldName(), diff --git a/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp b/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp index 381ba4ae264..7b09a9a750b 100644 --- a/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp @@ -54,7 +54,7 @@ public: * attribute field valulue nodes. */ virtual void - visitFieldValueNode(const FieldValueNode &expr); + visitFieldValueNode(const FieldValueNode &expr) override; }; diff --git a/searchcore/src/vespa/searchcore/proton/common/selectpruner.h b/searchcore/src/vespa/searchcore/proton/common/selectpruner.h index 61c61644d6a..9a7cd35627d 100644 --- a/searchcore/src/vespa/searchcore/proton/common/selectpruner.h +++ b/searchcore/src/vespa/searchcore/proton/common/selectpruner.h @@ -90,29 +90,28 @@ public: process(const document::select::Node &node); private: virtual void - visitAndBranch(const document::select::And &expr); + visitAndBranch(const document::select::And &expr) override; virtual void - visitComparison(const document::select::Compare &expr); + visitComparison(const document::select::Compare &expr) override; virtual void - visitDocumentType(const document::select::DocType &expr); + visitDocumentType(const document::select::DocType &expr) override; virtual void - visitNotBranch(const document::select::Not &expr); + visitNotBranch(const document::select::Not &expr) override; virtual void - visitOrBranch(const document::select::Or &expr); + visitOrBranch(const document::select::Or &expr) override; virtual void - visitArithmeticValueNode(const document::select::ArithmeticValueNode & - expr); + visitArithmeticValueNode(const document::select::ArithmeticValueNode &expr) override; virtual void - visitFunctionValueNode(const document::select::FunctionValueNode &expr); + visitFunctionValueNode(const document::select::FunctionValueNode &expr) override; virtual void - visitFieldValueNode(const document::select::FieldValueNode &expr); + visitFieldValueNode(const document::select::FieldValueNode &expr) override; void invertNode(void); diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h index 80f32e3f046..b3dc30c4d27 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h @@ -45,9 +45,9 @@ public: search::engine::DocsumReply::UP getDocsums(); // Implements GetDocsumsStateCallback - virtual void FillSummaryFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment * env); - virtual void FillRankFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment * env); - virtual void ParseLocation(search::docsummary::GetDocsumsState * state); + virtual void FillSummaryFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment * env) override; + virtual void FillRankFeatures(search::docsummary::GetDocsumsState * state, search::docsummary::IDocsumEnvironment * env) override; + virtual void ParseLocation(search::docsummary::GetDocsumsState * state) override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h index 4ac3a6e9876..d0ae1b305bc 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h @@ -37,9 +37,9 @@ public: virtual search::docsummary::IDocsumStore::UP createDocsumStore(const vespalib::string &resultClassName) = 0; // Inherit doc from IDocsumEnvironment - virtual search::IAttributeManager *getAttributeManager() = 0; - virtual vespalib::string lookupIndex(const vespalib::string & s) const = 0; - virtual juniper::Juniper *getJuniper() = 0; + virtual search::IAttributeManager *getAttributeManager() override = 0; + virtual vespalib::string lookupIndex(const vespalib::string & s) const override = 0; + virtual juniper::Juniper *getJuniper() override = 0; }; typedef std::unique_ptr<ISummaryManager> UP; diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h index 2d7da0df1ca..fdfee6271c4 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h @@ -20,14 +20,14 @@ public: SummaryCompactTarget(search::IDocumentStore & docStore); // Implements IFlushTarget - virtual MemoryGain getApproxMemoryGain() const; - virtual DiskGain getApproxDiskGain() const; - virtual SerialNum getFlushedSerialNum() const; - virtual Time getLastFlushTime() const; + virtual MemoryGain getApproxMemoryGain() const override; + virtual DiskGain getApproxDiskGain() const override; + virtual SerialNum getFlushedSerialNum() const override; + virtual Time getLastFlushTime() const override; - virtual Task::UP initFlush(SerialNum currentSerial); + virtual Task::UP initFlush(SerialNum currentSerial) override; - virtual FlushStats getLastFlushStats() const { return _lastStats; } + virtual FlushStats getLastFlushStats() const override { return _lastStats; } virtual uint64_t getApproxBytesToWriteToDisk() const override; }; diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp index 8082d14df1c..f2007b2f988 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp @@ -30,7 +30,7 @@ public: { _currSerial = _docStore.initFlush(currSerial); } - virtual void run() { + virtual void run() override { _docStore.flush(_currSerial); updateStats(); } @@ -40,7 +40,7 @@ public: } virtual SerialNum - getFlushSerial(void) const + getFlushSerial(void) const override { return _currSerial; } diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h index 64e9b2bea57..38fb0df3d52 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h @@ -20,14 +20,14 @@ public: SummaryFlushTarget(search::IDocumentStore & docStore); // Implements IFlushTarget - virtual MemoryGain getApproxMemoryGain() const; - virtual DiskGain getApproxDiskGain() const; - virtual SerialNum getFlushedSerialNum() const; - virtual Time getLastFlushTime() const; + virtual MemoryGain getApproxMemoryGain() const override; + virtual DiskGain getApproxDiskGain() const override; + virtual SerialNum getFlushedSerialNum() const override; + virtual Time getLastFlushTime() const override; - virtual Task::UP initFlush(SerialNum currentSerial); + virtual Task::UP initFlush(SerialNum currentSerial) override; - virtual FlushStats getLastFlushStats() const { return _lastStats; } + virtual FlushStats getLastFlushStats() const override { return _lastStats; } virtual uint64_t getApproxBytesToWriteToDisk() const override; }; diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h index 2509b3eaee8..b55345ae470 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h @@ -52,16 +52,16 @@ public: /** * Implements ISummarySetup. */ - search::docsummary::IDocsumWriter & getDocsumWriter() const { return *_docsumWriter; } - search::docsummary::ResultConfig & getResultConfig() { return *_docsumWriter->GetResultConfig(); } + search::docsummary::IDocsumWriter & getDocsumWriter() const override { return *_docsumWriter; } + search::docsummary::ResultConfig & getResultConfig() override { return *_docsumWriter->GetResultConfig(); } search::docsummary::IDocsumStore::UP createDocsumStore( - const vespalib::string &resultClassName); + const vespalib::string &resultClassName) override; // Inherit doc from IDocsumEnvironment - virtual search::IAttributeManager * getAttributeManager() { return _attributeMgr.get(); } - virtual vespalib::string lookupIndex(const vespalib::string & s) const { (void) s; return ""; } - virtual juniper::Juniper * getJuniper() { return _juniperConfig.get(); } + virtual search::IAttributeManager * getAttributeManager() override { return _attributeMgr.get(); } + virtual vespalib::string lookupIndex(const vespalib::string & s) const override { (void) s; return ""; } + virtual juniper::Juniper * getJuniper() override { return _juniperConfig.get(); } }; private: @@ -96,9 +96,9 @@ public: const vespa::config::search::SummarymapConfig &summarymapCfg, const vespa::config::search::summary::JuniperrcConfig &juniperCfg, const document::DocumentTypeRepo::SP &repo, - const search::IAttributeManager::SP &attributeMgr); + const search::IAttributeManager::SP &attributeMgr) override; - virtual search::IDocumentStore & getBackingStore() { return *_docStore; } + virtual search::IDocumentStore & getBackingStore() override { return *_docStore; } }; diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreattribute.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreattribute.h index 54686f79c01..012a0301ea6 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreattribute.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreattribute.h @@ -14,7 +14,7 @@ namespace proton { class DocumentMetaStoreAttribute : public search::NotImplementedAttribute { protected: - virtual void notImplemented() const __attribute__((noinline)); + virtual void notImplemented() const override __attribute__((noinline)); public: DocumentMetaStoreAttribute(const vespalib::string &name=getFixedName()); @@ -29,10 +29,7 @@ public: return document::GlobalId::LENGTH; } - virtual void - onCommit() - { - } + virtual void onCommit() override {} }; } diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.h index 01fa6c8c4aa..7116673d570 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastorecontext.h @@ -22,7 +22,7 @@ public: search::AttributeGuard _activeLidsGuard; public: ReadGuard(const search::AttributeVector::SP &metaStoreAttr); - virtual const search::IDocumentMetaStore &get() const { return _store; } + virtual const search::IDocumentMetaStore &get() const override { return _store; } }; private: search::AttributeVector::SP _metaStoreAttr; diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp index 6bc61482499..33c90819e33 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp @@ -52,10 +52,10 @@ public: void updateStats(); bool cleanUp(AttributeDirectory::Writer &writer); // Implements vespalib::Executor::Task - virtual void run(); + virtual void run() override; virtual SerialNum - getFlushSerial(void) const + getFlushSerial(void) const override { return _syncToken; } diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.h index 5ce55d74623..2fb04f40441 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.h @@ -72,12 +72,12 @@ public: void setCleanUpAfterFlush(bool cleanUp) { _cleanUpAfterFlush = cleanUp; } // Implements IFlushTarget - virtual MemoryGain getApproxMemoryGain() const; - virtual DiskGain getApproxDiskGain() const; - virtual Time getLastFlushTime() const; - virtual SerialNum getFlushedSerialNum() const; - virtual Task::UP initFlush(SerialNum currentSerial); - virtual FlushStats getLastFlushStats() const { return _lastStats; } + virtual MemoryGain getApproxMemoryGain() const override; + virtual DiskGain getApproxDiskGain() const override; + virtual Time getLastFlushTime() const override; + virtual SerialNum getFlushedSerialNum() const override; + virtual Task::UP initFlush(SerialNum currentSerial) override; + virtual FlushStats getLastFlushStats() const override { return _lastStats; } static void initCleanup(const vespalib::string &baseDir); virtual uint64_t getApproxBytesToWriteToDisk() const override; diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h index 0d1c2e99dda..850c736ec96 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h @@ -38,7 +38,7 @@ public: } virtual bool operator()(const document::GlobalId &lhs, - const document::GlobalId &rhs) const { + const document::GlobalId &rhs) const override { return _comp(lhs, rhs); } }; diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp index 5ec14409688..38e2d2345c7 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp @@ -229,7 +229,7 @@ private: virtual SearchIterator::UP createLeafSearch(const TermFieldMatchDataArray &tfmda, - bool strict) const + bool strict) const override { assert(tfmda.size() == 0); (void) tfmda; @@ -243,7 +243,7 @@ private: } virtual void - fetchPostings(bool strict) + fetchPostings(bool strict) override { _searchCtx->fetchPostings(strict); } diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp index d03a5a14743..c91f28a1379 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp @@ -21,7 +21,7 @@ class GidAllSearchIterator : public AttributeIteratorBase { private: virtual void - doSeek(uint32_t docId) + doSeek(uint32_t docId) override { if (_store.validLidFast(docId)) { setDocId(docId); @@ -29,7 +29,7 @@ private: } virtual void - doUnpack(uint32_t docId) + doUnpack(uint32_t docId) override { _matchData->reset(docId); } @@ -51,7 +51,7 @@ private: uint32_t _numDocs; virtual void - doSeek(uint32_t docId) + doSeek(uint32_t docId) override { if (_store.validLidFast(docId)) { setDocId(docId); @@ -80,7 +80,7 @@ private: const GlobalId & _gid; virtual void - doSeek(uint32_t docId) + doSeek(uint32_t docId) override { AttributeVector::DocId lid = 0; if (_store.getLid(_gid, lid) && (lid >= docId)) { diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/compact_lid_space_operation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/compact_lid_space_operation.h index 4a51b5221b1..7c07d8d1a05 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/compact_lid_space_operation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/compact_lid_space_operation.h @@ -20,10 +20,10 @@ public: uint32_t getLidLimit() const { return _lidLimit; } // Implements FeedOperation - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/createbucketoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/createbucketoperation.h index bf03eb53eb8..cfb402ac0f0 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/createbucketoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/createbucketoperation.h @@ -15,10 +15,10 @@ public: CreateBucketOperation(const document::BucketId &bucketId); virtual ~CreateBucketOperation() {} const document::BucketId &getBucketId() const { return _bucketId; } - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/deletebucketoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/deletebucketoperation.h index 1780634ca54..0e5f5bfd80f 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/deletebucketoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/deletebucketoperation.h @@ -15,10 +15,10 @@ public: DeleteBucketOperation(const document::BucketId &bucketId); virtual ~DeleteBucketOperation() {} const document::BucketId &getBucketId() const { return _bucketId; } - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h index 0f58f1b9cbe..4b22c868628 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h @@ -184,11 +184,11 @@ public: } virtual void - serialize(vespalib::nbostream &os) const; + serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); + const document::DocumentTypeRepo &repo) override; uint32_t getSerializedDocSize() const { return _serializedDocSize; } }; diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/joinbucketsoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/joinbucketsoperation.h index 7de28be9ecc..11b03420294 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/joinbucketsoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/joinbucketsoperation.h @@ -21,10 +21,10 @@ public: const document::BucketId &getSource1() const { return _source1; } const document::BucketId &getSource2() const { return _source2; } const document::BucketId &getTarget() const { return _target; } - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.h index 90e29422718..cfbbb5e9e29 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.h @@ -26,10 +26,10 @@ public: void setTargetLid(search::DocumentIdT lid) { setDbDocumentId(DbDocumentId(getSubDbId(), lid)); } - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/newconfigoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/newconfigoperation.h index cc6a2d18eb7..57563510cf9 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/newconfigoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/newconfigoperation.h @@ -22,10 +22,10 @@ public: NewConfigOperation(SerialNum serialNum, IStreamHandler &streamHandler); virtual ~NewConfigOperation() {} - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/noopoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/noopoperation.h index 47e36b4c39d..f8e88597d9a 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/noopoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/noopoperation.h @@ -10,10 +10,10 @@ struct NoopOperation : FeedOperation { NoopOperation(SerialNum serialNum); virtual ~NoopOperation() {} - virtual void serialize(vespalib::nbostream &) const {} + virtual void serialize(vespalib::nbostream &) const override {} virtual void deserialize(vespalib::nbostream &, - const document::DocumentTypeRepo &) {} - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &) override {} + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.h index 3f30c40f881..a77ff2a6165 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.h @@ -38,13 +38,13 @@ public: } virtual void - serialize(vespalib::nbostream &os) const; + serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); + const document::DocumentTypeRepo &repo) override; - virtual vespalib::string toString() const; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.h index ad32d7d2f80..218c4f7bd1a 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.h @@ -18,10 +18,10 @@ public: virtual ~PutOperation(); const DocumentSP &getDocument() const { return _doc; } void assertValid() const; - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.h index 7f742515a00..0f3ddc62413 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.h @@ -16,10 +16,10 @@ public: const document::DocumentId &docId); virtual ~RemoveOperation() {} const document::DocumentId &getDocumentId() const { return _docId; } - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; bool hasDocType() const { return _docId.hasDocType(); } vespalib::string getDocType() const { return _docId.getDocType(); } diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/splitbucketoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/splitbucketoperation.h index a9f54f262ef..5c7fab91ef8 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/splitbucketoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/splitbucketoperation.h @@ -21,10 +21,10 @@ public: const document::BucketId &getSource() const { return _source; } const document::BucketId &getTarget1() const { return _target1; } const document::BucketId &getTarget2() const { return _target2; } - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.h index b1bae7ceda4..fbc9813acd4 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.h @@ -17,13 +17,13 @@ protected: public: virtual ~SpoolerReplayOperation() {} SerialNum getSpoolerSerialNum() const { return _spoolerSerialNum; } - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &) { + const document::DocumentTypeRepo &) override { deserialize(is); } void deserialize(vespalib::nbostream &is); - virtual vespalib::string toString() const; + virtual vespalib::string toString() const override; }; diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h index 32e4bff7d9e..2a8ceeaf53a 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h @@ -22,10 +22,10 @@ public: const document::DocumentUpdate::SP &upd); virtual ~UpdateOperation() {} const document::DocumentUpdate::SP &getUpdate() const { return _upd; } - virtual void serialize(vespalib::nbostream &os) const; + virtual void serialize(vespalib::nbostream &os) const override; virtual void deserialize(vespalib::nbostream &is, - const document::DocumentTypeRepo &repo); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &repo) override; + virtual vespalib::string toString() const override; static UpdateOperation makeOldUpdate(const document::BucketId &bucketId, const storage::spi::Timestamp ×tamp, const document::DocumentUpdate::SP &upd); diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h index 070e9ce0c46..47b20de5465 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h @@ -16,10 +16,10 @@ public: fastos::TimeStamp getWipeTimeLimit() const { return _wipeTimeLimit; } - virtual void serialize(vespalib::nbostream &str) const; + virtual void serialize(vespalib::nbostream &str) const override; virtual void deserialize(vespalib::nbostream &str, - const document::DocumentTypeRepo &); - virtual vespalib::string toString() const; + const document::DocumentTypeRepo &) override; + virtual vespalib::string toString() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.h b/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.h index de7ca2cacba..4bf760ce372 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.h @@ -42,14 +42,14 @@ public: const IFlushTarget::SP & getFlushTarget() { return _target; } // Implements IFlushTarget. - virtual MemoryGain getApproxMemoryGain() const { return _memoryGain; } - virtual DiskGain getApproxDiskGain() const { return _diskGain; } - virtual SerialNum getFlushedSerialNum() const { return _flushedSerialNum; } - virtual Time getLastFlushTime() const { return _lastFlushTime; } - virtual bool needUrgentFlush() const { return _needUrgentFlush; } - - virtual Task::UP initFlush(SerialNum currentSerial) { return _target->initFlush(currentSerial); } - virtual FlushStats getLastFlushStats() const { return _target->getLastFlushStats(); } + virtual MemoryGain getApproxMemoryGain() const override { return _memoryGain; } + virtual DiskGain getApproxDiskGain() const override { return _diskGain; } + virtual SerialNum getFlushedSerialNum() const override { return _flushedSerialNum; } + virtual Time getLastFlushTime() const override { return _lastFlushTime; } + virtual bool needUrgentFlush() const override { return _needUrgentFlush; } + + virtual Task::UP initFlush(SerialNum currentSerial) override { return _target->initFlush(currentSerial); } + virtual FlushStats getLastFlushStats() const override { return _target->getLastFlushStats(); } virtual uint64_t getApproxBytesToWriteToDisk() const override; }; diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h index 6aecec0930a..d4ebb687e87 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h @@ -166,7 +166,7 @@ public: removeFlushHandler(const DocTypeName &docTypeName); // Implements FastOS_Runnable. - void Run(FastOS_ThreadInterface *thread, void *arg); + void Run(FastOS_ThreadInterface *thread, void *arg) override; FlushMetaSet getCurrentlyFlushingSet() const; diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushtargetproxy.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushtargetproxy.h index 04977c55b42..0849aeb518c 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushtargetproxy.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushtargetproxy.h @@ -47,25 +47,25 @@ public: } // Implements IFlushTarget. virtual MemoryGain - getApproxMemoryGain() const; + getApproxMemoryGain() const override; virtual DiskGain - getApproxDiskGain() const; + getApproxDiskGain() const override; virtual SerialNum - getFlushedSerialNum() const; + getFlushedSerialNum() const override; virtual Time - getLastFlushTime() const; + getLastFlushTime() const override; virtual bool - needUrgentFlush() const; + needUrgentFlush() const override; virtual Task::UP - initFlush(SerialNum currentSerial);; + initFlush(SerialNum currentSerial) override; virtual searchcorespi::FlushStats - getLastFlushStats() const; + getLastFlushStats() const override; virtual uint64_t getApproxBytesToWriteToDisk() const override; }; diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.h index 33b4c8647f7..788143283c5 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.h @@ -36,7 +36,7 @@ public: ~FlushTask(); // Implements Executor::Task. - void run(); + void run() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.h b/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.h index a287de2ab75..1398cac29c0 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.h @@ -50,7 +50,7 @@ public: // Implements IFlushTarget. virtual Task::UP - initFlush(SerialNum currentSerial); + initFlush(SerialNum currentSerial) override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/index/index_writer.h b/searchcore/src/vespa/searchcore/proton/index/index_writer.h index f4adb6aa5d0..c5dce9948ca 100644 --- a/searchcore/src/vespa/searchcore/proton/index/index_writer.h +++ b/searchcore/src/vespa/searchcore/proton/index/index_writer.h @@ -19,18 +19,18 @@ public: /** * Implements IIndexWriter. */ - virtual const IIndexManager::SP & getIndexManager() const { return _mgr; } + virtual const IIndexManager::SP & getIndexManager() const override { return _mgr; } virtual void put(search::SerialNum serialNum, const document::Document &doc, - const search::DocumentIdT lid); + const search::DocumentIdT lid) override; virtual void remove(search::SerialNum serialNum, - const search::DocumentIdT lid); + const search::DocumentIdT lid) override; virtual void commit(search::SerialNum serialNum, OnWriteDoneType onWriteDone) override; virtual void - heartBeat(search::SerialNum serialNum); + heartBeat(search::SerialNum serialNum) override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/index/indexmanager.h b/searchcore/src/vespa/searchcore/proton/index/indexmanager.h index d639a63f2cc..7db5d954aa0 100644 --- a/searchcore/src/vespa/searchcore/proton/index/indexmanager.h +++ b/searchcore/src/vespa/searchcore/proton/index/indexmanager.h @@ -36,14 +36,14 @@ public: createMemoryIndex(const search::index::Schema &schema, SerialNum serialNum) override; virtual searchcorespi::index::IDiskIndex::SP - loadDiskIndex(const vespalib::string &indexDir); + loadDiskIndex(const vespalib::string &indexDir) override; virtual searchcorespi::index::IDiskIndex::SP - reloadDiskIndex(const searchcorespi::index::IDiskIndex &oldIndex); + reloadDiskIndex(const searchcorespi::index::IDiskIndex &oldIndex) override; virtual bool runFusion(const search::index::Schema &schema, const vespalib::string &outputDir, const std::vector<vespalib::string> &sources, const search::diskindex::SelectorArray &docIdSelector, - search::SerialNum lastSerialNum); + search::SerialNum lastSerialNum) override; }; private: @@ -87,35 +87,35 @@ public: _maintainer.commit(serialNum, onWriteDone); } - virtual void heartBeat(SerialNum serialNum) { + virtual void heartBeat(SerialNum serialNum) override { _maintainer.heartBeat(serialNum); } - virtual SerialNum getCurrentSerialNum() const { + virtual SerialNum getCurrentSerialNum() const override { return _maintainer.getCurrentSerialNum(); } - virtual SerialNum getFlushedSerialNum() const { + virtual SerialNum getFlushedSerialNum() const override { return _maintainer.getFlushedSerialNum(); } - virtual searchcorespi::IndexSearchable::SP getSearchable() const { + virtual searchcorespi::IndexSearchable::SP getSearchable() const override { return _maintainer.getSearchable(); } - virtual search::SearchableStats getSearchableStats() const { + virtual search::SearchableStats getSearchableStats() const override { return _maintainer.getSearchableStats(); } - virtual searchcorespi::IFlushTarget::List getFlushTargets() { + virtual searchcorespi::IFlushTarget::List getFlushTargets() override { return _maintainer.getFlushTargets(); } - virtual void setSchema(const Schema &schema, SerialNum serialNum) { + virtual void setSchema(const Schema &schema, SerialNum serialNum) override { _maintainer.setSchema(schema, serialNum); } - virtual void wipeHistory(SerialNum wipeSerial) { + virtual void wipeHistory(SerialNum wipeSerial) override { _maintainer.wipeHistory(wipeSerial); } }; diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp index 2c306241e7c..e9c0cba6069 100644 --- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp @@ -27,7 +27,7 @@ public: // empty } - void run() { + void run() override { _engine.performSearch(std::move(_request), _client); } }; diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h index 0c026dd602d..6e812f61a7b 100644 --- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h +++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h @@ -147,7 +147,7 @@ public: // Implements SearchServer. search::engine::SearchReply::UP search( search::engine::SearchRequest::Source request, - search::engine::SearchClient &client); + search::engine::SearchClient &client) override; // Implements vespalib::StateExplorer virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override; diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp index 213f7ec13ae..037b1fff2a2 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp @@ -124,29 +124,29 @@ private: } protected: - virtual void visit(ProtonAnd &n) { buildIntermediate(new AndBlueprint(), n); } - virtual void visit(ProtonAndNot &n) { buildIntermediate(new AndNotBlueprint(), n); } - virtual void visit(ProtonOr &n) { buildIntermediate(new OrBlueprint(), n); } - virtual void visit(ProtonWeakAnd &n) { buildWeakAnd(n); } - virtual void visit(ProtonEquiv &n) { buildEquiv(n); } - virtual void visit(ProtonRank &n) { buildIntermediate(new RankBlueprint(), n); } - virtual void visit(ProtonNear &n) { buildIntermediate(new NearBlueprint(n.getDistance()), n); } - virtual void visit(ProtonONear &n) { buildIntermediate(new ONearBlueprint(n.getDistance()), n); } - - virtual void visit(ProtonWeightedSetTerm &n) { buildTerm(n); } - virtual void visit(ProtonDotProduct &n) { buildTerm(n); } - virtual void visit(ProtonWandTerm &n) { buildTerm(n); } - - virtual void visit(ProtonPhrase &n) { buildTerm(n); } - virtual void visit(ProtonNumberTerm &n) { buildTerm(n); } - virtual void visit(ProtonLocationTerm &n) { buildTerm(n); } - virtual void visit(ProtonPrefixTerm &n) { buildTerm(n); } - virtual void visit(ProtonRangeTerm &n) { buildTerm(n); } - virtual void visit(ProtonStringTerm &n) { buildTerm(n); } - virtual void visit(ProtonSubstringTerm &n) { buildTerm(n); } - virtual void visit(ProtonSuffixTerm &n) { buildTerm(n); } - virtual void visit(ProtonPredicateQuery &n) { buildTerm(n); } - virtual void visit(ProtonRegExpTerm &n) { buildTerm(n); } + virtual void visit(ProtonAnd &n) override { buildIntermediate(new AndBlueprint(), n); } + virtual void visit(ProtonAndNot &n) override { buildIntermediate(new AndNotBlueprint(), n); } + virtual void visit(ProtonOr &n) override { buildIntermediate(new OrBlueprint(), n); } + virtual void visit(ProtonWeakAnd &n) override { buildWeakAnd(n); } + virtual void visit(ProtonEquiv &n) override { buildEquiv(n); } + virtual void visit(ProtonRank &n) override { buildIntermediate(new RankBlueprint(), n); } + virtual void visit(ProtonNear &n) override { buildIntermediate(new NearBlueprint(n.getDistance()), n); } + virtual void visit(ProtonONear &n) override { buildIntermediate(new ONearBlueprint(n.getDistance()), n); } + + virtual void visit(ProtonWeightedSetTerm &n) override { buildTerm(n); } + virtual void visit(ProtonDotProduct &n) override { buildTerm(n); } + virtual void visit(ProtonWandTerm &n) override { buildTerm(n); } + + virtual void visit(ProtonPhrase &n) override { buildTerm(n); } + virtual void visit(ProtonNumberTerm &n) override { buildTerm(n); } + virtual void visit(ProtonLocationTerm &n) override { buildTerm(n); } + virtual void visit(ProtonPrefixTerm &n) override { buildTerm(n); } + virtual void visit(ProtonRangeTerm &n) override { buildTerm(n); } + virtual void visit(ProtonStringTerm &n) override { buildTerm(n); } + virtual void visit(ProtonSubstringTerm &n) override { buildTerm(n); } + virtual void visit(ProtonSuffixTerm &n) override { buildTerm(n); } + virtual void visit(ProtonPredicateQuery &n) override { buildTerm(n); } + virtual void visit(ProtonRegExpTerm &n) override { buildTerm(n); } public: BlueprintBuilderVisitor(const IRequestContext & requestContext, ISearchContext &context) : diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.h b/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.h index 08ac92d6f04..479427dd24a 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.h +++ b/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.h @@ -14,13 +14,13 @@ private: struct EstimateMatchFrequency : vespalib::Rendezvous<Matches, double> { EstimateMatchFrequency(size_t n) : vespalib::Rendezvous<Matches, double>(n) {} - virtual void mingle(); + virtual void mingle() override; }; struct SelectBest : vespalib::Rendezvous<std::vector<feature_t>, size_t> { size_t topN; SelectBest(size_t n, size_t topN_in) : vespalib::Rendezvous<std::vector<feature_t>, size_t>(n), topN(topN_in) {} - virtual void mingle(); + virtual void mingle() override; bool cmp(const uint32_t &a, const uint32_t &b) { return (in(a)[out(a)] > in(b)[out(b)]); } @@ -35,7 +35,7 @@ private: struct RangeCover : vespalib::Rendezvous<RangePair, RangePair> { RangeCover(size_t n) : vespalib::Rendezvous<RangePair, RangePair>(n) {} - virtual void mingle(); + virtual void mingle() override; }; EstimateMatchFrequency _estimate_match_frequency; SelectBest _selectBest; @@ -45,13 +45,13 @@ public: MatchLoopCommunicator(size_t threads, size_t topN); ~MatchLoopCommunicator(); - virtual double estimate_match_frequency(const Matches &matches) { + virtual double estimate_match_frequency(const Matches &matches) override { return _estimate_match_frequency.rendezvous(matches); } - virtual size_t selectBest(const std::vector<feature_t> &sortedScores) { + virtual size_t selectBest(const std::vector<feature_t> &sortedScores) override { return _selectBest.rendezvous(sortedScores); } - virtual RangePair rangeCover(const RangePair &ranges) { + virtual RangePair rangeCover(const RangePair &ranges) override { return _rangeCover.rendezvous(ranges); } }; diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp index f971e2633de..7f4823e7eb5 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp @@ -23,15 +23,15 @@ struct TimedMatchLoopCommunicator : IMatchLoopCommunicator { IMatchLoopCommunicator &communicator; fastos::StopWatch rerank_time; TimedMatchLoopCommunicator(IMatchLoopCommunicator &com) : communicator(com) {} - virtual double estimate_match_frequency(const Matches &matches) { + virtual double estimate_match_frequency(const Matches &matches) override { return communicator.estimate_match_frequency(matches); } - virtual size_t selectBest(const std::vector<feature_t> &sortedScores) { + virtual size_t selectBest(const std::vector<feature_t> &sortedScores) override { size_t result = communicator.selectBest(sortedScores); rerank_time.start(); return result; } - virtual RangePair rangeCover(const RangePair &ranges) { + virtual RangePair rangeCover(const RangePair &ranges) override { RangePair result = communicator.rangeCover(ranges); rerank_time.stop(); return result; diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_thread.h b/searchcore/src/vespa/searchcore/proton/matching/match_thread.h index d20e71e370a..f924dfcf0a2 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_thread.h +++ b/searchcore/src/vespa/searchcore/proton/matching/match_thread.h @@ -105,7 +105,7 @@ public: ResultProcessor &rp, vespalib::DualMergeDirector &md, uint32_t distributionKey); - virtual void run(); + virtual void run() override; const MatchingStats::Partition &get_thread_stats() const { return thread_stats; } double get_match_time() const { return match_time_s; } PartialResult::UP extract_result() { return std::move(resultContext->result); } diff --git a/searchcore/src/vespa/searchcore/proton/matching/matchdatareservevisitor.h b/searchcore/src/vespa/searchcore/proton/matching/matchdatareservevisitor.h index f0006925bfb..5616ef67d95 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/matchdatareservevisitor.h +++ b/searchcore/src/vespa/searchcore/proton/matching/matchdatareservevisitor.h @@ -23,7 +23,7 @@ public: template <class TermNode> void visitTerm(TermNode &n) { n.allocateTerms(_mdl); } - virtual void visit(ProtonNodeTypes::Equiv &n) { + virtual void visit(ProtonNodeTypes::Equiv &n) override { MatchDataReserveVisitor subAllocator(n.children_mdl); for (size_t i = 0; i < n.getChildren().size(); ++i) { n.getChildren()[i]->accept(subAllocator); diff --git a/searchcore/src/vespa/searchcore/proton/matching/partial_result.h b/searchcore/src/vespa/searchcore/proton/matching/partial_result.h index e39b0ed92f1..fb8245b1477 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/partial_result.h +++ b/searchcore/src/vespa/searchcore/proton/matching/partial_result.h @@ -47,7 +47,7 @@ public: _sortData.push_back(sd); _sortDataSize += sd.second; } - virtual void merge(Source &rhs); + virtual void merge(Source &rhs) override; }; } // namespace proton::matching diff --git a/searchcore/src/vespa/searchcore/proton/matching/resolveviewvisitor.h b/searchcore/src/vespa/searchcore/proton/matching/resolveviewvisitor.h index 475d058be9f..bf3d2c5c1ad 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/resolveviewvisitor.h +++ b/searchcore/src/vespa/searchcore/proton/matching/resolveviewvisitor.h @@ -25,7 +25,7 @@ public: template <class TermNode> void visitTerm(TermNode &n) { n.resolve(_resolver, _indexEnv); } - virtual void visit(ProtonNodeTypes::Equiv &n) { + virtual void visit(ProtonNodeTypes::Equiv &n) override { visitChildren(n); n.resolveFromChildren(n.getChildren()); } diff --git a/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h b/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h index ddb3fd253d3..ba5f473fcb1 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h +++ b/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h @@ -63,7 +63,7 @@ public: size_t getNumSearchSessions() const; std::vector<SearchSessionInfo> getSortedSearchSessionInfo() const; - void pruneTimedOutSessions(fastos::TimeStamp currentTime); + void pruneTimedOutSessions(fastos::TimeStamp currentTime) override; void close(); }; diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp index aa97a891d7f..68ff45e0213 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp @@ -30,14 +30,14 @@ public: } } - void visit(ProtonLocationTerm &) {} + void visit(ProtonLocationTerm &) override {} - virtual void visit(ProtonNodeTypes::AndNot &n) { + virtual void visit(ProtonNodeTypes::AndNot &n) override { assert(n.getChildren().size() > 0); n.getChildren()[0]->accept(*this); } - virtual void visit(ProtonNodeTypes::Equiv &n) { + virtual void visit(ProtonNodeTypes::Equiv &n) override { // XXX: unranked equiv not supported _term_data.push_back(&n); } diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp index 81589cb38fd..b4076e87f7a 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp @@ -19,29 +19,29 @@ struct TermDataFromTermVisitor data = &n; } - virtual void visit(ProtonAnd &) {} - virtual void visit(ProtonAndNot &) {} - virtual void visit(ProtonNear &) {} - virtual void visit(ProtonONear &) {} - virtual void visit(ProtonOr &) {} - virtual void visit(ProtonRank &) {} - virtual void visit(ProtonWeakAnd &) {} - - virtual void visit(ProtonWeightedSetTerm &n) { visitTerm(n); } - virtual void visit(ProtonDotProduct &n) { visitTerm(n); } - virtual void visit(ProtonWandTerm &n) { visitTerm(n); } - virtual void visit(ProtonPhrase &n) { visitTerm(n); } - virtual void visit(ProtonEquiv &n) { visitTerm(n); } - - virtual void visit(ProtonNumberTerm &n) { visitTerm(n); } - virtual void visit(ProtonLocationTerm &n) { visitTerm(n); } - virtual void visit(ProtonPrefixTerm &n) { visitTerm(n); } - virtual void visit(ProtonRangeTerm &n) { visitTerm(n); } - virtual void visit(ProtonStringTerm &n) { visitTerm(n); } - virtual void visit(ProtonSubstringTerm &n) { visitTerm(n); } - virtual void visit(ProtonSuffixTerm &n) { visitTerm(n); } - virtual void visit(ProtonPredicateQuery &) { } - virtual void visit(ProtonRegExpTerm &n) { visitTerm(n); } + virtual void visit(ProtonAnd &) override {} + virtual void visit(ProtonAndNot &) override {} + virtual void visit(ProtonNear &) override {} + virtual void visit(ProtonONear &) override {} + virtual void visit(ProtonOr &) override {} + virtual void visit(ProtonRank &) override {} + virtual void visit(ProtonWeakAnd &) override {} + + virtual void visit(ProtonWeightedSetTerm &n) override { visitTerm(n); } + virtual void visit(ProtonDotProduct &n) override { visitTerm(n); } + virtual void visit(ProtonWandTerm &n) override { visitTerm(n); } + virtual void visit(ProtonPhrase &n) override { visitTerm(n); } + virtual void visit(ProtonEquiv &n) override { visitTerm(n); } + + virtual void visit(ProtonNumberTerm &n) override { visitTerm(n); } + virtual void visit(ProtonLocationTerm &n) override { visitTerm(n); } + virtual void visit(ProtonPrefixTerm &n) override { visitTerm(n); } + virtual void visit(ProtonRangeTerm &n) override { visitTerm(n); } + virtual void visit(ProtonStringTerm &n) override { visitTerm(n); } + virtual void visit(ProtonSubstringTerm &n) override { visitTerm(n); } + virtual void visit(ProtonSuffixTerm &n) override { visitTerm(n); } + virtual void visit(ProtonPredicateQuery &) override { } + virtual void visit(ProtonRegExpTerm &n) override { visitTerm(n); } }; } // namespace diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.h b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.h index c877d5ed4c7..59df279739b 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.h +++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_target.h @@ -24,23 +24,23 @@ public: const searchcorespi::IFlushTarget &getTarget() const { return *_target; } // Implements searchcorespi::IFlushTarget - virtual MemoryGain getApproxMemoryGain() const { + virtual MemoryGain getApproxMemoryGain() const override { return _target->getApproxMemoryGain(); } - virtual DiskGain getApproxDiskGain() const { + virtual DiskGain getApproxDiskGain() const override { return _target->getApproxDiskGain(); } - virtual SerialNum getFlushedSerialNum() const { + virtual SerialNum getFlushedSerialNum() const override { return _target->getFlushedSerialNum(); } - virtual Time getLastFlushTime() const { + virtual Time getLastFlushTime() const override { return _target->getLastFlushTime(); } - virtual bool needUrgentFlush() const { + virtual bool needUrgentFlush() const override { return _target->needUrgentFlush(); } - virtual searchcorespi::FlushTask::UP initFlush(SerialNum currentSerial); - virtual searchcorespi::FlushStats getLastFlushStats() const { + virtual searchcorespi::FlushTask::UP initFlush(SerialNum currentSerial) override; + virtual searchcorespi::FlushStats getLastFlushStats() const override { return _target->getLastFlushStats(); } diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.h b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.h index fdd11a66dbb..b2bff7321e1 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.h +++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.h @@ -20,8 +20,8 @@ public: searchcorespi::FlushTask::UP task); // Implements searchcorespi::FlushTask - virtual void run(); - virtual search::SerialNum getFlushSerial() const { + virtual void run() override; + virtual search::SerialNum getFlushSerial() const override { return _task->getFlushSerial(); } }; diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h index fb5f9b336f3..3826afc2bc4 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h +++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.h @@ -30,8 +30,8 @@ public: double sampleLoad(time_point now, const std::lock_guard<std::mutex> &guard); // Implements IJobTracker - virtual void start(); - virtual void end(); + virtual void start() override; + virtual void end() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h index 6d668bc1839..e901662990b 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h +++ b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h @@ -51,7 +51,7 @@ public: LegacyAttributeMetrics *totalAttributes, const std::string &name) override; virtual void cleanAttributes(const AttributeMetricsCollection &subAttributes, - LegacyAttributeMetrics *totalAttributes); + LegacyAttributeMetrics *totalAttributes) override; virtual void addRankProfile(LegacyDocumentDBMetrics &owner, const std::string &name, size_t numDocIdPartitions) override; diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp index 00120012301..2a17cb97952 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp @@ -86,7 +86,7 @@ public: : _bucketSet() { } ~BucketIdListResultHandler(); - virtual void handle(const BucketIdListResult &result) { + virtual void handle(const BucketIdListResult &result) override { const BucketIdListResult::List &buckets = result.getList(); for (size_t i = 0; i < buckets.size(); ++i) { _bucketSet.insert(buckets[i]); @@ -114,7 +114,7 @@ public: BucketIdListResultHandler() { } ~SynchronizedBucketIdListResultHandler(); - virtual void handle(const BucketIdListResult &result) { + virtual void handle(const BucketIdListResult &result) override { { vespalib::LockGuard guard(_lock); BucketIdListResultHandler::handle(result); @@ -136,7 +136,7 @@ public: { } ~BucketInfoResultHandler(); - virtual void handle(const BucketInfoResult &result) { + virtual void handle(const BucketInfoResult &result) override { if (_first) { _result = result; _first = false; @@ -182,9 +182,9 @@ class SequenceOfOne : public Sequence<T> { public: SequenceOfOne(const T &value) : _done(false), _value(value) {} - virtual bool valid() const { return !_done; } - virtual T get() const { return _value; } - virtual void next() { _done = true; } + virtual bool valid() const override { return !_done; } + virtual T get() const override { return _value; } + virtual void next() override { _done = true; } }; template <typename T> @@ -728,7 +728,7 @@ private: public: ActiveBucketIdListResultHandler() : _bucketMap() { } - virtual void handle(const BucketIdListResult &result) { + virtual void handle(const BucketIdListResult &result) override { const BucketIdListResult::List &buckets = result.getList(); for (size_t i = 0; i < buckets.size(); ++i) { IR ir(_bucketMap.insert(std::make_pair(buckets[i], 1u))); diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h index ccd06a8eb0f..40d59453673 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h @@ -112,7 +112,7 @@ public: virtual BucketIdListResult listBuckets(PartitionId) const override; virtual Result setClusterState(const ClusterState& calc) override; virtual Result setActiveState(const Bucket& bucket, BucketInfo::ActiveState newState) override; - virtual BucketInfoResult getBucketInfo(const Bucket&) const; + virtual BucketInfoResult getBucketInfo(const Bucket&) const override; virtual Result put(const Bucket&, Timestamp, const document::Document::SP&, Context&) override; virtual RemoveResult remove(const Bucket&, Timestamp, const document::DocumentId&, Context&) override; virtual UpdateResult update(const Bucket&, Timestamp, const document::DocumentUpdate::SP&, Context&) override; diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h index fcc9c362306..d802b8da8ac 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/transport_latch.h @@ -23,7 +23,7 @@ public: virtual void send(mbus::Reply::UP reply, ResultUP result, bool documentWasFound, - double latency_ms); + double latency_ms) override; void await() { _latch.await(); } diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.h b/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.h index feaff2030bb..05aa10db4e5 100644 --- a/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.h +++ b/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.h @@ -47,9 +47,9 @@ public: search::SerialNum serialNum); // Implements IReprocessingInitializer - virtual bool hasReprocessors() const; + virtual bool hasReprocessors() const override; - virtual void initialize(IReprocessingHandler &handler); + virtual void initialize(IReprocessingHandler &handler) override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/document_reprocessing_handler.h b/searchcore/src/vespa/searchcore/proton/reprocessing/document_reprocessing_handler.h index f950e3b61a9..0f7feed137e 100644 --- a/searchcore/src/vespa/searchcore/proton/reprocessing/document_reprocessing_handler.h +++ b/searchcore/src/vespa/searchcore/proton/reprocessing/document_reprocessing_handler.h @@ -25,7 +25,7 @@ private: public: RewriteVisitor(DocumentReprocessingHandler &handler) : _handler(handler) {} // Implements search::IDocumentStoreRewriteVisitor - virtual void visit(uint32_t lid, document::Document &doc) { + virtual void visit(uint32_t lid, document::Document &doc) override { _handler.rewriteVisit(lid, doc); } }; @@ -57,18 +57,18 @@ public: } // Implements IReprocessingHandler - virtual void addReader(const IReprocessingReader::SP &reader) { + virtual void addReader(const IReprocessingReader::SP &reader) override { _readers.push_back(reader); } - virtual void addRewriter(const IReprocessingRewriter::SP &rewriter) { + virtual void addRewriter(const IReprocessingRewriter::SP &rewriter) override { _rewriters.push_back(rewriter); } // Implements search::IDocumentStoreReadVisitor - virtual void visit(uint32_t lid, const document::Document &doc); + virtual void visit(uint32_t lid, const document::Document &doc) override; - virtual void visit(uint32_t lid); + virtual void visit(uint32_t lid) override; void done(); }; diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/i_reprocessing_reader.h b/searchcore/src/vespa/searchcore/proton/reprocessing/i_reprocessing_reader.h index f8c800f6e2e..f75ab92550a 100644 --- a/searchcore/src/vespa/searchcore/proton/reprocessing/i_reprocessing_reader.h +++ b/searchcore/src/vespa/searchcore/proton/reprocessing/i_reprocessing_reader.h @@ -20,7 +20,9 @@ struct IReprocessingReader * Handle the given existing document. */ virtual void handleExisting(uint32_t lid, const document::Document &doc) = 0; - virtual void done() = 0; + + // signals that there are no more documents + virtual void done() {} }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/reprocess_documents_task.h b/searchcore/src/vespa/searchcore/proton/reprocessing/reprocess_documents_task.h index 013f9e9f004..a30dfb81b94 100644 --- a/searchcore/src/vespa/searchcore/proton/reprocessing/reprocess_documents_task.h +++ b/searchcore/src/vespa/searchcore/proton/reprocessing/reprocess_documents_task.h @@ -38,13 +38,12 @@ public: uint32_t docIdLimit); virtual void - run(); + run() override; virtual void - updateProgress(double progress); + updateProgress(double progress) override; - virtual Progress - getProgress() const; + virtual Progress getProgress() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h b/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h index 0de74f4a4ee..0ba79025f21 100644 --- a/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h +++ b/searchcore/src/vespa/searchcore/proton/server/attribute_writer_factory.h @@ -14,7 +14,7 @@ struct AttributeWriterFactory : public IAttributeWriterFactory { AttributeWriterFactory() {} virtual IAttributeWriter::SP create(const IAttributeWriter::SP &old, - const AttributeCollectionSpec &attrSpec) const + const AttributeCollectionSpec &attrSpec) const override { const AttributeWriter &oldAdapter = dynamic_cast<const AttributeWriter &>(*old.get()); const proton::IAttributeManager::SP &oldMgr = oldAdapter.getAttributeManager(); diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp index aa2cb4e982d..8eb229a5e6b 100644 --- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp @@ -33,25 +33,25 @@ public: } virtual bool - shouldBeReady(const document::BucketId &bucket) const + shouldBeReady(const document::BucketId &bucket) const override { return _calc.shouldBeReady(Bucket(bucket, PartitionId(0))); } virtual bool - clusterUp(void) const + clusterUp(void) const override { return _calc.clusterUp(); } virtual bool - nodeUp(void) const + nodeUp(void) const override { return _calc.nodeUp(); } virtual bool - nodeInitializing() const + nodeInitializing() const override { return _calc.nodeInitializing(); } diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h index aeb48804031..b666a0612ef 100644 --- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h +++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h @@ -35,7 +35,7 @@ private: // Implements IBucketModifiedHandler virtual void - notifyBucketModified(const document::BucketId &bucket); + notifyBucketModified(const document::BucketId &bucket) override; public: ClusterStateHandler(vespalib::Executor &executor); @@ -44,10 +44,10 @@ public: ~ClusterStateHandler(); virtual void - addClusterStateChangedHandler(IClusterStateChangedHandler *handler); + addClusterStateChangedHandler(IClusterStateChangedHandler *handler) override; virtual void - removeClusterStateChangedHandler(IClusterStateChangedHandler *handler); + removeClusterStateChangedHandler(IClusterStateChangedHandler *handler) override; /** * Implements the cluster state aspect of IPersistenceHandler. diff --git a/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.h b/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.h index 6057a801460..f0eaa4bb01d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.h +++ b/searchcore/src/vespa/searchcore/proton/server/docstorevalidator.h @@ -21,8 +21,8 @@ class DocStoreValidator : public search::IDocumentStoreReadVisitor public: DocStoreValidator(IDocumentMetaStore &dms); - virtual void visit(uint32_t lid, const document::Document &doc); - virtual void visit(uint32_t lid); + virtual void visit(uint32_t lid, const document::Document &doc) override; + virtual void visit(uint32_t lid) override; void visitDone(void); void killOrphans(search::IDocumentStore &store, search::SerialNum serialNum); diff --git a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h index eed523ed058..d5767ed2353 100644 --- a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h +++ b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.h @@ -23,11 +23,11 @@ public: DocumentScanIterator(const IDocumentMetaStore &_metaStore); // Implements IDocumentScanIterator - virtual bool valid() const; + virtual bool valid() const override; virtual search::DocumentMetaData next(uint32_t compactLidLimit, uint32_t maxDocsToScan, - bool retry); + bool retry) override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h index b597f0a9e0b..d01ae7618f6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h @@ -188,7 +188,7 @@ private: * Redo interrupted reprocessing if last entry in transaction log * is a config change. */ - virtual void enterRedoReprocessState(); + virtual void enterRedoReprocessState() override; void enterApplyLiveConfigState(); /** @@ -206,15 +206,15 @@ private: /** * Implements IFeedHandlerOwner */ - virtual void onTransactionLogReplayDone() __attribute__((noinline)); - virtual void onPerformPrune(SerialNum flushedSerial); - virtual bool isFeedBlockedByRejectedConfig(); + virtual void onTransactionLogReplayDone() override __attribute__((noinline)); + virtual void onPerformPrune(SerialNum flushedSerial) override; + virtual bool isFeedBlockedByRejectedConfig() override; /** * Implements IFeedHandlerOwner **/ - virtual void performWipeHistory(); - virtual bool getAllowPrune(void) const; + virtual void performWipeHistory() override; + virtual bool getAllowPrune(void) const override; void writeWipeHistoryTransactionLogEntry( @@ -231,13 +231,13 @@ private: /** * Implements IClusterStateChangedHandler */ - virtual void notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc); + virtual void notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc) override; void notifyAllBucketsChanged(); /** * Implements IWipeOldRemovedFieldsHandler */ - virtual void wipeOldRemovedFields(TimeStamp wipeTimeLimit); + virtual void wipeOldRemovedFields(TimeStamp wipeTimeLimit) override; void updateLegacyMetrics(LegacyDocumentDBMetrics &metrics); void updateMetrics(DocumentDBTaggedMetrics &metrics); void updateMetrics(DocumentDBTaggedMetrics::AttributeMetrics &metrics); @@ -435,9 +435,9 @@ public: /** * Implements IReplayConfig API. */ - virtual void replayConfig(SerialNum serialNum); + virtual void replayConfig(SerialNum serialNum) override; - virtual void replayWipeHistory(SerialNum serialNum, TimeStamp wipeTimeLimit); + virtual void replayWipeHistory(SerialNum serialNum, TimeStamp wipeTimeLimit) override; const DocTypeName & getDocTypeName(void) const { return _docTypeName; } @@ -450,7 +450,7 @@ public: void newConfigSnapshot(DocumentDBConfig::SP snapshot); // Implements DocumentDBConfigOwner - void reconfigure(const DocumentDBConfig::SP & snapshot); + void reconfigure(const DocumentDBConfig::SP & snapshot) override; int64_t getActiveGeneration() const; @@ -484,7 +484,7 @@ public: * * Sync transaction log to syncTo. */ - virtual void sync(SerialNum syncTo); + virtual void sync(SerialNum syncTo) override; void enterReprocessState(); void enterOnlineState(); void waitForOnlineState(); diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.h b/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.h index e2332d6ab94..c9e49eb1469 100644 --- a/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.h +++ b/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.h @@ -22,15 +22,15 @@ public: /** * Implements IThreadService */ - virtual vespalib::Executor::Task::UP execute(vespalib::Executor::Task::UP task) { + virtual vespalib::Executor::Task::UP execute(vespalib::Executor::Task::UP task) override { return _executor.execute(std::move(task)); } - virtual void run(vespalib::Runnable &runnable); - virtual vespalib::Syncable &sync() { + virtual void run(vespalib::Runnable &runnable) override; + virtual vespalib::Syncable &sync() override { _executor.sync(); return *this; } - virtual bool isCurrentThread() const; + virtual bool isCurrentThread() const override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h index 2cf63363f6f..111d28d7b37 100644 --- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h +++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h @@ -39,7 +39,7 @@ public: /** * Implements vespalib::Syncable */ - virtual vespalib::Syncable &sync(); + virtual vespalib::Syncable &sync() override; void shutdown(); @@ -58,10 +58,10 @@ public: /** * Implements IThreadingService */ - virtual searchcorespi::index::IThreadService &master() { + virtual searchcorespi::index::IThreadService &master() override { return _masterService; } - virtual searchcorespi::index::IThreadService &index() { + virtual searchcorespi::index::IThreadService &index() override { return _indexService; } diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h index 02d321f2eea..4fff4be5a75 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h @@ -89,7 +89,7 @@ protected: AttributeCollectionSpec::UP createAttributeSpec(const AttributeSpecs &attrCfg, SerialNum serialNum) const; AttributeManager::SP getAndResetInitAttributeManager(); - virtual IFlushTargetList getFlushTargetsInternal(); + virtual IFlushTargetList getFlushTargetsInternal() override; void reconfigureAttributeMetrics(const IAttributeManager &newMgr, const IAttributeManager &oldMgr); IReprocessingTask::UP diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h index 6d229438aa0..726039e0be7 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h @@ -72,11 +72,11 @@ private: _tls_mgr(tls_mgr), _tlsDirectWriter(tlsDirectWriter) { } - virtual void storeOperation(const FeedOperation &op); - virtual bool erase(SerialNum oldest_to_keep); + virtual void storeOperation(const FeedOperation &op) override; + virtual bool erase(SerialNum oldest_to_keep) override; virtual SerialNum - sync(SerialNum syncTo); + sync(SerialNum syncTo) override; }; typedef searchcorespi::index::IThreadingService IThreadingService; @@ -279,13 +279,13 @@ public: * Implements IDocumentMoveHandler */ virtual void - handleMove(MoveOperation &op); + handleMove(MoveOperation &op) override; /** * Implements IHeartBeatHandler */ virtual void - heartBeat(void); + heartBeat(void) override; virtual void sync(void); @@ -294,19 +294,19 @@ public: * Implements TransLogClient::Session::Callback. */ virtual RPC::Result - receive(const Packet &packet); + receive(const Packet &packet) override; virtual void - eof(void); + eof(void) override; virtual void - inSync(void); + inSync(void) override; /** * Implements IPruneRemovedDocumentsHandler */ void - performPruneRemovedDocuments(PruneRemovedDocumentsOperation &pruneOp); + performPruneRemovedDocuments(PruneRemovedDocumentsOperation &pruneOp) override; void syncTls(SerialNum syncTo); @@ -315,7 +315,7 @@ public: storeRemoteOperation(const FeedOperation &op); // Implements IOperationStorer - virtual void storeOperation(FeedOperation &op); + virtual void storeOperation(FeedOperation &op) override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp index 6c1473f74e0..2e79db1e599 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp @@ -78,61 +78,61 @@ public: _config_store(config_store) { } - virtual void replay(const PutOperation &op) { + virtual void replay(const PutOperation &op) override { _feed_view_ptr->handlePut(NULL, op); } - virtual void replay(const RemoveOperation &op) { + virtual void replay(const RemoveOperation &op) override { _feed_view_ptr->handleRemove(NULL, op); } - virtual void replay(const UpdateOperation &op) { + virtual void replay(const UpdateOperation &op) override { _feed_view_ptr->handleUpdate(NULL, op); } - virtual void replay(const NoopOperation &) {} // ignored - virtual void replay(const NewConfigOperation &op) { + virtual void replay(const NoopOperation &) override {} // ignored + virtual void replay(const NewConfigOperation &op) override { _replay_config.replayConfig(op.getSerialNum()); } - virtual void replay(const WipeHistoryOperation &op) { + virtual void replay(const WipeHistoryOperation &op) override { _config_store.saveWipeHistoryConfig(op.getSerialNum(), op.getWipeTimeLimit()); _replay_config.replayWipeHistory(op.getSerialNum(), op.getWipeTimeLimit()); } - virtual void replay(const DeleteBucketOperation &op) { + virtual void replay(const DeleteBucketOperation &op) override { _feed_view_ptr->handleDeleteBucket(op); } - virtual void replay(const SplitBucketOperation &op) { + virtual void replay(const SplitBucketOperation &op) override { _bucketDBHandler.handleSplit(op.getSerialNum(), op.getSource(), op.getTarget1(), op.getTarget2()); } - virtual void replay(const JoinBucketsOperation &op) { + virtual void replay(const JoinBucketsOperation &op) override { _bucketDBHandler.handleJoin(op.getSerialNum(), op.getSource1(), op.getSource2(), op.getTarget()); } - virtual void replay(const PruneRemovedDocumentsOperation &op) { + virtual void replay(const PruneRemovedDocumentsOperation &op) override { _feed_view_ptr->handlePruneRemovedDocuments(op); } - virtual void replay(const SpoolerReplayStartOperation &op) { + virtual void replay(const SpoolerReplayStartOperation &op) override { (void) op; } - virtual void replay(const SpoolerReplayCompleteOperation &op) { + virtual void replay(const SpoolerReplayCompleteOperation &op) override { (void) op; } - virtual void replay(const MoveOperation &op) { + virtual void replay(const MoveOperation &op) override { _feed_view_ptr->handleMove(op); } - virtual void replay(const CreateBucketOperation &) { + virtual void replay(const CreateBucketOperation &) override { } - virtual void replay(const CompactLidSpaceOperation &op) { + virtual void replay(const CompactLidSpaceOperation &op) override { _feed_view_ptr->handleCompactLidSpace(op); } - virtual NewConfigOperation::IStreamHandler &getNewConfigStreamHandler() { + virtual NewConfigOperation::IStreamHandler &getNewConfigStreamHandler() override { return _config_store; } - virtual document::DocumentTypeRepo &getDeserializeRepo() { + virtual document::DocumentTypeRepo &getDeserializeRepo() override { return *_feed_view_ptr->getDocumentTypeRepo(); } }; diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstates.h b/searchcore/src/vespa/searchcore/proton/server/feedstates.h index 53a7bdd0ee6..22a31c49554 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedstates.h +++ b/searchcore/src/vespa/searchcore/proton/server/feedstates.h @@ -28,12 +28,12 @@ public: { } - virtual void handleOperation(FeedToken, FeedOperation::UP op) { + virtual void handleOperation(FeedToken, FeedOperation::UP op) override { throwExceptionInHandleOperation(_doc_type_name, *op); } virtual void - receive(const PacketWrapper::SP &wrap, vespalib::Executor &) { + receive(const PacketWrapper::SP &wrap, vespalib::Executor &) override { throwExceptionInReceive(_doc_type_name.c_str(), wrap->packet.range().from(), wrap->packet.range().to(), @@ -57,12 +57,12 @@ public: IReplayConfig &replay_config, FeedConfigStore &config_store); - virtual void handleOperation(FeedToken, FeedOperation::UP op) { + virtual void handleOperation(FeedToken, FeedOperation::UP op) override { throwExceptionInHandleOperation(_doc_type_name, *op); } virtual void receive(const PacketWrapper::SP &wrap, - vespalib::Executor &executor); + vespalib::Executor &executor) override; }; @@ -79,12 +79,12 @@ public: _handler(handler) { } - virtual void handleOperation(FeedToken token, FeedOperation::UP op) { + virtual void handleOperation(FeedToken token, FeedOperation::UP op) override { _handler.performOperation(FeedToken::UP(new FeedToken(token)), std::move(op)); } virtual void - receive(const PacketWrapper::SP &wrap, vespalib::Executor &) + receive(const PacketWrapper::SP &wrap, vespalib::Executor &) override { throwExceptionInReceive(_handler.getDocTypeName().c_str(), wrap->packet.range().from(), diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h index 8998098dd90..3a108e866b3 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h +++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h @@ -36,12 +36,12 @@ public: virtual ~FileConfigManager(void); - virtual SerialNum getBestSerialNum() const; - virtual SerialNum getOldestSerialNum() const; + virtual SerialNum getBestSerialNum() const override; + virtual SerialNum getOldestSerialNum() const override; virtual void saveConfig(const DocumentDBConfig &snapshot, const search::index::Schema &historySchema, - SerialNum serialNum); + SerialNum serialNum) override; /** * Load a config snapshot from disk corresponding to the given @@ -59,20 +59,20 @@ public: virtual void loadConfig(const DocumentDBConfig ¤tSnapshot, SerialNum serialNum, DocumentDBConfig::SP &loadedSnapshot, - search::index::Schema::SP &historySchema); + search::index::Schema::SP &historySchema) override; - virtual void removeInvalid(); - virtual void prune(SerialNum serialNum); - virtual bool hasValidSerial(SerialNum serialNum) const; + virtual void removeInvalid() override; + virtual void prune(SerialNum serialNum) override; + virtual bool hasValidSerial(SerialNum serialNum) const override; - virtual SerialNum getPrevValidSerial(SerialNum serialNum) const; + virtual SerialNum getPrevValidSerial(SerialNum serialNum) const override; /** * Clone config except for history schema. * Used when wiping history. */ virtual void saveWipeHistoryConfig(SerialNum serialNum, - fastos::TimeStamp wipeTimeLimit); + fastos::TimeStamp wipeTimeLimit) override; /** @@ -81,7 +81,7 @@ public: * Used for serializing config into transaction log. */ virtual void - serializeConfig(SerialNum serialNum, vespalib::nbostream &stream); + serializeConfig(SerialNum serialNum, vespalib::nbostream &stream) override; /** @@ -93,7 +93,7 @@ public: * transaction log. */ virtual void - deserializeConfig(SerialNum serialNum, vespalib::nbostream &stream); + deserializeConfig(SerialNum serialNum, vespalib::nbostream &stream) override; virtual void setProtonConfig(const ProtonConfigSP &protonConfig) override; }; diff --git a/searchcore/src/vespa/searchcore/proton/server/heart_beat_job.h b/searchcore/src/vespa/searchcore/proton/server/heart_beat_job.h index 0741594c567..3e3c396fb7f 100644 --- a/searchcore/src/vespa/searchcore/proton/server/heart_beat_job.h +++ b/searchcore/src/vespa/searchcore/proton/server/heart_beat_job.h @@ -23,7 +23,7 @@ public: const DocumentDBHeartBeatConfig &config); // Implements IMaintenanceJob - virtual bool run(); + virtual bool run() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h index 6bd227ae193..5def9651f4d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h +++ b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.h @@ -22,12 +22,12 @@ public: ~JobTrackedMaintenanceJob(); // Implements IMaintenanceJob - virtual bool isBlocked() const { return _job->isBlocked(); } - virtual void unBlock() { _job->unBlock(); } - virtual void registerRunner(IMaintenanceJobRunner *runner) { + virtual bool isBlocked() const override { return _job->isBlocked(); } + virtual void unBlock() override { _job->unBlock(); } + virtual void registerRunner(IMaintenanceJobRunner *runner) override { _job->registerRunner(runner); } - virtual bool run(); + virtual bool run() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_handler.h b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_handler.h index 19ca603a972..67361cefc9c 100644 --- a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_handler.h +++ b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_handler.h @@ -20,15 +20,15 @@ public: const vespalib::string &docTypeName); // Implements ILidSpaceCompactionHandler - virtual vespalib::string getName() const { + virtual vespalib::string getName() const override { return _docTypeName + "." + _subDb.getName(); } - virtual uint32_t getSubDbId() const { return _subDb.getSubDbId(); } - virtual search::LidUsageStats getLidStatus() const; - virtual IDocumentScanIterator::UP getIterator() const; - virtual MoveOperation::UP createMoveOperation(const search::DocumentMetaData &document, uint32_t moveToLid) const; - virtual void handleMove(const MoveOperation &op); - virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op); + virtual uint32_t getSubDbId() const override { return _subDb.getSubDbId(); } + virtual search::LidUsageStats getLidStatus() const override; + virtual IDocumentScanIterator::UP getIterator() const override; + virtual MoveOperation::UP createMoveOperation(const search::DocumentMetaData &document, uint32_t moveToLid) const override; + virtual void handleMove(const MoveOperation &op) override; + virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.h b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.h index e3027a729f1..53d2081aaa5 100644 --- a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.h +++ b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.h @@ -56,7 +56,7 @@ public: virtual void notifyDiskMemUsage(DiskMemUsageState state) override; // Implements IMaintenanceJob - virtual bool run(); + virtual bool run() override; virtual void registerRunner(IMaintenanceJobRunner *runner) override; }; diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp index bdd1a46eed4..3fd28f1e13c 100644 --- a/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/maintenancecontroller.cpp @@ -25,7 +25,7 @@ private: MaintenanceJobRunner *_job; public: JobWrapperTask(MaintenanceJobRunner *job) : _job(job) {} - virtual void run() { _job->run(); } + virtual void run() override { _job->run(); } }; diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenancejobrunner.h b/searchcore/src/vespa/searchcore/proton/server/maintenancejobrunner.h index a7e50cc3c79..f39e5972273 100644 --- a/searchcore/src/vespa/searchcore/proton/server/maintenancejobrunner.h +++ b/searchcore/src/vespa/searchcore/proton/server/maintenancejobrunner.h @@ -31,7 +31,7 @@ public: MaintenanceJobRunner(vespalib::Executor &executor, IMaintenanceJob::UP job); - virtual void run(); + virtual void run() override; void stop() { _stopped = true; } bool isRunning() const; const IMaintenanceJob &getJob() const { return *_job; } diff --git a/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.h b/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.h index 27bf81a0f8a..57411c81e61 100644 --- a/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.h +++ b/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.h @@ -27,21 +27,21 @@ public: MemoryConfigStore(ConfigMaps::SP maps); ~MemoryConfigStore(); - virtual SerialNum getBestSerialNum() const; - virtual SerialNum getOldestSerialNum() const; - virtual bool hasValidSerial(SerialNum serial) const; - virtual SerialNum getPrevValidSerial(SerialNum serial) const; + virtual SerialNum getBestSerialNum() const override; + virtual SerialNum getOldestSerialNum() const override; + virtual bool hasValidSerial(SerialNum serial) const override; + virtual SerialNum getPrevValidSerial(SerialNum serial) const override; virtual void saveConfig(const DocumentDBConfig &config, const Schema &history, - SerialNum serial); + SerialNum serial) override; virtual void loadConfig(const DocumentDBConfig &, SerialNum serial, DocumentDBConfig::SP &loaded_config, - Schema::SP &history_schema); - virtual void removeInvalid(); - void prune(SerialNum serial); - virtual void saveWipeHistoryConfig(SerialNum serial, fastos::TimeStamp wipeTimeLimit); - virtual void serializeConfig(SerialNum, vespalib::nbostream &); - virtual void deserializeConfig(SerialNum, vespalib::nbostream &); + Schema::SP &history_schema) override; + virtual void removeInvalid() override; + void prune(SerialNum serial) override; + virtual void saveWipeHistoryConfig(SerialNum serial, fastos::TimeStamp wipeTimeLimit) override; + virtual void serializeConfig(SerialNum, vespalib::nbostream &) override; + virtual void deserializeConfig(SerialNum, vespalib::nbostream &) override; virtual void setProtonConfig(const ProtonConfigSP &) override; }; diff --git a/searchcore/src/vespa/searchcore/proton/server/ooscli.h b/searchcore/src/vespa/searchcore/proton/server/ooscli.h index f11b1d5686f..e07b208bcba 100644 --- a/searchcore/src/vespa/searchcore/proton/server/ooscli.h +++ b/searchcore/src/vespa/searchcore/proton/server/ooscli.h @@ -39,7 +39,7 @@ private: public: OosCli(const OosParams ¶ms, FRT_Supervisor &orb); virtual ~OosCli(); - virtual void PerformTask(); + virtual void PerformTask() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.h b/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.h index 5253d051150..add8a72264d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.h +++ b/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.h @@ -33,68 +33,68 @@ public: virtual ~PersistenceProviderProxy() {} - virtual Result initialize() { + virtual Result initialize() override { return _pp.initialize(); } // Implements PersistenceProvider - virtual PartitionStateListResult getPartitionStates() const { + virtual PartitionStateListResult getPartitionStates() const override { return _pp.getPartitionStates(); } - virtual BucketIdListResult listBuckets(PartitionId partId) const { + virtual BucketIdListResult listBuckets(PartitionId partId) const override { return _pp.listBuckets(partId); } - virtual Result setClusterState(const ClusterState &state) { + virtual Result setClusterState(const ClusterState &state) override { return _pp.setClusterState(state); } virtual Result setActiveState(const Bucket &bucket, - storage::spi::BucketInfo::ActiveState newState) { + storage::spi::BucketInfo::ActiveState newState) override { return _pp.setActiveState(bucket, newState); } - virtual BucketInfoResult getBucketInfo(const Bucket &bucket) const { + virtual BucketInfoResult getBucketInfo(const Bucket &bucket) const override { return _pp.getBucketInfo(bucket); } virtual Result put(const Bucket &bucket, Timestamp timestamp, const storage::spi::DocumentSP& doc, - Context& context) { + Context& context) override { return _pp.put(bucket, timestamp, doc, context); } virtual RemoveResult remove(const Bucket &bucket, Timestamp timestamp, const document::DocumentId &docId, - Context& context) { + Context& context) override { return _pp.remove(bucket, timestamp, docId, context); } virtual RemoveResult removeIfFound(const Bucket &bucket, Timestamp timestamp, const document::DocumentId &docId, - Context& context) { + Context& context) override { return _pp.removeIfFound(bucket, timestamp, docId, context); } virtual UpdateResult update(const Bucket &bucket, Timestamp timestamp, const storage::spi::DocumentUpdateSP& docUpd, - Context& context) { + Context& context) override { return _pp.update(bucket, timestamp, docUpd, context); } - virtual Result flush(const Bucket &bucket, Context& context) { + virtual Result flush(const Bucket &bucket, Context& context) override { return _pp.flush(bucket, context); } virtual GetResult get(const Bucket &bucket, const document::FieldSet& fieldSet, const document::DocumentId &docId, - Context& context) const { + Context& context) const override { return _pp.get(bucket, fieldSet, docId, context); } @@ -102,61 +102,61 @@ public: const document::FieldSet& fieldSet, const Selection &selection, IncludedVersions versions, - Context& context) { + Context& context) override { return _pp.createIterator(bucket, fieldSet, selection, versions, context); } virtual IterateResult iterate(IteratorId itrId, uint64_t maxByteSize, - Context& context) const { + Context& context) const override { return _pp.iterate(itrId, maxByteSize, context); } - virtual Result destroyIterator(IteratorId itrId, Context& context) { + virtual Result destroyIterator(IteratorId itrId, Context& context) override { return _pp.destroyIterator(itrId, context); } - virtual Result createBucket(const Bucket &bucket, Context& context) { + virtual Result createBucket(const Bucket &bucket, Context& context) override { return _pp.createBucket(bucket, context); } - virtual Result deleteBucket(const Bucket &bucket, Context& context) { + virtual Result deleteBucket(const Bucket &bucket, Context& context) override { return _pp.deleteBucket(bucket, context); } - virtual BucketIdListResult getModifiedBuckets() const { + virtual BucketIdListResult getModifiedBuckets() const override { return _pp.getModifiedBuckets(); } virtual Result maintain(const Bucket &bucket, - storage::spi::MaintenanceLevel level) { + storage::spi::MaintenanceLevel level) override { return _pp.maintain(bucket, level); } virtual Result split(const Bucket &source, const Bucket &target1, const Bucket &target2, - Context& context) { + Context& context) override { return _pp.split(source, target1, target2, context); } virtual Result join(const Bucket &source1, const Bucket &source2, const Bucket &target, - Context& context) { + Context& context) override { return _pp.join(source1, source2, target, context); } virtual Result move(const Bucket &source, storage::spi::PartitionId target, - Context& context) { + Context& context) override { return _pp.move(source, target, context); } virtual Result removeEntry(const Bucket &bucket, Timestamp timestamp, - Context& context) { + Context& context) override { return _pp.removeEntry(bucket, timestamp, context); } }; diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h index 01002443067..706f36f8543 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.h +++ b/searchcore/src/vespa/searchcore/proton/server/proton.h @@ -93,7 +93,7 @@ private: virtual void addTags(vespalib::GenericHeader &header, - const vespalib::string &name) const; + const vespalib::string &name) const override; void setClusterName(const vespalib::string &clusterName, @@ -159,7 +159,7 @@ private: virtual void removeDocumentDB(const DocTypeName &docTypeName) override; virtual void applyConfig(const BootstrapConfig::SP & configSnapshot) override; - virtual MonitorReply::UP ping(MonitorRequest::UP request, MonitorClient &client); + virtual MonitorReply::UP ping(MonitorRequest::UP request, MonitorClient &client) override; /** * Called by the metrics update hook (typically in the context of @@ -233,7 +233,7 @@ public: virtual void getComponentConfig(Consumer &consumer) override; // implements IPersistenceEngineOwner interface - virtual void setClusterState(const storage::spi::ClusterState &calc); + virtual void setClusterState(const storage::spi::ClusterState &calc) override; /** * Return the oldest active config generation used by proton. @@ -246,7 +246,7 @@ public: vespalib::string getBadConfigs(void) const; - virtual StatusReport::List getStatusReports() const; + virtual StatusReport::List getStatusReports() const override; MatchEngine & getMatchEngine() { return *_matchEngine; } FlushEngine & getFlushEngine() { return *_flushEngine; } @@ -254,7 +254,7 @@ public: bool isReplayDone() const { return _isReplayDone; } - virtual bool isInitializing() const { + virtual bool isInitializing() const override { return _isInitializing; } diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.h b/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.h index 8a0595e77d4..6c859a0db5d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.h +++ b/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.h @@ -43,7 +43,7 @@ public: DocumentDBConfig::SP getDocumentDBConfig(const DocTypeName & docTypeName) const; - void Run(FastOS_ThreadInterface * thread, void *arg); + void Run(FastOS_ThreadInterface * thread, void *arg) override; private: typedef std::map<DocTypeName, DocumentDBConfigManager::SP> DBManagerMap; diff --git a/searchcore/src/vespa/searchcore/proton/server/prune_session_cache_job.h b/searchcore/src/vespa/searchcore/proton/server/prune_session_cache_job.h index c53f40a3e26..917cfabbc71 100644 --- a/searchcore/src/vespa/searchcore/proton/server/prune_session_cache_job.h +++ b/searchcore/src/vespa/searchcore/proton/server/prune_session_cache_job.h @@ -19,7 +19,7 @@ public: double jobInterval); // Implements IMaintenanceJob - virtual bool run(); + virtual bool run() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h index 1d13bb35420..47cb814454a 100644 --- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h +++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h @@ -44,7 +44,7 @@ public: IFrozenBucketHandler &frozenHandler); // Implements IMaintenanceJob - virtual bool run(); + virtual bool run() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h index d7485a155f5..780295a7cc0 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h @@ -104,7 +104,7 @@ private: void reconfigureIndexSearchable(); void syncViews(); protected: - IFlushTargetList getFlushTargetsInternal(); + IFlushTargetList getFlushTargetsInternal() override; using Parent::updateLidReuseDelayer; diff --git a/searchcore/src/vespa/searchcore/proton/server/simpleflush.h b/searchcore/src/vespa/searchcore/proton/server/simpleflush.h index 8281021ad80..263367ad7e6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/simpleflush.h +++ b/searchcore/src/vespa/searchcore/proton/server/simpleflush.h @@ -23,7 +23,7 @@ public: // Implements IFlushStrategy virtual FlushContext::List getFlushTargets(const FlushContext::List &targetList, - const flushengine::TlsStatsMap &tlsStatsMap) const; + const flushengine::TlsStatsMap &tlsStatsMap) const override; }; diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h index a69b1908bf2..78f78a60ff0 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h @@ -306,13 +306,13 @@ public: * Implements IFeedView. */ virtual const document::DocumentTypeRepo::SP & - getDocumentTypeRepo() const { return _repo; } + getDocumentTypeRepo() const override { return _repo; } /** * Implements IFeedView. */ virtual const ISimpleDocumentMetaStore * - getDocumentMetaStorePtr() const; + getDocumentMetaStorePtr() const override; /** * Similar to IPersistenceHandler functions. @@ -321,43 +321,40 @@ public: */ virtual void - preparePut(PutOperation &putOp); + preparePut(PutOperation &putOp) override; virtual void - handlePut(FeedToken *token, - const PutOperation &putOp); + handlePut(FeedToken *token, const PutOperation &putOp) override; virtual void - prepareUpdate(UpdateOperation &updOp); + prepareUpdate(UpdateOperation &updOp) override; virtual void - handleUpdate(FeedToken *token, - const UpdateOperation &updOp); + handleUpdate(FeedToken *token, const UpdateOperation &updOp) override; virtual void - prepareRemove(RemoveOperation &rmOp); + prepareRemove(RemoveOperation &rmOp) override; virtual void - handleRemove(FeedToken *token, - const RemoveOperation &rmOp); + handleRemove(FeedToken *token, const RemoveOperation &rmOp) override; virtual void - prepareDeleteBucket(DeleteBucketOperation &delOp); + prepareDeleteBucket(DeleteBucketOperation &delOp) override; virtual void - handleDeleteBucket(const DeleteBucketOperation &delOp); + handleDeleteBucket(const DeleteBucketOperation &delOp) override; virtual void - prepareMove(MoveOperation &putOp); + prepareMove(MoveOperation &putOp) override; virtual void - handleMove(const MoveOperation &putOp); + handleMove(const MoveOperation &putOp) override; virtual void - heartBeat(search::SerialNum serialNum); + heartBeat(search::SerialNum serialNum) override; virtual void - sync(); + sync() override; virtual void forceCommit(SerialNum serialNum) override; @@ -371,10 +368,10 @@ public: * Called by writer thread. */ virtual void - handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp); + handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &pruneOp) override; virtual void - handleCompactLidSpace(const CompactLidSpaceOperation &op); + handleCompactLidSpace(const CompactLidSpaceOperation &op) override; }; diff --git a/searchcore/src/vespa/searchcore/proton/server/summaryadapter.h b/searchcore/src/vespa/searchcore/proton/server/summaryadapter.h index 2e874ad4d25..cbb2e8d0e94 100644 --- a/searchcore/src/vespa/searchcore/proton/server/summaryadapter.h +++ b/searchcore/src/vespa/searchcore/proton/server/summaryadapter.h @@ -28,7 +28,7 @@ public: virtual void heartBeat(search::SerialNum serialNum) override; - virtual const search::IDocumentStore &getDocumentStore() const { + virtual const search::IDocumentStore &getDocumentStore() const override { return _imgr->getBackingStore(); } diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.h b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.h index 37a6c3bf5a5..067369127af 100644 --- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.h +++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.h @@ -19,7 +19,7 @@ class TransactionLogManager : public TransactionLogManagerBase TransLogClient::Visitor::UP _visitor; virtual void doLogReplayComplete(const vespalib::string &domainName, - int64_t elapsedTime) const; + int64_t elapsedTime) const override; public: /** diff --git a/searchcore/src/vespa/searchcore/proton/server/wipe_old_removed_fields_job.h b/searchcore/src/vespa/searchcore/proton/server/wipe_old_removed_fields_job.h index 0a2b5fe3b6f..eb8ec4a7649 100644 --- a/searchcore/src/vespa/searchcore/proton/server/wipe_old_removed_fields_job.h +++ b/searchcore/src/vespa/searchcore/proton/server/wipe_old_removed_fields_job.h @@ -21,7 +21,7 @@ public: const DocumentDBWipeOldRemovedFieldsConfig &config); // Implements IMaintenanceJob - virtual bool run(); + virtual bool run() override; }; } // namespace proton diff --git a/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp b/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp index 8f56aa90a98..a41f76fef3c 100644 --- a/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp @@ -27,7 +27,7 @@ public: { } - void run() { + void run() override { _client.getDocsumsDone(_engine.getDocsums(_request.release())); } }; diff --git a/searchcore/src/vespa/searchcore/proton/test/buckethandler.h b/searchcore/src/vespa/searchcore/proton/test/buckethandler.h index 4b256bb1443..4d5caa3119b 100644 --- a/searchcore/src/vespa/searchcore/proton/test/buckethandler.h +++ b/searchcore/src/vespa/searchcore/proton/test/buckethandler.h @@ -26,10 +26,10 @@ public: ~BucketHandler(); virtual void - addBucketStateChangedHandler(IBucketStateChangedHandler *handler); + addBucketStateChangedHandler(IBucketStateChangedHandler *handler) override; virtual void - removeBucketStateChangedHandler(IBucketStateChangedHandler *handler); + removeBucketStateChangedHandler(IBucketStateChangedHandler *handler) override; void notifyBucketStateChanged(const document::BucketId &bucketId, diff --git a/searchcore/src/vespa/searchcore/proton/test/clusterstatehandler.h b/searchcore/src/vespa/searchcore/proton/test/clusterstatehandler.h index 78e1c73b35a..60d44391956 100644 --- a/searchcore/src/vespa/searchcore/proton/test/clusterstatehandler.h +++ b/searchcore/src/vespa/searchcore/proton/test/clusterstatehandler.h @@ -26,10 +26,10 @@ public: ~ClusterStateHandler(); virtual void - addClusterStateChangedHandler(IClusterStateChangedHandler *handler); + addClusterStateChangedHandler(IClusterStateChangedHandler *handler) override; virtual void - removeClusterStateChangedHandler(IClusterStateChangedHandler *handler); + removeClusterStateChangedHandler(IClusterStateChangedHandler *handler) override; void notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc); |