Merge pull request #31061 from vespa-engine/toregge/expose-imported-attributes-in-metrics

Expose imported attributes in metrics.

1 files changed, 13 insertions, 0 deletions

diff --git a/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp b/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp
index d51ec22a54a..1d66eefaff7 100644
--- a/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp
+++ b/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp
@@ -3,6 +3,7 @@
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/searchlib/attribute/bitvector_search_cache.h>
 #include <vespa/searchlib/common/bitvector.h>
+#include <vespa/vespalib/util/memoryusage.h>
 
 using namespace search;
 using namespace search::attribute;
@@ -31,9 +32,13 @@ struct Fixture {
 TEST_F("require that bit vectors can be inserted and retrieved", Fixture)
 {
     EXPECT_EQUAL(0u, f.cache.size());
+    auto old_mem_usage = f.cache.get_memory_usage();
     f.cache.insert("foo", f.entry1);
     f.cache.insert("bar", f.entry2);
     EXPECT_EQUAL(2u, f.cache.size());
+    auto new_mem_usage = f.cache.get_memory_usage();
+    EXPECT_LESS(old_mem_usage.usedBytes(), new_mem_usage.usedBytes());
+    EXPECT_LESS(old_mem_usage.allocatedBytes(), new_mem_usage.allocatedBytes());
 
     EXPECT_EQUAL(f.entry1, f.cache.find("foo"));
     EXPECT_EQUAL(f.entry2, f.cache.find("bar"));
@@ -43,9 +48,13 @@ TEST_F("require that bit vectors can be inserted and retrieved", Fixture)
 TEST_F("require that insert() doesn't replace existing bit vector", Fixture)
 {
     f.cache.insert("foo", f.entry1);
+    auto old_mem_usage = f.cache.get_memory_usage();
     f.cache.insert("foo", f.entry2);
+    auto new_mem_usage = f.cache.get_memory_usage();
     EXPECT_EQUAL(1u, f.cache.size());
     EXPECT_EQUAL(f.entry1, f.cache.find("foo"));
+    EXPECT_EQUAL(old_mem_usage.usedBytes(), new_mem_usage.usedBytes());
+    EXPECT_EQUAL(old_mem_usage.allocatedBytes(), new_mem_usage.allocatedBytes());
 }
 
 TEST_F("require that cache can be cleared", Fixture)
@@ -53,11 +62,15 @@ TEST_F("require that cache can be cleared", Fixture)
     f.cache.insert("foo", f.entry1);
     f.cache.insert("bar", f.entry2);
     EXPECT_EQUAL(2u, f.cache.size());
+    auto old_mem_usage = f.cache.get_memory_usage();
     f.cache.clear();
+    auto new_mem_usage = f.cache.get_memory_usage();
 
     EXPECT_EQUAL(0u, f.cache.size());
     EXPECT_TRUE(f.cache.find("foo").get() == nullptr);
     EXPECT_TRUE(f.cache.find("bar").get() == nullptr);
+    EXPECT_GREATER(old_mem_usage.usedBytes(), new_mem_usage.usedBytes());
+    EXPECT_GREATER(old_mem_usage.allocatedBytes(), new_mem_usage.allocatedBytes());
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }