Merge pull request #14072 from vespa-engine/balder/avoid-unnecessary-copy

There is no need to copy the document type as it has a longer lifetim…

3 files changed, 7 insertions, 7 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp b/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
index 031dd4f35e7..952c359b716 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
@@ -261,6 +261,7 @@ DocumentRetriever::getPartialDocument(search::DocumentIdT lid, const document::D
             case FieldSet::Type::DOCID:
                 break;
         }
+        doc->setRepo(getDocumentTypeRepo());
     }
     return doc;
 }
diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h
index 84e195fdff2..fcc08030764 100644
--- a/storage/src/vespa/storage/distributor/distributor.h
+++ b/storage/src/vespa/storage/distributor/distributor.h
@@ -25,11 +25,11 @@
 #include <unordered_map>
 
 namespace storage {
+    struct DoneInitializeHandler;
+    class HostInfo;
+}
 
-struct DoneInitializeHandler;
-class HostInfo;
-
-namespace distributor {
+namespace storage::distributor {
 
 class DistributorBucketSpaceRepo;
 class SimpleMaintenanceScanner;
@@ -342,5 +342,4 @@ private:
     bool _must_send_updated_host_info;
 };
 
-} // distributor
-} // storage
+}
diff --git a/storage/src/vespa/storage/persistence/fieldvisitor.h b/storage/src/vespa/storage/persistence/fieldvisitor.h
index 99558fe6e9c..688874742a6 100644
--- a/storage/src/vespa/storage/persistence/fieldvisitor.h
+++ b/storage/src/vespa/storage/persistence/fieldvisitor.h
@@ -15,7 +15,7 @@ namespace storage {
 
 class FieldVisitor : public document::select::Visitor {
 private:
-    document::DocumentType _docType;
+    const document::DocumentType & _docType;
     document::Field::Set::Builder _fields;
     
 public: