Count more of the memory used by the document metastore.

2 files changed, 6 insertions, 5 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
index 8dc2551d96b..c9f3a1c1de8 100644
--- a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
@@ -11,6 +11,7 @@
 #include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/documentmetastore/documentmetastorecontext.h>
+#include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
 #include <vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h>
 #include <vespa/searchcore/proton/initializer/initializer_task.h>
 #include <vespa/searchcore/proton/initializer/task_runner.h>
@@ -240,7 +241,7 @@ struct ParallelAttributeManager
 {
     InitializerTask::SP documentMetaStoreInitTask;
     std::shared_ptr<bucketdb::BucketDBOwner> bucketDbOwner;
-    DocumentMetaStore::SP documentMetaStore;
+    std::shared_ptr<DocumentMetaStore> documentMetaStore;
     AllocStrategy        alloc_strategy;
     bool fastAccessAttributesOnly;
     std::shared_ptr<AttributeManager::SP> mgr;
diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp
index 2e217a3f6a8..8185f8a30be 100644
--- a/searchcore/src/tests/proton/server/documentretriever_test.cpp
+++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp
@@ -101,6 +101,7 @@ using vespalib::eval::SimpleValue;
 using vespalib::eval::TensorSpec;
 using vespalib::eval::ValueType;
 using vespalib::eval::Value;
+using proton::documentmetastore::IStore;
 using namespace document::config_builder;
 using namespace search::index;
 
@@ -296,7 +297,7 @@ struct Fixture {
     const GlobalId &gid;
     BucketId bucket_id;
     Timestamp timestamp;
-    DocumentMetaStore::DocId lid;
+    IStore::DocId lid;
     MyDocumentStore doc_store;
     search::AttributeManager attr_manager;
     Schema schema;
@@ -365,11 +366,10 @@ struct Fixture {
           _dtName(doc_type_name),
           _retriever()
     {
-        using Result = DocumentMetaStore::Result;
         meta_store.constructFreeList();
-        Result inspect = meta_store.get().inspect(gid, 0u);
+        IStore::Result inspect = meta_store.get().inspect(gid, 0u);
         uint32_t docSize = 1;
-        Result putRes(meta_store.get().put(gid, bucket_id, timestamp, docSize, inspect.getLid(), 0u));
+        IStore::Result putRes(meta_store.get().put(gid, bucket_id, timestamp, docSize, inspect.getLid(), 0u));
         meta_store.get().commit(search::CommitParam(0));
         lid = putRes.getLid();
         ASSERT_TRUE(putRes.ok());