From 55e53f26ea1379b5ce87685e7b8c04f370b5fca0 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Thu, 11 Apr 2019 14:46:05 +0200 Subject: Style fixes. --- .../searchlib/diskindex/zc4_posting_writer.cpp | 63 +++++++++++----------- .../vespa/searchlib/diskindex/zc4_posting_writer.h | 8 +-- .../diskindex/zc4_posting_writer_base.cpp | 12 +++-- 3 files changed, 44 insertions(+), 39 deletions(-) diff --git a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.cpp b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.cpp index 08b4c2c5916..0eb59a383a5 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.cpp @@ -14,11 +14,11 @@ namespace search::diskindex template Zc4PostingWriter::Zc4PostingWriter(PostingListCounts &counts) : Zc4PostingWriterBase(counts), - _encodeContext(), - _encodeFeatures(nullptr) + _encode_context(), + _encode_features(nullptr) { - _encodeContext.setWriteContext(&_writeContext); - _writeContext.setEncodeContext(&_encodeContext); + _encode_context.setWriteContext(&_writeContext); + _writeContext.setEncodeContext(&_encode_context); } template @@ -31,8 +31,8 @@ void Zc4PostingWriter::reset_chunk() { _docIds.clear(); - if (_encodeFeatures != nullptr) { - _encodeFeatures->setupWrite(_featureWriteContext); + if (_encode_features != nullptr) { + _encode_features->setupWrite(_featureWriteContext); _featureOffset = 0; } } @@ -43,18 +43,19 @@ Zc4PostingWriter::flush_word_with_skip(bool hasMore) { assert(_docIds.size() >= _minSkipDocs || !_counts._segments.empty()); - if (_encodeFeatures != nullptr) { - _encodeFeatures->flush(); + if (_encode_features != nullptr) { + _encode_features->flush(); } - EncodeContext &e = _encodeContext; + EncodeContext &e = _encode_context; uint32_t numDocs = _docIds.size(); e.encodeExpGolomb(numDocs - 1, K_VALUE_ZCPOSTING_NUMDOCS); - if (numDocs >= _minChunkDocs) + if (numDocs >= _minChunkDocs) { e.writeBits((hasMore ? 1 : 0), 1); + } - calc_skip_info(_encodeFeatures != nullptr); + calc_skip_info(_encode_features != nullptr); uint32_t docIdsSize = _zcDocIds.size(); uint32_t l1SkipSize = _l1Skip.size(); @@ -73,7 +74,7 @@ Zc4PostingWriter::flush_word_with_skip(bool hasMore) } } } - if (_encodeFeatures != nullptr) { + if (_encode_features != nullptr) { e.encodeExpGolomb(_featureOffset, K_VALUE_ZCPOSTING_FEATURESSIZE); } @@ -148,9 +149,9 @@ Zc4PostingWriter::write_docid_and_features(const DocIdAndFeatures &fe if (__builtin_expect(_docIds.size() >= _minChunkDocs, false)) { flush_word_with_skip(true); } - if (_encodeFeatures != nullptr) { - _encodeFeatures->writeFeatures(features); - uint64_t writeOffset = _encodeFeatures->getWriteOffset(); + if (_encode_features != nullptr) { + _encode_features->writeFeatures(features); + uint64_t writeOffset = _encode_features->getWriteOffset(); uint64_t featureSize = writeOffset - _featureOffset; assert(static_cast(featureSize) == featureSize); _docIds.push_back(std::make_pair(features._docId, @@ -168,10 +169,10 @@ Zc4PostingWriter::flush_word_no_skip() // Too few document ids for skip info. assert(_docIds.size() < _minSkipDocs && _counts._segments.empty()); - if (_encodeFeatures != nullptr) { - _encodeFeatures->flush(); + if (_encode_features != nullptr) { + _encode_features->flush(); } - EncodeContext &e = _encodeContext; + EncodeContext &e = _encode_context; uint32_t numDocs = _docIds.size(); e.encodeExpGolomb(numDocs - 1, K_VALUE_ZCPOSTING_NUMDOCS); @@ -216,7 +217,7 @@ Zc4PostingWriter::flush_word() _numWords++; } - EncodeContext &e = _encodeContext; + EncodeContext &e = _encode_context; uint64_t writePos = e.getWriteOffset(); _counts._bitLength = writePos - _writePos; @@ -227,12 +228,12 @@ template void Zc4PostingWriter::set_encode_features(EncodeContext *encode_features) { - _encodeFeatures = encode_features; - if (_encodeFeatures != nullptr) { - _encodeFeatures->setWriteContext(&_featureWriteContext); - _encodeFeatures->setupWrite(_featureWriteContext); + _encode_features = encode_features; + if (_encode_features != nullptr) { + _encode_features->setWriteContext(&_featureWriteContext); + _encode_features->setupWrite(_featureWriteContext); } - _featureWriteContext.setEncodeContext(_encodeFeatures); + _featureWriteContext.setEncodeContext(_encode_features); _featureOffset = 0; } @@ -241,7 +242,7 @@ void Zc4PostingWriter::on_open() { _numWords = 0; - _writePos = _encodeContext.getWriteOffset(); // Position after file header + _writePos = _encode_context.getWriteOffset(); // Position after file header } template @@ -252,15 +253,15 @@ Zc4PostingWriter::on_close() // memory mapped file during search and into SIGSEGV territory. // First pad to 64 bits alignment. - _encodeContext.smallAlign(64); - _encodeContext.writeComprBufferIfNeeded(); + _encode_context.smallAlign(64); + _encode_context.writeComprBufferIfNeeded(); // Then write 128 more bits. This allows for 64-bit decoding // with a readbits that always leaves a nonzero preRead - _encodeContext.padBits(128); - _encodeContext.alignDirectIO(); - _encodeContext.flush(); - _encodeContext.writeComprBuffer(); // Also flushes slack + _encode_context.padBits(128); + _encode_context.alignDirectIO(); + _encode_context.flush(); + _encode_context.writeComprBuffer(); // Also flushes slack } template class Zc4PostingWriter; diff --git a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.h b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.h index 8148013b963..8dc5e249d52 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.h +++ b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.h @@ -23,9 +23,9 @@ class Zc4PostingWriter : public Zc4PostingWriterBase { using EncodeContext = bitcompression::FeatureEncodeContext; - EncodeContext _encodeContext; + EncodeContext _encode_context; // Buffer up features in memory - EncodeContext *_encodeFeatures; + EncodeContext *_encode_features; public: Zc4PostingWriter(const Zc4PostingWriter &) = delete; Zc4PostingWriter(Zc4PostingWriter &&) = delete; @@ -43,8 +43,8 @@ public: void on_open(); void on_close(); - EncodeContext &get_encode_features() { return *_encodeFeatures; } - EncodeContext &get_encode_context() { return _encodeContext; } + EncodeContext &get_encode_features() { return *_encode_features; } + EncodeContext &get_encode_context() { return _encode_context; } }; extern template class Zc4PostingWriter; diff --git a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer_base.cpp b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer_base.cpp index c0e5e5e8dcf..485610c2ebd 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer_base.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer_base.cpp @@ -187,14 +187,18 @@ Zc4PostingWriterBase::calc_skip_info(bool encodeFeatures) ++l1SkipCnt; } // Extra partial entries for skip tables to simplify iterator during search - if (_l1Skip.size() > 0) + if (_l1Skip.size() > 0) { _l1Skip.encode(lastDocId - lastL1SkipDocId - 1); - if (_l2Skip.size() > 0) + } + if (_l2Skip.size() > 0) { _l2Skip.encode(lastDocId - lastL2SkipDocId - 1); - if (_l3Skip.size() > 0) + } + if (_l3Skip.size() > 0) { _l3Skip.encode(lastDocId - lastL3SkipDocId - 1); - if (_l4Skip.size() > 0) + } + if (_l4Skip.size() > 0) { _l4Skip.encode(lastDocId - lastL4SkipDocId - 1); + } } void -- cgit v1.2.3