diff options
author | Henning Baldersheim <balder@oath.com> | 2018-11-14 16:09:16 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-11-14 21:06:48 +0100 |
commit | 54c6c0c277ba439a6e54e677c7db14821414ffad (patch) | |
tree | 1a2e924570080f99fdbb3df0b33efa95e7db9c1e /searchlib/src | |
parent | 2c95834d7273352a1cc89e939a7814b7b4f6be58 (diff) |
Use nested namespace and general code unification.
Diffstat (limited to 'searchlib/src')
36 files changed, 246 insertions, 570 deletions
diff --git a/searchlib/src/vespa/searchlib/diskindex/bitvectordictionary.cpp b/searchlib/src/vespa/searchlib/diskindex/bitvectordictionary.cpp index 56a42eb161b..0e8538386a0 100644 --- a/searchlib/src/vespa/searchlib/diskindex/bitvectordictionary.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/bitvectordictionary.cpp @@ -7,9 +7,7 @@ #include <vespa/log/log.h> LOG_SETUP(".diskindex.bitvectordictionary"); -namespace search { - -namespace diskindex { +namespace search::diskindex { BitVectorDictionary::BitVectorDictionary() @@ -23,7 +21,7 @@ BitVectorDictionary::BitVectorDictionary() BitVectorDictionary::~BitVectorDictionary() { - if (_datFile.get() != NULL) { + if (_datFile.get() != nullptr) { _datFile->Close(); } } @@ -100,7 +98,4 @@ BitVectorDictionary::lookup(uint64_t wordNum) itr->_numDocs); } - -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/bitvectordictionary.h b/searchlib/src/vespa/searchlib/diskindex/bitvectordictionary.h index fa3c51d737e..32a30ba6361 100644 --- a/searchlib/src/vespa/searchlib/diskindex/bitvectordictionary.h +++ b/searchlib/src/vespa/searchlib/diskindex/bitvectordictionary.h @@ -7,9 +7,7 @@ #include <vespa/searchlib/common/tunefileinfo.h> #include <vespa/vespalib/stllike/string.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { /** * This dictionary provides a sparse mapping from word number -> BitVector. @@ -62,7 +60,5 @@ public: const std::vector<WordSingleKey> & getEntries() const { return _entries; } }; -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/bitvectorfile.cpp b/searchlib/src/vespa/searchlib/diskindex/bitvectorfile.cpp index 374c6a8c7e6..fa924895342 100644 --- a/searchlib/src/vespa/searchlib/diskindex/bitvectorfile.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/bitvectorfile.cpp @@ -29,7 +29,7 @@ const size_t FILE_HEADERSIZE_ALIGNMENT = 4096; BitVectorFileWrite::BitVectorFileWrite(BitVectorKeyScope scope) : BitVectorIdxFileWrite(scope), - _datFile(NULL), + _datFile(nullptr), _datHeaderLen(0) { } @@ -50,7 +50,7 @@ BitVectorFileWrite::open(const vespalib::string &name, { vespalib::string datname = name + ".bdat"; - assert(_datFile == NULL); + assert(_datFile == nullptr); Parent::open(name, docIdLimit, tuneFileWrite, fileHeaderContext); @@ -159,7 +159,7 @@ BitVectorFileWrite::close() { size_t bitmapbytes = BitVector::getFileBytes(_docIdLimit); - if (_datFile != NULL) { + if (_datFile != nullptr) { if (_datFile->IsOpened()) { uint64_t pos = _datFile->GetPosition(); assert(pos == static_cast<uint64_t>(_numKeys) * @@ -170,12 +170,11 @@ BitVectorFileWrite::close() _datFile->Close(); } delete _datFile; - _datFile = NULL; + _datFile = nullptr; } Parent::close(); } -BitVectorCandidate::~BitVectorCandidate() { -} +BitVectorCandidate::~BitVectorCandidate() = default; } diff --git a/searchlib/src/vespa/searchlib/diskindex/bitvectorfile.h b/searchlib/src/vespa/searchlib/diskindex/bitvectorfile.h index 893b792d96b..17fb59a1aa5 100644 --- a/searchlib/src/vespa/searchlib/diskindex/bitvectorfile.h +++ b/searchlib/src/vespa/searchlib/diskindex/bitvectorfile.h @@ -8,22 +8,12 @@ #include <vespa/vespalib/stllike/string.h> #include "bitvectoridxfile.h" -namespace search -{ - - -namespace diskindex -{ +namespace search::diskindex { class BitVectorFileWrite : public BitVectorIdxFileWrite { private: - BitVectorFileWrite(const BitVectorFileWrite &) = delete; - BitVectorFileWrite(const BitVectorFileWrite &&) = delete; - BitVectorFileWrite& operator=(const BitVectorFileWrite &) = delete; - BitVectorFileWrite& operator=(const BitVectorFileWrite &&) = delete; - using Parent = BitVectorIdxFileWrite; Fast_BufferedFile *_datFile; @@ -33,33 +23,24 @@ private: uint32_t _datHeaderLen; public: + BitVectorFileWrite(const BitVectorFileWrite &) = delete; + BitVectorFileWrite(const BitVectorFileWrite &&) = delete; + BitVectorFileWrite& operator=(const BitVectorFileWrite &) = delete; + BitVectorFileWrite& operator=(const BitVectorFileWrite &&) = delete; BitVectorFileWrite(BitVectorKeyScope scope); - ~BitVectorFileWrite(); - void - open(const vespalib::string &name, uint32_t docIdLimit, - const TuneFileSeqWrite &tuneFileWrite, - const common::FileHeaderContext &fileHeaderContext); - - - void - addWordSingle(uint64_t wordNum, const BitVector &bitVector); + void open(const vespalib::string &name, uint32_t docIdLimit, + const TuneFileSeqWrite &tuneFileWrite, + const common::FileHeaderContext &fileHeaderContext); - void - flush(); - void - sync(); - - void - close(); - - void - makeDatHeader(const common::FileHeaderContext &fileHeaderContext); - - void - updateDatHeader(uint64_t fileBitSize); + void addWordSingle(uint64_t wordNum, const BitVector &bitVector); + void flush(); + void sync(); + void close(); + void makeDatHeader(const common::FileHeaderContext &fileHeaderContext); + void updateDatHeader(uint64_t fileBitSize); }; @@ -96,9 +77,7 @@ public: ~BitVectorCandidate(); - void - clear() - { + void clear() { if (__builtin_expect(_numDocs > _bitVectorLimit, false)) { _bv->clear(); } @@ -106,9 +85,7 @@ public: _array.clear(); } - void - flush(BitVector &obv) - { + void flush(BitVector &obv) { if (__builtin_expect(_numDocs > _bitVectorLimit, false)) { obv.orWith(*_bv); } else { @@ -119,9 +96,7 @@ public: clear(); } - void - add(uint32_t docId) - { + void add(uint32_t docId) { if (_numDocs < _bitVectorLimit) { _array.push_back(docId); } else { @@ -139,37 +114,19 @@ public: /* * Get number of documents buffered. This might include duplicates. */ - uint64_t - getNumDocs() const - { - return _numDocs; - } + uint64_t getNumDocs() const { return _numDocs; } - bool - empty() const - { - return _numDocs == 0; - } + bool empty() const { return _numDocs == 0; } /* * Return true if array limit has been exceeded and bitvector has been * populated. */ - bool - getCrossedBitVectorLimit() const - { + bool getCrossedBitVectorLimit() const { return _numDocs > _bitVectorLimit; } - BitVector & - getBitVector() - { - return *_bv; - } + BitVector &getBitVector() { return *_bv; } }; - -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/bitvectoridxfile.cpp b/searchlib/src/vespa/searchlib/diskindex/bitvectoridxfile.cpp index a4eca7feac9..3d7550c9c26 100644 --- a/searchlib/src/vespa/searchlib/diskindex/bitvectoridxfile.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/bitvectoridxfile.cpp @@ -14,8 +14,7 @@ using search::common::FileHeaderContext; namespace { void -readHeader(vespalib::FileHeader &h, - const vespalib::string &name) +readHeader(vespalib::FileHeader &h, const vespalib::string &name) { Fast_BufferedFile file(32768u); file.OpenReadOnly(name.c_str()); @@ -28,7 +27,7 @@ const size_t FILE_HEADERSIZE_ALIGNMENT = 4096; } BitVectorIdxFileWrite::BitVectorIdxFileWrite(BitVectorKeyScope scope) - : _idxFile(NULL), + : _idxFile(), _numKeys(0), _docIdLimit(0), _idxHeaderLen(0), @@ -37,11 +36,7 @@ BitVectorIdxFileWrite::BitVectorIdxFileWrite(BitVectorKeyScope scope) } -BitVectorIdxFileWrite::~BitVectorIdxFileWrite() -{ - // No implicit close() call, but cleanup memory allocations. - delete _idxFile; -} +BitVectorIdxFileWrite::~BitVectorIdxFileWrite() = default; uint64_t @@ -65,9 +60,8 @@ BitVectorIdxFileWrite::open(const vespalib::string &name, } vespalib::string idxname = name + getBitVectorKeyScopeSuffix(_scope); - assert(_idxFile == NULL); - FastOS_FileInterface *idxfile = new FastOS_File; - _idxFile = new Fast_BufferedFile(idxfile); + assert( !_idxFile); + _idxFile = std::make_unique<Fast_BufferedFile>(new FastOS_File()); if (tuneFileWrite.getWantSyncWrites()) _idxFile->EnableSyncWrites(); if (tuneFileWrite.getWantDirectIO()) @@ -174,7 +168,7 @@ BitVectorIdxFileWrite::sync() void BitVectorIdxFileWrite::close() { - if (_idxFile != NULL) { + if (_idxFile) { if (_idxFile->IsOpened()) { uint64_t pos = _idxFile->GetPosition(); assert(pos == idxSize()); @@ -182,8 +176,7 @@ BitVectorIdxFileWrite::close() updateIdxHeader(pos * 8); _idxFile->Close(); } - delete _idxFile; - _idxFile = NULL; + _idxFile.reset(); } } diff --git a/searchlib/src/vespa/searchlib/diskindex/bitvectoridxfile.h b/searchlib/src/vespa/searchlib/diskindex/bitvectoridxfile.h index 8d704d1bffe..98ca1698b14 100644 --- a/searchlib/src/vespa/searchlib/diskindex/bitvectoridxfile.h +++ b/searchlib/src/vespa/searchlib/diskindex/bitvectoridxfile.h @@ -8,30 +8,15 @@ #include <vespa/vespalib/stllike/string.h> #include "bitvectorkeyscope.h" -namespace search -{ - +namespace search::common { class FileHeaderContext; } -namespace common -{ -class FileHeaderContext; - -} - - -namespace diskindex -{ +namespace search::diskindex { class BitVectorIdxFileWrite { private: - BitVectorIdxFileWrite(const BitVectorIdxFileWrite &) = delete; - BitVectorIdxFileWrite(const BitVectorIdxFileWrite &&) = delete; - BitVectorIdxFileWrite& operator=(const BitVectorIdxFileWrite &) = delete; - BitVectorIdxFileWrite& operator=(const BitVectorIdxFileWrite &&) = delete; - - Fast_BufferedFile *_idxFile; + std::unique_ptr<Fast_BufferedFile> _idxFile; public: @@ -45,32 +30,26 @@ protected: void syncCommon(); public: + BitVectorIdxFileWrite(const BitVectorIdxFileWrite &) = delete; + BitVectorIdxFileWrite(const BitVectorIdxFileWrite &&) = delete; + BitVectorIdxFileWrite& operator=(const BitVectorIdxFileWrite &) = delete; + BitVectorIdxFileWrite& operator=(const BitVectorIdxFileWrite &&) = delete; BitVectorIdxFileWrite(BitVectorKeyScope scope); ~BitVectorIdxFileWrite(); - void - open(const vespalib::string &name, uint32_t docIdLimit, - const TuneFileSeqWrite &tuneFileWrite, - const search::common::FileHeaderContext &fileHeaderContext); - - + void open(const vespalib::string &name, uint32_t docIdLimit, + const TuneFileSeqWrite &tuneFileWrite, + const search::common::FileHeaderContext &fileHeaderContext); - void - addWordSingle(uint64_t wordNum, uint32_t numDocs); - void - flush(); - void - sync(); + void addWordSingle(uint64_t wordNum, uint32_t numDocs); + void flush(); + void sync(); + void close(); - void - close(); - - static uint32_t - getBitVectorLimit(uint32_t docIdLimit) - { + static uint32_t getBitVectorLimit(uint32_t docIdLimit) { // Must match FastS_BinSizeParams::CalcMaxBinSize() uint32_t ret = (docIdLimit + 63) / 64; if (ret < 16) @@ -80,15 +59,8 @@ public: return ret; } - void - makeIdxHeader(const search::common::FileHeaderContext &fileHeaderContext); - - void - updateIdxHeader(uint64_t fileBitSize); + void makeIdxHeader(const search::common::FileHeaderContext &fileHeaderContext); + void updateIdxHeader(uint64_t fileBitSize); }; - -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/bitvectorkeyscope.h b/searchlib/src/vespa/searchlib/diskindex/bitvectorkeyscope.h index 7b2af6adb9d..99deae5542b 100644 --- a/searchlib/src/vespa/searchlib/diskindex/bitvectorkeyscope.h +++ b/searchlib/src/vespa/searchlib/diskindex/bitvectorkeyscope.h @@ -2,12 +2,7 @@ #pragma once - -namespace search -{ - -namespace diskindex -{ +namespace search::diskindex { enum class BitVectorKeyScope { @@ -18,5 +13,3 @@ enum class BitVectorKeyScope const char *getBitVectorKeyScopeSuffix(BitVectorKeyScope scope); } - -} diff --git a/searchlib/src/vespa/searchlib/diskindex/dictionarywordreader.cpp b/searchlib/src/vespa/searchlib/diskindex/dictionarywordreader.cpp index b820a77724b..22cd42da06f 100644 --- a/searchlib/src/vespa/searchlib/diskindex/dictionarywordreader.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/dictionarywordreader.cpp @@ -22,9 +22,7 @@ DictionaryWordReader::DictionaryWordReader() } -DictionaryWordReader::~DictionaryWordReader() -{ -} +DictionaryWordReader::~DictionaryWordReader() = default; bool diff --git a/searchlib/src/vespa/searchlib/diskindex/dictionarywordreader.h b/searchlib/src/vespa/searchlib/diskindex/dictionarywordreader.h index ce791314b36..9c8db85bbeb 100644 --- a/searchlib/src/vespa/searchlib/diskindex/dictionarywordreader.h +++ b/searchlib/src/vespa/searchlib/diskindex/dictionarywordreader.h @@ -4,12 +4,7 @@ #include "pagedict4file.h" #include <vespa/fastlib/io/bufferedfile.h> -namespace search -{ - -namespace diskindex -{ - +namespace search::diskindex { /* * Helper class, will be used by fusion later to handle generation of @@ -28,20 +23,14 @@ public: { } - void - tryWriteWord(vespalib::stringref word) - { + void tryWriteWord(vespalib::stringref word) { if (word != _word || _wordNum == 0) { ++_wordNum; _word = word; } } - uint64_t - getWordNum() const - { - return _wordNum; - } + uint64_t getWordNum() const { return _wordNum; } }; @@ -63,35 +52,17 @@ private: using DictionaryFileSeqRead = index::DictionaryFileSeqRead; std::unique_ptr<DictionaryFileSeqRead> _dictFile; - void - allocFiles(); - - static uint64_t - noWordNumHigh() - { - return std::numeric_limits<uint64_t>::max(); - } - - static uint64_t - noWordNum() - { - return 0u; - } - + static uint64_t noWordNumHigh() { return std::numeric_limits<uint64_t>::max(); } + static uint64_t noWordNum() { return 0u; } public: DictionaryWordReader(); - ~DictionaryWordReader(); - bool - isValid() const - { + bool isValid() const { return _wordNum != noWordNumHigh(); } - bool - operator<(const DictionaryWordReader &rhs) const - { + bool operator<(const DictionaryWordReader &rhs) const { if (!isValid()) return false; if (!rhs.isValid()) @@ -99,37 +70,24 @@ public: return _word < rhs._word; } - void - read() - { + void read() { _dictFile->readWord(_word, _wordNum, _counts); } - bool - open(const vespalib::string & dictionaryName, - const vespalib::string & wordMapName, - const TuneFileSeqRead &tuneFileRead); + bool open(const vespalib::string & dictionaryName, + const vespalib::string & wordMapName, + const TuneFileSeqRead &tuneFileRead); - void - close(); + void close(); - void - writeNewWordNum(uint64_t newWordNum) - { + void writeNewWordNum(uint64_t newWordNum) { _old2newwordfile->WriteBuf(&newWordNum, sizeof(newWordNum)); } - void - write(WordAggregator &writer) - { + void write(WordAggregator &writer) { writer.tryWriteWord(_word); writeNewWordNum(writer.getWordNum()); } }; - - -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/diskindex.cpp b/searchlib/src/vespa/searchlib/diskindex/diskindex.cpp index e2fb7367b94..4b163ee07d2 100644 --- a/searchlib/src/vespa/searchlib/diskindex/diskindex.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/diskindex.cpp @@ -20,9 +20,7 @@ using namespace search::index; using namespace search::query; using namespace search::queryeval; -namespace search { - -namespace diskindex { +namespace search::diskindex { void swap(DiskIndex::LookupResult & a, DiskIndex::LookupResult & b) { @@ -37,12 +35,12 @@ DiskIndex::LookupResult::LookupResult() { } -DiskIndex::Key::Key() : _indexes() { } +DiskIndex::Key::Key() = default; DiskIndex::Key::Key(const IndexList & indexes, vespalib::stringref word) : _word(word), _indexes(indexes) { } -DiskIndex::Key::~Key() { } +DiskIndex::Key::~Key() = default; DiskIndex::DiskIndex(const vespalib::string &indexDir, size_t cacheSize) : _indexDir(indexDir), @@ -58,7 +56,7 @@ DiskIndex::DiskIndex(const vespalib::string &indexDir, size_t cacheSize) calculateSize(); } -DiskIndex::~DiskIndex() {} +DiskIndex::~DiskIndex() = default; bool DiskIndex::loadSchema() @@ -471,7 +469,4 @@ DiskIndex::createBlueprint(const IRequestContext & requestContext, const FieldSp } } - -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/diskindex.h b/searchlib/src/vespa/searchlib/diskindex/diskindex.h index dd3daab34cd..c4c8dfa6e6b 100644 --- a/searchlib/src/vespa/searchlib/diskindex/diskindex.h +++ b/searchlib/src/vespa/searchlib/diskindex/diskindex.h @@ -10,9 +10,7 @@ #include <vespa/vespalib/stllike/cache.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { /** * This class represents a disk index with a common dictionary, and @@ -160,6 +158,4 @@ public: void swap(DiskIndex::LookupResult & a, DiskIndex::LookupResult & b); -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/disktermblueprint.cpp b/searchlib/src/vespa/searchlib/diskindex/disktermblueprint.cpp index e2c3dafc13d..4c159fe6114 100644 --- a/searchlib/src/vespa/searchlib/diskindex/disktermblueprint.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/disktermblueprint.cpp @@ -56,9 +56,9 @@ namespace { bool areAnyParentsEquiv(const Blueprint * node) { - return (node == NULL) + return (node == nullptr) ? false - : (dynamic_cast<const EquivBlueprint *>(node) != NULL) + : (dynamic_cast<const EquivBlueprint *>(node) != nullptr) ? true : areAnyParentsEquiv(node->getParent()); } @@ -71,7 +71,7 @@ DiskTermBlueprint::fetchPostings(bool strict) (void) strict; _hasEquivParent = areAnyParentsEquiv(getParent()); _bitVector = _diskIndex.readBitVector(*_lookupRes); - if (!_useBitVector || (_bitVector.get() == NULL)) { + if (!_useBitVector || !_bitVector) { _postingHandle = _diskIndex.readPostingList(*_lookupRes); } _fetchPostingsDone = true; @@ -80,7 +80,7 @@ DiskTermBlueprint::fetchPostings(bool strict) SearchIterator::UP DiskTermBlueprint::createLeafSearch(const TermFieldMatchDataArray & tfmda, bool strict) const { - if ((_bitVector.get() != NULL) && (_useBitVector || (tfmda[0]->isNotNeeded() && !_hasEquivParent))) { + if (_bitVector && (_useBitVector || (tfmda[0]->isNotNeeded() && !_hasEquivParent))) { LOG(debug, "Return BitVectorIterator: %s, wordNum(%" PRIu64 "), docCount(%" PRIu64 ")", getName(_lookupRes->indexId).c_str(), _lookupRes->wordNum, _lookupRes->counts._numDocs); return BitVectorIterator::create(_bitVector.get(), tfmda, strict); diff --git a/searchlib/src/vespa/searchlib/diskindex/docidmapper.cpp b/searchlib/src/vespa/searchlib/diskindex/docidmapper.cpp index 70f7bdfea10..602b8143fd1 100644 --- a/searchlib/src/vespa/searchlib/diskindex/docidmapper.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/docidmapper.cpp @@ -11,7 +11,7 @@ namespace search::diskindex { DocIdMapping::DocIdMapping() : _docIdLimit(0u), - _selector(NULL), + _selector(nullptr), _selectorId(0) { } @@ -21,7 +21,7 @@ void DocIdMapping::clear() { _docIdLimit = 0; - _selector = NULL; + _selector = nullptr; _selectorId = 0; } @@ -30,7 +30,7 @@ void DocIdMapping::setup(uint32_t docIdLimit) { _docIdLimit = docIdLimit; - _selector = NULL; + _selector = nullptr; _selectorId = 0; } @@ -50,8 +50,7 @@ bool DocIdMapping::readDocIdLimit(const vespalib::string &mergedDir) { uint32_t docIdLimit = 0; - if (!search::docsummary::DocumentSummary:: - readDocIdLimit(mergedDir, docIdLimit)) + if (!search::docsummary::DocumentSummary::readDocIdLimit(mergedDir, docIdLimit)) return false; _docIdLimit = docIdLimit; return true; diff --git a/searchlib/src/vespa/searchlib/diskindex/docidmapper.h b/searchlib/src/vespa/searchlib/diskindex/docidmapper.h index 415405f8ae8..169e06a64ca 100644 --- a/searchlib/src/vespa/searchlib/diskindex/docidmapper.h +++ b/searchlib/src/vespa/searchlib/diskindex/docidmapper.h @@ -5,11 +5,9 @@ #include <vespa/vespalib/stllike/string.h> #include <cassert> -namespace search { +namespace search { class BitVector; } -class BitVector; - -namespace diskindex { +namespace search::diskindex { typedef vespalib::Array<uint8_t> SelectorArray; @@ -37,17 +35,17 @@ public: uint8_t _selectorId; DocIdMapper() - : _selector(NULL), + : _selector(nullptr), _docIdLimit(0u), _selectorLimit(0), _selectorId(0u) { } void setup(const DocIdMapping &mapping) { - _selector = (mapping._selector != NULL) ? - &((*mapping._selector)[0]) : NULL; + _selector = (mapping._selector != nullptr) ? + &((*mapping._selector)[0]) : nullptr; _docIdLimit = mapping._docIdLimit; - _selectorLimit = (mapping._selector != NULL) ? + _selectorLimit = (mapping._selector != nullptr) ? (*mapping._selector).size() : 0u; _selectorId = mapping._selectorId; @@ -59,7 +57,7 @@ public: uint32_t mapDocId(uint32_t docId) const { assert(docId < _docIdLimit); - if (_selector != NULL && + if (_selector != nullptr && (docId >= _selectorLimit || _selector[docId] != _selectorId)) { docId = noDocId(); } @@ -67,7 +65,4 @@ public: } }; -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/extposocc.cpp b/searchlib/src/vespa/searchlib/diskindex/extposocc.cpp index c6f9cc757fd..7b9a9b4bdd4 100644 --- a/searchlib/src/vespa/searchlib/diskindex/extposocc.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/extposocc.cpp @@ -22,18 +22,13 @@ using search::index::PostingListCounts; using search::index::PostingListParams; using search::index::Schema; -namespace -{ +namespace { vespalib::string PosOccIdCooked = "PosOcc.1.Cooked"; } -namespace search -{ - -namespace diskindex -{ +namespace search::diskindex { void setupDefaultPosOccParameters(PostingListParams *countParams, @@ -66,7 +61,7 @@ makePosOccWrite(const vespalib::string &name, uint32_t indexId, const TuneFileSeqWrite &tuneFileWrite) { - PostingListFileSeqWrite *posOccWrite = NULL; + PostingListFileSeqWrite *posOccWrite = nullptr; FileHeader fileHeader; if (fileHeader.taste(name, tuneFileWrite)) { @@ -111,7 +106,7 @@ makePosOccRead(const vespalib::string &name, const PostingListParams &featureParams, const TuneFileSeqRead &tuneFileRead) { - PostingListFileSeqRead *posOccRead = NULL; + PostingListFileSeqRead *posOccRead = nullptr; FileHeader fileHeader; if (fileHeader.taste(name, tuneFileRead)) { @@ -146,7 +141,4 @@ makePosOccRead(const vespalib::string &name, return posOccRead; } - -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/extposocc.h b/searchlib/src/vespa/searchlib/diskindex/extposocc.h index 12c57402def..df4e98abe35 100644 --- a/searchlib/src/vespa/searchlib/diskindex/extposocc.h +++ b/searchlib/src/vespa/searchlib/diskindex/extposocc.h @@ -4,25 +4,21 @@ #include <vespa/vespalib/stllike/string.h> -namespace search -{ - -class TuneFileSeqRead; -class TuneFileSeqWrite; - -namespace index { - -class PostingListParams; -class PostingListCountFileSeqWrite; -class PostingListCountFileSeqRead; -class PostingListFileSeqWrite; -class PostingListFileSeqRead; -class Schema; +namespace search { + class TuneFileSeqRead; + class TuneFileSeqWrite; +} +namespace search::index { + class PostingListParams; + class PostingListCountFileSeqWrite; + class PostingListCountFileSeqRead; + class PostingListFileSeqWrite; + class PostingListFileSeqRead; + class Schema; } -namespace diskindex -{ +namespace search::diskindex { void @@ -48,7 +44,4 @@ makePosOccRead(const vespalib::string &name, const index::PostingListParams &featureParams, const TuneFileSeqRead &tuneFileRead); -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/fieldreader.cpp b/searchlib/src/vespa/searchlib/diskindex/fieldreader.cpp index cffc2e09ef8..a56771f179a 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fieldreader.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/fieldreader.cpp @@ -40,9 +40,7 @@ FieldReader::FieldReader() } -FieldReader::~FieldReader() -{ -} +FieldReader::~FieldReader() = default; void diff --git a/searchlib/src/vespa/searchlib/diskindex/fieldreader.h b/searchlib/src/vespa/searchlib/diskindex/fieldreader.h index d55aa39d491..a73ffa149a9 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fieldreader.h +++ b/searchlib/src/vespa/searchlib/diskindex/fieldreader.h @@ -11,11 +11,7 @@ #include "docidmapper.h" #include "fieldwriter.h" -namespace search -{ - -namespace diskindex -{ +namespace search::diskindex { class FieldReaderFieldInfo; @@ -58,83 +54,48 @@ protected: uint32_t _docIdLimit; vespalib::string _word; - static uint64_t - noWordNumHigh() - { + static uint64_t noWordNumHigh() { return std::numeric_limits<uint64_t>::max(); } - static uint64_t - noWordNum() - { + static uint64_t noWordNum() { return 0u; } - void - readCounts(); - - void - readDocIdAndFeatures(); + void readCounts(); + void readDocIdAndFeatures(); public: FieldReader(); - virtual - ~FieldReader(); - - virtual void - read(); + virtual ~FieldReader(); - virtual bool - allowRawFeatures(); + virtual void read(); + virtual bool allowRawFeatures(); - void - write(FieldWriter &writer) - { + void write(FieldWriter &writer) { if (_wordNum != writer.getSparseWordNum()) { writer.newWord(_wordNum, _word); } writer.add(_docIdAndFeatures); } - bool - isValid() const - { - return _wordNum != noWordNumHigh(); - } + bool isValid() const { return _wordNum != noWordNumHigh(); } - bool - operator<(const FieldReader &rhs) const - { + bool operator<(const FieldReader &rhs) const { return _wordNum < rhs._wordNum || (_wordNum == rhs._wordNum && _docIdAndFeatures._docId < rhs._docIdAndFeatures._docId); } - virtual void - setup(const WordNumMapping &wordNumMapping, - const DocIdMapping &docIdMapping); - - virtual bool - open(const vespalib::string &prefix, const TuneFileSeqRead &tuneFileRead); - - virtual bool - close(); - - virtual void - setFeatureParams(const PostingListParams ¶ms); - - virtual void - getFeatureParams(PostingListParams ¶ms); + virtual void setup(const WordNumMapping &wordNumMapping, const DocIdMapping &docIdMapping); + virtual bool open(const vespalib::string &prefix, const TuneFileSeqRead &tuneFileRead); + virtual bool close(); + virtual void setFeatureParams(const PostingListParams ¶ms); + virtual void getFeatureParams(PostingListParams ¶ms); + uint32_t getDocIdLimit() const { return _docIdLimit; } - uint32_t - getDocIdLimit() const - { - return _docIdLimit; - } - - static std::unique_ptr<FieldReader> - allocFieldReader(const IndexIterator &index, const Schema &oldSchema); + static std::unique_ptr<FieldReader> allocFieldReader(const IndexIterator &index, const Schema &oldSchema); }; @@ -149,13 +110,8 @@ private: public: FieldReaderEmpty(const IndexIterator &index); - - virtual bool - open(const vespalib::string &prefix, const TuneFileSeqRead &tuneFileRead) - override; - - virtual void - getFeatureParams(PostingListParams ¶ms) override; + bool open(const vespalib::string &prefix, const TuneFileSeqRead &tuneFileRead) override; + void getFeatureParams(PostingListParams ¶ms) override; }; /* @@ -169,18 +125,9 @@ private: bool _hasElementWeights; public: FieldReaderStripInfo(const IndexIterator &index); - - virtual bool - allowRawFeatures() override; - - virtual void - read() override; - - virtual void - getFeatureParams(PostingListParams ¶ms) override; + bool allowRawFeatures() override; + void read() override; + void getFeatureParams(PostingListParams ¶ms) override; }; - -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/fieldwriter.cpp b/searchlib/src/vespa/searchlib/diskindex/fieldwriter.cpp index ab90a1dacc5..a85272cf142 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fieldwriter.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/fieldwriter.cpp @@ -30,7 +30,7 @@ FieldWriter::FieldWriter(uint32_t docIdLimit, { } -FieldWriter::~FieldWriter() { } +FieldWriter::~FieldWriter() = default; bool FieldWriter::open(const vespalib::string &prefix, diff --git a/searchlib/src/vespa/searchlib/diskindex/fieldwriter.h b/searchlib/src/vespa/searchlib/diskindex/fieldwriter.h index 74f515958fe..9a6edf90243 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fieldwriter.h +++ b/searchlib/src/vespa/searchlib/diskindex/fieldwriter.h @@ -8,9 +8,7 @@ #include <vespa/searchlib/bitcompression/countcompression.h> #include <vespa/searchlib/bitcompression/posocccompression.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { /* * FieldWriter is used to write a dictionary and posting list file @@ -22,11 +20,6 @@ namespace diskindex { class FieldWriter { private: - FieldWriter(const FieldWriter &rhs) = delete; - FieldWriter(const FieldWriter &&rhs) = delete; - FieldWriter &operator=(const FieldWriter &rhs) = delete; - FieldWriter &operator=(const FieldWriter &&rhs) = delete; - uint64_t _wordNum; uint32_t _prevDocId; @@ -55,6 +48,10 @@ private: void flush(); public: + FieldWriter(const FieldWriter &rhs) = delete; + FieldWriter(const FieldWriter &&rhs) = delete; + FieldWriter &operator=(const FieldWriter &rhs) = delete; + FieldWriter &operator=(const FieldWriter &&rhs) = delete; FieldWriter(uint32_t docIdLimit, uint64_t numWordIds); ~FieldWriter(); @@ -83,7 +80,4 @@ public: static void remove(const vespalib::string &prefix); }; -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/fileheader.cpp b/searchlib/src/vespa/searchlib/diskindex/fileheader.cpp index b35c25fcfd3..cfdaa22dbda 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fileheader.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/fileheader.cpp @@ -26,7 +26,7 @@ FileHeader::FileHeader() { } -FileHeader::~FileHeader() {} +FileHeader::~FileHeader() = default; bool FileHeader::taste(const vespalib::string &name, diff --git a/searchlib/src/vespa/searchlib/diskindex/fileheader.h b/searchlib/src/vespa/searchlib/diskindex/fileheader.h index 3d8cd5f1d1b..7567b2c8ed8 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fileheader.h +++ b/searchlib/src/vespa/searchlib/diskindex/fileheader.h @@ -6,10 +6,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vespa/searchlib/common/tunefileinfo.h> -namespace search -{ - -namespace diskindex +namespace search::diskindex { class FileHeader @@ -84,8 +81,4 @@ public: } }; - -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp index 2db6025d257..4fa472c2584 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fusion.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/fusion.cpp @@ -26,10 +26,7 @@ using search::index::SchemaUtil; using search::index::schema::DataType; using vespalib::getLastErrorString; - -namespace search { - -namespace diskindex { +namespace search::diskindex { void FusionInputIndex::setSchema(const Schema::SP &schema) @@ -40,7 +37,7 @@ FusionInputIndex::setSchema(const Schema::SP &schema) Fusion::Fusion(bool dynamicKPosIndexFormat, const TuneFileIndexing &tuneFileIndexing, const FileHeaderContext &fileHeaderContext) - : _schema(NULL), + : _schema(nullptr), _oldIndexes(), _docIdLimit(0u), _numWordIds(0u), @@ -50,27 +47,23 @@ Fusion::Fusion(bool dynamicKPosIndexFormat, _fileHeaderContext(fileHeaderContext) { } - Fusion::~Fusion() { ReleaseMappingTables(); } - void Fusion::setSchema(const Schema *schema) { _schema = schema; } - void Fusion::setOutDir(const vespalib::string &outDir) { _outDir = outDir; } - void Fusion::SetOldIndexList(const std::vector<vespalib::string> &oldIndexList) { @@ -589,7 +582,4 @@ Fusion::merge(const Schema &schema, return true; } - -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/fusion.h b/searchlib/src/vespa/searchlib/diskindex/fusion.h index 76547ad0e5f..94270317099 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fusion.h +++ b/searchlib/src/vespa/searchlib/diskindex/fusion.h @@ -9,22 +9,20 @@ #include <vector> #include <string> -namespace search -{ +namespace search { template <class IN> class PostingPriorityQueue; +} -namespace common -{ +namespace search::common { class TuneFileIndexing; class FileHeaderContext; } -namespace diskindex -{ +namespace search::diskindex { class FieldReader; class FieldWriter; @@ -108,7 +106,7 @@ public: const index::Schema & getSchema() const { - assert(_schema.get() != NULL); + assert(_schema.get() != nullptr); return *_schema.get(); } @@ -215,7 +213,7 @@ protected: const Schema & getSchema() const { - assert(_schema != NULL); + assert(_schema != nullptr); return *_schema; } public: @@ -257,7 +255,4 @@ public: const search::common::FileHeaderContext &fileHeaderContext); }; -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp index f14d158d616..91b7a813755 100644 --- a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp @@ -13,9 +13,7 @@ LOG_SETUP(".diskindex.indexbuilder"); -namespace search { - -namespace diskindex { +namespace search::diskindex { namespace { @@ -28,7 +26,7 @@ using index::WordDocElementFeatures; using index::schema::DataType; using vespalib::getLastErrorString; -static uint32_t +uint32_t noWordPos() { return std::numeric_limits<uint32_t>::max(); @@ -59,13 +57,6 @@ public: } -inline IndexBuilder::FieldHandle & -IndexBuilder::getIndexFieldHandle(uint32_t fieldId) -{ - return _fields[fieldId]; -} - - class IndexBuilder::FieldHandle { public: @@ -269,7 +260,7 @@ public: FileHandle::FileHandle() - : _fieldWriter(NULL), + : _fieldWriter(nullptr), _docIdAndFeatures() { } @@ -288,7 +279,7 @@ FileHandle::open(vespalib::stringref dir, const TuneFileSeqWrite &tuneFileWrite, const FileHeaderContext &fileHeaderContext) { - assert(_fieldWriter == NULL); + assert(_fieldWriter == nullptr); _fieldWriter = new FieldWriter(docIdLimit, numWordIds); @@ -306,10 +297,10 @@ void FileHandle::close() { bool ret = true; - if (_fieldWriter != NULL) { + if (_fieldWriter != nullptr) { bool closeRes = _fieldWriter->close(); delete _fieldWriter; - _fieldWriter = NULL; + _fieldWriter = nullptr; if (!closeRes) { LOG(error, "Could not close term writer"); @@ -340,9 +331,7 @@ IndexBuilder::FieldHandle::FieldHandle(const Schema &schema, } -IndexBuilder::FieldHandle::~FieldHandle() -{ -} +IndexBuilder::FieldHandle::~FieldHandle() = default; void @@ -523,7 +512,7 @@ SingleIterator::appendFeatures(DocIdAndFeatures &features) IndexBuilder::IndexBuilder(const Schema &schema) : index::IndexBuilder(schema), - _currentField(NULL), + _currentField(nullptr), _curDocId(noDocId()), _lowestOKDocId(1u), _curWord(), @@ -546,11 +535,7 @@ IndexBuilder::IndexBuilder(const Schema &schema) } } - -IndexBuilder::~IndexBuilder() -{ -} - +IndexBuilder::~IndexBuilder() = default; void IndexBuilder::startWord(vespalib::stringref word) @@ -568,7 +553,7 @@ void IndexBuilder::endWord() { assert(_inWord); - assert(_currentField != NULL); + assert(_currentField != nullptr); _currentField->endWord(); _inWord = false; _lowestOKDocId = 1u; @@ -581,7 +566,7 @@ IndexBuilder::startDocument(uint32_t docId) assert(_curDocId == noDocId()); assert(docId >= _lowestOKDocId); assert(docId < _docIdLimit); - assert(_currentField != NULL); + assert(_currentField != nullptr); _curDocId = docId; assert(_curDocId != noDocId()); _currentField->startDocument(docId); @@ -592,7 +577,7 @@ void IndexBuilder::endDocument() { assert(_curDocId != noDocId()); - assert(_currentField != NULL); + assert(_currentField != nullptr); _currentField->endDocument(); _lowestOKDocId = _curDocId + 1; _curDocId = noDocId(); @@ -603,11 +588,11 @@ void IndexBuilder::startField(uint32_t fieldId) { assert(_curDocId == noDocId()); - assert(_currentField == NULL); + assert(_currentField == nullptr); assert(fieldId < _fields.size()); assert(fieldId >= _lowestOKFieldId); _currentField = &_fields[fieldId]; - assert(_currentField != NULL); + assert(_currentField != nullptr); } @@ -616,9 +601,9 @@ IndexBuilder::endField() { assert(_curDocId == noDocId()); assert(!_inWord); - assert(_currentField != NULL); + assert(_currentField != nullptr); _lowestOKFieldId = _currentField->_fieldId + 1; - _currentField = NULL; + _currentField = nullptr; } @@ -627,7 +612,7 @@ IndexBuilder::startElement(uint32_t elementId, int32_t weight, uint32_t elementLen) { - assert(_currentField != NULL); + assert(_currentField != nullptr); _currentField->startElement(elementId, weight, elementLen); } @@ -635,7 +620,7 @@ IndexBuilder::startElement(uint32_t elementId, void IndexBuilder::endElement() { - assert(_currentField != NULL); + assert(_currentField != nullptr); _currentField->endElement(); } @@ -643,7 +628,7 @@ IndexBuilder::endElement() void IndexBuilder::addOcc(const WordDocElementWordPosFeatures &features) { - assert(_currentField != NULL); + assert(_currentField != nullptr); _currentField->addOcc(features); } @@ -710,7 +695,4 @@ IndexBuilder::close() } } - -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.h b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.h index dd5baf7c699..757a538cbe6 100644 --- a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.h +++ b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.h @@ -7,11 +7,9 @@ #include <limits> #include <vector> -namespace search { +namespace search::common { class FileHeaderContext; } -namespace common { class FileHeaderContext; } - -namespace diskindex { +namespace search::diskindex { class BitVectorCandidate; @@ -49,22 +47,21 @@ public: // schema argument must live until indexbuilder has been deleted. IndexBuilder(const Schema &schema); - virtual ~IndexBuilder(); - - virtual void startWord(vespalib::stringref word) override; - virtual void endWord() override; - virtual void startDocument(uint32_t docId) override; - virtual void endDocument() override; - virtual void startField(uint32_t fieldId) override; - virtual void endField() override; - virtual void startElement(uint32_t elementId, int32_t weight, uint32_t elementLen) override; - virtual void endElement() override; - virtual void addOcc(const WordDocElementWordPosFeatures &features) override; + ~IndexBuilder() override; + + void startWord(vespalib::stringref word) override; + void endWord() override; + void startDocument(uint32_t docId) override; + void endDocument() override; + void startField(uint32_t fieldId) override; + void endField() override; + void startElement(uint32_t elementId, int32_t weight, uint32_t elementLen) override; + void endElement() override; + void addOcc(const WordDocElementWordPosFeatures &features) override; // TODO: methods for attribute vectors. // TODO: methods for document summary. - inline FieldHandle & getIndexFieldHandle(uint32_t fieldId); void setPrefix(vespalib::stringref prefix); vespalib::string appendToPrefix(vespalib::stringref name); @@ -77,9 +74,4 @@ public: void close(); }; -} // namespace diskindex - -} // namespace search - - - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/pagedict4file.cpp b/searchlib/src/vespa/searchlib/diskindex/pagedict4file.cpp index 1870de30bad..93d78bd44af 100644 --- a/searchlib/src/vespa/searchlib/diskindex/pagedict4file.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/pagedict4file.cpp @@ -42,8 +42,8 @@ const uint32_t headerAlign = 4096; } PageDict4FileSeqRead::PageDict4FileSeqRead() - : _pReader(NULL), - _ssReader(NULL), + : _pReader(nullptr), + _ssReader(nullptr), _ssd(), _ssReadContext(_ssd), _ssfile(), @@ -261,15 +261,15 @@ PageDict4FileSeqRead::close() { delete _pReader; delete _ssReader; - _pReader = NULL; - _ssReader = NULL; + _pReader = nullptr; + _ssReader = nullptr; _ssReadContext.dropComprBuf(); _spReadContext.dropComprBuf(); _pReadContext.dropComprBuf(); - _ssReadContext.setFile(NULL); - _spReadContext.setFile(NULL); - _pReadContext.setFile(NULL); + _ssReadContext.setFile(nullptr); + _spReadContext.setFile(nullptr); + _pReadContext.setFile(nullptr); _ssfile.Close(); _spfile.Close(); _pfile.Close(); @@ -290,9 +290,9 @@ PageDict4FileSeqRead::getParams(PostingListParams ¶ms) PageDict4FileSeqWrite::PageDict4FileSeqWrite() - : _pWriter(NULL), - _spWriter(NULL), - _ssWriter(NULL), + : _pWriter(nullptr), + _spWriter(nullptr), + _ssWriter(nullptr), _pe(), _pWriteContext(_pe), _pfile(), @@ -333,9 +333,9 @@ PageDict4FileSeqWrite::open(const vespalib::string &name, const TuneFileSeqWrite &tuneFileWrite, const FileHeaderContext &fileHeaderContext) { - assert(_pWriter == NULL); - assert(_spWriter == NULL); - assert(_ssWriter == NULL); + assert(_pWriter == nullptr); + assert(_spWriter == nullptr); + assert(_ssWriter == nullptr); vespalib::string pname = name + ".pdat"; vespalib::string spname = name + ".spdat"; @@ -428,15 +428,15 @@ PageDict4FileSeqWrite::close() _pWriteContext.dropComprBuf(); _pfile.Sync(); _pfile.Close(); - _pWriteContext.setFile(NULL); + _pWriteContext.setFile(nullptr); _spWriteContext.dropComprBuf(); _spfile.Sync(); _spfile.Close(); - _spWriteContext.setFile(NULL); + _spWriteContext.setFile(nullptr); _ssWriteContext.dropComprBuf(); _ssfile.Sync(); _ssfile.Close(); - _ssWriteContext.setFile(NULL); + _ssWriteContext.setFile(nullptr); // Update file headers updatePHeader(usedPBits); @@ -446,9 +446,9 @@ PageDict4FileSeqWrite::close() delete _pWriter; delete _spWriter; delete _ssWriter; - _pWriter = NULL; - _spWriter = NULL; - _ssWriter = NULL; + _pWriter = nullptr; + _spWriter = nullptr; + _ssWriter = nullptr; return true; } diff --git a/searchlib/src/vespa/searchlib/diskindex/pagedict4randread.cpp b/searchlib/src/vespa/searchlib/diskindex/pagedict4randread.cpp index 67f955fab07..0ae141fd827 100644 --- a/searchlib/src/vespa/searchlib/diskindex/pagedict4randread.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/pagedict4randread.cpp @@ -18,10 +18,7 @@ vespalib::string mySSId("PageDict4SS.1"); using vespalib::getLastErrorString; -namespace search { - -namespace diskindex { - +namespace search::diskindex { PageDict4RandRead::PageDict4RandRead() : DictionaryFileRandRead(), @@ -42,7 +39,7 @@ PageDict4RandRead::PageDict4RandRead() } -PageDict4RandRead::~PageDict4RandRead() { } +PageDict4RandRead::~PageDict4RandRead() = default; void @@ -179,8 +176,7 @@ PageDict4RandRead::lookup(vespalib::stringref word, ssRes._pageNum); PLookupRes pRes; - const char *pData = static_cast<const char *> - (_pfile->MemoryMapPtr(0)); + const char *pData = static_cast<const char *>(_pfile->MemoryMapPtr(0)); pRes.lookup(*_ssReader, pData + pageSize * spRes._pageNum, word, @@ -209,16 +205,11 @@ PageDict4RandRead::open(const vespalib::string &name, vespalib::string spname = name + ".spdat"; vespalib::string ssname = name + ".ssdat"; - if (tuneFileRead.getWantMemoryMap() || true) { - int mmapFlags(tuneFileRead.getMemoryMapFlags()); - _ssfile->enableMemoryMap(mmapFlags); - _spfile->enableMemoryMap(mmapFlags); - _pfile->enableMemoryMap(mmapFlags); - } else if (tuneFileRead.getWantDirectIO()) { - _ssfile->EnableDirectIO(); - _spfile->EnableDirectIO(); - _pfile->EnableDirectIO(); - } + int mmapFlags(tuneFileRead.getMemoryMapFlags()); + _ssfile->enableMemoryMap(mmapFlags); + _spfile->enableMemoryMap(mmapFlags); + _pfile->enableMemoryMap(mmapFlags); + if (!_ssfile->OpenReadOnly(ssname.c_str())) { LOG(error, "could not open %s: %s", _ssfile->GetFileName(), getLastErrorString().c_str()); @@ -259,7 +250,7 @@ PageDict4RandRead::close() _ssReader.reset(); _ssReadContext.dropComprBuf(); - _ssReadContext.setFile(NULL); + _ssReadContext.setFile(nullptr); _ssfile->Close(); _spfile->Close(); _pfile->Close(); @@ -273,7 +264,4 @@ PageDict4RandRead::getNumWordIds() const return _ssd._numWordIds; } - -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/pagedict4randread.h b/searchlib/src/vespa/searchlib/diskindex/pagedict4randread.h index b7159f9398e..4da77880692 100644 --- a/searchlib/src/vespa/searchlib/diskindex/pagedict4randread.h +++ b/searchlib/src/vespa/searchlib/diskindex/pagedict4randread.h @@ -7,9 +7,7 @@ #include <vespa/searchlib/bitcompression/countcompression.h> #include <vespa/searchlib/bitcompression/pagedict4.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { class PageDict4RandRead : public index::DictionaryFileRandRead { @@ -55,6 +53,4 @@ public: uint64_t getNumWordIds() const override; }; -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/zcbuf.cpp b/searchlib/src/vespa/searchlib/diskindex/zcbuf.cpp index 3b7ccab0c53..e2f5e68758e 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcbuf.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/zcbuf.cpp @@ -7,9 +7,9 @@ namespace search::diskindex { ZcBuf::ZcBuf() - : _valI(NULL), - _valE(NULL), - _mallocStart(NULL), + : _valI(nullptr), + _valE(nullptr), + _mallocStart(nullptr), _mallocSize(0) { } diff --git a/searchlib/src/vespa/searchlib/diskindex/zcposocc.h b/searchlib/src/vespa/searchlib/diskindex/zcposocc.h index 093e452d4e1..cd21fb02f33 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcposocc.h +++ b/searchlib/src/vespa/searchlib/diskindex/zcposocc.h @@ -5,9 +5,7 @@ #include "zcposting.h" #include <vespa/searchlib/bitcompression/posocccompression.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { class Zc4PosOccSeqRead : public Zc4PostingSeqRead { @@ -59,8 +57,4 @@ public: ZcPosOccSeqWrite(const Schema &schema, uint32_t indexId, index::PostingListCountFileSeqWrite *countFile); }; - -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/zcposocciterators.h b/searchlib/src/vespa/searchlib/diskindex/zcposocciterators.h index d55ba24be09..efbc305db7a 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcposocciterators.h +++ b/searchlib/src/vespa/searchlib/diskindex/zcposocciterators.h @@ -5,9 +5,7 @@ #include "zcpostingiterators.h" #include <vespa/searchlib/bitcompression/posocccompression.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { template <bool bigEndian> class Zc4RareWordPosOccIterator : public Zc4RareWordPostingIterator<bigEndian> @@ -87,7 +85,4 @@ extern template class ZcRareWordPosOccIterator<false>; extern template class ZcPosOccIterator<true>; extern template class ZcPosOccIterator<false>; -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.cpp b/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.cpp index c05001c2ab8..f355ad6645e 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.cpp @@ -28,14 +28,12 @@ vespalib::string myId5("Zc.5"); } -namespace search { - -namespace diskindex { +namespace search::diskindex { using vespalib::getLastErrorString; ZcPosOccRandRead::ZcPosOccRandRead() - : _file(new FastOS_File()), + : _file(std::make_unique<FastOS_File>()), _fileSize(0), _minChunkDocs(1 << 30), _minSkipDocs(64), @@ -125,9 +123,9 @@ ZcPosOccRandRead::readPostingList(const PostingListCounts &counts, startOffset -= (startOffset & 7); void *mapPtr = _file->MemoryMapPtr(startOffset); - if (mapPtr != NULL) { + if (mapPtr != nullptr) { handle._mem = mapPtr; - handle._allocMem = NULL; + handle._allocMem = nullptr; handle._allocSize = 0; } else { uint64_t endOffset = (handle._bitOffset + _headerBitSize + @@ -145,11 +143,11 @@ ZcPosOccRandRead::readPostingList(const PostingListCounts &counts, padExtraAfter = 16 - padAfter; size_t mallocLen = padBefore + vectorLen + padAfter + padExtraAfter; - void *mallocStart = NULL; - void *alignedBuffer = NULL; + void *mallocStart = nullptr; + void *alignedBuffer = nullptr; if (mallocLen > 0) { alignedBuffer = _file->AllocateDirectIOBuffer(mallocLen, mallocStart); - assert(mallocStart != NULL); + assert(mallocStart != nullptr); assert(endOffset + padAfter + padExtraAfter <= _fileSize); _file->ReadBuf(alignedBuffer, padBefore + vectorLen + padAfter, @@ -365,6 +363,4 @@ Zc4PosOccRandRead::getSubIdentifier() return d.getIdentifier(); } -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.h b/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.h index 0dcca879cac..18668e7e118 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.h +++ b/searchlib/src/vespa/searchlib/diskindex/zcposoccrandread.h @@ -7,9 +7,7 @@ #include <vespa/searchlib/bitcompression/posocccompression.h> #include <vespa/searchlib/fef/termfieldmatchdataarray.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { class ZcPosOccRandRead : public index::PostingListFileRandRead { @@ -83,7 +81,4 @@ public: }; -} // namespace diskindex - -} // namespace search - +} diff --git a/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.cpp b/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.cpp index 919004c378f..c3261878b45 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.cpp @@ -4,9 +4,7 @@ #include <vespa/searchlib/fef/termfieldmatchdataarray.h> #include <vespa/searchlib/bitcompression/posocccompression.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { using search::fef::TermFieldMatchDataArray; using search::bitcompression::FeatureDecodeContext; @@ -600,6 +598,4 @@ template class ZcPostingIterator<false>; template class ZcRareWordPostingIterator<true>; template class ZcRareWordPostingIterator<false>; -} // namespace diskindex - -} // namespace search +} diff --git a/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h b/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h index a1f7a8b2e9f..1946796cdbf 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h +++ b/searchlib/src/vespa/searchlib/diskindex/zcpostingiterators.h @@ -7,9 +7,7 @@ #include <vespa/searchlib/queryeval/iterators.h> #include <vespa/fastos/dynamiclibrary.h> -namespace search { - -namespace diskindex { +namespace search::diskindex { using bitcompression::Position; @@ -309,8 +307,4 @@ extern template class ZcPostingIterator<false>; extern template class ZcRareWordPostingIterator<true>; extern template class ZcRareWordPostingIterator<false>; - -} // namespace diskindex - -} // namespace search - +} |