diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-07 07:57:40 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-07 07:57:40 +0000 |
commit | bfe567499a3494c6cca80fb7f37bbffe3866ad67 (patch) | |
tree | 758d54cfc1f455fc6ba3c82513005d8e5b6beb93 /searchlib | |
parent | 7092bc14ab8a99b496d1494e374e65a1734e9100 (diff) |
GC unused code
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/vespa/searchlib/util/filekit.h | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/util/filesizecalculator.h | 3 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/util/fileutil.cpp | 18 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/util/fileutil.h | 98 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/util/inline.h | 5 |
5 files changed, 44 insertions, 82 deletions
diff --git a/searchlib/src/vespa/searchlib/util/filekit.h b/searchlib/src/vespa/searchlib/util/filekit.h index 9720fc1d4a2..8c994ff5866 100644 --- a/searchlib/src/vespa/searchlib/util/filekit.h +++ b/searchlib/src/vespa/searchlib/util/filekit.h @@ -9,8 +9,6 @@ namespace search { class FileKit { -private: - static bool _syncFiles; public: static bool createStamp(const vespalib::string &name); static bool hasStamp(const vespalib::string &name); diff --git a/searchlib/src/vespa/searchlib/util/filesizecalculator.h b/searchlib/src/vespa/searchlib/util/filesizecalculator.h index 590893a0704..be795b84c8b 100644 --- a/searchlib/src/vespa/searchlib/util/filesizecalculator.h +++ b/searchlib/src/vespa/searchlib/util/filesizecalculator.h @@ -6,8 +6,7 @@ namespace vespalib { class GenericHeader; } -namespace search -{ +namespace search { /* * Class to calculate logical file size of a file based on header tags diff --git a/searchlib/src/vespa/searchlib/util/fileutil.cpp b/searchlib/src/vespa/searchlib/util/fileutil.cpp index 7d65e298767..cdeca9ce95c 100644 --- a/searchlib/src/vespa/searchlib/util/fileutil.cpp +++ b/searchlib/src/vespa/searchlib/util/fileutil.cpp @@ -115,15 +115,6 @@ void FileReaderBase::handleError(ssize_t numRead, size_t wanted) } } -void FileWriterBase::handleError(ssize_t numRead, size_t wanted) -{ - if (numRead == 0) { - throw std::runtime_error(vespalib::make_string("Failed writing anything to file %s", _file.GetFileName())); - } else { - throw std::runtime_error(vespalib::make_string("Partial read(%zd of %zu) of file %s", numRead, wanted, _file.GetFileName())); - } -} - ssize_t FileReaderBase::read(void *buf, size_t sz) { ssize_t numRead = _file->Read(buf, sz); @@ -133,13 +124,4 @@ FileReaderBase::read(void *buf, size_t sz) { return numRead; } -ssize_t -FileWriterBase::write(const void *buf, size_t sz) { - ssize_t numWritten = _file.Write2(buf, sz); - if (numWritten != ssize_t(sz)) { - handleError(numWritten, sz); - } - return numWritten; -} - } diff --git a/searchlib/src/vespa/searchlib/util/fileutil.h b/searchlib/src/vespa/searchlib/util/fileutil.h index bb74aa47484..3ebb66c5b5e 100644 --- a/searchlib/src/vespa/searchlib/util/fileutil.h +++ b/searchlib/src/vespa/searchlib/util/fileutil.h @@ -9,47 +9,46 @@ using vespalib::GenericHeader; -namespace search { +namespace search::fileutil { + +class LoadedBuffer +{ +protected: + void * _buffer; + size_t _size; + std::unique_ptr<GenericHeader> _header; +public: + LoadedBuffer(const LoadedBuffer & rhs) = delete; + LoadedBuffer & operator =(const LoadedBuffer & rhs) = delete; + typedef std::unique_ptr<LoadedBuffer> UP; + + LoadedBuffer(void * buf, size_t sz) + : _buffer(buf), + _size(sz), + _header(nullptr) + { } + + virtual ~LoadedBuffer() = default; + const void * buffer() const { return _buffer; } + const char * c_str() const { return static_cast<const char *>(_buffer); } + size_t size() const { return _size; } + bool empty() const { return _size == 0; } + size_t size(size_t elemSize) const { return _size/elemSize; } + const GenericHeader &getHeader() const { return *_header; } +}; - namespace fileutil { - - class LoadedBuffer - { - protected: - void * _buffer; - size_t _size; - std::unique_ptr<GenericHeader> _header; - public: - LoadedBuffer(const LoadedBuffer & rhs) = delete; - LoadedBuffer & operator =(const LoadedBuffer & rhs) = delete; - typedef std::unique_ptr<LoadedBuffer> UP; - - LoadedBuffer(void * buf, size_t sz) - : _buffer(buf), - _size(sz), - _header(nullptr) - { } - - virtual ~LoadedBuffer() { } - const void * buffer() const { return _buffer; } - const char * c_str() const { return static_cast<const char *>(_buffer); } - size_t size() const { return _size; } - bool empty() const { return _size == 0; } - size_t size(size_t elemSize) const { return _size/elemSize; } - const GenericHeader &getHeader() const { return *_header; } - }; - - class LoadedMmap : public LoadedBuffer - { - void * _mapBuffer; - size_t _mapSize; - public: - LoadedMmap(const vespalib::string &fileName); - - virtual ~LoadedMmap(); - }; +class LoadedMmap : public LoadedBuffer +{ + void * _mapBuffer; + size_t _mapSize; +public: + explicit LoadedMmap(const vespalib::string &fileName); + ~LoadedMmap() override; +}; - } +} + +namespace search { /** * Util class with static functions for handling attribute data files. **/ @@ -73,29 +72,18 @@ public: class FileReaderBase { public: - FileReaderBase(FastOS_FileInterface * file) : _file(file) { } + explicit FileReaderBase(FastOS_FileInterface * file) : _file(file) { } ssize_t read(void *buf, size_t sz); private: void handleError(ssize_t numRead, size_t wanted); FastOS_FileInterface * _file; }; -class FileWriterBase -{ -public: - FileWriterBase(FastOS_FileInterface & file) : _file(file) { } - ssize_t write(const void *buf, size_t sz); -protected: - void handleError(ssize_t numWritten, size_t wanted); -private: - FastOS_FileInterface & _file; -}; - template <typename T> class FileReader : public FileReaderBase { public: - FileReader(FastOS_FileInterface * file) : FileReaderBase(file) { } + explicit FileReader(FastOS_FileInterface * file) : FileReaderBase(file) { } T readHostOrder() { T result; read(&result, sizeof(result)); @@ -108,7 +96,7 @@ class SequentialReadModifyWriteInterface { public: typedef T Type; - virtual ~SequentialReadModifyWriteInterface() { } + virtual ~SequentialReadModifyWriteInterface() = default; virtual const T & read() = 0; virtual void write(const T & v) = 0; virtual bool next() = 0; @@ -124,8 +112,8 @@ private: typedef vespalib::Array<T> Vector; public: SequentialReadModifyWriteVector(); - SequentialReadModifyWriteVector(size_t sz); - ~SequentialReadModifyWriteVector(); + explicit SequentialReadModifyWriteVector(size_t sz); + ~SequentialReadModifyWriteVector() override; const T & read() override { return (*this)[_rp]; } void write(const T & v) override { (*this)[_wp++] = v; } bool next() override { _rp++; return _rp < Vector::size(); } diff --git a/searchlib/src/vespa/searchlib/util/inline.h b/searchlib/src/vespa/searchlib/util/inline.h deleted file mode 100644 index f8485f22de7..00000000000 --- a/searchlib/src/vespa/searchlib/util/inline.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once - -#include <vespa/vespalib/util/inline.h> - |