Merge pull request #14635 from vespa-engine/toregge/limit-memory-stats-used-for-reference-attribute-compaction

Ignore unique store dictionary memory usage when deciding if compaction is needed

2 files changed, 4 insertions, 2 deletions

diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store.h b/vespalib/src/vespa/vespalib/datastore/unique_store.h
index a47792de402..0a1593f3db3 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store.h
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store.h
@@ -56,6 +56,8 @@ public:
     void remove(EntryRef ref);
     std::unique_ptr<Remapper> compact_worst(bool compact_memory, bool compact_address_space);
     vespalib::MemoryUsage getMemoryUsage() const;
+    vespalib::MemoryUsage get_values_memory_usage() const { return _store.getMemoryUsage(); }
+    vespalib::MemoryUsage get_dictionary_memory_usage() const { return _dict->get_memory_usage(); }
     vespalib::AddressSpace get_address_space_usage() const;
 
     // TODO: Consider exposing only the needed functions from allocator
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
index 8b9525f5ad7..a87ec245308 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store.hpp
@@ -176,8 +176,8 @@ template <typename EntryT, typename RefT, typename Compare, typename Allocator>
 vespalib::MemoryUsage
 UniqueStore<EntryT, RefT, Compare, Allocator>::getMemoryUsage() const
 {
-    vespalib::MemoryUsage usage = _store.getMemoryUsage();
-    usage.merge(_dict->get_memory_usage());
+    vespalib::MemoryUsage usage = get_values_memory_usage();
+    usage.merge(get_dictionary_memory_usage());
     return usage;
 }