Remove array size from BufferFreeList.

3 files changed, 24 insertions, 24 deletions

diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp
index 4549291b80f..91666eb29fd 100644
--- a/searchlib/src/tests/attribute/attribute_test.cpp
+++ b/searchlib/src/tests/attribute/attribute_test.cpp
@@ -913,7 +913,7 @@ AttributeTest::testSingle()
             AttributePtr ptr = createAttribute("sv-post-int32", cfg);
             ptr->updateStat(true);
             EXPECT_EQ(338972u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(101612u, ptr->getStatus().getUsed());
+            EXPECT_EQ(101492u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<IntegerAttribute, AttributeVector::largeint_t, int32_t>(ptr, values);
         }
@@ -935,7 +935,7 @@ AttributeTest::testSingle()
             AttributePtr ptr = createAttribute("sv-post-float", cfg);
             ptr->updateStat(true);
             EXPECT_EQ(338972u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(101612u, ptr->getStatus().getUsed());
+            EXPECT_EQ(101492u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<FloatingPointAttribute, double, float>(ptr, values);
         }
@@ -948,7 +948,7 @@ AttributeTest::testSingle()
             AttributePtr ptr = createAttribute("sv-string", Config(BasicType::STRING, CollectionType::SINGLE));
             ptr->updateStat(true);
             EXPECT_EQ(116528u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(52920u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(52760u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<StringAttribute, string, string>(ptr, values);
         }
@@ -958,7 +958,7 @@ AttributeTest::testSingle()
             AttributePtr ptr = createAttribute("sv-fs-string", cfg);
             ptr->updateStat(true);
             EXPECT_EQ(344848u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(104664u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(104408u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<StringAttribute, string, string>(ptr, values);
         }
@@ -1089,8 +1089,8 @@ AttributeTest::testArray()
         {
             AttributePtr ptr = createAttribute("a-int32", Config(BasicType::INT32, CollectionType::ARRAY));
             ptr->updateStat(true);
-            EXPECT_EQ(495672u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(487944u, ptr->getStatus().getUsed());
+            EXPECT_EQ(487480u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(479720u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1099,8 +1099,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("flags", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(495672u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(487944u, ptr->getStatus().getUsed());
+            EXPECT_EQ(487480u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(479720u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1109,8 +1109,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("a-fs-int32", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(852308u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(589576u, ptr->getStatus().getUsed());
+            EXPECT_EQ(844116u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(581232u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1128,8 +1128,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("a-fs-float", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(852308u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(589576u, ptr->getStatus().getUsed());
+            EXPECT_EQ(844116u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(581232u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<FloatingPointAttribute, double>(ptr, values);
         }
@@ -1140,8 +1140,8 @@ AttributeTest::testArray()
         {
             AttributePtr ptr = createAttribute("a-string", Config(BasicType::STRING, CollectionType::ARRAY));
             ptr->updateStat(true);
-            EXPECT_EQ(607976u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(540864u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(599784u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
+            EXPECT_EQ(532480u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<StringAttribute, string>(ptr, values);
         }
@@ -1150,8 +1150,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("afs-string", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(858184u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(592628u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(849992u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
+            EXPECT_EQ(584148u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<StringAttribute, string>(ptr, values);
         }
diff --git a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
index 388b708f9aa..e3b9cf9702d 100644
--- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
@@ -463,7 +463,7 @@ TEST(MemoryIndexTest, require_that_num_docs_and_doc_id_limit_is_returned)
 TEST(MemoryIndexTest, require_that_we_understand_the_memory_footprint)
 {
     constexpr size_t BASE_ALLOCATED = 360936u;
-    constexpr size_t BASE_USED = 150932u;
+    constexpr size_t BASE_USED = 150804u;
     {
         MySetup setup;
         Index index(setup);
diff --git a/searchlib/src/tests/predicate/document_features_store_test.cpp b/searchlib/src/tests/predicate/document_features_store_test.cpp
index ee247f8c74e..d30df9dba6e 100644
--- a/searchlib/src/tests/predicate/document_features_store_test.cpp
+++ b/searchlib/src/tests/predicate/document_features_store_test.cpp
@@ -165,17 +165,17 @@ TEST("require that both features and ranges are removed by 'remove'") {
 
 TEST("require that both features and ranges counts towards memory usage") {
     DocumentFeaturesStore features_store(10);
-    EXPECT_EQUAL(50088u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50064u, features_store.getMemoryUsage().usedBytes());
 
     PredicateTreeAnnotations annotations;
     annotations.features.push_back(PredicateHash::hash64("foo=100-199"));
     features_store.insert(annotations, doc_id);
-    EXPECT_EQUAL(50096u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50072u, features_store.getMemoryUsage().usedBytes());
 
     annotations.features.clear();
     annotations.range_features.push_back({"foo", 100, 199});
     features_store.insert(annotations, doc_id + 1);
-    EXPECT_EQUAL(50192u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50168u, features_store.getMemoryUsage().usedBytes());
 }
 
 TEST("require that DocumentFeaturesStore can be serialized") {
@@ -205,17 +205,17 @@ TEST("require that serialization cleans up wordstore") {
     PredicateTreeAnnotations annotations;
     annotations.range_features.push_back({"foo", 100, 199});
     features_store.insert(annotations, doc_id);
-    EXPECT_EQUAL(50184u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50160u, features_store.getMemoryUsage().usedBytes());
     annotations.range_features.push_back({"bar", 100, 199});
     features_store.insert(annotations, doc_id + 1);
-    EXPECT_EQUAL(50572u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50548u, features_store.getMemoryUsage().usedBytes());
     features_store.remove(doc_id + 1);
-    EXPECT_EQUAL(50524u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50500u, features_store.getMemoryUsage().usedBytes());
 
     vespalib::DataBuffer buffer;
     features_store.serialize(buffer);
     DocumentFeaturesStore features_store2(buffer);
-    EXPECT_EQUAL(50184u, features_store2.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50160u, features_store2.getMemoryUsage().usedBytes());
 }