diff options
Diffstat (limited to 'storage')
123 files changed, 489 insertions, 517 deletions
diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp index 9277429eedd..f9ae4f57fa5 100644 --- a/storage/src/tests/bucketdb/bucketmanagertest.cpp +++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp @@ -153,11 +153,11 @@ public: static constexpr uint32_t MESSAGE_WAIT_TIME = 60*2; - void setUp() { + void setUp() override { _emptyBuckets = 0; } - void tearDown() { + void tearDown() override { } friend class ConcurrentOperationFixture; diff --git a/storage/src/tests/bucketdb/initializertest.cpp b/storage/src/tests/bucketdb/initializertest.cpp index 05e00184ce3..9aa7da92e36 100644 --- a/storage/src/tests/bucketdb/initializertest.cpp +++ b/storage/src/tests/bucketdb/initializertest.cpp @@ -423,7 +423,7 @@ struct FakePersistenceLayer : public StorageLink { } return 0; } - virtual bool onDown(const api::StorageMessage::SP& msg) { + virtual bool onDown(const api::StorageMessage::SP& msg) override { fatalError = ""; if (messageCallback) { messageCallback->onMessage(*msg); @@ -795,7 +795,7 @@ struct DatabaseInsertCallback : MessageCallback _expectedReadBucketPriority(255) {} - void onMessage(const api::StorageMessage& msg) + void onMessage(const api::StorageMessage& msg) override { // Always make sure we're not set as initialized while we're still // processing messages! Also ensure progress never goes down. diff --git a/storage/src/tests/bucketdb/lockablemaptest.cpp b/storage/src/tests/bucketdb/lockablemaptest.cpp index f18e0edc02a..91f273928d6 100644 --- a/storage/src/tests/bucketdb/lockablemaptest.cpp +++ b/storage/src/tests/bucketdb/lockablemaptest.cpp @@ -354,7 +354,7 @@ namespace { struct InsertEraseLoadGiver : public LoadGiver { InsertEraseLoadGiver(Map& map) : LoadGiver(map) {} - void run() { + void run() override { // Screws up order of buckets by xor'ing with 12345. // Only operate on last 32k super buckets. while (running()) { @@ -375,7 +375,7 @@ namespace { struct GetLoadGiver : public LoadGiver { GetLoadGiver(Map& map) : LoadGiver(map) {} - void run() { + void run() override { // It's legal to keep entries as long as you only request higher // buckets. So, to test this, keep entries until you request one // that is smaller than those stored. @@ -395,7 +395,7 @@ namespace { struct AllLoadGiver : public LoadGiver { AllLoadGiver(Map& map) : LoadGiver(map) {} - void run() { + void run() override { while (running()) { _map.all(*this, "foo"); ++_counter; @@ -413,7 +413,7 @@ namespace { struct EachLoadGiver : public LoadGiver { EachLoadGiver(Map& map) : LoadGiver(map) {} - void run() { + void run() override { while (running()) { _map.each(*this, "foo"); ++_counter; @@ -431,7 +431,7 @@ namespace { struct RandomRangeLoadGiver : public LoadGiver { RandomRangeLoadGiver(Map& map) : LoadGiver(map) {} - void run() { + void run() override { while (running()) { uint32_t min = (_counter ^ 23426) % 0x10000; uint32_t max = (_counter ^ 40612) % 0x10000; @@ -460,7 +460,7 @@ namespace { struct GetNextLoadGiver : public LoadGiver { GetNextLoadGiver(Map& map) : LoadGiver(map) {} - void run() { + void run() override { while (running()) { uint32_t bucket = (_counter ^ 60417) % 0xffff; if (_counter % 7 < 5) { diff --git a/storage/src/tests/bucketmover/bucketmovertest.cpp b/storage/src/tests/bucketmover/bucketmovertest.cpp index 2720e6bac2a..3a844b6d1d8 100644 --- a/storage/src/tests/bucketmover/bucketmovertest.cpp +++ b/storage/src/tests/bucketmover/bucketmovertest.cpp @@ -16,8 +16,8 @@ namespace bucketmover { struct BucketMoverTest : public CppUnit::TestFixture { public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testNormalUsage(); void testMaxPending(); diff --git a/storage/src/tests/common/dummystoragelink.h b/storage/src/tests/common/dummystoragelink.h index 072d961cbc0..34206e3d271 100644 --- a/storage/src/tests/common/dummystoragelink.h +++ b/storage/src/tests/common/dummystoragelink.h @@ -33,14 +33,14 @@ public: DummyStorageLink(); ~DummyStorageLink(); - bool onDown(const api::StorageMessage::SP&); - bool onUp(const api::StorageMessage::SP&); + bool onDown(const api::StorageMessage::SP&) override; + bool onUp(const api::StorageMessage::SP&) override; void addOnTopOfChain(StorageLink& link) { link.addTestLinkOnTop(this); } - void print(std::ostream& ost, bool verbose, const std::string& indent) const + void print(std::ostream& ost, bool verbose, const std::string& indent) const override { (void) verbose; ost << indent << "DummyStorageLink(" diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp index 5ee7d4633ad..8dea2fad94f 100644 --- a/storage/src/tests/common/metricstest.cpp +++ b/storage/src/tests/common/metricstest.cpp @@ -40,8 +40,8 @@ struct MetricsTest : public CppUnit::TestFixture { MetricsTest(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void runLoad(uint32_t count = 1); void createFakeLoad(); @@ -67,9 +67,9 @@ namespace { { framework::Clock& _clock; MetricClock(framework::Clock& c) : _clock(c) {} - virtual time_t getTime() const + virtual time_t getTime() const override { return _clock.getTimeInSeconds().getTime(); } - virtual time_t getTimeInMilliSecs() const + virtual time_t getTimeInMilliSecs() const override { return _clock.getTimeInMillis().getTime(); } }; } diff --git a/storage/src/tests/distributor/blockingoperationstartertest.cpp b/storage/src/tests/distributor/blockingoperationstartertest.cpp index ee0058643d9..2ae8a819d7e 100644 --- a/storage/src/tests/distributor/blockingoperationstartertest.cpp +++ b/storage/src/tests/distributor/blockingoperationstartertest.cpp @@ -40,7 +40,7 @@ public: void testOperationNotBlockedWhenNoMessagesPending(); void testOperationBlockedWhenMessagesPending(); - void setUp(); + void setUp() override; }; CPPUNIT_TEST_SUITE_REGISTRATION(BlockingOperationStarterTest); diff --git a/storage/src/tests/distributor/bucketdatabasetest.cpp b/storage/src/tests/distributor/bucketdatabasetest.cpp index 011b02c8f89..13a8aff239c 100644 --- a/storage/src/tests/distributor/bucketdatabasetest.cpp +++ b/storage/src/tests/distributor/bucketdatabasetest.cpp @@ -73,7 +73,7 @@ namespace { struct ModifyProcessor : public BucketDatabase::MutableEntryProcessor { - bool process(BucketDatabase::Entry& e) { + bool process(BucketDatabase::Entry& e) override { if (e.getBucketId() == document::BucketId(16, 0x0b)) { e.getBucketInfo() = BI(7); } else if (e.getBucketId() == document::BucketId(16, 0x2a)) { @@ -90,7 +90,7 @@ struct ListAllProcessor : public BucketDatabase::EntryProcessor { std::ostringstream ost; - bool process(const BucketDatabase::Entry& e) { + bool process(const BucketDatabase::Entry& e) override { ost << e << "\n"; return true; } @@ -100,7 +100,7 @@ struct DummyProcessor : public BucketDatabase::EntryProcessor { std::ostringstream ost; - bool process(const BucketDatabase::Entry&) { + bool process(const BucketDatabase::Entry&) override { return true; } }; @@ -110,7 +110,7 @@ struct StoppingProcessor : public BucketDatabase::EntryProcessor { std::ostringstream ost; - bool process(const BucketDatabase::Entry& e) { + bool process(const BucketDatabase::Entry& e) override { ost << e << "\n"; if (e.getBucketId() == document::BucketId(16, 0x2a)) { diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp index e0c0a76f3e7..d89ce2a03d0 100644 --- a/storage/src/tests/distributor/bucketdbupdatertest.cpp +++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp @@ -141,11 +141,11 @@ protected: } public: - void setUp() { + void setUp() override { createLinks(); }; - void tearDown() { + void tearDown() override { close(); } @@ -1746,7 +1746,7 @@ struct BucketDumper : public BucketDatabase::EntryProcessor { } - bool process(const BucketDatabase::Entry& e) { + bool process(const BucketDatabase::Entry& e) override { document::BucketId bucketId(e.getBucketId()); ost << (uint32_t)bucketId.getRawId() << ":"; diff --git a/storage/src/tests/distributor/bucketstateoperationtest.cpp b/storage/src/tests/distributor/bucketstateoperationtest.cpp index 67346626ad0..74a31de1541 100644 --- a/storage/src/tests/distributor/bucketstateoperationtest.cpp +++ b/storage/src/tests/distributor/bucketstateoperationtest.cpp @@ -28,12 +28,12 @@ private: void testBucketDbNotUpdatedOnFailure(); public: - void setUp() + void setUp() override { createLinks(); } - void tearDown() + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp index c1b5487717e..e7078f08d0a 100644 --- a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp +++ b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp @@ -58,7 +58,7 @@ struct MockedLatencyStatisticsProvider : LatencyStatisticsProvider { NodeStatsSnapshot returnedSnapshot; - NodeStatsSnapshot doGetLatencyStatistics() const { + NodeStatsSnapshot doGetLatencyStatistics() const override { return returnedSnapshot; } }; diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp index 40359ef460f..fc09dc17c1f 100644 --- a/storage/src/tests/distributor/distributortest.cpp +++ b/storage/src/tests/distributor/distributortest.cpp @@ -75,11 +75,11 @@ protected: void configured_safe_time_point_rejection_works_end_to_end(); public: - void setUp() { + void setUp() override { createLinks(); }; - void tearDown() { + void tearDown() override { close(); } @@ -375,7 +375,7 @@ public: StatusRequestThread(StatusReporterDelegate& reporter) : _reporter(reporter) {} - void run(framework::ThreadHandle&) { + void run(framework::ThreadHandle&) override { framework::HttpUrlPath path("/distributor?page=buckets"); std::ostringstream stream; _reporter.reportStatus(stream, path); diff --git a/storage/src/tests/distributor/garbagecollectiontest.cpp b/storage/src/tests/distributor/garbagecollectiontest.cpp index 73d872d3331..7f9098778cf 100644 --- a/storage/src/tests/distributor/garbagecollectiontest.cpp +++ b/storage/src/tests/distributor/garbagecollectiontest.cpp @@ -20,11 +20,11 @@ protected: void testSimple(); public: - void setUp() { + void setUp() override { createLinks(); }; - void tearDown() { + void tearDown() override { close(); } }; diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp index 15e87e4747b..f50ac81c0ad 100644 --- a/storage/src/tests/distributor/getoperationtest.cpp +++ b/storage/src/tests/distributor/getoperationtest.cpp @@ -52,7 +52,7 @@ public: document::BucketId bucketId; std::unique_ptr<Operation> op; - void setUp() { + void setUp() override { _repo.reset( new document::DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig>:: getConfig("config-doctypes", @@ -63,7 +63,7 @@ public: bucketId = getExternalOperationHandler().getBucketId(docId); }; - void tearDown() { + void tearDown() override { close(); op.reset(); } diff --git a/storage/src/tests/distributor/idealstatemanagertest.cpp b/storage/src/tests/distributor/idealstatemanagertest.cpp index 0522f0d4bc2..2b861d23c5e 100644 --- a/storage/src/tests/distributor/idealstatemanagertest.cpp +++ b/storage/src/tests/distributor/idealstatemanagertest.cpp @@ -20,11 +20,11 @@ class IdealStateManagerTest : public CppUnit::TestFixture, { public: IdealStateManagerTest() {} - void setUp() { + void setUp() override { createLinks(); }; - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/joinbuckettest.cpp b/storage/src/tests/distributor/joinbuckettest.cpp index 2e80605cc47..d817c7f14e0 100644 --- a/storage/src/tests/distributor/joinbuckettest.cpp +++ b/storage/src/tests/distributor/joinbuckettest.cpp @@ -25,11 +25,11 @@ protected: void sendSparseJoinsToNodesWithoutBothSourceBuckets(); public: - void setUp() { + void setUp() override { createLinks(); }; - void tearDown() { + void tearDown() override { close(); } }; diff --git a/storage/src/tests/distributor/maintenanceschedulertest.cpp b/storage/src/tests/distributor/maintenanceschedulertest.cpp index dfc81c1110c..52ae9f6c8a6 100644 --- a/storage/src/tests/distributor/maintenanceschedulertest.cpp +++ b/storage/src/tests/distributor/maintenanceschedulertest.cpp @@ -39,7 +39,7 @@ public: void testSuppressLowPrioritiesInEmergencyMode(); void testPriorityNotClearedIfOperationNotStarted(); - void setUp(); + void setUp() override; }; CPPUNIT_TEST_SUITE_REGISTRATION(MaintenanceSchedulerTest); diff --git a/storage/src/tests/distributor/mapbucketdatabasetest.cpp b/storage/src/tests/distributor/mapbucketdatabasetest.cpp index fbc13d5a8a2..6892f522bba 100644 --- a/storage/src/tests/distributor/mapbucketdatabasetest.cpp +++ b/storage/src/tests/distributor/mapbucketdatabasetest.cpp @@ -13,7 +13,7 @@ namespace distributor { struct MapBucketDatabaseTest : public BucketDatabaseTest { MapBucketDatabase _db; - virtual BucketDatabase& db() { return _db; }; + virtual BucketDatabase& db() override { return _db; } CPPUNIT_TEST_SUITE(MapBucketDatabaseTest); SETUP_DATABASE_TESTS(); diff --git a/storage/src/tests/distributor/mergeoperationtest.cpp b/storage/src/tests/distributor/mergeoperationtest.cpp index bd71b69673a..875d16a42ed 100644 --- a/storage/src/tests/distributor/mergeoperationtest.cpp +++ b/storage/src/tests/distributor/mergeoperationtest.cpp @@ -41,13 +41,13 @@ protected: void onlyMarkRedundantRetiredReplicasAsSourceOnly(); public: - void setUp() { + void setUp() override { createLinks(); _pendingTracker.reset(new PendingMessageTracker(getComponentRegister())); _sender.setPendingMessageTracker(*_pendingTracker); } - void tearDown() { + void tearDown() override { close(); } }; diff --git a/storage/src/tests/distributor/operationtargetresolvertest.cpp b/storage/src/tests/distributor/operationtargetresolvertest.cpp index 36dc849d964..26144ac950e 100644 --- a/storage/src/tests/distributor/operationtargetresolvertest.cpp +++ b/storage/src/tests/distributor/operationtargetresolvertest.cpp @@ -44,7 +44,7 @@ struct OperationTargetResolverTest : public CppUnit::TestFixture, BucketInstanceList getInstances(const BucketId& bid, bool stripToRedundancy); - void setUp() { + void setUp() override { _repo.reset(new document::DocumentTypeRepo( *config::ConfigGetter<document::DocumenttypesConfig>::getConfig( "config-doctypes", @@ -53,7 +53,7 @@ struct OperationTargetResolverTest : public CppUnit::TestFixture, createLinks(); }; - void tearDown() { + void tearDown() override { close(); } @@ -84,7 +84,7 @@ namespace { { \ struct MyAsserter : public Asserter { \ void assertEqualMsg(std::string t1, OperationTargetList t2, \ - OperationTargetList t3) { \ + OperationTargetList t3) override { \ CPPUNIT_ASSERT_EQUAL_MSG(t1, t2, t3); \ } \ }; \ diff --git a/storage/src/tests/distributor/pendingmessagetrackertest.cpp b/storage/src/tests/distributor/pendingmessagetrackertest.cpp index c83fbbe143b..6f4539d426e 100644 --- a/storage/src/tests/distributor/pendingmessagetrackertest.cpp +++ b/storage/src/tests/distributor/pendingmessagetrackertest.cpp @@ -412,7 +412,7 @@ public: TestChecker() : pri(UINT8_MAX) {} - bool check(uint32_t msgType, uint16_t node, uint8_t p) { + bool check(uint32_t msgType, uint16_t node, uint8_t p) override { (void) node; if (msgType == api::MessageType::REMOVE_ID) { pri = p; diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp index 5c156411e11..83b99460f2c 100644 --- a/storage/src/tests/distributor/putoperationtest.cpp +++ b/storage/src/tests/distributor/putoperationtest.cpp @@ -90,7 +90,7 @@ protected: void doTestCreationWithBucketActivationDisabled(bool disabled); public: - void setUp() { + void setUp() override { _repo.reset( new DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig> ::getConfig("config-doctypes", @@ -99,7 +99,7 @@ public: createLinks(); }; - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/removebucketoperationtest.cpp b/storage/src/tests/distributor/removebucketoperationtest.cpp index 7cf63a3146f..177f66eaec5 100644 --- a/storage/src/tests/distributor/removebucketoperationtest.cpp +++ b/storage/src/tests/distributor/removebucketoperationtest.cpp @@ -26,11 +26,11 @@ protected: void testFailWithInvalidBucketInfo(); public: - void setUp() { + void setUp() override { createLinks(); }; - void tearDown() { + void tearDown() override { close(); } }; diff --git a/storage/src/tests/distributor/removelocationtest.cpp b/storage/src/tests/distributor/removelocationtest.cpp index 954bfb6210b..876a01e4a6f 100644 --- a/storage/src/tests/distributor/removelocationtest.cpp +++ b/storage/src/tests/distributor/removelocationtest.cpp @@ -24,11 +24,11 @@ protected: public: std::unique_ptr<RemoveLocationOperation> op; - void setUp() { + void setUp() override { createLinks(); }; - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/removeoperationtest.cpp b/storage/src/tests/distributor/removeoperationtest.cpp index 9d0849962e4..a8f635b19e2 100644 --- a/storage/src/tests/distributor/removeoperationtest.cpp +++ b/storage/src/tests/distributor/removeoperationtest.cpp @@ -38,7 +38,7 @@ public: document::BucketId bucketId; std::unique_ptr<RemoveOperation> op; - void setUp() { + void setUp() override { createLinks(); docId = document::DocumentId(document::DocIdString("test", "uri")); @@ -46,7 +46,7 @@ public: _distributor->enableClusterState(lib::ClusterState("distributor:1 storage:4")); }; - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/simplemaintenancescannertest.cpp b/storage/src/tests/distributor/simplemaintenancescannertest.cpp index 3486f41149b..100d5582006 100644 --- a/storage/src/tests/distributor/simplemaintenancescannertest.cpp +++ b/storage/src/tests/distributor/simplemaintenancescannertest.cpp @@ -51,7 +51,7 @@ public: void perNodeMaintenanceStatsAreTracked(); void testReset(); - void setUp(); + void setUp() override; }; CPPUNIT_TEST_SUITE_REGISTRATION(SimpleMaintenanceScannerTest); diff --git a/storage/src/tests/distributor/splitbuckettest.cpp b/storage/src/tests/distributor/splitbuckettest.cpp index c69af0e038c..de99884b52b 100644 --- a/storage/src/tests/distributor/splitbuckettest.cpp +++ b/storage/src/tests/distributor/splitbuckettest.cpp @@ -42,14 +42,14 @@ protected: public: SplitOperationTest(); - void setUp() { + void setUp() override { createLinks(); getConfig().setSplitCount(splitCount); getConfig().setSplitSize(splitByteSize); } - void tearDown() { + void tearDown() override { close(); } }; diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp index f09c93622de..c9ab8a0aa78 100644 --- a/storage/src/tests/distributor/statecheckerstest.cpp +++ b/storage/src/tests/distributor/statecheckerstest.cpp @@ -31,11 +31,11 @@ struct StateCheckersTest : public CppUnit::TestFixture, { StateCheckersTest() {} - void setUp() { + void setUp() override { createLinks(); } - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/statoperationtest.cpp b/storage/src/tests/distributor/statoperationtest.cpp index f35869cf680..3526e789c96 100644 --- a/storage/src/tests/distributor/statoperationtest.cpp +++ b/storage/src/tests/distributor/statoperationtest.cpp @@ -14,11 +14,11 @@ namespace distributor { struct StatOperationTest : public CppUnit::TestFixture, public DistributorTestUtil { - void setUp() { + void setUp() override { createLinks(); }; - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/statusreporterdelegatetest.cpp b/storage/src/tests/distributor/statusreporterdelegatetest.cpp index f05eebed0ce..f136b00244a 100644 --- a/storage/src/tests/distributor/statusreporterdelegatetest.cpp +++ b/storage/src/tests/distributor/statusreporterdelegatetest.cpp @@ -26,7 +26,7 @@ namespace { class MockDelegator : public StatusDelegator { mutable std::ostringstream _calls; - bool handleStatusRequest(const DelegatedStatusRequest& request) const { + bool handleStatusRequest(const DelegatedStatusRequest& request) const override { _calls << "Request(" << request.path << ")"; return request.reporter.reportStatus(request.outputStream, request.path); } @@ -43,13 +43,13 @@ public: : framework::StatusReporter("foo", "Bar") {} vespalib::string getReportContentType( - const framework::HttpUrlPath&) const + const framework::HttpUrlPath&) const override { return "foo/bar"; } bool reportStatus(std::ostream& os, - const framework::HttpUrlPath& path) const + const framework::HttpUrlPath& path) const override { os << "reportStatus with " << path; return true; diff --git a/storage/src/tests/distributor/throttlingoperationstartertest.cpp b/storage/src/tests/distributor/throttlingoperationstartertest.cpp index 5c4ba99563c..8e7d98005c1 100644 --- a/storage/src/tests/distributor/throttlingoperationstartertest.cpp +++ b/storage/src/tests/distributor/throttlingoperationstartertest.cpp @@ -38,8 +38,8 @@ public: void testStartingOperationsFillsUpPendingWindow(); void testFinishingOperationsAllowsMoreToStart(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; }; CPPUNIT_TEST_SUITE_REGISTRATION(ThrottlingOperationStarterTest); diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp index 8556f5b5229..fb65e57928e 100644 --- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp +++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp @@ -104,7 +104,7 @@ protected: std::string getUpdatedValueFromLastPut(MessageSenderStub&); public: - void setUp() { + void setUp() override { _repo = _testRepo.getTypeRepoSp(); _doc_type = _repo->getDocumentType("testdoctype1"); createLinks(); @@ -112,7 +112,7 @@ public: getClock().setAbsoluteTimeInSeconds(200); } - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/updateoperationtest.cpp b/storage/src/tests/distributor/updateoperationtest.cpp index 1c47e0a8f05..9c4d1f87fe4 100644 --- a/storage/src/tests/distributor/updateoperationtest.cpp +++ b/storage/src/tests/distributor/updateoperationtest.cpp @@ -43,7 +43,7 @@ protected: void testMultiNodeInconsistentTimestamp(); public: - void setUp() { + void setUp() override { _repo.reset( new DocumentTypeRepo(*ConfigGetter<DocumenttypesConfig>:: getConfig("config-doctypes", @@ -52,7 +52,7 @@ public: createLinks(); } - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/distributor/visitoroperationtest.cpp b/storage/src/tests/distributor/visitoroperationtest.cpp index caf326a8720..331a3435485 100644 --- a/storage/src/tests/distributor/visitoroperationtest.cpp +++ b/storage/src/tests/distributor/visitoroperationtest.cpp @@ -120,13 +120,13 @@ public: 100) {} - void setUp() { + void setUp() override { createLinks(); nullId = document::BucketId(0, 0); doneId = document::BucketId(INT_MAX); }; - void tearDown() { + void tearDown() override { close(); } diff --git a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp index 7a03d1c017a..c1e7660323c 100644 --- a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp +++ b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp @@ -17,7 +17,7 @@ struct MemoryStatusViewerTest : public CppUnit::TestFixture std::unique_ptr<TestServiceLayerApp> _node; std::unique_ptr<framework::defaultimplementation::MemoryManager> _memMan; - void setUp(); + void setUp() override; void testEmptyState(); void testSnapshots(); diff --git a/storage/src/tests/frameworkimpl/status/statustest.cpp b/storage/src/tests/frameworkimpl/status/statustest.cpp index 0fc10e411cb..567f9192d34 100644 --- a/storage/src/tests/frameworkimpl/status/statustest.cpp +++ b/storage/src/tests/frameworkimpl/status/statustest.cpp @@ -17,7 +17,7 @@ namespace storage { struct StatusTest : public CppUnit::TestFixture { std::unique_ptr<TestServiceLayerApp> _node; - void setUp(); + void setUp() override; void testIndexStatusPage(); void testHtmlStatus(); @@ -51,13 +51,13 @@ namespace { } virtual void reportHtmlHeaderAdditions( - std::ostream& out, const framework::HttpUrlPath&) const + std::ostream& out, const framework::HttpUrlPath&) const override { out << _headerAddition; } virtual void reportHtmlStatus( - std::ostream& out, const framework::HttpUrlPath&) const + std::ostream& out, const framework::HttpUrlPath&) const override { out << _content; } @@ -68,7 +68,7 @@ namespace { : framework::XmlStatusReporter(id, name) {} virtual vespalib::string reportXmlStatus( vespalib::xml::XmlOutputStream& xos, - const framework::HttpUrlPath&) const + const framework::HttpUrlPath&) const override { xos << vespalib::xml::XmlTag("mytag") << vespalib::xml::XmlAttribute("foo", "bar") diff --git a/storage/src/tests/persistence/bucketownershipnotifiertest.cpp b/storage/src/tests/persistence/bucketownershipnotifiertest.cpp index ae54e629473..8553795db71 100644 --- a/storage/src/tests/persistence/bucketownershipnotifiertest.cpp +++ b/storage/src/tests/persistence/bucketownershipnotifiertest.cpp @@ -19,7 +19,7 @@ public: _clusterState("distributor:2 storage:1") {} - void setUp(); + void setUp() override; CPPUNIT_TEST_SUITE(BucketOwnershipNotifierTest); CPPUNIT_TEST(testSendNotifyBucketChangeIfOwningDistributorChanged); diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp index bf7528c2242..e21d367370b 100644 --- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp @@ -77,8 +77,8 @@ struct FileStorManagerTest : public CppUnit::TestFixture { FileStorManagerTest() : _node(), _waitTime(LONG_WAITTIME) {} - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testPut(); void testHeaderOnlyPut(); @@ -686,7 +686,7 @@ public: MessagePusherThread(FileStorHandler& handler, Document::SP doc); ~MessagePusherThread(); - void run() { + void run() override { while (!_done) { document::BucketIdFactory factory; document::BucketId bucket(16, factory.getBucketId( @@ -720,7 +720,7 @@ public: : _handler(handler), _config(0), _fetchedCount(0), _done(false), _failed(false), _threadDone(false) {} - void run() { + void run() override { while (!_done) { FileStorHandler::LockedMessage msg = _handler.getNextMessage(0, 255); if (msg.second.get()) { @@ -1160,7 +1160,7 @@ public: PausedThread(FileStorHandler& handler) : _handler(handler), pause(false), done(false), gotoperation(false) {} - void run() { + void run() override { FileStorHandler::LockedMessage msg = _handler.getNextMessage(0, 255); gotoperation = true; @@ -2364,10 +2364,10 @@ namespace { closeNextLink(); } - virtual void print(std::ostream& out, bool, const std::string&) const + virtual void print(std::ostream& out, bool, const std::string&) const override { out << "MidLink"; } - virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) { + virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) override { if (!StorageLinkTest::callOnUp(_up, msg)) _up.sendUp(msg); return true; } @@ -2395,10 +2395,10 @@ namespace { _leftAddr(leftAddr), _rightAddr(rightAddr) {} - virtual void print(std::ostream& out, bool, const std::string&) const + virtual void print(std::ostream& out, bool, const std::string&) const override { out << "BinaryStorageLink"; } - virtual bool onDown(const std::shared_ptr<api::StorageMessage> & msg) { + virtual bool onDown(const std::shared_ptr<api::StorageMessage> & msg) override { // LOG(debug, "onDown Received msg: ->%s, %s %llu\n", msg->getAddress() ? msg->getAddress()->toString().c_str() : "(null)", msg->toString().c_str(), msg->getMsgId()); vespalib::LockGuard lock(_lock); @@ -2432,7 +2432,8 @@ namespace { return true; } - virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) { // LOG(debug, "onUp Received msg: ->%s, %s %llu\n", msg->getAddress() ? msg->getAddress()->toString().c_str() : "(null)", msg->toString().c_str(), msg->getMsgId()); + virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) override { + // LOG(debug, "onUp Received msg: ->%s, %s %llu\n", msg->getAddress() ? msg->getAddress()->toString().c_str() : "(null)", msg->toString().c_str(), msg->getMsgId()); vespalib::LockGuard lock(_lock); std::set<api::StorageMessage::Id>::iterator it @@ -2455,17 +2456,17 @@ namespace { } } - void onFlush(bool downwards) { + void onFlush(bool downwards) override { if (downwards) { _left.flush(); _right.flush(); } } - void onOpen() { + void onOpen() override { _left.open(); _right.open(); } - void onClose() { + void onClose() override { _left.close(); _right.close(); } diff --git a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp index 8d6a8fb8e03..d608bef3307 100644 --- a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp @@ -45,7 +45,7 @@ struct BucketCheckerInjector : FileStorTestFixture::StorageLinkInjector : _node(node), _fixture(fixture) {} - void inject(DummyStorageLink& link) const { + void inject(DummyStorageLink& link) const override { link.push_back(std::unique_ptr<ModifiedBucketChecker>( new ModifiedBucketChecker(_node.getComponentRegister(), _node.getPersistenceProvider(), diff --git a/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp b/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp index 848799fde95..2dc60594c45 100644 --- a/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp +++ b/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp @@ -19,8 +19,8 @@ public: MESSAGE_WAIT_TIME = 60*2 }; - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testModifiedBucketThreadSendsRecheckBucketCommands(); void testDoNotCheckModifiedBucketsIfAlreadyPending(); diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp index 6dce437033d..a661c5c445e 100644 --- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp +++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp @@ -275,7 +275,7 @@ public: _downLink(downLink) {} - void run() { + void run() override { // Best-effort synchronized starting _queueBarrier.await(); _downLink.sendDown(_abortCmd); diff --git a/storage/src/tests/persistence/legacyoperationhandlertest.cpp b/storage/src/tests/persistence/legacyoperationhandlertest.cpp index ca496f4a260..df262501299 100644 --- a/storage/src/tests/persistence/legacyoperationhandlertest.cpp +++ b/storage/src/tests/persistence/legacyoperationhandlertest.cpp @@ -27,7 +27,7 @@ class LegacyOperationHandlerTest : public SingleDiskPersistenceTestUtils CPPUNIT_TEST_SUITE_END(); public: - void setUp() { + void setUp() override { SingleDiskPersistenceTestUtils::setUp(); createBucket(document::BucketId(16, 4)); spi::Context context(spi::LoadType(0, "default"), spi::Priority(0), diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp index 87db1f09bd3..8147992a516 100644 --- a/storage/src/tests/persistence/mergehandlertest.cpp +++ b/storage/src/tests/persistence/mergehandlertest.cpp @@ -28,7 +28,7 @@ struct MergeHandlerTest : public SingleDiskPersistenceTestUtils template <typename T> std::shared_ptr<T> fetchSingleMessage(); - void setUp(); + void setUp() override; enum ChainPos { FRONT, MIDDLE, BACK }; void setUpChain(ChainPos); @@ -129,7 +129,7 @@ private: : public HandlerInvoker { public: - std::string afterInvoke(MergeHandlerTest&, MergeHandler&); + std::string afterInvoke(MergeHandlerTest&, MergeHandler&) override; }; template <typename ExpectedMessage> @@ -139,21 +139,21 @@ private: : public NoReplyHandlerInvoker { public: - void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&); + void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override; }; class HandleMergeBucketReplyInvoker : public NoReplyHandlerInvoker { public: - void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&); + void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override; }; class HandleGetBucketDiffInvoker : public NoReplyHandlerInvoker { public: - void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&); + void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override; }; class MultiPositionHandlerInvoker @@ -176,9 +176,9 @@ private: public: HandleGetBucketDiffReplyInvoker(); ~HandleGetBucketDiffReplyInvoker(); - void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&); - void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&); - std::string afterInvoke(MergeHandlerTest&, MergeHandler&); + void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override; + void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override; + std::string afterInvoke(MergeHandlerTest&, MergeHandler&) override; private: MessageSenderStub _stub; std::shared_ptr<api::GetBucketDiffCommand> _diffCmd; @@ -189,7 +189,7 @@ private: { public: HandleApplyBucketDiffInvoker() : _counter(0) {} - void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&); + void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override; private: int _counter; }; @@ -200,9 +200,9 @@ private: public: HandleApplyBucketDiffReplyInvoker(); ~HandleApplyBucketDiffReplyInvoker(); - void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&); - void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&); - std::string afterInvoke(MergeHandlerTest&, MergeHandler&); + void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override; + void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&) override; + std::string afterInvoke(MergeHandlerTest&, MergeHandler&) override; private: int _counter; MessageSenderStub _stub; diff --git a/storage/src/tests/persistence/providershutdownwrappertest.cpp b/storage/src/tests/persistence/providershutdownwrappertest.cpp index 1d2bf08e0c4..8b1ef88aa2c 100644 --- a/storage/src/tests/persistence/providershutdownwrappertest.cpp +++ b/storage/src/tests/persistence/providershutdownwrappertest.cpp @@ -28,7 +28,7 @@ class TestShutdownListener public: TestShutdownListener() : _reason() {} - void requestShutdown(vespalib::stringref reason) { + void requestShutdown(vespalib::stringref reason) override { _reason = reason; } diff --git a/storage/src/tests/storageserver/bouncertest.cpp b/storage/src/tests/storageserver/bouncertest.cpp index f00e4b19c31..e5b9a3e6092 100644 --- a/storage/src/tests/storageserver/bouncertest.cpp +++ b/storage/src/tests/storageserver/bouncertest.cpp @@ -25,8 +25,8 @@ struct BouncerTest : public CppUnit::TestFixture { BouncerTest(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testFutureTimestamp(); void testAllowNotifyBucketChangeEvenWhenDistributorDown(); diff --git a/storage/src/tests/storageserver/bucketintegritycheckertest.cpp b/storage/src/tests/storageserver/bucketintegritycheckertest.cpp index 88a5546b174..d9a175f3b04 100644 --- a/storage/src/tests/storageserver/bucketintegritycheckertest.cpp +++ b/storage/src/tests/storageserver/bucketintegritycheckertest.cpp @@ -25,7 +25,7 @@ struct BucketIntegrityCheckerTest : public CppUnit::TestFixture { std::unique_ptr<TestServiceLayerApp> _node; int _timeout; // Timeout in seconds before aborting - void setUp() { + void setUp() override { _timeout = 60*2; _config.reset(new vdstestlib::DirConfig(getStandardConfig(true))); _node.reset(new TestServiceLayerApp(DiskCount(256), @@ -33,7 +33,7 @@ struct BucketIntegrityCheckerTest : public CppUnit::TestFixture { _config->getConfigId())); } - void tearDown() { + void tearDown() override { LOG(info, "Finished test"); } diff --git a/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp b/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp index 3b83d71d8f3..8eb6b74a840 100644 --- a/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp +++ b/storage/src/tests/storageserver/changedbucketownershiphandlertest.cpp @@ -119,7 +119,7 @@ public: void testExternalLoadOpAbortUpdatesMetric(); void testExternalLoadOpAbortsAreConfigurable(); - void setUp(); + void setUp() override; }; CPPUNIT_TEST_SUITE_REGISTRATION(ChangedBucketOwnershipHandlerTest); diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index 5c5c5627feb..1f1198efc3c 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -34,7 +34,7 @@ struct DocumentApiConverterTest : public CppUnit::TestFixture { } - void setUp() { + void setUp() override { _converter.reset(new DocumentApiConverter("raw:")); }; diff --git a/storage/src/tests/storageserver/mergethrottlertest.cpp b/storage/src/tests/storageserver/mergethrottlertest.cpp index a5e637146fc..8a01acd6a68 100644 --- a/storage/src/tests/storageserver/mergethrottlertest.cpp +++ b/storage/src/tests/storageserver/mergethrottlertest.cpp @@ -135,8 +135,8 @@ class MergeThrottlerTest : public CppUnit::TestFixture CPPUNIT_TEST(testNewClusterStateAbortsAllOutdatedActiveMerges); CPPUNIT_TEST_SUITE_END(); public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testMergesConfig(); void testChain(); diff --git a/storage/src/tests/storageserver/priorityconvertertest.cpp b/storage/src/tests/storageserver/priorityconvertertest.cpp index ecbdcfb6b91..ecbbd25b8b1 100644 --- a/storage/src/tests/storageserver/priorityconvertertest.cpp +++ b/storage/src/tests/storageserver/priorityconvertertest.cpp @@ -11,7 +11,7 @@ struct PriorityConverterTest : public CppUnit::TestFixture { std::unique_ptr<PriorityConverter> _converter; - void setUp() { + void setUp() override { vdstestlib::DirConfig config(getStandardConfig(true)); _converter.reset(new PriorityConverter(config.getConfigId())); }; diff --git a/storage/src/tests/storageserver/statemanagertest.cpp b/storage/src/tests/storageserver/statemanagertest.cpp index 83fad3a7484..4244ce0c4ce 100644 --- a/storage/src/tests/storageserver/statemanagertest.cpp +++ b/storage/src/tests/storageserver/statemanagertest.cpp @@ -31,8 +31,8 @@ struct StateManagerTest : public CppUnit::TestFixture { StateManagerTest(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testSystemState(); void testReportedNodeState(); @@ -138,7 +138,7 @@ namespace { MyStateListener(const NodeStateUpdater& upd) : updater(upd), current(*updater.getReportedNodeState()) {} - void handleNewState() + void handleNewState() override { ost << current << " -> "; current = *updater.getReportedNodeState(); diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp index 87686f06d6c..265b9e95d83 100644 --- a/storage/src/tests/storageserver/statereportertest.cpp +++ b/storage/src/tests/storageserver/statereportertest.cpp @@ -18,8 +18,8 @@ namespace storage { class DummyApplicationGenerationFether : public ApplicationGenerationFetcher { public: - virtual int64_t getGeneration() const { return 1; } - virtual std::string getComponentName() const { return "component"; } + virtual int64_t getGeneration() const override { return 1; } + virtual std::string getComponentName() const override { return "component"; } }; struct StateReporterTest : public CppUnit::TestFixture { @@ -36,8 +36,8 @@ struct StateReporterTest : public CppUnit::TestFixture { StateReporterTest(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void runLoad(uint32_t count = 1); void testReportConfigGeneration(); @@ -58,9 +58,9 @@ namespace { { framework::Clock& _clock; MetricClock(framework::Clock& c) : _clock(c) {} - virtual time_t getTime() const + virtual time_t getTime() const override { return _clock.getTimeInSeconds().getTime(); } - virtual time_t getTimeInMilliSecs() const + virtual time_t getTimeInMilliSecs() const override { return _clock.getTimeInMillis().getTime(); } }; } diff --git a/storage/src/tests/storageutil/charttest.cpp b/storage/src/tests/storageutil/charttest.cpp index d9ce3d6f1b4..4f83a9f26f4 100644 --- a/storage/src/tests/storageutil/charttest.cpp +++ b/storage/src/tests/storageutil/charttest.cpp @@ -10,8 +10,8 @@ namespace storage { struct PieChartTest : public CppUnit::TestFixture { - void setUp() {} - void tearDown() {} + void setUp() override {} + void tearDown() override {} void testWriteHtmlFile(); diff --git a/storage/src/tests/storageutil/palettetest.cpp b/storage/src/tests/storageutil/palettetest.cpp index ffc2dd091ee..e5a4e73d58a 100644 --- a/storage/src/tests/storageutil/palettetest.cpp +++ b/storage/src/tests/storageutil/palettetest.cpp @@ -7,8 +7,8 @@ namespace storage { struct PaletteTest : public CppUnit::TestFixture { - void setUp() {} - void tearDown() {} + void setUp() override {} + void tearDown() override {} void testNormalUsage(); diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp index f83ac825aa4..8aa57b982db 100644 --- a/storage/src/tests/visiting/visitormanagertest.cpp +++ b/storage/src/tests/visiting/visitormanagertest.cpp @@ -70,7 +70,7 @@ public: // Not using setUp since can't throw exception out of it. void initializeTest(); void addSomeRemoves(bool removeAll = false); - void tearDown(); + void tearDown() override; TestVisitorMessageSession& getSession(uint32_t n); uint64_t verifyCreateVisitorReply( api::ReturnCode::Result expectedResult, diff --git a/storage/src/tests/visiting/visitortest.cpp b/storage/src/tests/visiting/visitortest.cpp index 1e2eda75cc8..e6a3542cbf2 100644 --- a/storage/src/tests/visiting/visitortest.cpp +++ b/storage/src/tests/visiting/visitortest.cpp @@ -127,7 +127,7 @@ public: std::shared_ptr<api::CreateVisitorCommand> makeCreateVisitor( const VisitorOptions& options = VisitorOptions()); - void tearDown(); + void tearDown() override; bool waitUntilNoActiveVisitors(); TestVisitorMessageSession& getSession(uint32_t n); uint64_t verifyCreateVisitorReply( diff --git a/storage/src/vespa/storage/bucketdb/bucketdatabase.cpp b/storage/src/vespa/storage/bucketdb/bucketdatabase.cpp index 2c229052fc5..596d6cee31e 100644 --- a/storage/src/vespa/storage/bucketdb/bucketdatabase.cpp +++ b/storage/src/vespa/storage/bucketdb/bucketdatabase.cpp @@ -8,7 +8,7 @@ namespace { struct GetNextEntryProcessor : public BucketDatabase::EntryProcessor { BucketDatabase::Entry _entry; - bool process(const BucketDatabase::Entry& e) { + bool process(const BucketDatabase::Entry& e) override { _entry = e; return false; } diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.h b/storage/src/vespa/storage/bucketdb/bucketmanager.h index c9ae4be8069..64498386466 100644 --- a/storage/src/vespa/storage/bucketdb/bucketmanager.h +++ b/storage/src/vespa/storage/bucketdb/bucketmanager.h @@ -103,8 +103,7 @@ public: void startWorkerThread(); - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; /** Dump the whole database to the given output. Use for debugging. */ void dump(std::ostream& out) const; @@ -115,25 +114,23 @@ public: private: friend class BucketManagerTest; - void run(framework::ThreadHandle&); + void run(framework::ThreadHandle&) override; // Status::Reporter implementation - vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; - bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const; + vespalib::string getReportContentType(const framework::HttpUrlPath&) const override; + bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const override; /** Event saying node is up and running. We can start to build cache. */ - virtual void onOpen(); - virtual void onDoneInit() { _doneInitialized = true; } - virtual void onClose(); - virtual void onFlush(bool downwards); + virtual void onOpen() override; + virtual void onDoneInit() override { _doneInitialized = true; } + virtual void onClose() override; + virtual void onFlush(bool downwards) override; void updateMetrics(bool updateDocCount); void updateMetrics(const MetricLockGuard &) override { updateMetrics(true); } void updateMinUsedBits(); - bool onRequestBucketInfo( - const std::shared_ptr<api::RequestBucketInfoCommand>&); + bool onRequestBucketInfo(const std::shared_ptr<api::RequestBucketInfoCommand>&) override; bool processRequestBucketInfoCommands(BIList&); /** diff --git a/storage/src/vespa/storage/bucketdb/judyarray.h b/storage/src/vespa/storage/bucketdb/judyarray.h index 1c68e84084c..b5d8a50cb16 100644 --- a/storage/src/vespa/storage/bucketdb/judyarray.h +++ b/storage/src/vespa/storage/bucketdb/judyarray.h @@ -83,8 +83,7 @@ public: data_type& operator[](key_type key); size_type getMemoryUsage() const; - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; class ConstIterator : public vespalib::Printable { @@ -102,8 +101,7 @@ public: key_type key() const { return _key; } data_type value() const { return *_data; } - virtual void print(std::ostream& out, - bool verbose, const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; protected: // For creating end() iterator diff --git a/storage/src/vespa/storage/bucketdb/lockablemap.h b/storage/src/vespa/storage/bucketdb/lockablemap.h index 2670683f7e3..93dfb23c4db 100644 --- a/storage/src/vespa/storage/bucketdb/lockablemap.h +++ b/storage/src/vespa/storage/bucketdb/lockablemap.h @@ -168,8 +168,7 @@ public: const char* clientId, uint32_t chunkSize = DEFAULT_CHUNK_SIZE); - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; /** * Returns all buckets in the bucket database that can contain the given diff --git a/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp b/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp index 243deac5034..a271803714a 100644 --- a/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp +++ b/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp @@ -465,7 +465,7 @@ namespace { struct Writer : public BucketDatabase::EntryProcessor { std::ostream& _ost; Writer(std::ostream& ost) : _ost(ost) {} - virtual bool process(const BucketDatabase::Entry& e) { + virtual bool process(const BucketDatabase::Entry& e) override { _ost << e.toString() << "\n"; return true; } diff --git a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h index 94afc5b2e1a..6e9bef38672 100644 --- a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h +++ b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h @@ -138,23 +138,22 @@ public: ServiceLayerComponentRegister&); ~StorageBucketDBInitializer(); - virtual void print(std::ostream& out, - bool verbose, const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; - virtual void onOpen(); - virtual void onClose(); + virtual void onOpen() override; + virtual void onClose() override; - virtual void run(framework::ThreadHandle&); + virtual void run(framework::ThreadHandle&) override; - bool onDown(const std::shared_ptr<api::StorageMessage>&); - bool onInternalReply(const std::shared_ptr<api::InternalReply>&); + bool onDown(const std::shared_ptr<api::StorageMessage>&) override; + bool onInternalReply(const std::shared_ptr<api::InternalReply>&) override; void handleReadBucketListReply(ReadBucketListReply&); void handleReadBucketInfoReply(ReadBucketInfoReply&); void handleInternalBucketJoinReply(InternalBucketJoinReply&); /** Status implementation. */ - void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const; + void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const override; // The below functions should only be called by the class itself, but they // are left public for easability of access for unit tests and anonymous diff --git a/storage/src/vespa/storage/bucketmover/run.h b/storage/src/vespa/storage/bucketmover/run.h index 292b18f63a5..a626960eec7 100644 --- a/storage/src/vespa/storage/bucketmover/run.h +++ b/storage/src/vespa/storage/bucketmover/run.h @@ -92,8 +92,7 @@ public: RunStatistics& getStatistics() { return _statistics; } const RunStatistics& getStatistics() const { return _statistics; } - virtual void print(std::ostream&, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream&, bool verbose, const std::string& indent) const override; private: void removePending(Move&); void finalize(); diff --git a/storage/src/vespa/storage/common/bucketmessages.h b/storage/src/vespa/storage/common/bucketmessages.h index a690b42804f..6c0fbbf4ea2 100644 --- a/storage/src/vespa/storage/common/bucketmessages.h +++ b/storage/src/vespa/storage/common/bucketmessages.h @@ -27,7 +27,7 @@ public: ~ReadBucketList(); spi::PartitionId getPartition() const { return _partition; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; @@ -78,10 +78,10 @@ public: ReadBucketInfo(const document::BucketId& bucketId); ~ReadBucketInfo(); - document::BucketId getBucketId() const { return _bucketId; } + document::BucketId getBucketId() const override { return _bucketId; } bool hasSingleBucketId() const override { return true; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool verbose, const std::string& indent) const override; private: @@ -102,7 +102,7 @@ public: ReadBucketInfoReply(const ReadBucketInfo& cmd); ~ReadBucketInfoReply(); - document::BucketId getBucketId() const { return _bucketId; } + document::BucketId getBucketId() const override { return _bucketId; } bool hasSingleBucketId() const override { return true; } void print(std::ostream& out, bool verbose, const std::string& indent) const override; @@ -133,7 +133,7 @@ public: ~RepairBucketCommand(); bool hasSingleBucketId() const override { return true; } - document::BucketId getBucketId() const { return _bucket; } + document::BucketId getBucketId() const override { return _bucket; } uint16_t getDisk() const { return _disk; } bool verifyBody() const { return _verifyBody; } @@ -143,7 +143,7 @@ public: void verifyBody(bool doIt) { _verifyBody = doIt; } void moveToIdealDisk(bool doIt) { _moveToIdealDisk = doIt; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool verbose, const std::string& indent) const override; private: @@ -166,7 +166,7 @@ public: RepairBucketReply(const RepairBucketCommand& cmd, const api::BucketInfo& bucketInfo = api::BucketInfo()); ~RepairBucketReply(); - document::BucketId getBucketId() const { return _bucket; } + document::BucketId getBucketId() const override { return _bucket; } bool hasSingleBucketId() const override { return true; } const api::BucketInfo& getBucketInfo() const { return _bucketInfo; } @@ -199,7 +199,7 @@ public: BucketDiskMoveCommand(const document::BucketId& bucket, uint16_t srcDisk, uint16_t dstDisk); ~BucketDiskMoveCommand(); - document::BucketId getBucketId() const { return _bucket; } + document::BucketId getBucketId() const override { return _bucket; } bool hasSingleBucketId() const override { return true; } uint16_t getSrcDisk() const { return _srcDisk; } @@ -207,7 +207,7 @@ public: void setBucketId(const document::BucketId& id) { _bucket = id; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool, const std::string&) const override; }; @@ -234,7 +234,7 @@ public: uint32_t destinationFileSize = 0); ~BucketDiskMoveReply(); - document::BucketId getBucketId() const { return _bucket; } + document::BucketId getBucketId() const override { return _bucket; } bool hasSingleBucketId() const override { return true; } const api::BucketInfo& getBucketInfo() const { return _bucketInfo; } @@ -270,13 +270,13 @@ public: InternalBucketJoinCommand(const document::BucketId& bucket, uint16_t keepOnDisk, uint16_t joinFromDisk); ~InternalBucketJoinCommand(); - document::BucketId getBucketId() const { return _bucket; } + document::BucketId getBucketId() const override { return _bucket; } bool hasSingleBucketId() const override { return true; } uint16_t getDiskOfInstanceToKeep() const { return _keepOnDisk; } uint16_t getDiskOfInstanceToJoin() const { return _joinFromDisk; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; @@ -296,7 +296,7 @@ public: const api::BucketInfo& info = api::BucketInfo()); ~InternalBucketJoinReply(); - document::BucketId getBucketId() const { return _bucket; } + document::BucketId getBucketId() const override { return _bucket; } bool hasSingleBucketId() const override { return true; } const api::BucketInfo& getBucketInfo() const { return _bucketInfo; } diff --git a/storage/src/vespa/storage/common/servicelayercomponent.h b/storage/src/vespa/storage/common/servicelayercomponent.h index 8feccdbf954..e54421b1ce3 100644 --- a/storage/src/vespa/storage/common/servicelayercomponent.h +++ b/storage/src/vespa/storage/common/servicelayercomponent.h @@ -55,10 +55,11 @@ class ServiceLayerComponent : public StorageComponent, MinimumUsedBitsTracker* _minUsedBitsTracker; // ServiceLayerManagedComponent implementation - virtual void setDiskCount(uint16_t count) { _diskCount = count; } - virtual void setBucketDatabase(StorBucketDatabase& db) - { _bucketDatabase = &db; } - virtual void setMinUsedBitsTracker(MinimumUsedBitsTracker& tracker) { + virtual void setDiskCount(uint16_t count) override { _diskCount = count; } + virtual void setBucketDatabase(StorBucketDatabase& db) override { + _bucketDatabase = &db; + } + virtual void setMinUsedBitsTracker(MinimumUsedBitsTracker& tracker) override { _minUsedBitsTracker = &tracker; } public: diff --git a/storage/src/vespa/storage/common/statusmessages.h b/storage/src/vespa/storage/common/statusmessages.h index da1ac173997..4299fefe773 100644 --- a/storage/src/vespa/storage/common/statusmessages.h +++ b/storage/src/vespa/storage/common/statusmessages.h @@ -31,7 +31,7 @@ public: const std::string& getSortToken() const { return _sortToken; } void setSortToken(const std::string& token) { _sortToken = token; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; const framework::HttpUrlPath& getPath() const { return _path; } diff --git a/storage/src/vespa/storage/common/statusmetricconsumer.cpp b/storage/src/vespa/storage/common/statusmetricconsumer.cpp index 85dc82b62af..638ff54cbc7 100644 --- a/storage/src/vespa/storage/common/statusmetricconsumer.cpp +++ b/storage/src/vespa/storage/common/statusmetricconsumer.cpp @@ -415,7 +415,7 @@ namespace { std::ostream& out) : _usedMetrics(used), _out(out) {} - bool visitMetric(const metrics::Metric& metric, bool) { + bool visitMetric(const metrics::Metric& metric, bool) override { std::map<metrics::Metric::String, metrics::Metric::SP>::const_iterator it( _usedMetrics.find(metric.getPath())); diff --git a/storage/src/vespa/storage/common/statusmetricconsumer.h b/storage/src/vespa/storage/common/statusmetricconsumer.h index fac9296032e..0027cef9cd0 100644 --- a/storage/src/vespa/storage/common/statusmetricconsumer.h +++ b/storage/src/vespa/storage/common/statusmetricconsumer.h @@ -33,9 +33,8 @@ public: const std::string& name = "status"); ~StatusMetricConsumer(); - vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; - bool reportStatus(std::ostream& out, const framework::HttpUrlPath&) const; + vespalib::string getReportContentType(const framework::HttpUrlPath&) const override; + bool reportStatus(std::ostream& out, const framework::HttpUrlPath&) const override; void waitUntilTimeProcessed(framework::SecondTime t) const; diff --git a/storage/src/vespa/storage/common/storagelinkqueued.h b/storage/src/vespa/storage/common/storagelinkqueued.h index 2d3d8abd925..cd7b91a7a68 100644 --- a/storage/src/vespa/storage/common/storagelinkqueued.h +++ b/storage/src/vespa/storage/common/storagelinkqueued.h @@ -40,13 +40,13 @@ public: void dispatchUp(const std::shared_ptr<api::StorageMessage>&); /** Remember to call this method if you override it. */ - virtual void onClose() { + virtual void onClose() override { _commandDispatcher.flush(); _closeState |= 1; } /** Remember to call this method if you override it. */ - virtual void onFlush(bool downwards) { + virtual void onFlush(bool downwards) override { if (downwards) { _commandDispatcher.flush(); _closeState |= 2; @@ -82,7 +82,7 @@ private: virtual ~Dispatcher(); void start(); - void run(framework::ThreadHandle&); + void run(framework::ThreadHandle&) override; void add(const std::shared_ptr<Message>&); void flush(); @@ -103,8 +103,9 @@ private: parent, std::numeric_limits<unsigned int>::max(), true) { } - void send(const std::shared_ptr<api::StorageMessage> & reply) - { _parent.sendUp(reply); } + void send(const std::shared_ptr<api::StorageMessage> & reply) override { + _parent.sendUp(reply); + } virtual ~ReplyDispatcher() { terminate(); } }; @@ -117,8 +118,9 @@ private: { } virtual ~CommandDispatcher() { terminate(); } - void send(const std::shared_ptr<api::StorageMessage> & command) - { _parent.sendDown(command); } + void send(const std::shared_ptr<api::StorageMessage> & command) override { + _parent.sendDown(command); + } }; framework::ComponentRegister& _compReg; diff --git a/storage/src/vespa/storage/config/distributorconfiguration.cpp b/storage/src/vespa/storage/config/distributorconfiguration.cpp index 623312a8049..a5ce431d224 100644 --- a/storage/src/vespa/storage/config/distributorconfiguration.cpp +++ b/storage/src/vespa/storage/config/distributorconfiguration.cpp @@ -45,7 +45,7 @@ public: TimeVisitor() : hasCurrentTime(false) {} - void visitCurrentTimeValueNode(const document::select::CurrentTimeValueNode&) { + void visitCurrentTimeValueNode(const document::select::CurrentTimeValueNode&) override { hasCurrentTime = true; } }; diff --git a/storage/src/vespa/storage/distributor/activecopy.h b/storage/src/vespa/storage/distributor/activecopy.h index 00a7bf3d4f6..7f8fbedb61c 100644 --- a/storage/src/vespa/storage/distributor/activecopy.h +++ b/storage/src/vespa/storage/distributor/activecopy.h @@ -37,7 +37,7 @@ public: bool contains(uint16_t) const; bool empty() const { return _v.empty(); } size_t size() const { return _v.size(); } - void print(std::ostream&, bool verbose, const std::string& indent) const; + void print(std::ostream&, bool verbose, const std::string& indent) const override; }; } // distributor diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.h b/storage/src/vespa/storage/distributor/bucketdbupdater.h index 8f050d87d95..b87f0e5f898 100644 --- a/storage/src/vespa/storage/distributor/bucketdbupdater.h +++ b/storage/src/vespa/storage/distributor/bucketdbupdater.h @@ -43,14 +43,14 @@ public: void recheckBucketInfo(uint32_t nodeIdx, const document::BucketId& bid); - bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>& cmd); + bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>& cmd) override; bool onRequestBucketInfoReply( - const std::shared_ptr<api::RequestBucketInfoReply> & repl); + const std::shared_ptr<api::RequestBucketInfoReply> & repl) override; - bool onMergeBucketReply(const std::shared_ptr<api::MergeBucketReply>& reply); + bool onMergeBucketReply(const std::shared_ptr<api::MergeBucketReply>& reply) override; - bool onNotifyBucketChange(const std::shared_ptr<api::NotifyBucketChangeCommand>&); + bool onNotifyBucketChange(const std::shared_ptr<api::NotifyBucketChangeCommand>&) override; void resendDelayedMessages(); @@ -60,8 +60,8 @@ public: const framework::HttpUrlPath&) const; vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; - bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; + bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const override; virtual void print(std::ostream& out, bool verbose, const std::string& indent) const; @@ -241,7 +241,7 @@ private: ~NodeRemover(); - virtual bool process(BucketDatabase::Entry& e); + virtual bool process(BucketDatabase::Entry& e) override; void logRemove(const document::BucketId& bucketId, const char* msg) const; diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index d1e64406ef6..fdda56cea55 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -462,7 +462,7 @@ public: MaintenanceChecker() : found(false) {}; - bool check(uint32_t msgType, uint16_t node, uint8_t pri) { + bool check(uint32_t msgType, uint16_t node, uint8_t pri) override { (void) node; (void) pri; for (uint32_t i = 0; @@ -486,7 +486,7 @@ public: SplitChecker(uint8_t maxP) : found(false), maxPri(maxP) {}; - bool check(uint32_t msgType, uint16_t node, uint8_t pri) { + bool check(uint32_t msgType, uint16_t node, uint8_t pri) override { (void) node; (void) pri; if (msgType == api::MessageType::SPLITBUCKET_ID && pri <= maxPri) { diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h index c56f4f9456a..40d6ee76e07 100644 --- a/storage/src/vespa/storage/distributor/distributor.h +++ b/storage/src/vespa/storage/distributor/distributor.h @@ -56,23 +56,23 @@ public: ~Distributor(); - void onOpen(); + void onOpen() override; - void onClose(); + void onClose() override; - bool onDown(const std::shared_ptr<api::StorageMessage>&); + bool onDown(const std::shared_ptr<api::StorageMessage>&) override; - void sendUp(const std::shared_ptr<api::StorageMessage>&); + void sendUp(const std::shared_ptr<api::StorageMessage>&) override; - void sendDown(const std::shared_ptr<api::StorageMessage>&); + void sendDown(const std::shared_ptr<api::StorageMessage>&) override; - virtual ChainedMessageSender& getMessageSender() { + virtual ChainedMessageSender& getMessageSender() override { return (_messageSender == 0 ? *this : *_messageSender); } - DistributorMetricSet& getMetrics() { return *_metrics; } + DistributorMetricSet& getMetrics() override { return *_metrics; } - PendingMessageTracker& getPendingMessageTracker() { + PendingMessageTracker& getPendingMessageTracker() override { return _pendingMessageTracker; } @@ -82,7 +82,7 @@ public: * Enables a new cluster state. Called after the bucket db updater has * retrieved all bucket info related to the change. */ - void enableClusterState(const lib::ClusterState& clusterState); + void enableClusterState(const lib::ClusterState& clusterState) override; /** * Invoked when a pending cluster state for a distribution (config) @@ -90,39 +90,39 @@ public: * will eventually cause this method to be called, assuming the pending * cluster state completed successfully. */ - void notifyDistributionChangeEnabled(); + void notifyDistributionChangeEnabled() override; - void storageDistributionChanged(); + void storageDistributionChanged() override; - void recheckBucketInfo(uint16_t nodeIdx, const document::BucketId& bid); + void recheckBucketInfo(uint16_t nodeIdx, const document::BucketId& bid) override; - bool handleReply(const std::shared_ptr<api::StorageReply>& reply); + bool handleReply(const std::shared_ptr<api::StorageReply>& reply) override; // StatusReporter implementation vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; - bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; + bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const override; - bool handleStatusRequest(const DelegatedStatusRequest& request) const; + bool handleStatusRequest(const DelegatedStatusRequest& request) const override; uint32_t pendingMaintenanceCount() const; std::string getActiveIdealStateOperations() const; std::string getActiveOperations() const; - virtual framework::ThreadWaitInfo doCriticalTick(framework::ThreadIndex); - virtual framework::ThreadWaitInfo doNonCriticalTick(framework::ThreadIndex); + virtual framework::ThreadWaitInfo doCriticalTick(framework::ThreadIndex) override; + virtual framework::ThreadWaitInfo doNonCriticalTick(framework::ThreadIndex) override; /** * Checks whether a bucket needs to be split, and sends a split * if so. */ void checkBucketForSplit(const BucketDatabase::Entry& e, - uint8_t priority); + uint8_t priority) override; - const lib::Distribution& getDistribution() const; + const lib::Distribution& getDistribution() const override; - const lib::ClusterState& getClusterState() const { + const lib::ClusterState& getClusterState() const override { return _clusterState; } @@ -130,7 +130,7 @@ public: * @return Returns the states in which the distributors consider * storage nodes to be up. */ - const char* getStorageNodeUpStates() const + const char* getStorageNodeUpStates() const override { return _initializingIsUp ? "uri" : "ur"; } /** @@ -138,14 +138,14 @@ public: * request bucket info operations have been performed as well. Passes the * merge back to the operation that created it. */ - void handleCompletedMerge(const std::shared_ptr<api::MergeBucketReply>& reply); + void handleCompletedMerge(const std::shared_ptr<api::MergeBucketReply>& reply) override; - bool initializing() const { + bool initializing() const override { return !_doneInitializing; } - const DistributorConfiguration& getConfig() const { + const DistributorConfiguration& getConfig() const override { return _component.getTotalDistributorConfig(); } @@ -153,14 +153,14 @@ public: return _schedulingMode == MaintenanceScheduler::RECOVERY_SCHEDULING_MODE; } - int getDistributorIndex() const; + int getDistributorIndex() const override; - const std::string& getClusterName() const; + const std::string& getClusterName() const override; - const PendingMessageTracker& getPendingMessageTracker() const; + const PendingMessageTracker& getPendingMessageTracker() const override; - virtual void sendCommand(const std::shared_ptr<api::StorageCommand>&); - virtual void sendReply(const std::shared_ptr<api::StorageReply>&); + virtual void sendCommand(const std::shared_ptr<api::StorageCommand>&) override; + virtual void sendReply(const std::shared_ptr<api::StorageReply>&) override; const BucketGcTimeCalculator::BucketIdHasher& getBucketIdHasher() const override { diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.h b/storage/src/vespa/storage/distributor/idealstatemanager.h index b177278bd20..3b468a64024 100644 --- a/storage/src/vespa/storage/distributor/idealstatemanager.h +++ b/storage/src/vespa/storage/distributor/idealstatemanager.h @@ -130,7 +130,7 @@ private: StatusBucketVisitor(const IdealStateManager& ism, std::ostream& out) : _ism(ism), _out(out) {} - bool process(const BucketDatabase::Entry& e) { + bool process(const BucketDatabase::Entry& e) override { _ism.getBucketStatus(e, _statsTracker, _out); return true; } diff --git a/storage/src/vespa/storage/distributor/operations/external/getoperation.h b/storage/src/vespa/storage/distributor/operations/external/getoperation.h index 88f9300a112..ecdfb1e677a 100644 --- a/storage/src/vespa/storage/distributor/operations/external/getoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/getoperation.h @@ -29,15 +29,15 @@ public: const std::shared_ptr<api::GetCommand> & msg, PersistenceOperationMetricSet& metric); - void onClose(DistributorMessageSender& sender); + void onClose(DistributorMessageSender& sender) override; - void onStart(DistributorMessageSender& sender); + void onStart(DistributorMessageSender& sender) override; - void onReceive(DistributorMessageSender& sender, const std::shared_ptr<api::StorageReply> & msg); + void onReceive(DistributorMessageSender& sender, const std::shared_ptr<api::StorageReply> & msg) override; - const char* getName() const { return "get"; } + const char* getName() const override { return "get"; } - std::string getStatus() const { return ""; } + std::string getStatus() const override { return ""; } bool hasConsistentCopies() const; diff --git a/storage/src/vespa/storage/distributor/operations/external/putoperation.h b/storage/src/vespa/storage/distributor/operations/external/putoperation.h index 677b2f85d4e..5043fed307f 100644 --- a/storage/src/vespa/storage/distributor/operations/external/putoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/putoperation.h @@ -27,16 +27,16 @@ public: const std::shared_ptr<api::PutCommand> & msg, PersistenceOperationMetricSet& metric); - void onStart(DistributorMessageSender& sender); + void onStart(DistributorMessageSender& sender) override; - const char* getName() const { return "put"; }; + const char* getName() const override { return "put"; } - std::string getStatus() const { return ""; }; + std::string getStatus() const override { return ""; } void onReceive(DistributorMessageSender& sender, - const std::shared_ptr<api::StorageReply> &); + const std::shared_ptr<api::StorageReply> &) override; - void onClose(DistributorMessageSender& sender); + void onClose(DistributorMessageSender& sender) override; /** * Gets the ideal state of the given bucket, and adds all nodes from the diff --git a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h index 8e092a96f88..25cc0825b7d 100644 --- a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h @@ -25,17 +25,15 @@ public: const std::shared_ptr<api::GetBucketListCommand>& cmd); virtual ~StatBucketListOperation() {} - virtual const char* getName() const { return "statBucketList"; } - virtual std::string getStatus() const { return ""; } + virtual const char* getName() const override { return "statBucketList"; } + virtual std::string getStatus() const override { return ""; } - virtual void onStart(DistributorMessageSender& sender); - virtual void onReceive(DistributorMessageSender&, - const std::shared_ptr<api::StorageReply>&) - { + virtual void onStart(DistributorMessageSender& sender) override; + virtual void onReceive(DistributorMessageSender&, const std::shared_ptr<api::StorageReply>&) override { // Never called. assert(false); } - void onClose(DistributorMessageSender&) { + void onClose(DistributorMessageSender&) override { } private: diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp index d0a1e98f0c8..15f8d06965a 100644 --- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp @@ -52,24 +52,24 @@ struct IntermediateMessageSender : DistributorMessageSender { DistributorMessageSender & fwd); ~IntermediateMessageSender(); - virtual void sendCommand(const std::shared_ptr<api::StorageCommand>& cmd) { + virtual void sendCommand(const std::shared_ptr<api::StorageCommand>& cmd) override { msgMap.insert(cmd->getMsgId(), callback); forward.sendCommand(cmd); }; - virtual void sendReply(const std::shared_ptr<api::StorageReply>& reply) { + virtual void sendReply(const std::shared_ptr<api::StorageReply>& reply) override { _reply = reply; } - virtual int getDistributorIndex() const { + virtual int getDistributorIndex() const override { return forward.getDistributorIndex(); } - virtual const std::string& getClusterName() const { + virtual const std::string& getClusterName() const override { return forward.getClusterName(); } - virtual const PendingMessageTracker& getPendingMessageTracker() const { + virtual const PendingMessageTracker& getPendingMessageTracker() const override { return forward.getPendingMessageTracker(); } }; diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h index 361fcd03037..7cff0aba493 100644 --- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h @@ -52,16 +52,16 @@ public: DistributorMetricSet& metrics); ~TwoPhaseUpdateOperation(); - void onStart(DistributorMessageSender& sender); + void onStart(DistributorMessageSender& sender) override; - const char* getName() const { return "twophaseupdate"; } + const char* getName() const override { return "twophaseupdate"; } - std::string getStatus() const { return ""; } + std::string getStatus() const override { return ""; } void onReceive(DistributorMessageSender&, - const std::shared_ptr<api::StorageReply>&); + const std::shared_ptr<api::StorageReply>&) override; - void onClose(DistributorMessageSender& sender); + void onClose(DistributorMessageSender& sender) override; bool canSendHeaderOnly() const; diff --git a/storage/src/vespa/storage/distributor/operations/external/updateoperation.h b/storage/src/vespa/storage/distributor/operations/external/updateoperation.h index b990e953623..0a2a9e564a0 100644 --- a/storage/src/vespa/storage/distributor/operations/external/updateoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/updateoperation.h @@ -24,16 +24,16 @@ public: const std::shared_ptr<api::UpdateCommand> & msg, PersistenceOperationMetricSet& metric); - void onStart(DistributorMessageSender& sender); + void onStart(DistributorMessageSender& sender) override; - const char* getName() const { return "update"; }; + const char* getName() const override { return "update"; } - std::string getStatus() const { return ""; }; + std::string getStatus() const override { return ""; } void onReceive(DistributorMessageSender& sender, - const std::shared_ptr<api::StorageReply> & msg); + const std::shared_ptr<api::StorageReply> & msg) override; - void onClose(DistributorMessageSender& sender); + void onClose(DistributorMessageSender& sender) override; std::pair<document::BucketId, uint16_t> getNewestTimestampLocation() const { return _newestTimestampLocation; diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp index ec165b0ee25..295512d579c 100644 --- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp @@ -481,7 +481,7 @@ struct NextEntryFinder : public BucketDatabase::EntryProcessor { NextEntryFinder(const document::BucketId& id) : _first(true), _last(id), _next() {} - bool process(const BucketDatabase::Entry& e) { + bool process(const BucketDatabase::Entry& e) override { document::BucketId bucket(e.getBucketId()); if (_first && bucket == _last) { diff --git a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h index d5a4731c0de..802bb0f4bac 100644 --- a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h +++ b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h @@ -23,7 +23,7 @@ struct BucketInstance : public vespalib::AsciiPrintable { lib::Node node, uint16_t idealLocationPriority, bool trusted, bool exist = true); - void print(vespalib::asciistream& out, const PrintProperties&) const; + void print(vespalib::asciistream& out, const PrintProperties&) const override; }; class BucketInstanceList : public vespalib::AsciiPrintable { @@ -104,7 +104,7 @@ public: } virtual OperationTargetList getTargets(OperationType type, - const document::BucketId& id) + const document::BucketId& id) override { return getInstances(type, id).createTargets(); } }; diff --git a/storage/src/vespa/storage/distributor/persistence_operation_metric_set.h b/storage/src/vespa/storage/distributor/persistence_operation_metric_set.h index b50ca0cb798..b1353e1c498 100644 --- a/storage/src/vespa/storage/distributor/persistence_operation_metric_set.h +++ b/storage/src/vespa/storage/distributor/persistence_operation_metric_set.h @@ -29,7 +29,7 @@ public: metrics::LongCountMetric notfound; MetricSet * clone(std::vector<Metric::UP>& ownerList, CopyType copyType, - metrics::MetricSet* owner, bool includeUnused) const; + metrics::MetricSet* owner, bool includeUnused) const override; }; class PersistenceOperationMetricSet : public metrics::MetricSet diff --git a/storage/src/vespa/storage/distributor/statechecker.cpp b/storage/src/vespa/storage/distributor/statechecker.cpp index 64a80117fe3..d257663e261 100644 --- a/storage/src/vespa/storage/distributor/statechecker.cpp +++ b/storage/src/vespa/storage/distributor/statechecker.cpp @@ -33,15 +33,15 @@ public: _priority(priority) {} - IdealStateOperation::UP createOperation() { + IdealStateOperation::UP createOperation() override { return std::move(_operation); } - MaintenancePriority getPriority() const { + MaintenancePriority getPriority() const override { return _priority; } - MaintenanceOperation::Type getType() const { + MaintenanceOperation::Type getType() const override { assert(_operation.get()); return _operation->getType(); } diff --git a/storage/src/vespa/storage/distributor/statecheckers.h b/storage/src/vespa/storage/distributor/statecheckers.h index 8edf04f3bf7..0113749f2fd 100644 --- a/storage/src/vespa/storage/distributor/statecheckers.h +++ b/storage/src/vespa/storage/distributor/statecheckers.h @@ -10,21 +10,21 @@ namespace distributor { class SynchronizeAndMoveStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Synchronization and moving"; } + std::string getStatusText() const override { return "Synchronization and moving"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "SynchronizeAndMove"; } + const char* getName() const override { return "SynchronizeAndMove"; } }; class DeleteExtraCopiesStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Delete extra copies"; } + std::string getStatusText() const override { return "Delete extra copies"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "DeleteExtraCopies"; } + const char* getName() const override { return "DeleteExtraCopies"; } private: bool bucketHasNoData(const StateChecker::Context& c); @@ -48,11 +48,11 @@ private: class JoinBucketsStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Join buckets"; } + std::string getStatusText() const override { return "Join buckets"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "JoinBuckets"; } + const char* getName() const override { return "JoinBuckets"; } private: uint64_t getTotalUsedFileSize(const Context& c) const; uint64_t getTotalMetaCount(const Context& c) const; @@ -68,11 +68,11 @@ private: class SplitBucketStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Split buckets"; } + std::string getStatusText() const override { return "Split buckets"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "SplitBucket"; } + const char* getName() const override { return "SplitBucket"; } private: @@ -86,12 +86,12 @@ private: class SplitInconsistentStateChecker : public StateChecker { public: - std::string getStatusText() const + std::string getStatusText() const override { return "Fix inconsistently split buckets"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "SplitInconsistentBuckets"; } + const char* getName() const override { return "SplitInconsistentBuckets"; } private: typedef std::pair<document::BucketId, uint16_t> BucketAndNode; @@ -114,23 +114,23 @@ class BucketStateStateChecker : public StateChecker const ActiveList& activeList, const StateChecker::Context& c) const; public: - std::string getStatusText() const { return "Set bucket copy state"; } + std::string getStatusText() const override { return "Set bucket copy state"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "SetBucketState"; } + const char* getName() const override { return "SetBucketState"; } }; class GarbageCollectionStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Garbage collection"; } + std::string getStatusText() const override { return "Garbage collection"; } bool needsGarbageCollection(const Context& c) const; - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "GarbageCollection"; } + const char* getName() const override { return "GarbageCollection"; } }; } diff --git a/storage/src/vespa/storage/distributor/statusreporterdelegate.h b/storage/src/vespa/storage/distributor/statusreporterdelegate.h index 7f66554b091..0c836910765 100644 --- a/storage/src/vespa/storage/distributor/statusreporterdelegate.h +++ b/storage/src/vespa/storage/distributor/statusreporterdelegate.h @@ -22,8 +22,8 @@ public: void registerStatusPage(); vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; - bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; + bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const override; }; } // distributor diff --git a/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h index f58303519c5..2cf0255bf9f 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h +++ b/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h @@ -36,16 +36,16 @@ public: DistributorComponentRegisterImpl(); ~DistributorComponentRegisterImpl(); - virtual void registerDistributorComponent(DistributorManagedComponent&); + virtual void registerDistributorComponent(DistributorManagedComponent&) override; void setTimeCalculator(UniqueTimeCalculator& calc); void setDistributorConfig(const DistributorConfig&); void setVisitorConfig(const VisitorConfig&); private: - virtual void handleNewState(); + virtual void handleNewState() override; - virtual void setNodeStateUpdater(NodeStateUpdater& updater); + virtual void setNodeStateUpdater(NodeStateUpdater& updater) override; }; } // storage diff --git a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h index fe73e5a1563..7d322f027d5 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h +++ b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h @@ -35,7 +35,7 @@ public: return _minUsedBitsTracker; } - virtual void registerServiceLayerComponent(ServiceLayerManagedComponent&); + virtual void registerServiceLayerComponent(ServiceLayerManagedComponent&) override; void setDiskCount(uint16_t count); }; diff --git a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h index 416391fbd53..cf9abbb6864 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h +++ b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h @@ -53,7 +53,7 @@ public: NodeStateUpdater& getNodeStateUpdater() { assert(_nodeStateUpdater != 0); return *_nodeStateUpdater; } - virtual void registerStorageComponent(StorageComponent&); + virtual void registerStorageComponent(StorageComponent&) override; void setNodeInfo(vespalib::stringref clusterName, const lib::NodeType& nodeType, diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp index 10a3c0bcf75..12e2c31068a 100644 --- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp +++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp @@ -236,9 +236,7 @@ StatusWebServer::WebServer::onGetRequest(const string & tmpurl, const string &se namespace { class IndexPageReporter : public framework::HtmlStatusReporter { std::ostringstream ost; - virtual void reportHtmlStatus(std::ostream& out, - const framework::HttpUrlPath&) const - { + virtual void reportHtmlStatus(std::ostream& out, const framework::HttpUrlPath&) const override { out << ost.str(); } diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h index 2f3f5ea9d57..c89c286387b 100644 --- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h +++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h @@ -32,7 +32,7 @@ class StatusWebServer : private config::IFetcherCallback<vespa::config::content: virtual void onGetRequest(const string & url, const string & serverSpec, - Fast_HTTPConnection& conn); + Fast_HTTPConnection& conn) override; const vespalib::string &getServerSpec() const { return _serverSpec; } @@ -74,9 +74,9 @@ public: const vespalib::string &serverSpec); private: - virtual void configure(std::unique_ptr<vespa::config::content::core::StorStatusConfig> config); + virtual void configure(std::unique_ptr<vespa::config::content::core::StorStatusConfig> config) override; void getPage(const char* url, Fast_HTTPConnection& conn); - virtual void run(framework::ThreadHandle&); + virtual void run(framework::ThreadHandle&) override; }; diff --git a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp index b904a0ea103..5d58a092053 100644 --- a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp +++ b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp @@ -149,7 +149,7 @@ namespace { virtual void visitThread(const vespalib::string& id, const framework::ThreadProperties& tp, const framework::ThreadTickData& tick, - DeadLockDetector::State& state) + DeadLockDetector::State& state) override { // In case we just got a new tick, ignore the thread if (tick._lastTickMs > _currentTime.getTime()) return; @@ -285,7 +285,7 @@ namespace { void visitThread(const vespalib::string& id, const framework::ThreadProperties& tp, const framework::ThreadTickData& tick, - DeadLockDetector::State& /*state*/) + DeadLockDetector::State& /*state*/) override { _table._table.addRow(id); uint32_t i = _table._table.getRowCount() - 1; diff --git a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h index 61ce0b26757..146d0ccb751 100644 --- a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h +++ b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.h @@ -88,11 +88,11 @@ private: StorageComponent* _component; framework::Thread::UP _thread; - virtual void run(framework::ThreadHandle&); + virtual void run(framework::ThreadHandle&) override; // Status implementation virtual void reportHtmlStatus(std::ostream& out, - const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; vespalib::string getBucketLockInfo() const; }; diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h b/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h index 378103def1c..e658599a3dc 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandler.h @@ -253,9 +253,9 @@ public: void abortQueuedOperations(const AbortBucketOperationsCommand& cmd); /** Send the given command back out of the persistence layer. */ - void sendCommand(const api::StorageCommand::SP&); + void sendCommand(const api::StorageCommand::SP&) override; /** Send the given reply back out of the persistence layer. */ - void sendReply(const api::StorageReply::SP&); + void sendReply(const api::StorageReply::SP&) override; /** Writes status page. */ void getStatus(std::ostream& out, const framework::HttpUrlPath& path) const; diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h index 410d586f0a2..dc2bb96d67b 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.h @@ -135,7 +135,7 @@ public: const vespalib::stringref & statusString); ~BucketLock(); - const document::BucketId& getBucketId() const { return _id; } + const document::BucketId& getBucketId() const override { return _id; } private: Disk& _disk; @@ -171,8 +171,8 @@ public: void remapQueue(const RemapInfo& source, RemapInfo& target1, RemapInfo& target2, Operation op); void failOperations(const document::BucketId&, uint16_t fromDisk, const api::ReturnCode&); - void sendCommand(const std::shared_ptr<api::StorageCommand>&); - void sendReply(const std::shared_ptr<api::StorageReply>&); + void sendCommand(const std::shared_ptr<api::StorageCommand>&) override; + void sendReply(const std::shared_ptr<api::StorageReply>&) override; void getStatus(std::ostream& out, const framework::HttpUrlPath& path) const; @@ -190,7 +190,7 @@ public: std::string dumpQueue(uint16_t disk) const; ResumeGuard pause(); - void resume(); + void resume() override; void abortQueuedOperations(const AbortBucketOperationsCommand& cmd); private: diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h index 78c23f083f0..a6942102c42 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h @@ -104,8 +104,7 @@ public: ServiceLayerComponentRegister&); ~FileStorManager(); - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; // Return true if we are currently merging the given bucket. bool isMerging(const document::BucketId& bucket) const; @@ -118,10 +117,10 @@ public: return *_provider; } - void handleNewState(); + void handleNewState() override; private: - void configure(std::unique_ptr<vespa::config::content::StorFilestorConfig> config); + void configure(std::unique_ptr<vespa::config::content::StorFilestorConfig> config) override; void replyWithBucketNotFound(api::StorageMessage&, const document::BucketId&); @@ -149,53 +148,47 @@ private: uint16_t disk); // Document operations - bool onPut(const std::shared_ptr<api::PutCommand>&); - bool onUpdate(const std::shared_ptr<api::UpdateCommand>&); - bool onGet(const std::shared_ptr<api::GetCommand>&); - bool onRemove(const std::shared_ptr<api::RemoveCommand>&); - bool onRevert(const std::shared_ptr<api::RevertCommand>&); - bool onMultiOperation(const std::shared_ptr<api::MultiOperationCommand>&); - bool onBatchPutRemove(const std::shared_ptr<api::BatchPutRemoveCommand>&); - bool onStatBucket(const std::shared_ptr<api::StatBucketCommand>&); + bool onPut(const std::shared_ptr<api::PutCommand>&) override; + bool onUpdate(const std::shared_ptr<api::UpdateCommand>&) override; + bool onGet(const std::shared_ptr<api::GetCommand>&) override; + bool onRemove(const std::shared_ptr<api::RemoveCommand>&) override; + bool onRevert(const std::shared_ptr<api::RevertCommand>&) override; + bool onMultiOperation(const std::shared_ptr<api::MultiOperationCommand>&) override; + bool onBatchPutRemove(const std::shared_ptr<api::BatchPutRemoveCommand>&) override; + bool onStatBucket(const std::shared_ptr<api::StatBucketCommand>&) override; // Bucket operations - bool onRemoveLocation(const std::shared_ptr<api::RemoveLocationCommand>&); - bool onCreateBucket(const std::shared_ptr<api::CreateBucketCommand>&); - bool onDeleteBucket(const std::shared_ptr<api::DeleteBucketCommand>&); - bool onMergeBucket(const std::shared_ptr<api::MergeBucketCommand>&); - bool onGetBucketDiff(const std::shared_ptr<api::GetBucketDiffCommand>&); - bool onGetBucketDiffReply( - const std::shared_ptr<api::GetBucketDiffReply>&); - bool onApplyBucketDiff( - const std::shared_ptr<api::ApplyBucketDiffCommand>&); - bool onApplyBucketDiffReply( - const std::shared_ptr<api::ApplyBucketDiffReply>&); - bool onJoinBuckets(const std::shared_ptr<api::JoinBucketsCommand>&); - bool onSplitBucket(const std::shared_ptr<api::SplitBucketCommand>&); - bool onSetBucketState(const std::shared_ptr<api::SetBucketStateCommand>&); - bool onNotifyBucketChangeReply( - const std::shared_ptr<api::NotifyBucketChangeReply>&) - { return true; } + bool onRemoveLocation(const std::shared_ptr<api::RemoveLocationCommand>&) override; + bool onCreateBucket(const std::shared_ptr<api::CreateBucketCommand>&) override; + bool onDeleteBucket(const std::shared_ptr<api::DeleteBucketCommand>&) override; + bool onMergeBucket(const std::shared_ptr<api::MergeBucketCommand>&) override; + bool onGetBucketDiff(const std::shared_ptr<api::GetBucketDiffCommand>&) override; + bool onGetBucketDiffReply(const std::shared_ptr<api::GetBucketDiffReply>&) override; + bool onApplyBucketDiff(const std::shared_ptr<api::ApplyBucketDiffCommand>&) override; + bool onApplyBucketDiffReply(const std::shared_ptr<api::ApplyBucketDiffReply>&) override; + bool onJoinBuckets(const std::shared_ptr<api::JoinBucketsCommand>&) override; + bool onSplitBucket(const std::shared_ptr<api::SplitBucketCommand>&) override; + bool onSetBucketState(const std::shared_ptr<api::SetBucketStateCommand>&) override; + bool onNotifyBucketChangeReply(const std::shared_ptr<api::NotifyBucketChangeReply>&) override { return true; } // Other - bool onInternal(const std::shared_ptr<api::InternalCommand>&); - bool onInternalReply(const std::shared_ptr<api::InternalReply>&); + bool onInternal(const std::shared_ptr<api::InternalCommand>&) override; + bool onInternalReply(const std::shared_ptr<api::InternalReply>&) override; void handleAbortBucketOperations( const std::shared_ptr<AbortBucketOperationsCommand>&); - void sendCommand(const std::shared_ptr<api::StorageCommand>&); - void sendReply(const std::shared_ptr<api::StorageReply>&); + void sendCommand(const std::shared_ptr<api::StorageCommand>&) override; + void sendReply(const std::shared_ptr<api::StorageReply>&) override; - void sendUp(const std::shared_ptr<api::StorageMessage>&); + void sendUp(const std::shared_ptr<api::StorageMessage>&) override; - void onClose(); - void onFlush(bool downwards); + void onClose() override; + void onFlush(bool downwards) override; - virtual void reportHtmlStatus(std::ostream&, - const framework::HttpUrlPath&) const; + virtual void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const override; - virtual void storageDistributionChanged(); + virtual void storageDistributionChanged() override; void updateState(); }; diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h index 3b7838bb20c..04c8c7b2391 100644 --- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h +++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h @@ -31,19 +31,19 @@ public: const config::ConfigUri& configUri); ~ModifiedBucketChecker(); - void configure(std::unique_ptr<vespa::config::content::core::StorServerConfig>); + void configure(std::unique_ptr<vespa::config::content::core::StorServerConfig>) override; - void run(framework::ThreadHandle& thread); + void run(framework::ThreadHandle& thread) override; bool tick(); - void onOpen(); - void onClose(); + void onOpen() override; + void onClose() override; void setUnitTestingSingleThreadedMode() { _singleThreadMode = true; } private: - bool onInternalReply(const std::shared_ptr<api::InternalReply>&); + bool onInternalReply(const std::shared_ptr<api::InternalReply>&) override; bool currentChunkFinished() const { return _pendingRequests == 0; } diff --git a/storage/src/vespa/storage/persistence/messages.h b/storage/src/vespa/storage/persistence/messages.h index aad2d1bedce..b4cf14413f4 100644 --- a/storage/src/vespa/storage/persistence/messages.h +++ b/storage/src/vespa/storage/persistence/messages.h @@ -31,9 +31,9 @@ public: uint32_t maxByteSize); ~GetIterCommand(); - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; - document::BucketId getBucketId() const { return _bucketId; } + document::BucketId getBucketId() const override { return _bucketId; } bool hasSingleBucketId() const override { return true; } spi::IteratorId getIteratorId() const { return _iteratorId; } @@ -65,7 +65,7 @@ public: ~GetIterReply(); bool hasSingleBucketId() const override { return true; } - document::BucketId getBucketId() const { + document::BucketId getBucketId() const override { return _bucketId; } @@ -102,7 +102,7 @@ public: spi::IncludedVersions includedVersions); ~CreateIteratorCommand(); bool hasSingleBucketId() const override { return true; } - document::BucketId getBucketId() const { return _bucketId; } + document::BucketId getBucketId() const override { return _bucketId; } const spi::Selection& getSelection() const { return _selection; } spi::IncludedVersions getIncludedVersions() const { return _includedVersions; } const std::string& getFields() const { return _fieldSet; } @@ -114,7 +114,7 @@ public: return _readConsistency; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; @@ -132,7 +132,7 @@ public: ~CreateIteratorReply(); bool hasSingleBucketId() const override { return true; } - document::BucketId getBucketId() const { return _bucketId; } + document::BucketId getBucketId() const override { return _bucketId; } spi::IteratorId getIteratorId() const { return _iteratorId; } @@ -152,7 +152,7 @@ public: spi::IteratorId getIteratorId() const { return _iteratorId; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool, const std::string &) const override; }; @@ -182,11 +182,11 @@ public: RecheckBucketInfoCommand(const document::BucketId& bucketId); ~RecheckBucketInfoCommand(); - document::BucketId getBucketId() const { + document::BucketId getBucketId() const override { return _bucketId; } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; @@ -202,7 +202,7 @@ public: RecheckBucketInfoReply(const RecheckBucketInfoCommand& cmd); ~RecheckBucketInfoReply(); - document::BucketId getBucketId() const { + document::BucketId getBucketId() const override { return _bucketId; } @@ -256,7 +256,7 @@ public: return _predicate->shouldAbort(bid); } - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; diff --git a/storage/src/vespa/storage/persistence/persistencethread.h b/storage/src/vespa/storage/persistence/persistencethread.h index 89658b5041e..f4c70353fab 100644 --- a/storage/src/vespa/storage/persistence/persistencethread.h +++ b/storage/src/vespa/storage/persistence/persistencethread.h @@ -31,11 +31,11 @@ public: ~PersistenceThread(); /** Waits for current operation to be finished. */ - void flush(); + void flush() override; bool isMerging(const BucketId& bucket) const; - virtual framework::Thread& getThread() { return *_thread; } + virtual framework::Thread& getThread() override { return *_thread; } MessageTracker::UP handlePut(api::PutCommand& cmd); MessageTracker::UP handleRemove(api::RemoveCommand& cmd); @@ -99,7 +99,7 @@ private: void processMessages(FileStorHandler::LockedMessage & lock); // Thread main loop - virtual void run(framework::ThreadHandle&); + virtual void run(framework::ThreadHandle&) override; bool checkForError(const spi::Result& response, MessageTracker& tracker); diff --git a/storage/src/vespa/storage/persistence/processallhandler.cpp b/storage/src/vespa/storage/persistence/processallhandler.cpp index 23990cd2108..2095e19261c 100644 --- a/storage/src/vespa/storage/persistence/processallhandler.cpp +++ b/storage/src/vespa/storage/persistence/processallhandler.cpp @@ -33,7 +33,7 @@ public: _bucket(bucket), _context(context) {} - void process(spi::DocEntry& entry) { + void process(spi::DocEntry& entry) override { spi::RemoveResult removeResult = _provider.remove( _bucket, entry.getTimestamp(), @@ -55,7 +55,7 @@ public: StatEntryProcessor(std::ostream& o) : ost(o) {}; - void process(spi::DocEntry& e) { + void process(spi::DocEntry& e) override { ost << " Timestamp: " << e.getTimestamp() << ", "; if (e.getDocument() != 0) { ost << "Doc(" << e.getDocument()->getId() << ")" diff --git a/storage/src/vespa/storage/persistence/splitbitdetector.cpp b/storage/src/vespa/storage/persistence/splitbitdetector.cpp index 1749df09d28..8d816760815 100644 --- a/storage/src/vespa/storage/persistence/splitbitdetector.cpp +++ b/storage/src/vespa/storage/persistence/splitbitdetector.cpp @@ -56,7 +56,7 @@ struct BucketVisitor : public BucketProcessor::EntryProcessor { BucketVisitor(const document::BucketIdFactory& factory); ~BucketVisitor(); - void process(spi::DocEntry& slot) { + void process(spi::DocEntry& slot) override { assert(slot.getDocumentId()); ++_docCount; _docSize += slot.getDocumentSize(); diff --git a/storage/src/vespa/storage/storageserver/bucketintegritychecker.h b/storage/src/vespa/storage/storageserver/bucketintegritychecker.h index 47173bedcda..6b87be804d0 100644 --- a/storage/src/vespa/storage/storageserver/bucketintegritychecker.h +++ b/storage/src/vespa/storage/storageserver/bucketintegritychecker.h @@ -49,8 +49,7 @@ struct SchedulingOptions : public document::Printable { for (uint32_t i=0; i<7; ++i) { _dailyStates[i] = RUN_FULL; } } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; @@ -113,10 +112,9 @@ public: ServiceLayerComponentRegister&); ~BucketIntegrityChecker(); - virtual void onClose(); + virtual void onClose() override; - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; SchedulingOptions& getSchedulingOptions() { return _scheduleOptions; } @@ -133,26 +131,26 @@ public: framework::Clock& getClock() { return _component.getClock(); } private: - virtual void configure(std::unique_ptr<vespa::config::content::core::StorIntegritycheckerConfig>); + virtual void configure(std::unique_ptr<vespa::config::content::core::StorIntegritycheckerConfig>) override; - void onDoneInit(); + void onDoneInit() override; - bool onInternalReply(const std::shared_ptr<api::InternalReply>&); - bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>&); + bool onInternalReply(const std::shared_ptr<api::InternalReply>&) override; + bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>&) override; bool onNotifyBucketChangeReply( - const std::shared_ptr<api::NotifyBucketChangeReply>&) + const std::shared_ptr<api::NotifyBucketChangeReply>&) override { return true; } SchedulingOptions::RunState getCurrentRunState( framework::SecondTime time) const; - virtual void run(framework::ThreadHandle&); + virtual void run(framework::ThreadHandle&) override; uint32_t getTotalPendingCount() const; // Status::Reporter implementation virtual void reportHtmlStatus(std::ostream&, - const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; }; diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.h b/storage/src/vespa/storage/storageserver/communicationmanager.h index 916a92247da..31100de78d1 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.h +++ b/storage/src/vespa/storage/storageserver/communicationmanager.h @@ -141,8 +141,8 @@ private: typedef std::vector< std::pair<framework::SecondTime, mbus::IProtocol::SP> > Protocols; Protocols _earlierGenerations; - void onOpen(); - void onClose(); + void onOpen() override; + void onClose() override; void process(const std::shared_ptr<api::StorageMessage>& msg); @@ -151,7 +151,7 @@ private: void configureMessageBusLimits(const CommunicationManagerConfig& cfg); - void configure(std::unique_ptr<CommunicationManagerConfig> config); + void configure(std::unique_ptr<CommunicationManagerConfig> config) override; void receiveStorageReply(const std::shared_ptr<api::StorageReply>&); @@ -201,7 +201,7 @@ public: * From StorageLink. Called when messages arrive from storage * modules. Will convert and dispatch messages to MessageServer */ - virtual bool onUp(const std::shared_ptr<api::StorageMessage>&); + virtual bool onUp(const std::shared_ptr<api::StorageMessage>&) override; bool sendCommand(const std::shared_ptr<api::StorageCommand>& command); @@ -210,19 +210,18 @@ public: void sendMessageBusReply(StorageTransportContext& context, const std::shared_ptr<api::StorageReply>& reply); // Pump thread - void run(framework::ThreadHandle&); + void run(framework::ThreadHandle&) override; - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; /** Get messages from messagebus. */ - void handleMessage(std::unique_ptr<mbus::Message> msg); + void handleMessage(std::unique_ptr<mbus::Message> msg) override; void sendMessageBusMessage(const std::shared_ptr<api::StorageCommand>& msg, std::unique_ptr<mbus::Message> mbusMsg, const mbus::Route& route); /** Get replies from messagebus. */ - void handleReply(std::unique_ptr<mbus::Reply> msg); + void handleReply(std::unique_ptr<mbus::Reply> msg) override; void updateMessagebusProtocol(const document::DocumentTypeRepo::SP &repo); diff --git a/storage/src/vespa/storage/storageserver/distributornode.h b/storage/src/vespa/storage/storageserver/distributornode.h index c0b6db67b95..03792d8fb56 100644 --- a/storage/src/vespa/storage/storageserver/distributornode.h +++ b/storage/src/vespa/storage/storageserver/distributornode.h @@ -41,19 +41,19 @@ public: StorageLink::UP communicationManager = StorageLink::UP()); ~DistributorNode(); - virtual const lib::NodeType& getNodeType() const + virtual const lib::NodeType& getNodeType() const override { return lib::NodeType::DISTRIBUTOR; } - virtual ResumeGuard pause(); + virtual ResumeGuard pause() override; void handleConfigChange(vespa::config::content::core::StorDistributormanagerConfig&); void handleConfigChange(vespa::config::content::core::StorVisitordispatcherConfig&); private: - virtual void initializeNodeSpecific(); - virtual StorageLink::UP createChain(); + virtual void initializeNodeSpecific() override; + virtual StorageLink::UP createChain() override; - virtual api::Timestamp getUniqueTimestamp(); + virtual api::Timestamp getUniqueTimestamp() override; /** * Shut down necessary distributor-specific components before shutting diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.cpp b/storage/src/vespa/storage/storageserver/mergethrottler.cpp index c8cfd7f3214..ebfa10fe814 100644 --- a/storage/src/vespa/storage/storageserver/mergethrottler.cpp +++ b/storage/src/vespa/storage/storageserver/mergethrottler.cpp @@ -35,10 +35,10 @@ class DummyMbusMessage : public Base private: static const mbus::string NAME; public: - const mbus::string& getProtocol() const { return NAME; } - uint32_t getType() const { return 0x1badb007; } + const mbus::string& getProtocol() const override { return NAME; } + uint32_t getType() const override { return 0x1badb007; } - uint8_t priority() const { return 255; } + uint8_t priority() const override { return 255; } }; template <typename Base> diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.h b/storage/src/vespa/storage/storageserver/mergethrottler.h index c58c11d48e0..8ee4ca7be71 100644 --- a/storage/src/vespa/storage/storageserver/mergethrottler.h +++ b/storage/src/vespa/storage/storageserver/mergethrottler.h @@ -245,15 +245,15 @@ public: ~MergeThrottler(); /** Implements document::Runnable::run */ - void run(framework::ThreadHandle&); + void run(framework::ThreadHandle&) override; - void onOpen(); - void onClose(); - void onFlush(bool downwards); - bool onUp(const std::shared_ptr<api::StorageMessage>& msg); - bool onDown(const std::shared_ptr<api::StorageMessage>& msg); + void onOpen() override; + void onClose() override; + void onFlush(bool downwards) override; + bool onUp(const std::shared_ptr<api::StorageMessage>& msg) override; + bool onDown(const std::shared_ptr<api::StorageMessage>& msg) override; - bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>& stateCmd); + bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>& stateCmd) override; // For unit testing only const ActiveMergeMap& getActiveMerges() const { return _merges; } @@ -270,11 +270,10 @@ public: std::size_t getMaxQueueSize() const { return _maxQueueSize; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; // HtmlStatusReporter implementation - void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const; + void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const override; private: friend class ThreadRendezvousGuard; // impl in .cpp file @@ -328,7 +327,7 @@ private: /** * Callback method for config system (IFetcherCallback) */ - void configure(std::unique_ptr<vespa::config::content::core::StorServerConfig> newConfig); + void configure(std::unique_ptr<vespa::config::content::core::StorServerConfig> newConfig) override; // NOTE: unless explicitly specified, all the below functions require // _sync lock to be held upon call (usually implicitly via MessageGuard) diff --git a/storage/src/vespa/storage/storageserver/opslogger.h b/storage/src/vespa/storage/storageserver/opslogger.h index 6f6b52c4607..57f304a04aa 100644 --- a/storage/src/vespa/storage/storageserver/opslogger.h +++ b/storage/src/vespa/storage/storageserver/opslogger.h @@ -26,21 +26,20 @@ public: const config::ConfigUri & configUri); ~OpsLogger(); - void onClose(); + void onClose() override; - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; - bool onPutReply(const std::shared_ptr<api::PutReply>& msg); - bool onUpdateReply(const std::shared_ptr<api::UpdateReply>& msg); - bool onRemoveReply(const std::shared_ptr<api::RemoveReply>& msg); - bool onGetReply(const std::shared_ptr<api::GetReply>& msg); + bool onPutReply(const std::shared_ptr<api::PutReply>& msg) override; + bool onUpdateReply(const std::shared_ptr<api::UpdateReply>& msg) override; + bool onRemoveReply(const std::shared_ptr<api::RemoveReply>& msg) override; + bool onGetReply(const std::shared_ptr<api::GetReply>& msg) override; /** Ignore all replies on the way down the storage chain. */ - bool onDown(const std::shared_ptr<api::StorageMessage>&) + bool onDown(const std::shared_ptr<api::StorageMessage>&) override { return false; }; - void configure(std::unique_ptr<vespa::config::content::core::StorOpsloggerConfig> config); + void configure(std::unique_ptr<vespa::config::content::core::StorOpsloggerConfig> config) override; private: vespalib::Lock _lock; diff --git a/storage/src/vespa/storage/storageserver/priorityconverter.h b/storage/src/vespa/storage/storageserver/priorityconverter.h index 5e7eb54acf9..62e476606bc 100644 --- a/storage/src/vespa/storage/storageserver/priorityconverter.h +++ b/storage/src/vespa/storage/storageserver/priorityconverter.h @@ -25,7 +25,7 @@ public: /** Converts the given priority into a document api priority number. */ documentapi::Priority::Value toDocumentPriority(uint8_t) const; - void configure(std::unique_ptr<Config> config); + void configure(std::unique_ptr<Config> config) override; private: static_assert(documentapi::Priority::PRI_ENUM_SIZE == 16, diff --git a/storage/src/vespa/storage/storageserver/statemanager.h b/storage/src/vespa/storage/storageserver/statemanager.h index 537ecec2e72..028168937b5 100644 --- a/storage/src/vespa/storage/storageserver/statemanager.h +++ b/storage/src/vespa/storage/storageserver/statemanager.h @@ -67,27 +67,25 @@ public: std::unique_ptr<HostInfo>, bool testMode = false); ~StateManager(); - void onOpen(); - void onClose(); + void onOpen() override; + void onClose() override; void tick(); - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; /** Implementation of HtmlStatusReporter */ - virtual void reportHtmlStatus(std::ostream&, - const framework::HttpUrlPath&) const; + virtual void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const override; - virtual lib::NodeState::CSP getReportedNodeState() const; - virtual lib::NodeState::CSP getCurrentNodeState() const; - virtual lib::ClusterState::CSP getSystemState() const; + virtual lib::NodeState::CSP getReportedNodeState() const override; + virtual lib::NodeState::CSP getCurrentNodeState() const override; + virtual lib::ClusterState::CSP getSystemState() const override; - virtual void addStateListener(StateListener&); - virtual void removeStateListener(StateListener&); + virtual void addStateListener(StateListener&) override; + virtual void removeStateListener(StateListener&) override; - virtual Lock::SP grabStateChangeLock(); - virtual void setReportedNodeState(const lib::NodeState& state); + virtual Lock::SP grabStateChangeLock() override; + virtual void setReportedNodeState(const lib::NodeState& state) override; void setClusterState(const lib::ClusterState& c); @@ -130,15 +128,15 @@ private: const lib::ClusterState& currentState, const lib::ClusterState& newState) const; - bool onGetNodeState(const std::shared_ptr<api::GetNodeStateCommand>&); - bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>&); + bool onGetNodeState(const std::shared_ptr<api::GetNodeStateCommand>&) override; + bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>&) override; /** * _stateLock MUST NOT be held while calling. */ std::string getNodeInfo() const; - virtual void run(framework::ThreadHandle&); + virtual void run(framework::ThreadHandle&) override; }; diff --git a/storage/src/vespa/storage/storageserver/statereporter.h b/storage/src/vespa/storage/storageserver/statereporter.h index dfef97e85d0..51a9e93a197 100644 --- a/storage/src/vespa/storage/storageserver/statereporter.h +++ b/storage/src/vespa/storage/storageserver/statereporter.h @@ -38,9 +38,9 @@ public: ~StateReporter(); vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; bool reportStatus(std::ostream& out, - const framework::HttpUrlPath& path) const; + const framework::HttpUrlPath& path) const override; private: metrics::MetricManager &_manager; diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h index 3e4a4b7642e..5df29191489 100644 --- a/storage/src/vespa/storage/storageserver/storagenode.h +++ b/storage/src/vespa/storage/storageserver/storagenode.h @@ -81,10 +81,10 @@ public: bool attemptedStopped() const; - virtual void notifyDoneInitializing(); + virtual void notifyDoneInitializing() override; void waitUntilInitialized(uint32_t timeoutSeconds = 15); - void updateMetrics(const MetricLockGuard & guard); + void updateMetrics(const MetricLockGuard & guard) override; /** Updates the document type repo. */ void setNewDocumentRepo(const document::DocumentTypeRepo::SP& repo); @@ -95,7 +95,7 @@ public: */ virtual ResumeGuard pause() = 0; - void requestShutdown(vespalib::stringref reason); + void requestShutdown(vespalib::stringref reason) override; void notifyPartitionDown(int partId, vespalib::stringref reason); @@ -140,10 +140,10 @@ private: std::unique_ptr<StorageLink> _chain; /** Implementation of config callbacks. */ - virtual void configure(std::unique_ptr<vespa::config::content::core::StorServerConfig> config); - virtual void configure(std::unique_ptr<vespa::config::content::UpgradingConfig> config); - virtual void configure(std::unique_ptr<vespa::config::content::StorDistributionConfig> config); - virtual void configure(std::unique_ptr<vespa::config::content::core::StorPrioritymappingConfig>); + virtual void configure(std::unique_ptr<vespa::config::content::core::StorServerConfig> config) override; + virtual void configure(std::unique_ptr<vespa::config::content::UpgradingConfig> config) override; + virtual void configure(std::unique_ptr<vespa::config::content::StorDistributionConfig> config) override; + virtual void configure(std::unique_ptr<vespa::config::content::core::StorPrioritymappingConfig>) override; virtual void configure(std::unique_ptr<document::DocumenttypesConfig> config, bool hasChanged, int64_t generation); void updateUpgradeFlag(const vespa::config::content::UpgradingConfig&); diff --git a/storage/src/vespa/storage/tools/storage-cmd.cpp b/storage/src/vespa/storage/tools/storage-cmd.cpp index 021e5ed9b03..8b0496507c5 100644 --- a/storage/src/vespa/storage/tools/storage-cmd.cpp +++ b/storage/src/vespa/storage/tools/storage-cmd.cpp @@ -43,7 +43,7 @@ private: } public: - int Main() { + int Main() override { if (_argc < 3) { fprintf(stderr, "usage: storage-cmd <connectspec> <method> [args]\n"); fprintf(stderr, "Calls RPC method on a storage/distributor process\n"); diff --git a/storage/src/vespa/storage/tools/throttlingsim.h b/storage/src/vespa/storage/tools/throttlingsim.h index 9135507c0d3..b583a7d2533 100644 --- a/storage/src/vespa/storage/tools/throttlingsim.h +++ b/storage/src/vespa/storage/tools/throttlingsim.h @@ -33,7 +33,7 @@ public: Receiver(int meanwait, int max) : meanwaitms(meanwait), processed(0), maxqueuesize(max) {}; bool enqueue(const Message& msg); - void run(); + void run() override; void print(); }; @@ -55,7 +55,7 @@ public: void sendMessage(const Message& m); void print(); - void run(); + void run() override; }; Messaging::Messaging(int meanwait) : lastOk(0), meanwaitms(meanwait) {} @@ -75,7 +75,7 @@ public: double max_diff; virtual void returnMessage(const Message& m) = 0; - virtual void run(); + virtual void run() override; virtual void print(double timenow); Client(Messaging& msgng, double windowSize, int to); @@ -92,16 +92,16 @@ public: FixedClient(Messaging& msgng, int winsize, int to) : Client(msgng, winsize, to) {}; - virtual void returnMessage(const Message& m); + virtual void returnMessage(const Message& m) override; }; class LoadBalancingClient : public Client { public: LoadBalancingClient(Messaging& msgng, int winsize, int to); - virtual void returnMessage(const Message& m); - virtual void run(); - virtual void print(double timenow); + virtual void returnMessage(const Message& m) override; + virtual void run() override; + virtual void print(double timenow) override; std::vector<double> weights; }; @@ -110,9 +110,9 @@ class BusyCounterBalancingClient : public Client { public: BusyCounterBalancingClient(Messaging& msgng, int winsize, int to); - virtual void returnMessage(const Message& m); - virtual void run(); - virtual void print(double timenow); + virtual void returnMessage(const Message& m) override; + virtual void run() override; + virtual void print(double timenow) override; std::vector<int> busyCount; }; @@ -127,7 +127,7 @@ public: DynamicClient(Messaging& msgng, int maxWinSize, double to) : Client(msgng, 1, static_cast<int>(to)), maxwinsize(maxWinSize), threshold(maxWinSize / 2), lastFailTimestamp(0) {}; - virtual void returnMessage(const Message& m); + virtual void returnMessage(const Message& m) override; }; class LatencyControlClient : public Client { @@ -138,9 +138,9 @@ public: : Client(msgng, 1, static_cast<int>(to)), count(0){}; - virtual void returnMessage(const Message& m); + virtual void returnMessage(const Message& m) override; - virtual void print(double timenow); + virtual void print(double timenow) override; }; @@ -153,6 +153,6 @@ private: public: ThrottlingApp() {}; - int Main(); + int Main() override; }; diff --git a/storage/src/vespa/storage/visiting/countvisitor.h b/storage/src/vespa/storage/visiting/countvisitor.h index 75e0e866553..ecf51035a03 100644 --- a/storage/src/vespa/storage/visiting/countvisitor.h +++ b/storage/src/vespa/storage/visiting/countvisitor.h @@ -18,12 +18,12 @@ public: CountVisitor(StorageComponent&, const vdslib::Parameters& params); - virtual void completedVisiting(HitCounter&); + virtual void completedVisiting(HitCounter&) override; private: void handleDocuments(const document::BucketId& bucketId, std::vector<spi::DocEntry::UP>& entries, - HitCounter& hitCounter); + HitCounter& hitCounter) override; bool _doScheme; std::map<std::string, int> _schemeCount; @@ -43,13 +43,13 @@ private: struct CountVisitorFactory : public VisitorFactory { VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; Visitor* makeVisitor(StorageComponent& c, VisitorEnvironment&, - const vdslib::Parameters& params) + const vdslib::Parameters& params) override { return new CountVisitor(c, params); } diff --git a/storage/src/vespa/storage/visiting/dumpvisitor.h b/storage/src/vespa/storage/visiting/dumpvisitor.h index 0aa690ce3c0..31ff8ef0638 100644 --- a/storage/src/vespa/storage/visiting/dumpvisitor.h +++ b/storage/src/vespa/storage/visiting/dumpvisitor.h @@ -27,7 +27,7 @@ private: void handleDocuments(const document::BucketId& bucketId, std::vector<spi::DocEntry::UP>& entries, - HitCounter& hitCounter); + HitCounter& hitCounter) override; std::unique_ptr<std::set<std::string> > _requestedFields; std::unique_ptr<std::set<std::string> > _requestedDocuments; @@ -40,13 +40,13 @@ public: DumpVisitorFactory() {} VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; storage::Visitor* makeVisitor(StorageComponent& component, storage::VisitorEnvironment&, - const vdslib::Parameters& params) + const vdslib::Parameters& params) override { return new DumpVisitor(component, params); } diff --git a/storage/src/vespa/storage/visiting/dumpvisitorsingle.h b/storage/src/vespa/storage/visiting/dumpvisitorsingle.h index eab10ad2653..d7f7b63d851 100644 --- a/storage/src/vespa/storage/visiting/dumpvisitorsingle.h +++ b/storage/src/vespa/storage/visiting/dumpvisitorsingle.h @@ -20,20 +20,19 @@ public: private: void handleDocuments(const document::BucketId&, - std::vector<spi::DocEntry::UP>&, - HitCounter&); + std::vector<spi::DocEntry::UP>&, HitCounter&) override; }; struct DumpVisitorSingleFactory : public VisitorFactory { VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; Visitor* - makeVisitor(StorageComponent& c, VisitorEnvironment&, - const vdslib::Parameters& params) + makeVisitor(StorageComponent& c, + VisitorEnvironment&, const vdslib::Parameters& params) override { return new DumpVisitorSingle(c, params); } diff --git a/storage/src/vespa/storage/visiting/messages.h b/storage/src/vespa/storage/visiting/messages.h index ab5628b6669..d646355895f 100644 --- a/storage/src/vespa/storage/visiting/messages.h +++ b/storage/src/vespa/storage/visiting/messages.h @@ -28,11 +28,11 @@ public: : api::InternalCommand(ID), _config(config) {} - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; const vespa::config::content::core::StorVisitorConfig& getConfig() const { return _config; } - virtual void print(std::ostream& out, bool verbose, const std::string& indent) const + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override { out << "PropagateVisitorConfig()"; @@ -57,7 +57,7 @@ public: } - virtual void print(std::ostream& out, bool verbose, const std::string& indent) const + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override { out << "PropagateVisitorConfigReply()"; diff --git a/storage/src/vespa/storage/visiting/recoveryvisitor.h b/storage/src/vespa/storage/visiting/recoveryvisitor.h index b8c64e7d0fd..dac6996028b 100644 --- a/storage/src/vespa/storage/visiting/recoveryvisitor.h +++ b/storage/src/vespa/storage/visiting/recoveryvisitor.h @@ -26,9 +26,9 @@ public: private: void handleDocuments(const document::BucketId& bucketId, std::vector<spi::DocEntry::UP>& entries, - HitCounter& hitCounter); + HitCounter& hitCounter) override; - void completedBucket(const document::BucketId&, HitCounter&); + void completedBucket(const document::BucketId&, HitCounter&) override; std::set<std::string> _requestedFields; @@ -42,13 +42,13 @@ private: struct RecoveryVisitorFactory : public VisitorFactory { VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; Visitor* makeVisitor(StorageComponent& c, VisitorEnvironment&, - const vdslib::Parameters& params) + const vdslib::Parameters& params) override { return new RecoveryVisitor(c, params); } diff --git a/storage/src/vespa/storage/visiting/testvisitor.h b/storage/src/vespa/storage/visiting/testvisitor.h index 9d4bb498ae0..c2740b11d56 100644 --- a/storage/src/vespa/storage/visiting/testvisitor.h +++ b/storage/src/vespa/storage/visiting/testvisitor.h @@ -17,21 +17,21 @@ public: TestVisitor(StorageComponent&, const vdslib::Parameters&); private: - void startingVisitor(const std::vector<document::BucketId>& buckets); + void startingVisitor(const std::vector<document::BucketId>& buckets) override; void handleDocuments(const document::BucketId& bucketId, std::vector<spi::DocEntry::UP>& entries, - HitCounter& hitCounter); + HitCounter& hitCounter) override; - void completedBucket(const document::BucketId& bucket, HitCounter& hitCounter); + void completedBucket(const document::BucketId& bucket, HitCounter& hitCounter) override; spi::ReadConsistency getRequiredReadConsistency() const override { return spi::ReadConsistency::WEAK; } - void completedVisiting(HitCounter& hitCounter); + void completedVisiting(HitCounter& hitCounter) override; - void abortedVisiting(); + void abortedVisiting() override; // Send datagram with message back to client void report(const std::string& message); @@ -42,13 +42,13 @@ private: struct TestVisitorFactory : public VisitorFactory { VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; Visitor* makeVisitor(StorageComponent& c, VisitorEnvironment&, - const vdslib::Parameters& params) { + const vdslib::Parameters& params) override { return new TestVisitor(c, params); } diff --git a/storage/src/vespa/storage/visiting/visitor.h b/storage/src/vespa/storage/visiting/visitor.h index a392374ed5d..3d5e9fc2c53 100644 --- a/storage/src/vespa/storage/visiting/visitor.h +++ b/storage/src/vespa/storage/visiting/visitor.h @@ -174,8 +174,7 @@ private: bool hasPendingIterators() const { return _pendingIterators > 0; } - void print(std::ostream& out, bool /*verbose*/, - const std::string& /*indent*/) const + void print(std::ostream& out, bool, const std::string& /*indent*/) const override { out << "BucketIterationState(" << _bucketId diff --git a/storage/src/vespa/storage/visiting/visitormanager.h b/storage/src/vespa/storage/visiting/visitormanager.h index aa9ecf37647..9b750e3af4f 100644 --- a/storage/src/vespa/storage/visiting/visitormanager.h +++ b/storage/src/vespa/storage/visiting/visitormanager.h @@ -92,10 +92,9 @@ public: const VisitorFactory::Map& external = VisitorFactory::Map()); virtual ~VisitorManager(); - virtual void onClose(); + virtual void onClose() override; - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; uint32_t getActiveVisitorCount() const; @@ -126,8 +125,8 @@ public: void enforceQueueUsage() { _enforceQueueUse = true; } private: - void configure(std::unique_ptr<vespa::config::content::core::StorVisitorConfig>); - virtual void run(framework::ThreadHandle&); + void configure(std::unique_ptr<vespa::config::content::core::StorVisitorConfig>) override; + virtual void run(framework::ThreadHandle&) override; /** * Schedules a visitor for running. onCreateVisitor will typically call @@ -139,10 +138,10 @@ private: bool scheduleVisitor(const std::shared_ptr<api::CreateVisitorCommand>&, bool skipQueue, vespalib::MonitorGuard& visitorLock); - bool onCreateVisitor(const std::shared_ptr<api::CreateVisitorCommand>&); + bool onCreateVisitor(const std::shared_ptr<api::CreateVisitorCommand>&) override; - bool onDown(const std::shared_ptr<api::StorageMessage>& r); - bool onInternalReply(const std::shared_ptr<api::InternalReply>& r); + bool onDown(const std::shared_ptr<api::StorageMessage>& r) override; + bool onInternalReply(const std::shared_ptr<api::InternalReply>& r) override; bool processReply(const std::shared_ptr<api::StorageReply>&); /** @@ -159,14 +158,12 @@ private: bool attemptScheduleQueuedVisitor(vespalib::MonitorGuard& visitorLock); // VisitorMessageHandler implementation - void send(const std::shared_ptr<api::StorageCommand>& cmd, - Visitor& visitor); - void send(const std::shared_ptr<api::StorageReply>& reply); - void closed(api::VisitorId id); + void send(const std::shared_ptr<api::StorageCommand>& cmd, Visitor& visitor) override; + void send(const std::shared_ptr<api::StorageReply>& reply) override; + void closed(api::VisitorId id) override; // Status::Reporter implementation - virtual void reportHtmlStatus(std::ostream&, - const framework::HttpUrlPath&) const; + virtual void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const override; /** * The maximum amount of concurrent visitors for a priority is given diff --git a/storage/src/vespa/storage/visiting/visitorthread.h b/storage/src/vespa/storage/visiting/visitorthread.h index fdfef7b2073..2f0a125d6ce 100644 --- a/storage/src/vespa/storage/visiting/visitorthread.h +++ b/storage/src/vespa/storage/visiting/visitorthread.h @@ -117,7 +117,7 @@ public: } private: - virtual void run(framework::ThreadHandle&); + virtual void run(framework::ThreadHandle&) override; /** * Attempt to fetch an event from the visitor thread's queue. If an event * was available, pop it from the queue and return it. If not, return @@ -134,11 +134,11 @@ private: const vdslib::Parameters& params, vespalib::asciistream & error); - bool onCreateVisitor(const std::shared_ptr<api::CreateVisitorCommand>&); + bool onCreateVisitor(const std::shared_ptr<api::CreateVisitorCommand>&) override; bool onVisitorReply(const std::shared_ptr<api::StorageReply>& reply); - bool onInternal(const std::shared_ptr<api::InternalCommand>&); - bool onInternalReply(const std::shared_ptr<api::InternalReply>&); + bool onInternal(const std::shared_ptr<api::InternalCommand>&) override; + bool onInternalReply(const std::shared_ptr<api::InternalReply>&) override; /** Deletes a visitor instance. */ void close(); |