diff options
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/vespa/vespalib/datastore/compaction_spec.h | 10 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/datastore/datastorebase.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vespalib/src/vespa/vespalib/datastore/compaction_spec.h b/vespalib/src/vespa/vespalib/datastore/compaction_spec.h index 49e2f5057cb..bd50b88796b 100644 --- a/vespalib/src/vespa/vespalib/datastore/compaction_spec.h +++ b/vespalib/src/vespa/vespalib/datastore/compaction_spec.h @@ -16,13 +16,13 @@ class CompactionSpec bool _compact_memory; bool _compact_address_space; public: - CompactionSpec(bool compact_memory, bool compact_address_space) - : _compact_memory(compact_memory), - _compact_address_space(compact_address_space) + CompactionSpec(bool compact_memory_, bool compact_address_space_) + : _compact_memory(compact_memory_), + _compact_address_space(compact_address_space_) { } - bool get_compact_memory() const noexcept { return _compact_memory; } - bool get_compact_address_space() const noexcept { return _compact_address_space; } + bool compact_memory() const noexcept { return _compact_memory; } + bool compact_address_space() const noexcept { return _compact_address_space; } }; } diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp index 367eb328ab2..059171e1f02 100644 --- a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp +++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp @@ -542,11 +542,11 @@ DataStoreBase::startCompactWorstBuffers(CompactionSpec compaction_spec, const Co uint32_t arraySize = typeHandler->getArraySize(); uint32_t reservedElements = typeHandler->getReservedElements(bufferId); size_t deadElems = state.getDeadElems() - reservedElements; - if (compaction_spec.get_compact_memory() && deadElems > worstDeadElems) { + if (compaction_spec.compact_memory() && deadElems > worstDeadElems) { worstMemoryBufferId = bufferId; worstDeadElems = deadElems; } - if (compaction_spec.get_compact_address_space()) { + if (compaction_spec.compact_address_space()) { size_t deadArrays = deadElems / arraySize; if (deadArrays > worstDeadArrays) { worstAddressSpaceBufferId = bufferId; |