Use std::vector instead of vespalib::Array

3 files changed, 26 insertions, 24 deletions

diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp
index ff8641640a9..5e0392c7da5 100644
--- a/searchlib/src/tests/attribute/attribute_test.cpp
+++ b/searchlib/src/tests/attribute/attribute_test.cpp
@@ -907,7 +907,7 @@ AttributeTest::testSingle()
             AttributePtr ptr = createAttribute("sv-post-int32", cfg);
             ptr->updateStat(true);
             EXPECT_EQ(338972u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(101632u, ptr->getStatus().getUsed());
+            EXPECT_EQ(101512u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<IntegerAttribute, AttributeVector::largeint_t, int32_t>(ptr, values);
         }
@@ -929,7 +929,7 @@ AttributeTest::testSingle()
             AttributePtr ptr = createAttribute("sv-post-float", cfg);
             ptr->updateStat(true);
             EXPECT_EQ(338972u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(101632u, ptr->getStatus().getUsed());
+            EXPECT_EQ(101512u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<FloatingPointAttribute, double, float>(ptr, values);
         }
@@ -942,7 +942,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(52844u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(52684u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<StringAttribute, string, string>(ptr, values);
         }
@@ -952,7 +952,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(104556u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(104300u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<StringAttribute, string, string>(ptr, values);
         }
@@ -1083,8 +1083,8 @@ AttributeTest::testArray()
         {
             AttributePtr ptr = createAttribute("a-int32", Config(BasicType::INT32, CollectionType::ARRAY));
             ptr->updateStat(true);
-            EXPECT_EQ(297952u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(256092u, ptr->getStatus().getUsed());
+            EXPECT_EQ(293856u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(253668u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1093,8 +1093,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("flags", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(297952u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(256092u, ptr->getStatus().getUsed());
+            EXPECT_EQ(293856u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(253668u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1103,8 +1103,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("a-fs-int32", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(654588u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(357744u, ptr->getStatus().getUsed());
+            EXPECT_EQ(650492u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(355200u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1122,8 +1122,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("a-fs-float", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(654588u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(357744u, ptr->getStatus().getUsed());
+            EXPECT_EQ(650492u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(355200u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<FloatingPointAttribute, double>(ptr, values);
         }
@@ -1134,8 +1134,8 @@ AttributeTest::testArray()
         {
             AttributePtr ptr = createAttribute("a-string", Config(BasicType::STRING, CollectionType::ARRAY));
             ptr->updateStat(true);
-            EXPECT_EQ(410256u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(308936u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(406160u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
+            EXPECT_EQ(306352u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<StringAttribute, string>(ptr, values);
         }
@@ -1144,8 +1144,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("afs-string", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(660464u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(360668u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(656368u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
+            EXPECT_EQ(357988u + 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 1b51ba90f7c..7bd82ffdcad 100644
--- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
@@ -469,7 +469,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 = 150804u;
+    constexpr size_t BASE_USED = 150676u;
     {
         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 0e77a1be878..3d479a6d39a 100644
--- a/searchlib/src/tests/predicate/document_features_store_test.cpp
+++ b/searchlib/src/tests/predicate/document_features_store_test.cpp
@@ -175,18 +175,19 @@ TEST("require that both features and ranges are removed by 'remove'") {
 }
 
 TEST("require that both features and ranges counts towards memory usage") {
+    constexpr size_t BASE_USED = 557152u;
     DocumentFeaturesStore features_store(10);
-    EXPECT_EQUAL(562024u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(BASE_USED, features_store.getMemoryUsage().usedBytes());
 
     PredicateTreeAnnotations annotations;
     annotations.features.push_back(PredicateHash::hash64("foo=100-199"));
     features_store.insert(annotations, doc_id);
-    EXPECT_EQUAL(562376u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(BASE_USED + 352u, features_store.getMemoryUsage().usedBytes());
 
     annotations.features.clear();
     annotations.range_features.push_back({"foo", 100, 199});
     features_store.insert(annotations, doc_id + 1);
-    EXPECT_EQUAL(562480u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(BASE_USED + 456u, features_store.getMemoryUsage().usedBytes());
 }
 
 TEST("require that DocumentFeaturesStore can be serialized") {
@@ -212,21 +213,22 @@ TEST("require that DocumentFeaturesStore can be serialized") {
 }
 
 TEST("require that serialization cleans up wordstore") {
+    constexpr size_t BASE_USED = 557592u;
     DocumentFeaturesStore features_store(10);
     PredicateTreeAnnotations annotations;
     annotations.range_features.push_back({"foo", 100, 199});
     features_store.insert(annotations, doc_id);
-    EXPECT_EQUAL(562464u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(BASE_USED, features_store.getMemoryUsage().usedBytes());
     annotations.range_features.push_back({"bar", 100, 199});
     features_store.insert(annotations, doc_id + 1);
-    EXPECT_EQUAL(562524u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(BASE_USED +60u, features_store.getMemoryUsage().usedBytes());
     features_store.remove(doc_id + 1);
-    EXPECT_EQUAL(562524u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(BASE_USED + 60u, features_store.getMemoryUsage().usedBytes());
 
     vespalib::DataBuffer buffer;
     save_document_features_store(features_store, buffer);
     DocumentFeaturesStore features_store2(buffer);
-    EXPECT_EQUAL(562464u, features_store2.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(BASE_USED, features_store2.getMemoryUsage().usedBytes());
 }