diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-01-29 15:18:47 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-01-29 15:18:47 +0000 |
commit | b30813a6e74187ba07d7f70dbd1986659ed1990b (patch) | |
tree | 8ad79c86836a89e81a556e0acfd174ff5444aeb4 /searchlib/src | |
parent | 90c844e2b4441653f7caf8eb1f26b703a3fb5526 (diff) |
Be consistent with factors and percentages
Diffstat (limited to 'searchlib/src')
-rw-r--r-- | searchlib/src/tests/attribute/attribute_test.cpp | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/flagattribute.cpp | 24 |
2 files changed, 12 insertions, 14 deletions
diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp index fd95a3716d3..4e38bd45f9d 100644 --- a/searchlib/src/tests/attribute/attribute_test.cpp +++ b/searchlib/src/tests/attribute/attribute_test.cpp @@ -2145,7 +2145,7 @@ AttributeTest::testReaderDuringLastUpdate(const Config &config, bool fs, bool co string name(ss.str()); Config cfg = config; cfg.setFastSearch(fs); - cfg.setGrowStrategy(GrowStrategy::make(100, 50, 0)); + cfg.setGrowStrategy(GrowStrategy::make(100, 0.5, 0)); LOG(info, "testReaderDuringLastUpdate(%s)", name.c_str()); AttributePtr attr = AttributeFactory::createAttribute(name, cfg); diff --git a/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp b/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp index 449ec0cd86d..a38cbe60e56 100644 --- a/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/flagattribute.cpp @@ -108,7 +108,7 @@ bool FlagAttributeT<B>::onLoad() { for (size_t i(0), m(_bitVectors.size()); i < m; i++) { _bitVectorStore[i].reset(); - _bitVectors[i] = NULL; + _bitVectors[i] = nullptr; } _bitVectorSize = 0; return B::onLoad(); @@ -125,7 +125,7 @@ void FlagAttributeT<B>::setNewValues(DocId doc, const std::vector<typename B::WT typename B::WType value = values[i]; uint32_t offset = getOffset(value); BitVector * bv = _bitVectors[offset]; - if (bv == NULL) { + if (bv == nullptr) { assert(_bitVectorSize >= this->getNumDocs()); _bitVectorStore[offset] = BitVector::create(_bitVectorSize); _bitVectors[offset] = _bitVectorStore[offset].get(); @@ -143,7 +143,7 @@ FlagAttributeT<B>::setNewBVValue(DocId doc, typename B::WType::ValueType value) { uint32_t offset = getOffset(value); BitVector * bv = _bitVectors[offset]; - if (bv == NULL) { + if (bv == nullptr) { assert(_bitVectorSize >= this->getNumDocs()); _bitVectorStore[offset] = BitVector::create(_bitVectorSize); _bitVectors[offset] = _bitVectorStore[offset].get(); @@ -195,7 +195,7 @@ FlagAttributeT<B>::ensureGuardBit() { for (uint32_t i = 0; i < _bitVectors.size(); ++i) { BitVector * bv = _bitVectors[i]; - if (bv != NULL) { + if (bv != nullptr) { ensureGuardBit(*bv); } } @@ -207,7 +207,7 @@ FlagAttributeT<B>::clearGuardBit(DocId doc) { for (uint32_t i = 0; i < _bitVectors.size(); ++i) { BitVector * bv = _bitVectors[i]; - if (bv != NULL) { + if (bv != nullptr) { bv->clearBit(doc); // clear guard bit and start using this doc id } } @@ -218,10 +218,10 @@ void FlagAttributeT<B>::resizeBitVectors(uint32_t neededSize) { const GrowStrategy & gs = this->getConfig().getGrowStrategy(); - uint32_t newSize = neededSize + (neededSize * gs.getDocsGrowPercent() / 100) + gs.getDocsGrowDelta(); + uint32_t newSize = neededSize + (neededSize * gs.getDocsGrowFactor()) + gs.getDocsGrowDelta(); for (uint32_t i = 0; i < _bitVectors.size(); ++i) { BitVector * bv = _bitVectors[i]; - if (bv != NULL) { + if (bv != nullptr) { vespalib::GenerationHeldBase::UP hold(bv->grow(newSize)); ensureGuardBit(*bv); _bitVectorHolder.hold(std::move(hold)); @@ -249,18 +249,16 @@ FlagAttributeT<B>::SearchContext::SearchContext(QueryTermSimple::UP qTerm, const template <typename B> SearchIterator::UP -FlagAttributeT<B>::SearchContext::createIterator(fef::TermFieldMatchData * - matchData, - bool strict) +FlagAttributeT<B>::SearchContext::createIterator(fef::TermFieldMatchData * matchData, bool strict) { if (valid()) { if (_low == _high) { const Attribute & attr(static_cast<const Attribute &>(attribute())); const BitVector * bv(attr.getBitVector(_low)); - if (bv != NULL) { + if (bv != nullptr) { return BitVectorIterator::create(bv, attr.getCommittedDocIdLimit(), *matchData, strict); } else { - return SearchIterator::UP(new queryeval::EmptySearch()); + return std::make_unique<queryeval::EmptySearch>(); } } else { SearchIterator::UP flagIterator( @@ -270,7 +268,7 @@ FlagAttributeT<B>::SearchContext::createIterator(fef::TermFieldMatchData * return flagIterator; } } else { - return SearchIterator::UP(new queryeval::EmptySearch()); + return std::make_unique<queryeval::EmptySearch>(); } } |