Reduce code visibility

9 files changed, 32 insertions, 18 deletions

diff --git a/searchlib/src/tests/docstore/document_store/document_store_test.cpp b/searchlib/src/tests/docstore/document_store/document_store_test.cpp
index 2ab24a00557..0ef04d0e722 100644
--- a/searchlib/src/tests/docstore/document_store/document_store_test.cpp
+++ b/searchlib/src/tests/docstore/document_store/document_store_test.cpp
@@ -3,6 +3,7 @@
 #include <vespa/searchlib/docstore/logdocumentstore.h>
 #include <vespa/searchlib/docstore/cachestats.h>
 #include <vespa/document/repo/documenttyperepo.h>
+#include <vespa/document/fieldvalue/document.h>
 
 using namespace search;
 using CompressionConfig = vespalib::compression::CompressionConfig;
diff --git a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
index ac645998198..0a3c3788c98 100644
--- a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
+++ b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
@@ -9,6 +9,7 @@
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/repo/configbuilder.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
index ed99003c2f7..a22c44e843c 100644
--- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
+++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp
@@ -4,6 +4,7 @@
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/datatype/documenttype.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/searchlib/docstore/chunkformats.h>
 #include <vespa/searchlib/docstore/logdocumentstore.h>
 #include <vespa/searchlib/docstore/storebybucket.h>
diff --git a/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h b/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h
index 4c8e8a19456..ba28bec3604 100644
--- a/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h
+++ b/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h
@@ -2,8 +2,10 @@
 
 #pragma once
 
-namespace search {
-namespace common {
+#include <cstdint>
+#include <cstddef>
+
+namespace search::common {
 
 /**
  * Interface for a component that has a lid space that can be compacted and shrunk.
@@ -34,5 +36,3 @@ struct ICompactableLidSpace {
 };
 
 }
-}
-
diff --git a/searchlib/src/vespa/searchlib/docstore/documentstore.cpp b/searchlib/src/vespa/searchlib/docstore/documentstore.cpp
index 9b88383bbf1..59e92b112fa 100644
--- a/searchlib/src/vespa/searchlib/docstore/documentstore.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/documentstore.cpp
@@ -4,6 +4,7 @@
 #include "documentstore.h"
 #include "visitcache.h"
 #include "ibucketizer.h"
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/vespalib/stllike/cache.hpp>
 #include <vespa/vespalib/data/databuffer.h>
 #include <vespa/vespalib/util/compressor.h>
diff --git a/searchlib/src/vespa/searchlib/docstore/documentstore.h b/searchlib/src/vespa/searchlib/docstore/documentstore.h
index e6e4364e6ab..08b042d99c5 100644
--- a/searchlib/src/vespa/searchlib/docstore/documentstore.h
+++ b/searchlib/src/vespa/searchlib/docstore/documentstore.h
@@ -3,7 +3,8 @@
 #pragma once
 
 #include "idocumentstore.h"
-#include "idatastore.h"
+#include <vespa/vespalib/util/compressionconfig.h>
+
 
 namespace search {
 
@@ -62,7 +63,7 @@ public:
     DocumentStore(const Config & config, IDataStore & store);
     ~DocumentStore();
 
-    document::Document::UP read(DocumentIdT lid, const document::DocumentTypeRepo &repo) const override;
+    DocumentUP read(DocumentIdT lid, const document::DocumentTypeRepo &repo) const override;
     void visit(const LidVector & lids, const document::DocumentTypeRepo &repo, IDocumentVisitor & visitor) const override;
     void write(uint64_t synkToken, DocumentIdT lid, const document::Document& doc) override;
     void write(uint64_t synkToken, DocumentIdT lid, const vespalib::nbostream & os) override;
diff --git a/searchlib/src/vespa/searchlib/docstore/idocumentstore.cpp b/searchlib/src/vespa/searchlib/docstore/idocumentstore.cpp
index a17f376d911..44708d11539 100644
--- a/searchlib/src/vespa/searchlib/docstore/idocumentstore.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/idocumentstore.cpp
@@ -1,16 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "idocumentstore.h"
+#include <vespa/document/fieldvalue/document.h>
 
 namespace search {
 
-IDocumentStore::IDocumentStore()
-{
-}
+IDocumentStore::IDocumentStore() = default;
 
-IDocumentStore::~IDocumentStore()
-{
-}
+IDocumentStore::~IDocumentStore() = default;
 
 void IDocumentStore::visit(const LidVector & lids, const document::DocumentTypeRepo &repo, IDocumentVisitor & visitor) const {
     for (uint32_t lid : lids) {
diff --git a/searchlib/src/vespa/searchlib/docstore/idocumentstore.h b/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
index a7302c9c1a5..d4827366619 100644
--- a/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
+++ b/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
@@ -2,12 +2,18 @@
 
 #pragma once
 
-#include <vespa/document/fieldvalue/document.h>
+#include "idatastore.h"
 #include <vespa/searchlib/common/i_compactable_lid_space.h>
-#include <vespa/searchlib/docstore/idatastore.h>
 #include <vespa/searchlib/query/base.h>
 #include <future>
 
+namespace document {
+    class Document;
+    class DocumentTypeRepo;
+}
+
+namespace vespalib { class nbostream; }
+
 namespace search {
 
 class CacheStats;
@@ -15,16 +21,18 @@ class CacheStats;
 class IDocumentStoreReadVisitor
 {
 public:
+    using DocumentSP = std::shared_ptr<document::Document>;
     virtual ~IDocumentStoreReadVisitor() { }
-    virtual void visit(uint32_t lid, const std::shared_ptr<document::Document> &doc) = 0;
+    virtual void visit(uint32_t lid, const DocumentSP &doc) = 0;
     virtual void visit(uint32_t lid) = 0;
 };
 
 class IDocumentStoreRewriteVisitor
 {
 public:
+    using DocumentSP = std::shared_ptr<document::Document>;
     virtual ~IDocumentStoreRewriteVisitor() { }
-    virtual void visit(uint32_t lid, const std::shared_ptr<document::Document> &doc) = 0;
+    virtual void visit(uint32_t lid, const DocumentSP &doc) = 0;
 };
 
 class IDocumentStoreVisitorProgress
@@ -38,8 +46,9 @@ public:
 class IDocumentVisitor
 {
 public:
+    using DocumentUP = std::unique_ptr<document::Document>;
     virtual ~IDocumentVisitor() { }
-    virtual void visit(uint32_t lid, document::Document::UP doc) = 0;
+    virtual void visit(uint32_t lid, DocumentUP doc) = 0;
     virtual bool allowVisitCaching() const = 0;
 private:
 };
@@ -57,6 +66,7 @@ public:
      **/
     using SP = std::shared_ptr<IDocumentStore>;
     using LidVector = std::vector<uint32_t>;
+    using DocumentUP = std::unique_ptr<document::Document>;
 
 
     /**
@@ -74,7 +84,7 @@ public:
      * @param lid The local ID associated with the document.
      * @return NULL if there is no document associated with the lid.
      **/
-    virtual document::Document::UP read(DocumentIdT lid, const document::DocumentTypeRepo &repo) const = 0;
+    virtual DocumentUP read(DocumentIdT lid, const document::DocumentTypeRepo &repo) const = 0;
     virtual void visit(const LidVector & lidVector, const document::DocumentTypeRepo &repo, IDocumentVisitor & visitor) const;
 
     /**
diff --git a/searchlib/src/vespa/searchlib/docstore/visitcache.h b/searchlib/src/vespa/searchlib/docstore/visitcache.h
index 5070f645557..eb035ac2a2c 100644
--- a/searchlib/src/vespa/searchlib/docstore/visitcache.h
+++ b/searchlib/src/vespa/searchlib/docstore/visitcache.h
@@ -8,6 +8,8 @@
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <vespa/vespalib/util/alloc.h>
+#include <vespa/vespalib/util/memory.h>
+#include <vespa/vespalib/util/compressionconfig.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/document/util/bytebuffer.h>