Merge pull request #27377 from vespa-engine/toregge/use-32-bit-array-sizes

Use 32-bit array sizes.

2 files changed, 5 insertions, 4 deletions

diff --git a/vespalib/src/vespa/vespalib/datastore/array_store_type_mapper.cpp b/vespalib/src/vespa/vespalib/datastore/array_store_type_mapper.cpp
index ff514f5a00b..520fb4cc4ef 100644
--- a/vespalib/src/vespa/vespalib/datastore/array_store_type_mapper.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/array_store_type_mapper.cpp
@@ -16,11 +16,12 @@ ArrayStoreTypeMapper::~ArrayStoreTypeMapper() = default;
 uint32_t
 ArrayStoreTypeMapper::get_type_id(size_t array_size) const
 {
-    assert(!_array_sizes.empty());
-    auto result = std::lower_bound(_array_sizes.begin() + 1, _array_sizes.end(), array_size);
-    if (result == _array_sizes.end()) {
+    assert(_array_sizes.size() >= 2u);
+    if (array_size > _array_sizes.back()) {
         return 0; // type id 0 uses buffer type for large arrays
     }
+    auto result = std::lower_bound(_array_sizes.begin() + 1, _array_sizes.end(), array_size);
+    assert(result < _array_sizes.end());
     return result - _array_sizes.begin();
 }
 
diff --git a/vespalib/src/vespa/vespalib/datastore/array_store_type_mapper.h b/vespalib/src/vespa/vespalib/datastore/array_store_type_mapper.h
index 2a406a39bf9..a73b6ef2e97 100644
--- a/vespalib/src/vespa/vespalib/datastore/array_store_type_mapper.h
+++ b/vespalib/src/vespa/vespalib/datastore/array_store_type_mapper.h
@@ -18,7 +18,7 @@ namespace vespalib::datastore {
 class ArrayStoreTypeMapper
 {
 protected:
-    std::vector<size_t> _array_sizes;
+    std::vector<uint32_t> _array_sizes;
 public:
     ArrayStoreTypeMapper();
     ~ArrayStoreTypeMapper();