diff options
| author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
|---|---|---|
| committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
| commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
| tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /eval/src/vespa/eval/eval/fast_value.hpp | |
| parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
| parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) | |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'eval/src/vespa/eval/eval/fast_value.hpp')
| -rw-r--r-- | eval/src/vespa/eval/eval/fast_value.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eval/src/vespa/eval/eval/fast_value.hpp b/eval/src/vespa/eval/eval/fast_value.hpp index 561b8ee8102..cc9eb663b76 100644 --- a/eval/src/vespa/eval/eval/fast_value.hpp +++ b/eval/src/vespa/eval/eval/fast_value.hpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "value_builder_factory.h" #include "fast_value_index.h" @@ -36,7 +36,7 @@ struct FastCells { size_t capacity; size_t size; mutable alloc::Alloc memory; - FastCells(size_t initial_capacity); + explicit FastCells(size_t initial_capacity); FastCells(const FastCells &) = delete; FastCells & operator = (const FastCells &) = delete; ~FastCells(); @@ -184,6 +184,7 @@ struct FastValue final : Value, ValueBuilder<T> { } MemoryUsage get_memory_usage() const override { MemoryUsage usage = self_memory_usage<FastValue<T,transient>>(); + usage.merge(vector_extra_memory_usage(my_type.dimensions())); usage.merge(vector_extra_memory_usage(get_view(my_handles))); usage.merge(my_index.map.estimate_extra_memory_usage()); usage.merge(my_cells.estimate_extra_memory_usage()); |