diff options
Diffstat (limited to 'searchlib')
7 files changed, 19 insertions, 45 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/attributefilebufferwriter.h b/searchlib/src/vespa/searchlib/attribute/attributefilebufferwriter.h index 5275f68f6be..a6052f5f6b6 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributefilebufferwriter.h +++ b/searchlib/src/vespa/searchlib/attribute/attributefilebufferwriter.h @@ -5,8 +5,7 @@ #include "iattributefilewriter.h" #include <vespa/searchlib/util/bufferwriter.h> -namespace search -{ +namespace search { /* * BufferWriter implementation that passes full buffers on to @@ -27,10 +26,9 @@ public: static constexpr size_t BUFFER_SIZE = 4 * 1024 * 1024; AttributeFileBufferWriter(IAttributeFileWriter &fileWriter); + ~AttributeFileBufferWriter() override; - virtual ~AttributeFileBufferWriter(); - - virtual void flush() override; + void flush() override; size_t getBytesWritten() const { return _bytesWritten; } }; diff --git a/searchlib/src/vespa/searchlib/attribute/attributememorysavetarget.h b/searchlib/src/vespa/searchlib/attribute/attributememorysavetarget.h index 0be594c38d0..f06764fa34b 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributememorysavetarget.h +++ b/searchlib/src/vespa/searchlib/attribute/attributememorysavetarget.h @@ -3,21 +3,14 @@ #pragma once #include "iattributesavetarget.h" +#include "attributememoryfilewriter.h" #include <vespa/searchlib/util/rawbuf.h> #include <memory> #include <vespa/searchlib/common/tunefileinfo.h> -#include "attributememoryfilewriter.h" - -namespace search -{ - -namespace common -{ - -class FileHeaderContext; -} +namespace search::common { class FileHeaderContext; } +namespace search { class AttributeVector; /** @@ -39,7 +32,7 @@ public: * Write the underlying buffer(s) to file(s). **/ bool writeToFile(const TuneFileAttributes &tuneFileAttributes, - const search::common::FileHeaderContext &fileHeaderContext); + const common::FileHeaderContext &fileHeaderContext); bool setup() override { return true; } void close() override {} diff --git a/searchlib/src/vespa/searchlib/attribute/enumattributesaver.h b/searchlib/src/vespa/searchlib/attribute/enumattributesaver.h index 218eb8095c1..9d5dd52be4a 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumattributesaver.h +++ b/searchlib/src/vespa/searchlib/attribute/enumattributesaver.h @@ -21,13 +21,10 @@ class EnumAttributeSaver public: EnumAttributeSaver(const EnumStoreBase &enumStore, bool disableReEnumerate); - ~EnumAttributeSaver(); void enableReEnumerate(); - void writeUdat(IAttributeSaveTarget &saveTarget); - const EnumStoreBase &getEnumStore() const { return _enumStore; } }; diff --git a/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp b/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp index ba6ba0ef6ee..8db929a259c 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp +++ b/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp @@ -9,6 +9,8 @@ #include <vespa/searchlib/common/rcuvector.hpp> #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/vespalib/stllike/hash_map.hpp> + #include <vespa/log/log.h> LOG_SETUP(".searchlib.attribute.enumstorebase"); @@ -626,37 +628,28 @@ EnumStoreBase::reEnumerate<EnumPostingTree>(const EnumPostingTree &tree); template ssize_t -EnumStoreBase::deserialize<EnumTree>(const void *src, - size_t available, - IndexVector &idx, - EnumTree &tree); +EnumStoreBase::deserialize<EnumTree>(const void *src, size_t available, IndexVector &idx, EnumTree &tree); template ssize_t -EnumStoreBase::deserialize<EnumPostingTree>(const void *src, - size_t available, - IndexVector &idx, - EnumPostingTree &tree); +EnumStoreBase::deserialize<EnumPostingTree>(const void *src, size_t available, IndexVector &idx, EnumPostingTree &tree); template void -EnumStoreBase::fixupRefCounts<EnumTree>(const EnumVector &hist, - EnumTree &tree); +EnumStoreBase::fixupRefCounts<EnumTree>(const EnumVector &hist, EnumTree &tree); template void -EnumStoreBase::fixupRefCounts<EnumPostingTree>( - const EnumVector &hist, - EnumPostingTree &tree); +EnumStoreBase::fixupRefCounts<EnumPostingTree>(const EnumVector &hist, EnumPostingTree &tree); template class EnumStoreDict<EnumTree>; template class EnumStoreDict<EnumPostingTree>; namespace attribute { - template class RcuVectorBase<EnumStoreIndex>; - } } + +template class vespalib::hash_map<search::EnumStoreIndex, search::EnumStoreIndex>; diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.cpp b/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.cpp index f62c5a82b10..cdc56907112 100644 --- a/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.cpp +++ b/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.cpp @@ -82,9 +82,7 @@ MultiValueEnumAttributeSaver(GenerationHandler::Guard &&guard, template <typename MultiValueT> -MultiValueEnumAttributeSaver<MultiValueT>::~MultiValueEnumAttributeSaver() -{ -} +MultiValueEnumAttributeSaver<MultiValueT>::~MultiValueEnumAttributeSaver() = default; template <typename MultiValueT> bool diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.h b/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.h index 3348f3c100a..3bc646057f7 100644 --- a/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.h +++ b/searchlib/src/vespa/searchlib/attribute/multienumattributesaver.h @@ -26,12 +26,12 @@ class MultiValueEnumAttributeSaver : public MultiValueAttributeSaver const MultiValueMapping &_mvMapping; EnumAttributeSaver _enumSaver; public: - virtual bool onSave(IAttributeSaveTarget &saveTarget) override; + bool onSave(IAttributeSaveTarget &saveTarget) override; MultiValueEnumAttributeSaver(GenerationHandler::Guard &&guard, const attribute::AttributeHeader &header, const MultiValueMapping &mvMapping, const EnumStoreBase &enumStore); - virtual ~MultiValueEnumAttributeSaver(); + ~MultiValueEnumAttributeSaver() override; }; diff --git a/searchlib/src/vespa/searchlib/util/bufferwriter.cpp b/searchlib/src/vespa/searchlib/util/bufferwriter.cpp index 37f87123216..6e57d6f58d4 100644 --- a/searchlib/src/vespa/searchlib/util/bufferwriter.cpp +++ b/searchlib/src/vespa/searchlib/util/bufferwriter.cpp @@ -11,11 +11,7 @@ BufferWriter::BufferWriter() { } - -BufferWriter::~BufferWriter() -{ -} - +BufferWriter::~BufferWriter() = default; void BufferWriter::writeSlow(const void *src, size_t len) @@ -37,5 +33,4 @@ BufferWriter::writeSlow(const void *src, size_t len) } } - } // namespace search |