Rename member functions in BufferTypeBase to track rename

of member variables.

3 files changed, 5 insertions, 5 deletions

diff --git a/vespalib/src/vespa/vespalib/datastore/buffer_type.cpp b/vespalib/src/vespa/vespalib/datastore/buffer_type.cpp
index 5dbd24de271..d7abee3f993 100644
--- a/vespalib/src/vespa/vespalib/datastore/buffer_type.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/buffer_type.cpp
@@ -174,7 +174,7 @@ BufferTypeBase::calcArraysToAlloc(uint32_t bufferId, ElemCount elemsNeeded, bool
 }
 
 uint32_t
-BufferTypeBase::get_scaled_num_arrays_for_new_buffer() const
+BufferTypeBase::get_scaled_num_entries_for_new_buffer() const
 {
     uint32_t active_buffers_count = get_active_buffers_count();
     if (active_buffers_count <= 1u || _num_entries_for_new_buffer == 0u) {
diff --git a/vespalib/src/vespa/vespalib/datastore/buffer_type.h b/vespalib/src/vespa/vespalib/datastore/buffer_type.h
index 831acdaa830..40b78d2bb9b 100644
--- a/vespalib/src/vespa/vespalib/datastore/buffer_type.h
+++ b/vespalib/src/vespa/vespalib/datastore/buffer_type.h
@@ -76,8 +76,8 @@ public:
     uint32_t get_active_buffers_count() const { return _active_buffers.size(); }
     const std::vector<uint32_t>& get_active_buffers() const noexcept { return _active_buffers; }
     size_t getMaxArrays() const { return _max_entries; }
-    uint32_t get_scaled_num_arrays_for_new_buffer() const;
-    uint32_t get_num_arrays_for_new_buffer() const noexcept { return _num_entries_for_new_buffer; }
+    uint32_t get_scaled_num_entries_for_new_buffer() const;
+    uint32_t get_num_entries_for_new_buffer() const noexcept { return _num_entries_for_new_buffer; }
 protected:
 
     struct BufferCounts {
diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
index 3c44712505a..efb7645412e 100644
--- a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
@@ -126,7 +126,7 @@ DataStoreBase::consider_grow_active_buffer(uint32_t type_id, size_t entries_need
     if (active_buffers_count < min_active_buffers) {
         return false;
     }
-    if (type_handler->get_num_arrays_for_new_buffer() == 0u) {
+    if (type_handler->get_num_entries_for_new_buffer() == 0u) {
         return false;
     }
     assert(!getBufferState(buffer_id).getCompacting());
@@ -185,7 +185,7 @@ DataStoreBase::switch_or_grow_primary_buffer(uint32_t typeId, size_t entries_nee
 {
     auto typeHandler = _typeHandlers[typeId];
     uint32_t arraySize = typeHandler->getArraySize();
-    size_t num_entries_for_new_buffer = typeHandler->get_scaled_num_arrays_for_new_buffer();
+    size_t num_entries_for_new_buffer = typeHandler->get_scaled_num_entries_for_new_buffer();
     size_t numElemsForNewBuffer = num_entries_for_new_buffer * arraySize;
     uint32_t bufferId = primary_buffer_id(typeId);
     if (entries_needed * arraySize + getBufferState(bufferId).size() >= numElemsForNewBuffer) {