diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-10-06 15:47:55 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2022-10-06 15:52:12 +0000 |
commit | 015fa522fd1b8a85a490bde41262a6401d8dfd20 (patch) | |
tree | e86b210f0f25f432908aa30b0a178156ddf8d925 /searchlib | |
parent | e058823899d4575cf3cd544c3fd0f739c0d085e3 (diff) |
Move tracking of datastore buffer statistics to separate classes.
Diffstat (limited to 'searchlib')
4 files changed, 9 insertions, 10 deletions
diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp index 23d96f7b81c..dcca1f136f6 100644 --- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp @@ -451,14 +451,13 @@ featureStoreRef(const FieldIndexCollection &fieldIndexes, uint32_t fieldId) return fieldIndexes.getFieldIndex(fieldId)->getFeatureStore(); } -DataStoreBase::MemStats +MemoryStats getFeatureStoreMemStats(const FieldIndexCollection &fieldIndexes) { - DataStoreBase::MemStats res; + MemoryStats res; uint32_t numFields = fieldIndexes.getNumFields(); for (uint32_t fieldId = 0; fieldId < numFields; ++fieldId) { - DataStoreBase::MemStats stats = - fieldIndexes.getFieldIndex(fieldId)->getFeatureStore().getMemStats(); + auto stats = fieldIndexes.getFieldIndex(fieldId)->getFeatureStore().getMemStats(); res += stats; } return res; @@ -1029,7 +1028,7 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working) myPushDocument(_inv); } - DataStoreBase::MemStats beforeStats = getFeatureStoreMemStats(_fic); + auto beforeStats = getFeatureStoreMemStats(_fic); LOG(info, "Before feature compaction: allocElems=%zu, usedElems=%zu" ", deadElems=%zu, holdElems=%zu" @@ -1049,7 +1048,7 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working) (fieldIndex->takeGenerationGuard())); } myCommit(_fic, *_pushThreads); - DataStoreBase::MemStats duringStats = getFeatureStoreMemStats(_fic); + auto duringStats = getFeatureStoreMemStats(_fic); LOG(info, "During feature compaction: allocElems=%zu, usedElems=%zu" ", deadElems=%zu, holdElems=%zu" @@ -1064,7 +1063,7 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working) duringStats._holdBuffers); guards.clear(); myCommit(_fic, *_pushThreads); - DataStoreBase::MemStats afterStats = getFeatureStoreMemStats(_fic); + auto afterStats = getFeatureStoreMemStats(_fic); LOG(info, "After feature compaction: allocElems=%zu, usedElems=%zu" ", deadElems=%zu, holdElems=%zu" diff --git a/searchlib/src/vespa/searchlib/memoryindex/feature_store.h b/searchlib/src/vespa/searchlib/memoryindex/feature_store.h index 35a9ebcaa53..adeeba4d06e 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/feature_store.h +++ b/searchlib/src/vespa/searchlib/memoryindex/feature_store.h @@ -210,7 +210,7 @@ public: void clearHoldLists() { _store.clearHoldLists();} std::unique_ptr<vespalib::datastore::CompactingBuffers> start_compact(); vespalib::MemoryUsage getMemoryUsage() const { return _store.getMemoryUsage(); } - vespalib::datastore::DataStoreBase::MemStats getMemStats() const { return _store.getMemStats(); } + vespalib::datastore::MemoryStats getMemStats() const { return _store.getMemStats(); } }; } diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.cpp index fa3b1486c84..fba1d494690 100644 --- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.cpp @@ -41,7 +41,7 @@ DirectTensorStore::add_entry(TensorSP tensor) { auto ref = _tensor_store.addEntry(tensor); auto& state = _tensor_store.getBufferState(RefType(ref).bufferId()); - state.incExtraUsedBytes(tensor->get_memory_usage().allocatedBytes()); + state.stats().inc_extra_used_bytes(tensor->get_memory_usage().allocatedBytes()); return ref; } diff --git a/searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp b/searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp index b4fddec25b3..e8752a3145a 100644 --- a/searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp @@ -196,7 +196,7 @@ StreamedValueStore::add_entry(TensorEntry::SP tensor) { auto ref = _concrete_store.addEntry(tensor); auto& state = _concrete_store.getBufferState(RefType(ref).bufferId()); - state.incExtraUsedBytes(tensor->get_memory_usage().allocatedBytes()); + state.stats().inc_extra_used_bytes(tensor->get_memory_usage().allocatedBytes()); return ref; } |