diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-07-28 14:03:55 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-07-31 17:40:49 +0200 |
commit | f50edc720a3fb1ffbd34229946b4b124a1f43caa (patch) | |
tree | cd47d3fa5800fe3e385f2cf2c09b4b5c7a311076 /memfilepersistence | |
parent | 0c8bd42e380fa826e1bddbf5da75e85ea0251698 (diff) |
reduce inlining
Diffstat (limited to 'memfilepersistence')
-rw-r--r-- | memfilepersistence/src/vespa/memfilepersistence/common/options.cpp | 51 | ||||
-rw-r--r-- | memfilepersistence/src/vespa/memfilepersistence/common/options.h | 53 |
2 files changed, 59 insertions, 45 deletions
diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp b/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp index 0aa2c05c967..ddd64534393 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp @@ -9,6 +9,32 @@ LOG_SETUP(".persistence.slotfile.options"); namespace storage::memfile { +Options::Options() + : _minimumFileMetaSlots(512), + _maximumFileMetaSlots(0), + _minimumFileHeaderBlockSize(102848), + _maximumFileHeaderBlockSize(0), + _minimumFileSize(1048576), + _maximumFileSize(0), + _fileBlockSize(4096), + _revertTimePeriod(300 * 1000000ull), + _keepRemoveTimePeriod(604800 * 1000000ull), + _maxDocumentVersions(5), + _cacheSize(0), + _initialIndexRead(65536), + _maximumGapToReadThrough(65536), + _diskFullFactor(0.98), + _growFactor(2.0), + _overrepresentMetaDataFactor(1.2), + _overrepresentHeaderBlockFactor(1.1), + _defaultRemoveDocType() +{ +} + +Options::Options(const Options &) noexcept = default; +Options & Options::operator=(const Options &) noexcept = default; +~Options() { } + Options::Options(const vespa::config::storage::StorMemfilepersistenceConfig& newConfig, const vespa::config::content::PersistenceConfig& newPersistenceConfig) : _minimumFileMetaSlots(newConfig.minimumFileMetaSlots), @@ -36,6 +62,31 @@ Options::Options(const vespa::config::storage::StorMemfilepersistenceConfig& new validate(); } +bool +Options::operator==(const Options& options) const { + if (_minimumFileMetaSlots == options._minimumFileMetaSlots + && _maximumFileMetaSlots == options._maximumFileMetaSlots + && _minimumFileHeaderBlockSize + == options._minimumFileHeaderBlockSize + && _maximumFileHeaderBlockSize + == options._maximumFileHeaderBlockSize + && _minimumFileSize == options._minimumFileSize + && _maximumFileSize == options._maximumFileSize + && _fileBlockSize == options._fileBlockSize + && _revertTimePeriod == options._revertTimePeriod + && _maxDocumentVersions == options._maxDocumentVersions + && _keepRemoveTimePeriod == options._keepRemoveTimePeriod + && _cacheSize == options._cacheSize + && _initialIndexRead == options._initialIndexRead + && _maximumGapToReadThrough == options._maximumGapToReadThrough + && _diskFullFactor == options._diskFullFactor + && _defaultRemoveDocType == options._defaultRemoveDocType) + { + return true; + } + return false; +} + namespace { template<typename Number> void verifyAligned(Number n, uint32_t alignSize, const char* name) { diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/options.h b/memfilepersistence/src/vespa/memfilepersistence/common/options.h index 1b7483c3e3b..3dd01fbc18e 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/options.h +++ b/memfilepersistence/src/vespa/memfilepersistence/common/options.h @@ -16,7 +16,6 @@ #pragma once - #include <vespa/config-stor-memfilepersistence.h> #include <vespa/config-persistence.h> #include <vespa/vespalib/util/printable.h> @@ -68,27 +67,13 @@ struct Options : public vespalib::Printable * Creates a new slotfile options instance. Implemented in header file, * such that the current defaults can be easily viewed. */ - Options() - : _minimumFileMetaSlots(512), - _maximumFileMetaSlots(0), - _minimumFileHeaderBlockSize(102848), - _maximumFileHeaderBlockSize(0), - _minimumFileSize(1048576), - _maximumFileSize(0), - _fileBlockSize(4096), - _revertTimePeriod(300 * 1000000ull), - _keepRemoveTimePeriod(604800 * 1000000ull), - _maxDocumentVersions(5), - _cacheSize(0), - _initialIndexRead(65536), - _maximumGapToReadThrough(65536), - _diskFullFactor(0.98), - _growFactor(2.0), - _overrepresentMetaDataFactor(1.2), - _overrepresentHeaderBlockFactor(1.1), - _defaultRemoveDocType() - { - } + Options(); + + Options(const Options &) noexcept; + Options & operator=(const Options &) noexcept; + + + ~Options() { } Options(const vespa::config::storage::StorMemfilepersistenceConfig& newConfig, const vespa::config::content::PersistenceConfig& newPersistenceConfig); @@ -100,29 +85,7 @@ struct Options : public vespalib::Printable void print(std::ostream& out, bool verbose, const std::string& indent) const override; - bool operator==(const Options& options) const { - if (_minimumFileMetaSlots == options._minimumFileMetaSlots - && _maximumFileMetaSlots == options._maximumFileMetaSlots - && _minimumFileHeaderBlockSize - == options._minimumFileHeaderBlockSize - && _maximumFileHeaderBlockSize - == options._maximumFileHeaderBlockSize - && _minimumFileSize == options._minimumFileSize - && _maximumFileSize == options._maximumFileSize - && _fileBlockSize == options._fileBlockSize - && _revertTimePeriod == options._revertTimePeriod - && _maxDocumentVersions == options._maxDocumentVersions - && _keepRemoveTimePeriod == options._keepRemoveTimePeriod - && _cacheSize == options._cacheSize - && _initialIndexRead == options._initialIndexRead - && _maximumGapToReadThrough == options._maximumGapToReadThrough - && _diskFullFactor == options._diskFullFactor - && _defaultRemoveDocType == options._defaultRemoveDocType) - { - return true; - } - return false; - } + bool operator==(const Options& options) const; }; } |