add override in storage/persistence module

8 files changed, 60 insertions, 67 deletions

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();