diff options
Diffstat (limited to 'memfilepersistence/src')
28 files changed, 84 insertions, 87 deletions
diff --git a/memfilepersistence/src/tests/device/devicemanagertest.cpp b/memfilepersistence/src/tests/device/devicemanagertest.cpp index 7e26543349b..15882663383 100644 --- a/memfilepersistence/src/tests/device/devicemanagertest.cpp +++ b/memfilepersistence/src/tests/device/devicemanagertest.cpp @@ -72,14 +72,14 @@ namespace { Listener() : ost() { ost << "\n"; } virtual ~Listener() {} - virtual void handleDirectoryEvent(Directory& dir, const IOEvent& e) { + virtual void handleDirectoryEvent(Directory& dir, const IOEvent& e) override { ost << "Dir " << dir.getPath() << ": " << e.toString(true) << "\n"; } - virtual void handlePartitionEvent(Partition& part, const IOEvent& e) { + virtual void handlePartitionEvent(Partition& part, const IOEvent& e) override { ost << "Partition " << part.getMountPoint() << ": " << e.toString(true) << "\n"; } - virtual void handleDiskEvent(Disk& disk, const IOEvent& e) { + virtual void handleDiskEvent(Disk& disk, const IOEvent& e) override { ost << "Disk " << disk.getId() << ": " << e.toString(true) << "\n"; } diff --git a/memfilepersistence/src/tests/device/mountpointlisttest.cpp b/memfilepersistence/src/tests/device/mountpointlisttest.cpp index aaeff981af8..986b6fbe157 100644 --- a/memfilepersistence/src/tests/device/mountpointlisttest.cpp +++ b/memfilepersistence/src/tests/device/mountpointlisttest.cpp @@ -31,7 +31,7 @@ public: void testInitDisks(); void init(); - void tearDown(); + void tearDown() override; framework::defaultimplementation::FakeClock _clock; diff --git a/memfilepersistence/src/tests/device/partitionmonitortest.cpp b/memfilepersistence/src/tests/device/partitionmonitortest.cpp index faa8451e4d1..44f3752d840 100644 --- a/memfilepersistence/src/tests/device/partitionmonitortest.cpp +++ b/memfilepersistence/src/tests/device/partitionmonitortest.cpp @@ -56,7 +56,7 @@ struct FakeStatter : public PartitionMonitor::Statter { _info.f_bfree -= (size / _info.f_bsize); } - virtual void statFileSystem(const std::string&, struct statvfs& info) { + virtual void statFileSystem(const std::string&, struct statvfs& info) override { info = _info; } }; diff --git a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp index b34adc7fa8f..673a72068b7 100644 --- a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp +++ b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp @@ -58,8 +58,8 @@ public: void testCachePrefetchRequirements(); void testBucketEvictedFromCacheOnIterateException(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; struct Chunk { diff --git a/memfilepersistence/src/tests/spi/memcachetest.cpp b/memfilepersistence/src/tests/spi/memcachetest.cpp index 939f116b88d..07697b79cac 100644 --- a/memfilepersistence/src/tests/spi/memcachetest.cpp +++ b/memfilepersistence/src/tests/spi/memcachetest.cpp @@ -130,7 +130,7 @@ private: } public: - void tearDown() { + void tearDown() override { _cache.reset(0); _metrics.reset(0); _component.reset(0); diff --git a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp index 32fc9096963..eefe962979d 100644 --- a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp +++ b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp @@ -15,8 +15,8 @@ namespace memfile { class MemFileAutoRepairTest : public SingleDiskMemFileTestUtils { public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testFileMetadataCorruptionIsAutoRepaired(); void testDocumentContentCorruptionIsAutoRepaired(); diff --git a/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp b/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp index a5d1c50d043..ad20a28ed0c 100644 --- a/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp +++ b/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp @@ -15,7 +15,7 @@ namespace memfile { struct MemFileV1SerializerTest : public SingleDiskMemFileTestUtils { - void tearDown(); + void tearDown() override; void setUpPartialWriteEnvironment(); void resetConfig(uint32_t minimumFileSize, uint32_t minimumFileHeaderBlockSize); void doTestPartialWriteRemove(bool readAll); @@ -204,50 +204,50 @@ MemFileV1SerializerTest::resetConfig(uint32_t minimumFileSize, struct DummyMemFileIOInterface : MemFileIOInterface { Document::UP getDocumentHeader(const document::DocumentTypeRepo&, - DataLocation) const + DataLocation) const override { return Document::UP(); } - document::DocumentId getDocumentId(DataLocation) const { + document::DocumentId getDocumentId(DataLocation) const override { return document::DocumentId(""); } void readBody(const document::DocumentTypeRepo&, DataLocation, - Document&) const + Document&) const override { } DataLocation addDocumentIdOnlyHeader( const DocumentId&, - const document::DocumentTypeRepo&) + const document::DocumentTypeRepo&) override { return DataLocation(); } - DataLocation addHeader(const Document&) { return DataLocation(); } - DataLocation addBody(const Document&) { return DataLocation(); } - void clear(DocumentPart) {} - bool verifyConsistent() const { return true; } - void move(const FileSpecification&) {} + DataLocation addHeader(const Document&) override { return DataLocation(); } + DataLocation addBody(const Document&) override { return DataLocation(); } + void clear(DocumentPart) override {} + bool verifyConsistent() const override { return true; } + void move(const FileSpecification&) override {} DataLocation copyCache(const MemFileIOInterface&, DocumentPart, - DataLocation) + DataLocation) override { return DataLocation(); } - void close() {}; - bool isCached(DataLocation, DocumentPart) const { return false; } - bool isPersisted(DataLocation, DocumentPart) const { return false; } + void close() override {} + bool isCached(DataLocation, DocumentPart) const override { return false; } + bool isPersisted(DataLocation, DocumentPart) const override { return false; } uint32_t getSerializedSize(DocumentPart, - DataLocation) const { return 0; } + DataLocation) const override { return 0; } void ensureCached(Environment&, DocumentPart, - const std::vector<DataLocation>&) + const std::vector<DataLocation>&) override {} - size_t getCachedSize(DocumentPart) const { return 0; } + size_t getCachedSize(DocumentPart) const override { return 0; } }; #define VESPA_MEMFILEV1_SETUP_SOURCE \ diff --git a/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp b/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp index 0cf04eadaa2..51951e22aea 100644 --- a/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp +++ b/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp @@ -17,7 +17,7 @@ struct MemFileV1VerifierTest : public SingleDiskMemFileTestUtils { void testVerify(); - void tearDown(); + void tearDown() override; std::unique_ptr<MemFile> createMemFile(FileSpecification& file, bool callLoadFile) diff --git a/memfilepersistence/src/tests/spi/providerconformancetest.cpp b/memfilepersistence/src/tests/spi/providerconformancetest.cpp index 526f61a812c..8bc2237265b 100644 --- a/memfilepersistence/src/tests/spi/providerconformancetest.cpp +++ b/memfilepersistence/src/tests/spi/providerconformancetest.cpp @@ -39,7 +39,7 @@ struct ProviderConformanceTest : public spi::ConformanceTest { spi::PersistenceProvider::UP getPersistenceImplementation(const document::DocumentTypeRepo::SP& repo, - const document::DocumenttypesConfig&) + const document::DocumenttypesConfig&) override { system("rm -rf vdsroot"); system("mkdir -p vdsroot/disks/d0"); diff --git a/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp b/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp index 3eac7b57e81..ffe7972552f 100644 --- a/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp +++ b/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp @@ -51,21 +51,19 @@ class SimpleMemFileIOBufferTest : public SingleDiskMemFileTestUtils public: class DummyFileReader : public VersionSerializer { public: - virtual FileVersion getFileVersion() { return FileVersion(); } - virtual void loadFile(MemFile&, Environment&, - Buffer&, uint64_t ) {} - virtual FlushResult flushUpdatesToFile(MemFile&, Environment&) { + virtual FileVersion getFileVersion() override { return FileVersion(); } + virtual void loadFile(MemFile&, Environment&, Buffer&, uint64_t ) override {} + virtual FlushResult flushUpdatesToFile(MemFile&, Environment&) override { return FlushResult::TooSmall; } - virtual void rewriteFile(MemFile&, Environment&) {} + virtual void rewriteFile(MemFile&, Environment&) override {} virtual bool verify(MemFile&, Environment&, - std::ostream&, bool, - uint16_t) { return false; }; + std::ostream&, bool, uint16_t) override { return false; }; virtual void cacheLocations(MemFileIOInterface&, Environment&, const Options&, DocumentPart, - const std::vector<DataLocation>&) {} + const std::vector<DataLocation>&) override {} }; DummyFileReader dfr; diff --git a/memfilepersistence/src/tests/spi/simulatedfailurefile.h b/memfilepersistence/src/tests/spi/simulatedfailurefile.h index 825c9f53585..515b70e5e5a 100644 --- a/memfilepersistence/src/tests/spi/simulatedfailurefile.h +++ b/memfilepersistence/src/tests/spi/simulatedfailurefile.h @@ -18,7 +18,7 @@ public: : _readOpsBeforeFailure(-1), _writeOpsBeforeFailure(0) { } - vespalib::LazyFile::UP createFile(const std::string& fileName) const; + vespalib::LazyFile::UP createFile(const std::string& fileName) const override; void setReadOpsBeforeFailure(int ops) { _readOpsBeforeFailure = ops; @@ -38,8 +38,8 @@ public: int readOpsBeforeFailure, int writeOpsBeforeFailure); - off_t write(const void *buf, size_t bufsize, off_t offset); - size_t read(void *buf, size_t bufsize, off_t offset) const; + off_t write(const void *buf, size_t bufsize, off_t offset) override; + size_t read(void *buf, size_t bufsize, off_t offset) const override; }; } // ns memfile diff --git a/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp b/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp index 08bfa3bcab3..0f36f0a0571 100644 --- a/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp +++ b/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp @@ -15,7 +15,7 @@ struct VdsDiskToolTest : public SingleDiskMemFileTestUtils { framework::defaultimplementation::FakeClock _clock; - void setUp(); + void setUp() override; void setupRoot(); void testSimple(); diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/environment.h b/memfilepersistence/src/vespa/memfilepersistence/common/environment.h index a73ad4ceea9..243c9054ded 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/environment.h +++ b/memfilepersistence/src/vespa/memfilepersistence/common/environment.h @@ -126,7 +126,7 @@ struct DefaultLazyFileFactory DefaultLazyFileFactory(int flags) : _flags(flags) {} - vespalib::LazyFile::UP createFile(const std::string& fileName) const; + vespalib::LazyFile::UP createFile(const std::string& fileName) const override; }; } // storage diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/filespecification.h b/memfilepersistence/src/vespa/memfilepersistence/common/filespecification.h index 63dd0d3172e..23e4857fdb3 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/filespecification.h +++ b/memfilepersistence/src/vespa/memfilepersistence/common/filespecification.h @@ -38,7 +38,7 @@ public: FileVersion getWantedFileVersion() const { return _wantedVersion; } virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + const std::string& indent) const override; bool operator==(const FileSpecification& o) const { return (_bucketId == o._bucketId && _dir == o._dir diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/options.h b/memfilepersistence/src/vespa/memfilepersistence/common/options.h index a83657a9189..ecc11251f89 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/options.h +++ b/memfilepersistence/src/vespa/memfilepersistence/common/options.h @@ -101,7 +101,7 @@ struct Options : public vespalib::Printable /** Printable implementation */ void print(std::ostream& out, bool verbose, - const std::string& indent) const; + const std::string& indent) const override; bool operator==(const Options& options) const { if (_minimumFileMetaSlots == options._minimumFileMetaSlots diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp index dfca9dc7d27..b483d4691c4 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp @@ -26,8 +26,7 @@ namespace { } struct RealStatter : public PartitionMonitor::Statter { - virtual void statFileSystem(const std::string& file, - struct statvfs& info) + virtual void statFileSystem(const std::string& file, struct statvfs& info) override { if (statvfs(file.c_str(), &info) != 0) { vespalib::asciistream ost; diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/locationreadplanner.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/locationreadplanner.h index 915f158eb85..d56f5f80441 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/locationreadplanner.h +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/locationreadplanner.h @@ -41,7 +41,7 @@ public: uint32_t getTotalBufferSize() const; void print(std::ostream& out, bool verbose, - const std::string& indent) const; + const std::string& indent) const override; private: const MemFileIOInterface& _io; diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp index 66e263a88cf..742a37fcf36 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp @@ -742,19 +742,19 @@ namespace { _buffer.resize(firstAligned - _headerBlockIndex); } - virtual uint32_t getCachedAmount() const + virtual uint32_t getCachedAmount() const override { return _buffer.size() + _headerBlockIndex; } - virtual char* getCache(uint32_t pos) { + virtual char* getCache(uint32_t pos) override { // We should never get requests to write prior to header block // index. assert(pos >= _headerBlockIndex); return (&_buffer[0] + (pos - _headerBlockIndex)); } - virtual bool duplicateCacheWrite() const { return true; } + virtual bool duplicateCacheWrite() const override { return true; } - virtual void setData(const char* data, size_t len, uint64_t pos) { + virtual void setData(const char* data, size_t len, uint64_t pos) override { if (pos < _headerBlockIndex) { if (len <= _headerBlockIndex - pos) return; uint32_t diff = (_headerBlockIndex - pos); diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.h index 04d62074f05..283ab174895 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.h +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.h @@ -22,10 +22,10 @@ public: MemFileV1Serializer(ThreadMetricProvider&); - virtual FileVersion getFileVersion() { return TRADITIONAL_SLOTFILE; } + virtual FileVersion getFileVersion() override { return TRADITIONAL_SLOTFILE; } virtual void loadFile(MemFile& file, Environment&, - Buffer& buffer, uint64_t bytesRead); + Buffer& buffer, uint64_t bytesRead) override; void cacheLocationsForPart(SimpleMemFileIOBuffer& cache, DocumentPart part, @@ -38,15 +38,15 @@ public: Environment& env, const Options& options, DocumentPart part, - const std::vector<DataLocation>& locations); + const std::vector<DataLocation>& locations) override; - virtual FlushResult flushUpdatesToFile(MemFile&, Environment&); + virtual FlushResult flushUpdatesToFile(MemFile&, Environment&) override; - virtual void rewriteFile(MemFile&, Environment&); + virtual void rewriteFile(MemFile&, Environment&) override; virtual bool verify(MemFile&, Environment&, std::ostream& errorReport, bool repairErrors, - uint16_t fileVerifyFlags); + uint16_t fileVerifyFlags) override; uint64_t read(vespalib::LazyFile& file, char* buf, diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h index 40c5ffb4865..6ed529e6c80 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.h @@ -213,37 +213,37 @@ public: virtual Document::UP getDocumentHeader( const document::DocumentTypeRepo& repo, - DataLocation loc) const; + DataLocation loc) const override; - virtual document::DocumentId getDocumentId(DataLocation loc) const; + virtual document::DocumentId getDocumentId(DataLocation loc) const override; virtual void readBody( const document::DocumentTypeRepo& repo, DataLocation loc, - Document& doc) const; + Document& doc) const override; virtual DataLocation addDocumentIdOnlyHeader( const DocumentId& id, - const document::DocumentTypeRepo& repo); + const document::DocumentTypeRepo& repo) override; - virtual DataLocation addHeader(const Document& doc); + virtual DataLocation addHeader(const Document& doc) override; - virtual DataLocation addBody(const Document& doc); + virtual DataLocation addBody(const Document& doc) override; - virtual void clear(DocumentPart type); + virtual void clear(DocumentPart type) override; - virtual bool verifyConsistent() const; + virtual bool verifyConsistent() const override; /** * Moves the underlying file to another location. */ - virtual void move(const FileSpecification& target); + virtual void move(const FileSpecification& target) override; - virtual void close(); + virtual void close() override; virtual DataLocation copyCache(const MemFileIOInterface& source, DocumentPart part, - DataLocation loc); + DataLocation loc) override; /** * Add a location -> buffer mapping @@ -256,19 +256,19 @@ public: /** * @return Returns true if the given location is cached. */ - virtual bool isCached(DataLocation loc, DocumentPart type) const; + virtual bool isCached(DataLocation loc, DocumentPart type) const override; /** * @return Returns true if the given location has been persisted to disk. */ - virtual bool isPersisted(DataLocation loc, DocumentPart type) const; + virtual bool isPersisted(DataLocation loc, DocumentPart type) const override; virtual uint32_t getSerializedSize(DocumentPart part, - DataLocation loc) const; + DataLocation loc) const override; virtual void ensureCached(Environment& env, DocumentPart part, - const std::vector<DataLocation>& locations); + const std::vector<DataLocation>& locations) override; /** * Moves the given location into the persisted data area. @@ -293,7 +293,7 @@ public: const char* getBuffer(DataLocation loc, DocumentPart part) const; - size_t getCachedSize(DocumentPart part) const; + size_t getCachedSize(DocumentPart part) const override; BufferAllocation allocateBuffer(DocumentPart part, uint32_t sz, diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/uniqueslotgenerator.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/uniqueslotgenerator.h index c2ce3adede8..72cd6945235 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/uniqueslotgenerator.h +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/uniqueslotgenerator.h @@ -36,7 +36,7 @@ private: bool operator==(const ContentLocation& other) const; void print(std::ostream& out, bool verbose, - const std::string& indent) const; + const std::string& indent) const override; }; void addSlot(DocumentPart, const MemSlot&); @@ -58,7 +58,7 @@ public: return *_slotsInOrder[part][uniqueIndex]; } - void print(std::ostream&, bool verbose, const std::string& indent) const; + void print(std::ostream&, bool verbose, const std::string& indent) const override; }; diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.h b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.h index ccd8a306332..b3ac15ed376 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.h +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.h @@ -294,7 +294,7 @@ public: void printEntriesState(std::ostream& out, bool verbose, const std::string& indent) const; void print(std::ostream& out, bool verbose, - const std::string& indent) const; + const std::string& indent) const override; /** Stat wants control of printing of slots. */ void printUserFriendly(const MemSlot& slot, diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.cpp b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.cpp index efa26605f37..8ea60d57f80 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.cpp @@ -121,20 +121,20 @@ struct MemFileCache::CacheEntryGuard : public MemFilePtr::EntryGuard { return _entry->_file; } - virtual void deleteFile() { + virtual void deleteFile() override { LOG(debug, "Cache entry guard deleting %s", _file->toString().c_str()); _env._memFileMapper.deleteFile(*_file, _env); erase(); } - virtual void erase() { + virtual void erase() override { LOG(debug, "Cache entry guard erasing %s from cache", _file->toString().c_str()); _cache.erase(document::BucketId(_entry->_file.getFile().getBucketId())); _entry = 0; } - virtual void move(EntryGuard& target) { + virtual void move(EntryGuard& target) override { LOG(debug, "Cache entry guard moving %s", _file->toString().c_str()); _cache.move(*this, static_cast<CacheEntryGuard&>(target)); } diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/slotiterator.h b/memfilepersistence/src/vespa/memfilepersistence/memfile/slotiterator.h index d62bdf10025..b1d68591b92 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/slotiterator.h +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/slotiterator.h @@ -65,8 +65,8 @@ public: Timestamp fromTimestamp, Timestamp toTimestamp); - virtual void iterate() const; - virtual SlotIterator* clone() const; + virtual void iterate() const override; + virtual SlotIterator* clone() const override; }; class AllSlotsIterator : public SlotIterator { @@ -82,8 +82,8 @@ public: Timestamp fromTimestamp, Timestamp toTimestamp); - virtual void iterate() const; - virtual SlotIterator* clone() const; + virtual void iterate() const override; + virtual SlotIterator* clone() const override; }; /** diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/splitoperationhandler.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/splitoperationhandler.cpp index 34d86259832..247722588f5 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/splitoperationhandler.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/splitoperationhandler.cpp @@ -25,7 +25,7 @@ struct BucketMatcher : public SlotMatcher { _factory(factory), _bid(bid) {} - virtual bool match(const Slot& slot) { + virtual bool match(const Slot& slot) override { document::DocumentId id(slot.getDocumentId()); document::BucketId bucket = _factory.getBucketId(id); bucket.setUsedBits(_bid.getUsedBits()); diff --git a/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp b/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp index 030bac0752e..c794d611767 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp @@ -162,7 +162,7 @@ namespace { const char* documentConfigId); ~EnvironmentImpl(); - MemFilePersistenceThreadMetrics& getMetrics() const { + MemFilePersistenceThreadMetrics& getMetrics() const override { return *_threadMetrics; } diff --git a/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfileapp.cpp b/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfileapp.cpp index 3f8941274e8..f8d13714ae9 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfileapp.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfileapp.cpp @@ -8,7 +8,7 @@ namespace { struct DumpSlotFileApp : public FastOS_Application { - int Main() { + int Main() override { try{ config::ConfigUri config(""); return storage::memfile::SlotFileDumper::dump( diff --git a/memfilepersistence/src/vespa/memfilepersistence/tools/vdsdiskapp.cpp b/memfilepersistence/src/vespa/memfilepersistence/tools/vdsdiskapp.cpp index 394c4fafffb..7127c75cb1b 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/tools/vdsdiskapp.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/tools/vdsdiskapp.cpp @@ -10,7 +10,7 @@ LOG_SETUP(".vdsdisktool"); namespace { struct DiskApp : public FastOS_Application { - int Main() { + int Main() override { try { std::string dir = vespa::Defaults::vespaHome(); dir.append("var/db/vespa/vds"); |