From 9bb9d8e14827ecc4dba2d43e2d9e76248c120e1d Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 7 Oct 2020 11:16:08 +0000 Subject: Add noexcept as indicated by -Wnoeexcept --- .../apps/vespa-feed-bm/bm_storage_link_context.h | 2 +- .../proton/documentdb/feedview/feedview_test.cpp | 2 +- .../lid_space_compaction_test.cpp | 5 +-- .../maintenancecontroller_test.cpp | 2 +- .../storeonlyfeedview/storeonlyfeedview_test.cpp | 4 +- .../documentmetastore/documentmetastore_test.cpp | 2 +- .../tests/proton/flushengine/flushengine_test.cpp | 4 +- .../prepare_restart_flush_strategy_test.cpp | 6 +-- .../shrink_lid_space_flush_target_test.cpp | 16 ++++--- .../src/tests/proton/matching/matching_test.cpp | 2 +- .../document_db_reference_resolver_test.cpp | 2 +- .../gid_to_lid_change_handler_test.cpp | 2 +- .../reprocessing_runner_test.cpp | 46 ++++--------------- .../src/tests/proton/server/feedstates_test.cpp | 2 +- .../proton/server/memoryflush/memoryflush_test.cpp | 29 +++++------- .../proton/attribute/attribute_populator.cpp | 2 +- .../vespa/searchcore/proton/common/doctypename.cpp | 4 +- .../vespa/searchcore/proton/common/doctypename.h | 6 +-- .../proton/documentmetastore/gid_compare.h | 7 ++- .../searchcore/proton/flushengine/iflushhandler.h | 2 +- .../searchcore/proton/initializer/task_runner.h | 2 +- .../searchcore/proton/matching/sessionmanager.h | 2 +- .../vespa/searchcore/proton/server/feedhandler.cpp | 2 +- .../vespa/searchcore/proton/server/feedstates.h | 4 +- .../proton/server/move_operation_limiter.cpp | 2 +- .../vespa/searchcore/proton/server/packetwrapper.h | 3 +- .../vespa/searchcore/proton/server/rpc_hooks.cpp | 2 +- .../proton/test/document_meta_store_observer.h | 51 ++++++++++------------ .../searchcore/proton/test/dummy_flush_handler.h | 19 +++----- .../searchcore/proton/test/dummy_flush_target.h | 30 +++++-------- .../proton/test/mock_gid_to_lid_change_handler.h | 4 +- 31 files changed, 109 insertions(+), 159 deletions(-) (limited to 'searchcore') diff --git a/searchcore/src/apps/vespa-feed-bm/bm_storage_link_context.h b/searchcore/src/apps/vespa-feed-bm/bm_storage_link_context.h index adb2a13ec10..f2df20f1f66 100644 --- a/searchcore/src/apps/vespa-feed-bm/bm_storage_link_context.h +++ b/searchcore/src/apps/vespa-feed-bm/bm_storage_link_context.h @@ -10,7 +10,7 @@ class BmStorageLink; struct BmStorageLinkContext { BmStorageLink* bm_link; - BmStorageLinkContext() + BmStorageLinkContext() noexcept : bm_link(nullptr) { } diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index b275064c0f2..e6751a0cb98 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -176,7 +176,7 @@ struct MyGidToLidChangeHandler : public MockGidToLidChangeHandler uint32_t _changes; std::map _gidToLid; public: - MyGidToLidChangeHandler() + MyGidToLidChangeHandler() noexcept : MockGidToLidChangeHandler(), _changeGid(), _changeLid(std::numeric_limits::max()), 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 04444647b5d..8890a6cfdda 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 @@ -212,11 +212,10 @@ MyDocumentStore::~MyDocumentStore() = default; struct MyDocumentRetriever : public DocumentRetrieverBaseForTest { std::shared_ptr repo; const MyDocumentStore& store; - MyDocumentRetriever(std::shared_ptr repo_in, const MyDocumentStore& store_in) + MyDocumentRetriever(std::shared_ptr repo_in, const MyDocumentStore& store_in) noexcept : repo(std::move(repo_in)), store(store_in) - { - } + {} const document::DocumentTypeRepo& getDocumentTypeRepo() const override { return *repo; } void getBucketMetaData(const storage::spi::Bucket&, DocumentMetaData::Vector&) const override { abort(); } DocumentMetaData getDocumentMetaData(const DocumentId&) const override { abort(); } diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index 70b2100521f..63c7a873eaf 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -147,7 +147,7 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest { MyDocumentSubDB &_subDB; - explicit MyDocumentRetriever(MyDocumentSubDB &subDB) + explicit MyDocumentRetriever(MyDocumentSubDB &subDB) noexcept : _subDB(subDB) { } diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp index 8d1276497bd..e6e71d51e47 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp @@ -171,7 +171,7 @@ struct MoveOperationFeedView : public MyMinimalFeedView { struct MoveOperationCallback : public IDestructorCallback { int &outstandingMoveOps; - MoveOperationCallback(int &outstandingMoveOps_) : outstandingMoveOps(outstandingMoveOps_) { + explicit MoveOperationCallback(int &outstandingMoveOps_) noexcept : outstandingMoveOps(outstandingMoveOps_) { ++outstandingMoveOps; } ~MoveOperationCallback() override { @@ -194,7 +194,7 @@ struct FixtureBase { documentmetastore::LidReuseDelayerConfig lidReuseDelayerConfig; typename FeedViewType::UP feedview; - FixtureBase(SubDbType subDbType = SubDbType::READY) + explicit FixtureBase(SubDbType subDbType = SubDbType::READY) : removeCount(0), putCount(0), heartbeatCount(0), diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp index 9ca22bafe9a..60d96e37e15 100644 --- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp +++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp @@ -2090,7 +2090,7 @@ public: size_t remove_batch_cnt; size_t remove_cnt; - MockOperationListener() + MockOperationListener() noexcept : remove_batch_cnt(0), remove_cnt(0) { diff --git a/searchcore/src/tests/proton/flushengine/flushengine_test.cpp b/searchcore/src/tests/proton/flushengine/flushengine_test.cpp index 08fa1b11229..38fca35ea87 100644 --- a/searchcore/src/tests/proton/flushengine/flushengine_test.cpp +++ b/searchcore/src/tests/proton/flushengine/flushengine_test.cpp @@ -361,14 +361,14 @@ public: public: typedef std::shared_ptr SP; - SimpleStrategy() {} + SimpleStrategy() noexcept : _targets() {} uint32_t indexOf(const IFlushTarget::SP &target) const { IFlushTarget *raw = target.get(); CachedFlushTarget *cached = dynamic_cast(raw); - if (cached != NULL) { + if (cached != nullptr) { raw = cached->getFlushTarget().get(); } WrappedFlushTarget *wrapped = dynamic_cast(raw); diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp index 5f93f97f165..1b8be388c13 100644 --- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp +++ b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp @@ -27,16 +27,16 @@ struct SimpleFlushTarget : public test::DummyFlushTarget const Type &type, SerialNum flushedSerial_, uint64_t approxDiskBytes_, - double replay_operation_cost_) + double replay_operation_cost_) noexcept : test::DummyFlushTarget(name, type, Component::OTHER), flushedSerial(flushedSerial_), approxDiskBytes(approxDiskBytes_), replay_operation_cost(replay_operation_cost_) {} - virtual SerialNum getFlushedSerialNum() const override { + SerialNum getFlushedSerialNum() const override { return flushedSerial; } - virtual uint64_t getApproxBytesToWriteToDisk() const override { + uint64_t getApproxBytesToWriteToDisk() const override { return approxDiskBytes; } double get_replay_operation_cost() const override { diff --git a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp b/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp index 964cd47afa5..6c502bccce1 100644 --- a/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp +++ b/searchcore/src/tests/proton/flushengine/shrink_lid_space_flush_target/shrink_lid_space_flush_target_test.cpp @@ -18,26 +18,26 @@ class MyLidSpace : public search::common::ICompactableLidSpace bool _canShrink; size_t _canFree; public: - MyLidSpace() + MyLidSpace() noexcept : _canShrink(true), _canFree(16) { } - virtual ~MyLidSpace() override {} + ~MyLidSpace() override = default; - virtual void compactLidSpace(uint32_t wantedDocLidLimit) override { + void compactLidSpace(uint32_t wantedDocLidLimit) override { (void) wantedDocLidLimit; } - virtual bool canShrinkLidSpace() const override { + bool canShrinkLidSpace() const override { return _canShrink; } - virtual size_t getEstimatedShrinkLidSpaceGain() const override { + size_t getEstimatedShrinkLidSpaceGain() const override { return _canShrink ? _canFree : 0; } - virtual void shrinkLidSpace() override { + void shrinkLidSpace() override { if (_canShrink) { _canFree = 0; _canShrink = false; @@ -62,9 +62,11 @@ struct Fixture { } - ~Fixture() { } + ~Fixture(); }; +Fixture::~Fixture() = default; + TEST_F("require that flush target returns estimated memory gain", Fixture) { auto memoryGain = f._ft->getApproxMemoryGain(); diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp index 22dc19167f6..30f83273bd7 100644 --- a/searchcore/src/tests/proton/matching/matching_test.cpp +++ b/searchcore/src/tests/proton/matching/matching_test.cpp @@ -284,7 +284,7 @@ struct MyWorld { struct MySearchHandler : ISearchHandler { Matcher::SP _matcher; - MySearchHandler(Matcher::SP matcher) : _matcher(matcher) {} + MySearchHandler(Matcher::SP matcher) noexcept : _matcher(std::move(matcher)) {} DocsumReply::UP getDocsums(const DocsumRequest &) override { return DocsumReply::UP(); diff --git a/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp b/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp index 48b2a269f6b..bacdd85dcc5 100644 --- a/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp +++ b/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp @@ -61,7 +61,7 @@ struct MyDocumentDBReference : public MockDocumentDBReference { std::shared_ptr _gidToLidChangeHandler; MyDocumentDBReference(MyGidToLidMapperFactory::SP factory_, - std::shared_ptr gidToLidChangeHandler) + std::shared_ptr gidToLidChangeHandler) noexcept : factory(std::move(factory_)), _gidToLidChangeHandler(std::move(gidToLidChangeHandler)) { diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp index 920472c6a01..a10d48ee7fe 100644 --- a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp +++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp @@ -39,7 +39,7 @@ class ListenerStats { uint32_t _destroyedListeners; public: - ListenerStats() + ListenerStats() noexcept : _lock(), _putChanges(0u), _removeChanges(0u), 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 0053a03105f..242ad91271e 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 @@ -32,7 +32,7 @@ struct MyTask : public IReprocessingTask double initProgress, double middleProgress, double finalProgress, - double weight) + double weight) noexcept : _runner(runner), _initProgress(initProgress), _middleProgress(middleProgress), @@ -42,9 +42,7 @@ struct MyTask : public IReprocessingTask { } - virtual void - run() override - { + void run() override { ASSERT_EQUAL(_initProgress, _runner.getProgress()); _myProgress = 0.5; ASSERT_EQUAL(_middleProgress, _runner.getProgress()); @@ -52,9 +50,7 @@ struct MyTask : public IReprocessingTask ASSERT_EQUAL(_finalProgress, _runner.getProgress()); } - virtual Progress - getProgress() const override - { + Progress getProgress() const override { return Progress(_myProgress, _weight); } @@ -65,11 +61,7 @@ struct MyTask : public IReprocessingTask double finalProgress, double weight) { - return std::make_shared(runner, - initProgress, - middleProgress, - finalProgress, - weight); + return std::make_shared(runner, initProgress, middleProgress, finalProgress, weight); } }; @@ -77,16 +69,8 @@ TEST_F("require that progress is calculated when tasks are executed", Fixture) { TaskList tasks; EXPECT_EQUAL(0.0, f._runner.getProgress()); - tasks.push_back(MyTask::create(f._runner, - 0.0, - 0.1, - 0.2, - 1.0)); - tasks.push_back(MyTask::create(f._runner, - 0.2, - 0.6, - 1.0, - 4.0)); + tasks.push_back(MyTask::create(f._runner, 0.0, 0.1, 0.2, 1.0)); + tasks.push_back(MyTask::create(f._runner, 0.2, 0.6, 1.0, 4.0)); f._runner.addTasks(tasks); tasks.clear(); EXPECT_EQUAL(0.0, f._runner.getProgress()); @@ -99,11 +83,7 @@ TEST_F("require that runner can be reset", Fixture) { TaskList tasks; EXPECT_EQUAL(0.0, f._runner.getProgress()); - tasks.push_back(MyTask::create(f._runner, - 0.0, - 0.5, - 1.0, - 1.0)); + tasks.push_back(MyTask::create(f._runner, 0.0, 0.5, 1.0, 1.0)); f._runner.addTasks(tasks); tasks.clear(); EXPECT_EQUAL(0.0, f._runner.getProgress()); @@ -111,21 +91,13 @@ TEST_F("require that runner can be reset", Fixture) EXPECT_EQUAL(1.0, f._runner.getProgress()); f._runner.reset(); EXPECT_EQUAL(0.0, f._runner.getProgress()); - tasks.push_back(MyTask::create(f._runner, - 0.0, - 0.5, - 1.0, - 1.0)); + tasks.push_back(MyTask::create(f._runner, 0.0, 0.5, 1.0, 1.0)); f._runner.addTasks(tasks); tasks.clear(); EXPECT_EQUAL(0.0, f._runner.getProgress()); f._runner.reset(); EXPECT_EQUAL(0.0, f._runner.getProgress()); - tasks.push_back(MyTask::create(f._runner, - 0.0, - 0.5, - 1.0, - 4.0)); + tasks.push_back(MyTask::create(f._runner, 0.0, 0.5, 1.0, 4.0)); f._runner.addTasks(tasks); tasks.clear(); EXPECT_EQUAL(0.0, f._runner.getProgress()); diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp index 42d88328d14..59e504de6ce 100644 --- a/searchcore/src/tests/proton/server/feedstates_test.cpp +++ b/searchcore/src/tests/proton/server/feedstates_test.cpp @@ -124,7 +124,7 @@ TEST_F("require that replay progress is tracked", Fixture) { RemoveOperationContext opCtx(10); TlsReplayProgress progress("test", 5, 15); - PacketWrapper::SP wrap(new PacketWrapper(*opCtx.packet, &progress)); + auto wrap = std::make_shared(*opCtx.packet, &progress); ForegroundThreadExecutor executor; f.state.receive(wrap, executor); diff --git a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp index 7f650847183..305f5d8c9ba 100644 --- a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp +++ b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp @@ -22,19 +22,13 @@ typedef IFlushTarget::DiskGain DiskGain; class MyFlushHandler : public IFlushHandler { public: - MyFlushHandler(const vespalib::string &name) : IFlushHandler(name) {} - // Implements IFlushHandler - virtual std::vector getFlushTargets() override { + MyFlushHandler(const vespalib::string &name) noexcept : IFlushHandler(name) {} + std::vector getFlushTargets() override { return std::vector(); } - virtual SerialNum getCurrentSerialNumber() const override { return 0; } - virtual void flushDone(SerialNum oldestSerial) override { (void) oldestSerial; } - - virtual void - syncTls(search::SerialNum syncTo) override - { - (void) syncTo; - } + SerialNum getCurrentSerialNumber() const override { return 0; } + void flushDone(SerialNum oldestSerial) override { (void) oldestSerial; } + void syncTls(search::SerialNum syncTo) override {(void) syncTo;} }; class MyFlushTarget : public test::DummyFlushTarget { @@ -47,7 +41,7 @@ private: public: MyFlushTarget(const vespalib::string &name, MemoryGain memoryGain, DiskGain diskGain, SerialNum flushedSerial, - system_time lastFlushTime, bool urgentFlush) : + system_time lastFlushTime, bool urgentFlush) noexcept : test::DummyFlushTarget(name), _memoryGain(memoryGain), _diskGain(diskGain), @@ -56,12 +50,11 @@ public: _urgentFlush(urgentFlush) { } - // Implements IFlushTarget - virtual MemoryGain getApproxMemoryGain() const override { return _memoryGain; } - virtual DiskGain getApproxDiskGain() const override { return _diskGain; } - virtual SerialNum getFlushedSerialNum() const override { return _flushedSerial; } - virtual system_time getLastFlushTime() const override { return _lastFlushTime; } - virtual bool needUrgentFlush() const override { return _urgentFlush; } + MemoryGain getApproxMemoryGain() const override { return _memoryGain; } + DiskGain getApproxDiskGain() const override { return _diskGain; } + SerialNum getFlushedSerialNum() const override { return _flushedSerial; } + system_time getLastFlushTime() const override { return _lastFlushTime; } + bool needUrgentFlush() const override { return _urgentFlush; } }; struct StringList : public std::vector { diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_populator.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_populator.cpp index 5208195a968..33a5776cb8a 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_populator.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_populator.cpp @@ -18,7 +18,7 @@ class PopulateDoneContext : public IDestructorCallback { std::shared_ptr _doc; public: - PopulateDoneContext(std::shared_ptr doc) + PopulateDoneContext(std::shared_ptr doc) noexcept : _doc(std::move(doc)) { } diff --git a/searchcore/src/vespa/searchcore/proton/common/doctypename.cpp b/searchcore/src/vespa/searchcore/proton/common/doctypename.cpp index 21b27ef6ffd..4d76018d66b 100644 --- a/searchcore/src/vespa/searchcore/proton/common/doctypename.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/doctypename.cpp @@ -7,12 +7,12 @@ namespace proton { -DocTypeName::DocTypeName(const search::engine::Request &request) +DocTypeName::DocTypeName(const search::engine::Request &request) noexcept : _name(request.propertiesMap.matchProperties().lookup("documentdb", "searchdoctype").get("")) {} -DocTypeName::DocTypeName(const document::DocumentType &docType) +DocTypeName::DocTypeName(const document::DocumentType &docType) noexcept : _name(docType.getName()) {} diff --git a/searchcore/src/vespa/searchcore/proton/common/doctypename.h b/searchcore/src/vespa/searchcore/proton/common/doctypename.h index 661d54ab8d4..f0fa3c72ee9 100644 --- a/searchcore/src/vespa/searchcore/proton/common/doctypename.h +++ b/searchcore/src/vespa/searchcore/proton/common/doctypename.h @@ -13,9 +13,9 @@ class DocTypeName vespalib::string _name; public: - explicit DocTypeName(const vespalib::string &name) : _name(name) { } - explicit DocTypeName(const search::engine::Request &request); - explicit DocTypeName(const document::DocumentType &docType); + explicit DocTypeName(const vespalib::string &name) noexcept : _name(name) { } + explicit DocTypeName(const search::engine::Request &request) noexcept; + explicit DocTypeName(const document::DocumentType &docType) noexcept; const vespalib::string & getName() const { return _name; } diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h index dd32abcab6e..c16dd8a7292 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h @@ -14,7 +14,7 @@ class IGidCompare public: typedef std::shared_ptr SP; - virtual ~IGidCompare() {} + virtual ~IGidCompare() = default; virtual bool operator()(const document::GlobalId &lhs, const document::GlobalId &rhs) const = 0; @@ -30,14 +30,13 @@ private: document::GlobalId::BucketOrderCmp _comp; public: - DefaultGidCompare() + DefaultGidCompare() noexcept : IGidCompare(), _comp() { } - virtual bool operator()(const document::GlobalId &lhs, - const document::GlobalId &rhs) const override { + bool operator()(const document::GlobalId &lhs, const document::GlobalId &rhs) const override { return _comp(lhs, rhs); } }; diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h b/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h index 914de9df30c..ca23f27ed49 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h @@ -28,7 +28,7 @@ public: * * @param name The unique name of this handler. */ - IFlushHandler(const vespalib::string &name) + IFlushHandler(const vespalib::string &name) noexcept : _name(name) { } diff --git a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h index f28c46334bc..bd0d82b0b2c 100644 --- a/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h +++ b/searchcore/src/vespa/searchcore/proton/initializer/task_runner.h @@ -28,7 +28,7 @@ class TaskRunner { using SP = std::shared_ptr; Context(InitializerTask::SP rootTask, vespalib::Executor &contextExecutor, - vespalib::Executor::Task::UP doneTask) + vespalib::Executor::Task::UP doneTask) noexcept : _rootTask(rootTask), _contextExecutor(contextExecutor), _doneTask(std::move(doneTask)) diff --git a/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h b/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h index 96c83270735..0cff5583bbd 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h +++ b/searchcore/src/vespa/searchcore/proton/matching/sessionmanager.h @@ -37,7 +37,7 @@ public: vespalib::steady_time doom; SearchSessionInfo(const vespalib::string &id_in, vespalib::steady_time created_in, - vespalib::steady_time doom_in) + vespalib::steady_time doom_in) noexcept : id(id_in), created(created_in), doom(doom_in) {} }; diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp index 174ba090842..a52be734c13 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp @@ -111,7 +111,7 @@ TlsMgrWriter::sync(SerialNum syncTo) class OnCommitDone : public search::IDestructorCallback { public: - OnCommitDone(Executor & executor, std::unique_ptr task) + OnCommitDone(Executor & executor, std::unique_ptr task) noexcept : _executor(executor), _task(std::move(task)) {} diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstates.h b/searchcore/src/vespa/searchcore/proton/server/feedstates.h index 0c2e9109cce..3d24f4068a2 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedstates.h +++ b/searchcore/src/vespa/searchcore/proton/server/feedstates.h @@ -24,7 +24,7 @@ class InitState : public FeedState { vespalib::string _doc_type_name; public: - InitState(const vespalib::string &name) + InitState(const vespalib::string &name) noexcept : FeedState(INIT), _doc_type_name(name) { @@ -73,7 +73,7 @@ class NormalState : public FeedState { FeedHandler &_handler; public: - NormalState(FeedHandler &handler) + NormalState(FeedHandler &handler) noexcept : FeedState(NORMAL), _handler(handler) { } diff --git a/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp b/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp index e535b05393c..c84abb373f8 100644 --- a/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp @@ -10,7 +10,7 @@ using BlockedReason = IBlockableMaintenanceJob::BlockedReason; struct MoveOperationLimiter::Callback : public search::IDestructorCallback { MoveOperationLimiter::SP _limiter; - Callback(MoveOperationLimiter::SP limiter) : _limiter(std::move(limiter)) {} + Callback(MoveOperationLimiter::SP limiter) noexcept : _limiter(std::move(limiter)) {} virtual ~Callback() { _limiter->endOperation(); } }; diff --git a/searchcore/src/vespa/searchcore/proton/server/packetwrapper.h b/searchcore/src/vespa/searchcore/proton/server/packetwrapper.h index c36652ec847..6f132604662 100644 --- a/searchcore/src/vespa/searchcore/proton/server/packetwrapper.h +++ b/searchcore/src/vespa/searchcore/proton/server/packetwrapper.h @@ -20,8 +20,7 @@ struct PacketWrapper { search::transactionlog::client::RPC::Result result; vespalib::Gate gate; - PacketWrapper(const search::transactionlog::Packet &p, - TlsReplayProgress *progress_) + PacketWrapper(const search::transactionlog::Packet &p, TlsReplayProgress *progress_) noexcept : packet(p), progress(progress_), result(search::transactionlog::client::RPC::ERROR), diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp index c724e1065e9..62ffdb3e5a8 100644 --- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp @@ -19,7 +19,7 @@ namespace { struct Pair { string key; string value; - Pair(const string &k, const string &v) + Pair(const string &k, const string &v) noexcept : key(k), value(v) { diff --git a/searchcore/src/vespa/searchcore/proton/test/document_meta_store_observer.h b/searchcore/src/vespa/searchcore/proton/test/document_meta_store_observer.h index 66cc5ed0fea..a6ff6d86d0d 100644 --- a/searchcore/src/vespa/searchcore/proton/test/document_meta_store_observer.h +++ b/searchcore/src/vespa/searchcore/proton/test/document_meta_store_observer.h @@ -15,38 +15,36 @@ struct DocumentMetaStoreObserver : public IDocumentMetaStore DocId _compactLidSpaceLidLimit; uint32_t _holdUnblockShrinkLidSpaceCnt; - DocumentMetaStoreObserver(IDocumentMetaStore &store) + DocumentMetaStoreObserver(IDocumentMetaStore &store) noexcept : _store(store), _removeCompleteCnt(0), _removeCompleteLid(0), _compactLidSpaceLidLimit(0), _holdUnblockShrinkLidSpaceCnt(0) - { - } + {} /** * Implements search::IDocumentMetaStore **/ - virtual bool getGid(DocId lid, GlobalId &gid) const override { + bool getGid(DocId lid, GlobalId &gid) const override { return _store.getGid(lid, gid); } - virtual bool getGidEvenIfMoved(DocId lid, GlobalId &gid) const override { + bool getGidEvenIfMoved(DocId lid, GlobalId &gid) const override { return _store.getGidEvenIfMoved(lid, gid); } - virtual bool getLid(const GlobalId &gid, DocId &lid) const override { + bool getLid(const GlobalId &gid, DocId &lid) const override { return _store.getLid(gid, lid); } - virtual search::DocumentMetaData getMetaData(const GlobalId &gid) const override { + search::DocumentMetaData getMetaData(const GlobalId &gid) const override { return _store.getMetaData(gid); } - virtual void getMetaData(const BucketId &bucketId, - search::DocumentMetaData::Vector &result) const override { + void getMetaData(const BucketId &bucketId, search::DocumentMetaData::Vector &result) const override { _store.getMetaData(bucketId, result); } - virtual search::LidUsageStats getLidUsageStats() const override { + search::LidUsageStats getLidUsageStats() const override { return _store.getLidUsageStats(); } - virtual search::queryeval::Blueprint::UP createWhiteListBlueprint() const override { + search::queryeval::Blueprint::UP createWhiteListBlueprint() const override { return _store.createWhiteListBlueprint(); } uint64_t getCurrentGeneration() const override { @@ -57,40 +55,39 @@ struct DocumentMetaStoreObserver : public IDocumentMetaStore /** * Implements documentmetastore::IStore. */ - virtual Result inspectExisting(const GlobalId &gid, uint64_t prepare_serial_num) override { + Result inspectExisting(const GlobalId &gid, uint64_t prepare_serial_num) override { return _store.inspectExisting(gid, prepare_serial_num); } - virtual Result inspect(const GlobalId &gid, uint64_t prepare_serial_num) override { + Result inspect(const GlobalId &gid, uint64_t prepare_serial_num) override { return _store.inspect(gid, prepare_serial_num); } - virtual Result put(const GlobalId &gid, - const BucketId &bucketId, - const Timestamp ×tamp, - uint32_t docSize, - DocId lid, - uint64_t prepare_serial_num) override { + Result put(const GlobalId &gid, + const BucketId &bucketId, + const Timestamp ×tamp, + uint32_t docSize, + DocId lid, + uint64_t prepare_serial_num) override + { return _store.put(gid, bucketId, timestamp, docSize, lid, prepare_serial_num); } - virtual bool updateMetaData(DocId lid, - const BucketId &bucketId, - const Timestamp ×tamp) override { + bool updateMetaData(DocId lid, const BucketId &bucketId, const Timestamp ×tamp) override { return _store.updateMetaData(lid, bucketId, timestamp); } - virtual bool remove(DocId lid, uint64_t prepare_serial_num) override { + bool remove(DocId lid, uint64_t prepare_serial_num) override { return _store.remove(lid, prepare_serial_num); } - virtual void removeComplete(DocId lid) override { + void removeComplete(DocId lid) override { ++_removeCompleteCnt; _removeCompleteLid = lid; _store.removeComplete(lid); } - virtual void move(DocId fromLid, DocId toLid, uint64_t prepare_serial_num) override { + void move(DocId fromLid, DocId toLid, uint64_t prepare_serial_num) override { _store.move(fromLid, toLid, prepare_serial_num); } - virtual bool validLid(DocId lid) const override { + bool validLid(DocId lid) const override { return _store.validLid(lid); } - virtual void removeBatch(const std::vector &lidsToRemove, + void removeBatch(const std::vector &lidsToRemove, const DocId docIdLimit) override { _store.removeBatch(lidsToRemove, docIdLimit); } diff --git a/searchcore/src/vespa/searchcore/proton/test/dummy_flush_handler.h b/searchcore/src/vespa/searchcore/proton/test/dummy_flush_handler.h index 53fa8a9c3fb..af2f4c63443 100644 --- a/searchcore/src/vespa/searchcore/proton/test/dummy_flush_handler.h +++ b/searchcore/src/vespa/searchcore/proton/test/dummy_flush_handler.h @@ -3,37 +3,32 @@ #include -namespace proton { - -namespace test { +namespace proton::test { /** * Default implementation used for testing. */ struct DummyFlushHandler : public IFlushHandler { - DummyFlushHandler(const vespalib::string &name) + DummyFlushHandler(const vespalib::string &name) noexcept : IFlushHandler(name) {} - // Implements IFlushHandler - virtual std::vector getFlushTargets() override { + std::vector getFlushTargets() override { return std::vector(); } - virtual SerialNum getCurrentSerialNumber() const override { + SerialNum getCurrentSerialNumber() const override { return 0; } - virtual void flushDone(SerialNum oldestSerial) override { + void flushDone(SerialNum oldestSerial) override { (void) oldestSerial; } - virtual void syncTls(SerialNum syncTo) override { + void syncTls(SerialNum syncTo) override { (void) syncTo; } }; -} // namespace test - -} // namespace proton +} diff --git a/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h b/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h index 8e291126430..dd3cd49df2f 100644 --- a/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h +++ b/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h @@ -3,39 +3,33 @@ #include -namespace proton { - -namespace test { +namespace proton::test { struct DummyFlushTarget : public searchcorespi::IFlushTarget { - DummyFlushTarget(const vespalib::string &name) + DummyFlushTarget(const vespalib::string &name) noexcept : searchcorespi::IFlushTarget(name) {} DummyFlushTarget(const vespalib::string &name, const Type &type, - const Component &component) + const Component &component) noexcept : searchcorespi::IFlushTarget(name, type, component) {} - // Implements searchcorespi::IFlushTarget - virtual MemoryGain getApproxMemoryGain() const override { return MemoryGain(0, 0); } - virtual DiskGain getApproxDiskGain() const override { return DiskGain(0, 0); } - virtual SerialNum getFlushedSerialNum() const override { return 0; } - virtual Time getLastFlushTime() const override { return Time(); } - virtual bool needUrgentFlush() const override { return false; } - virtual searchcorespi::FlushTask::UP initFlush(SerialNum) override { + MemoryGain getApproxMemoryGain() const override { return MemoryGain(0, 0); } + DiskGain getApproxDiskGain() const override { return DiskGain(0, 0); } + SerialNum getFlushedSerialNum() const override { return 0; } + Time getLastFlushTime() const override { return Time(); } + bool needUrgentFlush() const override { return false; } + searchcorespi::FlushTask::UP initFlush(SerialNum) override { return searchcorespi::FlushTask::UP(); } - virtual searchcorespi::FlushStats getLastFlushStats() const override { + searchcorespi::FlushStats getLastFlushStats() const override { return searchcorespi::FlushStats(); } - virtual uint64_t getApproxBytesToWriteToDisk() const override { + uint64_t getApproxBytesToWriteToDisk() const override { return 0; } }; -} // namespace test - -} // namespace proton - +} diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h index e808f721e83..f9531486e9b 100644 --- a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h +++ b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h @@ -23,7 +23,7 @@ private: std::vector> _listeners; public: - MockGidToLidChangeHandler() + MockGidToLidChangeHandler() noexcept : IGidToLidChangeHandler(), _adds(), _removes(), @@ -31,7 +31,7 @@ public: { } - ~MockGidToLidChangeHandler() override { } + ~MockGidToLidChangeHandler() override = default; void addListener(std::unique_ptr listener) override { _adds.emplace_back(listener->getDocTypeName(), listener->getName()); -- cgit v1.2.3