diff options
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/tests/attribute/changevector/changevector_test.cpp | 2 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/changevector.hpp | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/searchlib/src/tests/attribute/changevector/changevector_test.cpp b/searchlib/src/tests/attribute/changevector/changevector_test.cpp index d7d1a8d2699..93a23630407 100644 --- a/searchlib/src/tests/attribute/changevector/changevector_test.cpp +++ b/searchlib/src/tests/attribute/changevector/changevector_test.cpp @@ -12,7 +12,7 @@ template <typename T> void verifyStrictOrdering(const T & v) { vespalib::hash_set<uint32_t> complete; uint32_t prev_doc(0); - uint32_t prev_value; + uint32_t prev_value(0); for (const auto & c : v.getDocIdInsertOrder()) { if (prev_doc != c._doc) { complete.insert(prev_doc); diff --git a/searchlib/src/vespa/searchlib/attribute/changevector.hpp b/searchlib/src/vespa/searchlib/attribute/changevector.hpp index f8e4b266cba..5052f4b9a10 100644 --- a/searchlib/src/vespa/searchlib/attribute/changevector.hpp +++ b/searchlib/src/vespa/searchlib/attribute/changevector.hpp @@ -8,16 +8,13 @@ namespace search { +using vespalib::roundUp2inN; + namespace { // This number is selected to be large enough to hold bursts between commits constexpr size_t NUM_ELEMS_TO_RESERVE = 200; -template <typename T> -constexpr size_t roundUp2inN(size_t elems) { - return vespalib::roundUp2inN(elems, sizeof(T)); -} - } template <typename T> @@ -57,7 +54,7 @@ ChangeVectorT<T>::push_back(uint32_t doc, Accessor & ac) { if (ac.size() <= 0) { return; } - _v.reserve(vespalib::roundUp2inN(size() + ac.size(), sizeof(T))); + _v.reserve(roundUp2inN<T>(size() + ac.size())); for (size_t i(0), m(ac.size()); i < m; i++, ac.next()) { _v.push_back(T(ChangeBase::APPEND, doc, typename T::DataType(ac.value()), ac.weight())); } |