Revert "Balder/use an actual fieldset repo"

24 files changed, 197 insertions, 151 deletions

diff --git a/storage/src/tests/common/teststorageapp.cpp b/storage/src/tests/common/teststorageapp.cpp
index 1847de0e84f..9fcf1049e1b 100644
--- a/storage/src/tests/common/teststorageapp.cpp
+++ b/storage/src/tests/common/teststorageapp.cpp
@@ -171,17 +171,19 @@ TestServiceLayerApp::TestServiceLayerApp(DiskCount dc, NodeIndex index,
     assert(dc > 0);
 }
 
-TestServiceLayerApp::~TestServiceLayerApp() = default;
+TestServiceLayerApp::~TestServiceLayerApp() {}
 
 void
 TestServiceLayerApp::setupDummyPersistence()
 {
-    auto provider = std::make_unique<spi::dummy::DummyPersistence>(getTypeRepo(), _compReg.getDiskCount());
+    spi::PersistenceProvider::UP provider(new spi::dummy::DummyPersistence(
+            getTypeRepo(), _compReg.getDiskCount()));
     setPersistenceProvider(std::move(provider));
 }
 
 void
-TestServiceLayerApp::setPersistenceProvider(PersistenceProviderUP provider)
+TestServiceLayerApp::setPersistenceProvider(
+        spi::PersistenceProvider::UP provider)
 {
     _partitions = provider->getPartitionStates().getList();
     assert(spi::PartitionId(_compReg.getDiskCount()) == _partitions.size());
diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h
index 218e7352f04..e567206c371 100644
--- a/storage/src/tests/common/teststorageapp.h
+++ b/storage/src/tests/common/teststorageapp.h
@@ -107,9 +107,8 @@ private:
 
 class TestServiceLayerApp : public TestStorageApp
 {
-    using PersistenceProviderUP = std::unique_ptr<spi::PersistenceProvider>;
     ServiceLayerComponentRegisterImpl& _compReg;
-    PersistenceProviderUP _persistenceProvider;
+    spi::PersistenceProvider::UP _persistenceProvider;
     spi::PartitionStateList _partitions;
 
 public:
@@ -119,7 +118,7 @@ public:
     ~TestServiceLayerApp();
 
     void setupDummyPersistence();
-    void setPersistenceProvider(PersistenceProviderUP);
+    void setPersistenceProvider(spi::PersistenceProvider::UP);
 
     ServiceLayerComponentRegisterImpl& getComponentRegister() { return _compReg; }
 
diff --git a/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp
index 67a1c41a9ef..dd9ce6e6cba 100644
--- a/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp
+++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp
@@ -147,9 +147,11 @@ PersistenceProviderWrapper::get(const spi::Bucket& bucket,
 }
 
 spi::CreateIteratorResult
-PersistenceProviderWrapper::createIterator(const spi::Bucket &bucket, FieldSetSP fields, const spi::Selection &sel,
+PersistenceProviderWrapper::createIterator(const spi::Bucket& bucket,
+                                           const document::FieldSet& fields,
+                                           const spi::Selection& sel,
                                            spi::IncludedVersions versions,
-                                           spi::Context &context)
+                                           spi::Context& context)
 {
     // TODO: proper printing of FieldSet and Selection
 
diff --git a/storage/src/tests/persistence/common/persistenceproviderwrapper.h b/storage/src/tests/persistence/common/persistenceproviderwrapper.h
index 75712750d68..21e5d8016aa 100644
--- a/storage/src/tests/persistence/common/persistenceproviderwrapper.h
+++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.h
@@ -100,9 +100,8 @@ public:
     spi::UpdateResult update(const spi::Bucket&, spi::Timestamp, spi::DocumentUpdateSP, spi::Context&) override;
     spi::GetResult get(const spi::Bucket&, const document::FieldSet&, const spi::DocumentId&, spi::Context&) const override;
 
-    spi::CreateIteratorResult
-    createIterator(const spi::Bucket &bucket, FieldSetSP, const spi::Selection &, spi::IncludedVersions versions,
-                   spi::Context &context) override;
+    spi::CreateIteratorResult createIterator(const spi::Bucket&, const document::FieldSet&, const spi::Selection&,
+                                             spi::IncludedVersions versions, spi::Context&) override;
 
     spi::IterateResult iterate(spi::IteratorId, uint64_t maxByteSize, spi::Context&) const override;
     spi::Result destroyIterator(spi::IteratorId, spi::Context&) override;
diff --git a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
index c73ae7e506c..d9582cec585 100644
--- a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp
@@ -15,7 +15,9 @@ namespace storage {
 struct MergeBlockingTest : public FileStorTestFixture {
     void setupDisks() {
         FileStorTestFixture::setupPersistenceThreads(1);
-        _node->setPersistenceProvider(std::make_unique<spi::dummy::DummyPersistence>(_node->getTypeRepo(), 1));
+        _node->setPersistenceProvider(
+                spi::PersistenceProvider::UP(
+                        new spi::dummy::DummyPersistence(_node->getTypeRepo(), 1)));
     }
 
     void SetUp() override;
diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
index 7810a595012..93c484368de 100644
--- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
@@ -77,19 +77,18 @@ spi::LoadType defaultLoadType(0, "default");
 }
 
 struct OperationAbortingTest : FileStorTestFixture {
-    std::unique_ptr<spi::dummy::DummyPersistence> _dummyProvider;
-    BlockingMockProvider * _blockingProvider;
+    spi::PersistenceProvider::UP _dummyProvider;
+    BlockingMockProvider* _blockingProvider;
     std::unique_ptr<vespalib::Barrier> _queueBarrier;
     std::unique_ptr<vespalib::Barrier> _completionBarrier;
 
     void setupProviderAndBarriers(uint32_t queueBarrierThreads) {
         FileStorTestFixture::setupPersistenceThreads(1);
-        _dummyProvider = std::make_unique<spi::dummy::DummyPersistence>(_node->getTypeRepo(), 1);
-        _queueBarrier = std::make_unique<vespalib::Barrier>(queueBarrierThreads);
-        _completionBarrier = std::make_unique<vespalib::Barrier>(2);
-        auto blockingProvider = std::make_unique<BlockingMockProvider>(*_dummyProvider, *_queueBarrier, *_completionBarrier);
-        _blockingProvider = blockingProvider.get();
-        _node->setPersistenceProvider(std::move(blockingProvider));
+        _dummyProvider.reset(new spi::dummy::DummyPersistence(_node->getTypeRepo(), 1));
+        _queueBarrier.reset(new vespalib::Barrier(queueBarrierThreads));
+        _completionBarrier.reset(new vespalib::Barrier(2));
+        _blockingProvider = new BlockingMockProvider(*_dummyProvider, *_queueBarrier, *_completionBarrier);
+        _node->setPersistenceProvider(spi::PersistenceProvider::UP(_blockingProvider));
     }
 
     void validateReplies(DummyStorageLink& link, size_t repliesTotal,
diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp
index f50fbb0c8e8..504767e68c7 100644
--- a/storage/src/tests/persistence/persistencetestutils.cpp
+++ b/storage/src/tests/persistence/persistencetestutils.cpp
@@ -231,9 +231,9 @@ PersistenceTestUtils::doGetOnDisk(
 document::DocumentUpdate::SP
 PersistenceTestUtils::createBodyUpdate(const document::DocumentId& docId, const document::FieldValue& updateValue)
 {
-    const DocumentType* docType(getTypeRepo()->getDocumentType("testdoctype1"));
-    auto update = std::make_shared<document::DocumentUpdate>(*getTypeRepo(), *docType, docId);
-    auto assignUpdate = std::make_shared<document::AssignValueUpdate>(updateValue);
+    const DocumentType* docType(_env->_component.getTypeRepo()->getDocumentType("testdoctype1"));
+    document::DocumentUpdate::SP update(new document::DocumentUpdate(*_env->_component.getTypeRepo(), *docType, docId));
+    std::shared_ptr<document::AssignValueUpdate> assignUpdate(new document::AssignValueUpdate(updateValue));
     document::FieldUpdate fieldUpdate(docType->getField("content"));
     fieldUpdate.addUpdate(*assignUpdate);
     update->addUpdate(fieldUpdate);
@@ -243,9 +243,9 @@ PersistenceTestUtils::createBodyUpdate(const document::DocumentId& docId, const
 document::DocumentUpdate::SP
 PersistenceTestUtils::createHeaderUpdate(const document::DocumentId& docId, const document::FieldValue& updateValue)
 {
-    const DocumentType* docType(getTypeRepo()->getDocumentType("testdoctype1"));
-    auto update = std::make_shared<document::DocumentUpdate>(*getTypeRepo(), *docType, docId);
-    auto assignUpdate = std::make_shared<document::AssignValueUpdate>(updateValue);
+    const DocumentType* docType(_env->_component.getTypeRepo()->getDocumentType("testdoctype1"));
+    document::DocumentUpdate::SP update(new document::DocumentUpdate(*_env->_component.getTypeRepo(), *docType, docId));
+    std::shared_ptr<document::AssignValueUpdate> assignUpdate(new document::AssignValueUpdate(updateValue));
     document::FieldUpdate fieldUpdate(docType->getField("headerval"));
     fieldUpdate.addUpdate(*assignUpdate);
     update->addUpdate(fieldUpdate);
@@ -253,7 +253,8 @@ PersistenceTestUtils::createHeaderUpdate(const document::DocumentId& docId, cons
 }
 
 uint16_t
-PersistenceTestUtils::getDiskFromBucketDatabaseIfUnset(const document::Bucket& bucket, uint16_t disk)
+PersistenceTestUtils::getDiskFromBucketDatabaseIfUnset(const document::Bucket& bucket,
+                                                       uint16_t disk)
 {
     if (disk == 0xffff) {
         StorBucketDatabase::WrappedEntry entry(
@@ -341,7 +342,7 @@ PersistenceTestUtils::clearBody(document::Document& doc)
     //doc->getBody().clear();
     vespalib::nbostream stream;
     doc.serializeHeader(stream);
-    doc.deserialize(*getTypeRepo(), stream);
+    doc.deserialize(*_env->_component.getTypeRepo(), stream);
 }
 
 document::Document::UP
diff --git a/storage/src/tests/persistence/persistencetestutils.h b/storage/src/tests/persistence/persistencetestutils.h
index 3d25a205017..6cee3b79ab8 100644
--- a/storage/src/tests/persistence/persistencetestutils.h
+++ b/storage/src/tests/persistence/persistencetestutils.h
@@ -101,7 +101,7 @@ public:
     FileStorHandler& fsHandler() { return *_env->_handler; }
     FileStorMetrics& metrics() { return _env->_metrics; }
     MessageKeeper& messageKeeper() { return _env->_messageKeeper; }
-    std::shared_ptr<const document::DocumentTypeRepo> getTypeRepo() { return _env->_component.getTypeRepo()->documentTypeRepo; }
+    std::shared_ptr<const document::DocumentTypeRepo> getTypeRepo() { return _env->_component.getTypeRepo(); }
     StorageComponent& getComponent() { return _env->_component; }
     TestServiceLayerApp& getNode() { return _env->_node; }
 
diff --git a/storage/src/vespa/storage/common/storagecomponent.cpp b/storage/src/vespa/storage/common/storagecomponent.cpp
index 3846fe3a9c0..21a4b8eea64 100644
--- a/storage/src/vespa/storage/common/storagecomponent.cpp
+++ b/storage/src/vespa/storage/common/storagecomponent.cpp
@@ -2,22 +2,17 @@
 
 #include "storagecomponent.h"
 #include <vespa/storage/storageserver/prioritymapper.h>
+
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vdslib/distribution/distribution.h>
-#include <vespa/document/fieldset/fieldsetrepo.h>
 
 namespace storage {
 
-StorageComponent::Repos::Repos(std::shared_ptr<const document::DocumentTypeRepo> repo)
-    : documentTypeRepo(std::move(repo)),
-      fieldSetRepo(std::make_shared<document::FieldSetRepo>(*documentTypeRepo))
-{}
-
-StorageComponent::Repos::~Repos() = default;
-
 // Defined in cpp file to allow unique pointers of unknown type in header.
-StorageComponent::~StorageComponent() = default;
+StorageComponent::~StorageComponent()
+{
+}
 
 void
 StorageComponent::setNodeInfo(vespalib::stringref clusterName,
@@ -31,11 +26,10 @@ StorageComponent::setNodeInfo(vespalib::stringref clusterName,
 }
 
 void
-StorageComponent::setDocumentTypeRepo(std::shared_ptr<const document::DocumentTypeRepo> docTypeRepo)
+StorageComponent::setDocumentTypeRepo(DocumentTypeRepoSP repo)
 {
-    auto repo = std::make_shared<Repos>(std::move(docTypeRepo));
     std::lock_guard guard(_lock);
-    _repos = std::move(repo);
+    _docTypeRepo = repo;
 }
 
 void
@@ -84,7 +78,7 @@ StorageComponent::StorageComponent(StorageComponentRegister& compReg,
       _clusterName(),
       _nodeType(nullptr),
       _index(0),
-      _repos(),
+      _docTypeRepo(),
       _loadTypes(),
       _priorityMapper(new PriorityMapper),
       _bucketIdFactory(),
@@ -122,11 +116,11 @@ StorageComponent::getPriority(const documentapi::LoadType& lt) const
     return _priorityMapper->getPriority(lt);
 }
 
-std::shared_ptr<StorageComponent::Repos>
+StorageComponent::DocumentTypeRepoSP
 StorageComponent::getTypeRepo() const
 {
     std::lock_guard guard(_lock);
-    return _repos;
+    return _docTypeRepo;
 }
 
 StorageComponent::LoadTypeSetSP
diff --git a/storage/src/vespa/storage/common/storagecomponent.h b/storage/src/vespa/storage/common/storagecomponent.h
index e0b1dc74d7f..821cd43f21d 100644
--- a/storage/src/vespa/storage/common/storagecomponent.h
+++ b/storage/src/vespa/storage/common/storagecomponent.h
@@ -42,7 +42,6 @@ namespace vespa::config::content::core::internal {
 }
 namespace document {
     class DocumentTypeRepo;
-    class FieldSetRepo;
 }
 namespace documentapi {
     class LoadType;
@@ -59,14 +58,9 @@ struct StorageComponentRegister;
 
 class StorageComponent : public framework::Component {
 public:
-    struct Repos {
-        explicit Repos(std::shared_ptr<const document::DocumentTypeRepo> repo);
-        ~Repos();
-        const std::shared_ptr<const document::DocumentTypeRepo> documentTypeRepo;
-        const std::shared_ptr<const document::FieldSetRepo> fieldSetRepo;
-    };
     using UP = std::unique_ptr<StorageComponent>;
     using PriorityConfig = vespa::config::content::core::internal::InternalStorPrioritymappingType;
+    using DocumentTypeRepoSP = std::shared_ptr<const document::DocumentTypeRepo>;
     using LoadTypeSetSP = std::shared_ptr<documentapi::LoadTypeSet>;
     using DistributionSP = std::shared_ptr<lib::Distribution>;
 
@@ -74,7 +68,9 @@ public:
      * Node type is supposed to be set immediately, and never be updated.
      * Thus it does not need to be threadsafe. Should never be used before set.
      */
-    void setNodeInfo(vespalib::stringref clusterName, const lib::NodeType& nodeType, uint16_t index);
+    void setNodeInfo(vespalib::stringref clusterName,
+                     const lib::NodeType& nodeType,
+                     uint16_t index);
 
     /**
      * Node state updater is supposed to be set immediately, and never be
@@ -82,14 +78,14 @@ public:
      * before set.
      */
     void setNodeStateUpdater(NodeStateUpdater& updater);
-    void setDocumentTypeRepo(std::shared_ptr<const document::DocumentTypeRepo>);
+    void setDocumentTypeRepo(DocumentTypeRepoSP);
     void setLoadTypes(LoadTypeSetSP);
     void setPriorityConfig(const PriorityConfig&);
     void setBucketIdFactory(const document::BucketIdFactory&);
     void setDistribution(DistributionSP);
 
     StorageComponent(StorageComponentRegister&, vespalib::stringref name);
-    ~StorageComponent() override;
+    virtual ~StorageComponent();
 
     vespalib::string getClusterName() const { return _clusterName; }
     const lib::NodeType& getNodeType() const { return *_nodeType; }
@@ -98,7 +94,7 @@ public:
 
     vespalib::string getIdentity() const;
 
-    std::shared_ptr<Repos> getTypeRepo() const;
+    DocumentTypeRepoSP getTypeRepo() const;
     LoadTypeSetSP getLoadTypes() const;
     const document::BucketIdFactory& getBucketIdFactory() const
         { return _bucketIdFactory; }
@@ -110,8 +106,7 @@ private:
     vespalib::string _clusterName;
     const lib::NodeType* _nodeType;
     uint16_t _index;
-    std::shared_ptr<Repos> _repos;
-    // TODO: move loadTypes and _distribution in to _repos so lock will only taken once and only copying one shared_ptr.
+    DocumentTypeRepoSP _docTypeRepo;
     LoadTypeSetSP _loadTypes;
     std::unique_ptr<PriorityMapper> _priorityMapper;
     document::BucketIdFactory _bucketIdFactory;
diff --git a/storage/src/vespa/storage/config/distributorconfiguration.cpp b/storage/src/vespa/storage/config/distributorconfiguration.cpp
index aa606cdc8b9..0c9988421a3 100644
--- a/storage/src/vespa/storage/config/distributorconfiguration.cpp
+++ b/storage/src/vespa/storage/config/distributorconfiguration.cpp
@@ -70,7 +70,7 @@ DistributorConfiguration::containsTimeStatement(const std::string& documentSelec
 {
     TimeVisitor visitor;
     try {
-        document::select::Parser parser(*_component.getTypeRepo()->documentTypeRepo, _component.getBucketIdFactory());
+        document::select::Parser parser(*_component.getTypeRepo(), _component.getBucketIdFactory());
 
         std::unique_ptr<document::select::Node> node = parser.parse(documentSelection);
         node->visit(visitor);
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp
index cfd8d7f1753..c74d4135556 100644
--- a/storage/src/vespa/storage/distributor/distributor.cpp
+++ b/storage/src/vespa/storage/distributor/distributor.cpp
@@ -108,7 +108,8 @@ Distributor::Distributor(DistributorComponentRegister& compReg,
       _must_send_updated_host_info(false)
 {
     _component.registerMetric(*_metrics);
-    _component.registerMetricUpdateHook(_metricUpdateHook, framework::SecondTime(0));
+    _component.registerMetricUpdateHook(_metricUpdateHook,
+                                        framework::SecondTime(0));
     _distributorStatusDelegate.registerStatusPage();
     _bucketDBStatusDelegate.registerStatusPage();
     hostInfoReporterRegistrar.registerReporter(&_hostInfoReporter);
diff --git a/storage/src/vespa/storage/distributor/operations/external/removelocationoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/removelocationoperation.cpp
index 4c762cf4c23..ca1b6f266d6 100644
--- a/storage/src/vespa/storage/distributor/operations/external/removelocationoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/removelocationoperation.cpp
@@ -38,7 +38,8 @@ RemoveLocationOperation::getBucketId(
         DistributorComponent& manager,
         const api::RemoveLocationCommand& cmd, document::BucketId& bid)
 {
-    document::select::Parser parser(*manager.getTypeRepo()->documentTypeRepo, manager.getBucketIdFactory());
+        std::shared_ptr<const document::DocumentTypeRepo> repo = manager.getTypeRepo();
+        document::select::Parser parser(*repo, manager.getBucketIdFactory());
 
     document::BucketSelector bucketSel(manager.getBucketIdFactory());
     std::unique_ptr<document::BucketSelector::BucketVector> exprResult
diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
index 3866ee4e6f7..41f452df801 100644
--- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
@@ -576,7 +576,7 @@ TwoPhaseUpdateOperation::processAndMatchTasCondition(DistributorMessageSender& s
         return true; // No condition; nothing to do here.
     }
 
-    document::select::Parser parser(*_manager.getTypeRepo()->documentTypeRepo, _manager.getBucketIdFactory());
+    document::select::Parser parser(*_manager.getTypeRepo(), _manager.getBucketIdFactory());
     std::unique_ptr<document::select::Node> selection;
     try {
          selection = parser.parse(_updateCmd->getCondition().getSelection());
diff --git a/storage/src/vespa/storage/persistence/bucketprocessor.cpp b/storage/src/vespa/storage/persistence/bucketprocessor.cpp
index ea09fcfc348..c88b08612d7 100644
--- a/storage/src/vespa/storage/persistence/bucketprocessor.cpp
+++ b/storage/src/vespa/storage/persistence/bucketprocessor.cpp
@@ -47,11 +47,11 @@ BucketProcessor::iterateAll(spi::PersistenceProvider& provider,
     spi::Selection sel
         = spi::Selection(spi::DocumentSelection(documentSelection));
     spi::CreateIteratorResult createIterResult(provider.createIterator(
-            bucket,
-            std::make_shared<document::AllFields>(),
-            sel,
-            versions,
-            context));
+                                                       bucket,
+                                                       document::AllFields(),
+                                                       sel,
+                                                       versions,
+                                                       context));
 
     if (createIterResult.getErrorCode() != spi::Result::ErrorType::NONE) {
         vespalib::asciistream ss;
diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp
index 612d4545a8a..70894858887 100644
--- a/storage/src/vespa/storage/persistence/mergehandler.cpp
+++ b/storage/src/vespa/storage/persistence/mergehandler.cpp
@@ -1,5 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+
 #include "mergehandler.h"
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vdslib/distribution/distribution.h>
@@ -13,14 +14,17 @@ LOG_SETUP(".persistence.mergehandler");
 
 namespace storage {
 
-MergeHandler::MergeHandler(spi::PersistenceProvider& spi, PersistenceUtil& env)
+MergeHandler::MergeHandler(spi::PersistenceProvider& spi,
+                           PersistenceUtil& env)
     : _spi(spi),
       _env(env),
       _maxChunkSize(env._config.bucketMergeChunkSize)
 {
 }
 
-MergeHandler::MergeHandler(spi::PersistenceProvider& spi, PersistenceUtil& env, uint32_t maxChunkSize)
+MergeHandler::MergeHandler(spi::PersistenceProvider& spi,
+                           PersistenceUtil& env,
+                           uint32_t maxChunkSize)
     : _spi(spi),
       _env(env),
       _maxChunkSize(maxChunkSize)
@@ -54,7 +58,9 @@ checkResult(const spi::Result& result,
 }
 
 void
-checkResult(const spi::Result& result, const spi::Bucket& bucket, const char* op)
+checkResult(const spi::Result& result,
+            const spi::Bucket& bucket,
+            const char* op)
 {
     if (result.hasError()) {
         vespalib::asciistream ss;
@@ -118,11 +124,11 @@ MergeHandler::populateMetaData(
     spi::Selection sel(docSel);
     sel.setToTimestamp(spi::Timestamp(maxTimestamp.getTime()));
     spi::CreateIteratorResult createIterResult(_spi.createIterator(
-            bucket,
-            std::make_shared<document::NoFields>(),
-            sel,
-            spi::ALL_VERSIONS,
-            context));
+                                                       bucket,
+                                                       document::NoFields(),
+                                                       sel,
+                                                       spi::ALL_VERSIONS,
+                                                       context));
 
     if (createIterResult.getErrorCode() != spi::Result::ErrorType::NONE) {
             std::ostringstream ss;
@@ -136,7 +142,8 @@ MergeHandler::populateMetaData(
     IteratorGuard iteratorGuard(_spi, iteratorId, context);
 
     while (true) {
-        spi::IterateResult result(_spi.iterate(iteratorId, UINT64_MAX, context));
+        spi::IterateResult result(
+                _spi.iterate(iteratorId, UINT64_MAX, context));
         if (result.getErrorCode() != spi::Result::ErrorType::NONE) {
             std::ostringstream ss;
             ss << "Failed to iterate for "
@@ -293,7 +300,8 @@ namespace {
     }
 
     int
-    countUnfilledEntries(const std::vector<api::ApplyBucketDiffCommand::Entry>& diff)
+    countUnfilledEntries(
+            const std::vector<api::ApplyBucketDiffCommand::Entry>& diff)
     {
         int count = 0;
 
@@ -315,9 +323,11 @@ namespace {
         return value;
     }
 
-    api::StorageMessageAddress createAddress(const std::string& clusterName, uint16_t node)
+    api::StorageMessageAddress createAddress(const std::string& clusterName,
+                                             uint16_t node)
     {
-        return api::StorageMessageAddress(clusterName, lib::NodeType::STORAGE, node);
+        return api::StorageMessageAddress(
+                clusterName, lib::NodeType::STORAGE, node);
     }
 
     void assertContainedInBucket(const document::DocumentId& docId,
@@ -360,11 +370,14 @@ MergeHandler::fetchLocalData(
             alreadyFilled += e._headerBlob.size() + e._bodyBlob.size();
         }
     }
-    uint32_t remainingSize = _maxChunkSize - std::min(_maxChunkSize, alreadyFilled);
-    LOG(debug, "Diff of %s has already filled %u of max %u bytes, remaining size to fill is %u",
+    uint32_t remainingSize = _maxChunkSize - std::min(_maxChunkSize,
+                                                      alreadyFilled);
+    LOG(debug, "Diff of %s has already filled %u of max %u bytes, "
+        "remaining size to fill is %u",
         bucket.toString().c_str(), alreadyFilled, _maxChunkSize, remainingSize);
     if (remainingSize == 0) {
-        LOG(debug, "Diff already at max chunk size, not fetching any local data");
+        LOG(debug,
+            "Diff already at max chunk size, not fetching any local data");
         return;
     }
 
@@ -374,7 +387,7 @@ MergeHandler::fetchLocalData(
     sel.setTimestampSubset(slots);
     spi::CreateIteratorResult createIterResult(
             _spi.createIterator(bucket,
-                                std::make_shared<document::AllFields>(),
+                                document::AllFields(),
                                 sel,
                                 spi::NEWEST_DOCUMENT_OR_REMOVE,
                                 context));
@@ -396,7 +409,8 @@ MergeHandler::fetchLocalData(
     bool fetchedAllLocalData = false;
     bool chunkLimitReached = false;
     while (true) {
-        spi::IterateResult result(_spi.iterate(iteratorId, remainingSize, context));
+        spi::IterateResult result(
+                _spi.iterate(iteratorId, remainingSize, context));
         if (result.getErrorCode() != spi::Result::ErrorType::NONE) {
             std::ostringstream ss;
             ss << "Failed to iterate for "
@@ -412,7 +426,8 @@ MergeHandler::fetchLocalData(
             {
                 remainingSize -= list[i]->getSize();
                 LOG(spam, "Added %s, remainingSize is %u",
-                    entries.back()->toString().c_str(), remainingSize);
+                    entries.back()->toString().c_str(),
+                    remainingSize);
                 entries.push_back(std::move(list[i]));
             } else {
                 LOG(spam, "Adding %s would exceed chunk size limit of %u; "
@@ -438,7 +453,8 @@ MergeHandler::fetchLocalData(
             docEntry.toString().c_str());
 
         std::vector<api::ApplyBucketDiffCommand::Entry>::iterator iter(
-                std::lower_bound(diff.begin(), diff.end(),
+                std::lower_bound(diff.begin(),
+                                 diff.end(),
                                  api::Timestamp(docEntry.getTimestamp()),
                                  DiffEntryTimestampPredicate()));
         assert(iter != diff.end());
@@ -550,8 +566,8 @@ MergeHandler::applyDiffLocally(
     std::vector<spi::DocEntry::UP> entries;
     populateMetaData(bucket, MAX_TIMESTAMP, entries, context);
 
-    std::shared_ptr<const document::DocumentTypeRepo> repo(_env._component.getTypeRepo()->documentTypeRepo);
-    assert(repo);
+    std::shared_ptr<const document::DocumentTypeRepo> repo(_env._component.getTypeRepo());
+    assert(repo.get() != nullptr);
 
     uint32_t existingCount = entries.size();
     uint32_t i = 0, j = 0;
@@ -711,7 +727,8 @@ MergeHandler::processBucketMerge(const spi::Bucket& bucket, MergeStatus& status,
 
     // If nothing to update, we're done.
     if (status.diff.size() == 0) {
-        LOG(debug, "Done with merge of %s. No more entries in diff.", bucket.toString().c_str());
+        LOG(debug, "Done with merge of %s. No more entries in diff.",
+            bucket.toString().c_str());
         return status.reply;
     }
 
@@ -738,8 +755,10 @@ MergeHandler::processBucketMerge(const spi::Bucket& bucket, MergeStatus& status,
              ? std::numeric_limits<uint32_t>().max()
              : _maxChunkSize);
 
-        cmd = std::make_shared<api::ApplyBucketDiffCommand>(bucket.getBucket(), nodes, maxSize);
-        cmd->setAddress(createAddress(_env._component.getClusterName(), nodes[1].index));
+        cmd.reset(new api::ApplyBucketDiffCommand(
+                          bucket.getBucket(), nodes, maxSize));
+        cmd->setAddress(createAddress(_env._component.getClusterName(),
+                                      nodes[1].index));
         findCandidates(bucket.getBucketId(),
                        status,
                        true,
@@ -779,7 +798,8 @@ MergeHandler::processBucketMerge(const spi::Bucket& bucket, MergeStatus& status,
         for (std::map<uint16_t, uint32_t>::const_iterator it = counts.begin();
              it != counts.end(); ++it)
         {
-            if (it->second >= uint32_t(_env._config.commonMergeChainOptimalizationMinimumSize)
+            if (it->second >= uint32_t(
+                        _env._config.commonMergeChainOptimalizationMinimumSize)
                 || counts.size() == 1)
             {
                 LOG(spam, "Sending separate apply bucket diff for path %x "
@@ -812,11 +832,15 @@ MergeHandler::processBucketMerge(const spi::Bucket& bucket, MergeStatus& status,
                     (_env._config.enableMergeLocalNodeChooseDocsOptimalization
                      ? std::numeric_limits<uint32_t>().max()
                      : _maxChunkSize);
-                cmd = std::make_shared<api::ApplyBucketDiffCommand>(bucket.getBucket(), nodes, maxSize);
-                cmd->setAddress(createAddress(_env._component.getClusterName(), nodes[1].index));
+                cmd.reset(new api::ApplyBucketDiffCommand(
+                                  bucket.getBucket(), nodes, maxSize));
+                cmd->setAddress(
+                        createAddress(_env._component.getClusterName(),
+                                      nodes[1].index));
                     // Add all the metadata, and thus use big limit. Max
                     // data to fetch parameter will control amount added.
-                findCandidates(bucket.getBucketId(), status, true, it->first, newMask, maxSize, *cmd);
+                findCandidates(bucket.getBucketId(), status, true,
+                               it->first, newMask, maxSize, *cmd);
                 break;
             }
         }
@@ -824,17 +848,22 @@ MergeHandler::processBucketMerge(const spi::Bucket& bucket, MergeStatus& status,
 
     // If we found no group big enough to handle on its own, do a common
     // merge to merge the remaining data.
-    if ( ! cmd ) {
-        cmd = std::make_shared<api::ApplyBucketDiffCommand>(bucket.getBucket(), status.nodeList, _maxChunkSize);
-        cmd->setAddress(createAddress(_env._component.getClusterName(), status.nodeList[1].index));
-        findCandidates(bucket.getBucketId(), status, false, 0, 0, _maxChunkSize, *cmd);
+    if (cmd.get() == 0) {
+        cmd.reset(new api::ApplyBucketDiffCommand(bucket.getBucket(),
+                                                  status.nodeList,
+                                                  _maxChunkSize));
+        cmd->setAddress(createAddress(_env._component.getClusterName(),
+                                      status.nodeList[1].index));
+        findCandidates(bucket.getBucketId(), status, false, 0, 0,
+                       _maxChunkSize, *cmd);
     }
     cmd->setPriority(status.context.getPriority());
     cmd->setTimeout(status.timeout);
     if (applyDiffNeedLocalData(cmd->getDiff(), 0, true)) {
         framework::MilliSecTimer startTime(_env._component.getClock());
         fetchLocalData(bucket, cmd->getLoadType(), cmd->getDiff(), 0, context);
-        _env._metrics.merge_handler_metrics.mergeDataReadLatency.addValue(startTime.getElapsedTimeAsDouble());
+        _env._metrics.merge_handler_metrics.mergeDataReadLatency.addValue(
+                startTime.getElapsedTimeAsDouble());
     }
     status.pendingId = cmd->getMsgId();
     LOG(debug, "Sending %s", cmd->toString().c_str());
@@ -849,7 +878,8 @@ public:
     document::Bucket _bucket;
     bool _active;
 
-    MergeStateDeleter(FileStorHandler& handler, const document::Bucket& bucket)
+    MergeStateDeleter(FileStorHandler& handler,
+                      const document::Bucket& bucket)
         : _handler(handler),
           _bucket(bucket),
           _active(true)
@@ -876,7 +906,8 @@ MergeHandler::handleMergeBucket(api::MergeBucketCommand& cmd, MessageTracker::UP
 
     if (cmd.getNodes().size() < 2) {
         LOG(debug, "Attempt to merge a single instance of a bucket");
-        tracker->fail(ReturnCode::ILLEGAL_PARAMETERS, "Cannot merge a single copy");
+        tracker->fail(ReturnCode::ILLEGAL_PARAMETERS,
+                     "Cannot merge a single copy");
         return tracker;
     }
 
@@ -923,7 +954,8 @@ MergeHandler::handleMergeBucket(api::MergeBucketCommand& cmd, MessageTracker::UP
     auto cmd2 = std::make_shared<api::GetBucketDiffCommand>(bucket.getBucket(), s->nodeList, s->maxTimestamp.getTime());
     if (!buildBucketInfoList(bucket, cmd.getLoadType(), s->maxTimestamp, 0, cmd2->getDiff(), tracker->context())) {
         LOG(debug, "Bucket non-existing in db. Failing merge.");
-        tracker->fail(ReturnCode::BUCKET_DELETED, "Bucket not found in buildBucketInfo step");
+        tracker->fail(ReturnCode::BUCKET_DELETED,
+                     "Bucket not found in buildBucketInfo step");
         return tracker;
     }
     _env._metrics.merge_handler_metrics.mergeMetadataReadLatency.addValue(s->startTime.getElapsedTimeAsDouble());
@@ -1084,7 +1116,8 @@ MergeHandler::handleGetBucketDiff(api::GetBucketDiffCommand& cmd, MessageTracker
     checkResult(_spi.createBucket(bucket, tracker->context()), bucket, "create bucket");
 
     if (_env._fileStorHandler.isMerging(bucket.getBucket())) {
-        tracker->fail(ReturnCode::BUSY, "A merge is already running on this bucket.");
+        tracker->fail(ReturnCode::BUSY,
+                     "A merge is already running on this bucket.");
         return tracker;
     }
     uint8_t index = findOwnIndex(cmd.getNodes(), _env._nodeIndex);
@@ -1097,13 +1130,16 @@ MergeHandler::handleGetBucketDiff(api::GetBucketDiffCommand& cmd, MessageTracker
                              index, local, tracker->context()))
     {
         LOG(debug, "Bucket non-existing in db. Failing merge.");
-        tracker->fail(ReturnCode::BUCKET_DELETED, "Bucket not found in buildBucketInfo step");
+        tracker->fail(ReturnCode::BUCKET_DELETED,
+                     "Bucket not found in buildBucketInfo step");
         return tracker;
     }
     if (!mergeLists(remote, local, local)) {
-        LOG(error, "Diffing %s found suspect entries.", bucket.toString().c_str());
+        LOG(error, "Diffing %s found suspect entries.",
+            bucket.toString().c_str());
     }
-    _env._metrics.merge_handler_metrics.mergeMetadataReadLatency.addValue(startTime.getElapsedTimeAsDouble());
+    _env._metrics.merge_handler_metrics.mergeMetadataReadLatency.addValue(
+            startTime.getElapsedTimeAsDouble());
 
     // If last node in merge chain, we can send reply straight away
     if (index + 1u >= cmd.getNodes().size()) {
@@ -1180,21 +1216,24 @@ namespace {
         bool operator()(const api::ApplyBucketDiffCommand::Entry& x,
                         const api::ApplyBucketDiffCommand::Entry& y)
         {
-            return (x._entry._timestamp < y._entry._timestamp);
+            return (x._entry._timestamp
+                        < y._entry._timestamp);
         }
     };
 
 } // End of anonymous namespace
 
 void
-MergeHandler::handleGetBucketDiffReply(api::GetBucketDiffReply& reply, MessageSender& sender)
+MergeHandler::handleGetBucketDiffReply(api::GetBucketDiffReply& reply,
+                                       MessageSender& sender)
 {
     _env._metrics.getBucketDiffReply.inc();
     spi::Bucket bucket(reply.getBucket(), spi::PartitionId(_env._partition));
     LOG(debug, "GetBucketDiffReply(%s)", bucket.toString().c_str());
 
     if (!_env._fileStorHandler.isMerging(bucket.getBucket())) {
-        LOG(warning, "Got GetBucketDiffReply for %s which we have no merge state for.",
+        LOG(warning, "Got GetBucketDiffReply for %s which we have no "
+                     "merge state for.",
             bucket.toString().c_str());
         return;
     }
@@ -1348,7 +1387,8 @@ MergeHandler::handleApplyBucketDiff(api::ApplyBucketDiffCommand& cmd, MessageTra
 }
 
 void
-MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply,MessageSender& sender)
+MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply,
+                                         MessageSender& sender)
 {
     _env._metrics.applyBucketDiffReply.inc();
     spi::Bucket bucket(reply.getBucket(), spi::PartitionId(_env._partition));
@@ -1356,7 +1396,8 @@ MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply,Messag
     LOG(debug, "%s", reply.toString().c_str());
 
     if (!_env._fileStorHandler.isMerging(bucket.getBucket())) {
-        LOG(warning, "Got ApplyBucketDiffReply for %s which we have no merge state for.",
+        LOG(warning, "Got ApplyBucketDiffReply for %s which we have no "
+                     "merge state for.",
             bucket.toString().c_str());
         return;
     }
@@ -1374,19 +1415,25 @@ MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply,Messag
     api::ReturnCode returnCode = reply.getResult();
     try {
         if (reply.getResult().failed()) {
-            LOG(debug, "Got failed apply bucket diff reply %s", reply.toString().c_str());
+            LOG(debug, "Got failed apply bucket diff reply %s",
+                reply.toString().c_str());
         } else {
             assert(reply.getNodes().size() >= 2);
             uint8_t index = findOwnIndex(reply.getNodes(), _env._nodeIndex);
             if (applyDiffNeedLocalData(diff, index, false)) {
                 framework::MilliSecTimer startTime(_env._component.getClock());
-                fetchLocalData(bucket, reply.getLoadType(), diff, index, s.context);
-                _env._metrics.merge_handler_metrics.mergeDataReadLatency.addValue(startTime.getElapsedTimeAsDouble());
+                fetchLocalData(bucket, reply.getLoadType(), diff, index,
+                               s.context);
+                _env._metrics.merge_handler_metrics.mergeDataReadLatency.addValue(
+                        startTime.getElapsedTimeAsDouble());
             }
             if (applyDiffHasLocallyNeededData(diff, index)) {
                 framework::MilliSecTimer startTime(_env._component.getClock());
-                api::BucketInfo info(applyDiffLocally(bucket, reply.getLoadType(), diff, index, s.context));
-                _env._metrics.merge_handler_metrics.mergeDataWriteLatency.addValue(startTime.getElapsedTimeAsDouble());
+                api::BucketInfo info(
+                        applyDiffLocally(bucket, reply.getLoadType(), diff,
+                                         index, s.context));
+                _env._metrics.merge_handler_metrics.mergeDataWriteLatency.addValue(
+                        startTime.getElapsedTimeAsDouble());
             } else {
                 LOG(spam, "Merge(%s): Didn't need fetched data on node %u (%u)",
                     bucket.toString().c_str(),
@@ -1417,7 +1464,8 @@ MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply,Messag
                     "Got reply indicating merge cycle did not fix any entries: %s",
                     reply.toString(true).c_str());
                 LOG(warning,
-                    "Merge state for which there was no progress across a full merge cycle: %s",
+                    "Merge state for which there was no progress across a "
+                    "full merge cycle: %s",
                     s.toString().c_str());
             }
 
@@ -1431,7 +1479,8 @@ MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply,Messag
                     // We have sent something on and shouldn't reply now.
                     clearState = false;
                 } else {
-                    _env._metrics.merge_handler_metrics.mergeLatencyTotal.addValue(s.startTime.getElapsedTimeAsDouble());
+                    _env._metrics.merge_handler_metrics.mergeLatencyTotal.addValue(
+                            s.startTime.getElapsedTimeAsDouble());
                 }
             }
         } else {
@@ -1443,7 +1492,8 @@ MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply,Messag
     } catch (std::exception& e) {
         _env._fileStorHandler.clearMergeStatus(
                 bucket.getBucket(),
-                api::ReturnCode(api::ReturnCode::INTERNAL_FAILURE, e.what()));
+                api::ReturnCode(api::ReturnCode::INTERNAL_FAILURE,
+                                e.what()));
         throw;
     }
 
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index 2cdb6194b6d..53e455ea204 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -286,14 +286,14 @@ PersistenceThread::handleGet(api::GetCommand& cmd, MessageTracker::UP tracker)
     tracker->setMetric(metrics);
     metrics.request_size.addValue(cmd.getApproxByteSize());
 
-    auto fieldSet = _env._component.getTypeRepo()->fieldSetRepo->getFieldSet(cmd.getFieldSet());
+    document::FieldSet::UP fieldSet = document::FieldSetRepo::parse(*_env._component.getTypeRepo(), cmd.getFieldSet());
     tracker->context().setReadConsistency(api_read_consistency_to_spi(cmd.internal_read_consistency()));
     spi::GetResult result =
         _spi.get(getBucket(cmd.getDocumentId(), cmd.getBucket()), *fieldSet, cmd.getDocumentId(), tracker->context());
 
     if (tracker->checkForError(result)) {
         if (!result.hasDocument() && (document::FieldSet::Type::NONE != fieldSet->getType())) {
-            metrics.notFound.inc();
+            _env._metrics.get[cmd.getLoadType()].notFound.inc();
         }
         tracker->setReply(std::make_shared<api::GetReply>(cmd, result.getDocumentPtr(), result.getTimestamp(),
                                                           false, result.is_tombstone()));
@@ -455,11 +455,11 @@ MessageTracker::UP
 PersistenceThread::handleCreateIterator(CreateIteratorCommand& cmd, MessageTracker::UP tracker)
 {
     tracker->setMetric(_env._metrics.createIterator);
-    document::FieldSet::SP fieldSet = _env._component.getTypeRepo()->fieldSetRepo->getFieldSet(cmd.getFields());
+    document::FieldSet::UP fieldSet = document::FieldSetRepo::parse(*_env._component.getTypeRepo(), cmd.getFields());
     tracker->context().setReadConsistency(cmd.getReadConsistency());
     spi::CreateIteratorResult result(_spi.createIterator(
-            spi::Bucket(cmd.getBucket(), spi::PartitionId(_env._partition)),
-            std::move(fieldSet), cmd.getSelection(), cmd.getIncludedVersions(), tracker->context()));
+        spi::Bucket(cmd.getBucket(), spi::PartitionId(_env._partition)),
+        *fieldSet, cmd.getSelection(), cmd.getIncludedVersions(), tracker->context()));
     if (tracker->checkForError(result)) {
         tracker->setReply(std::make_shared<CreateIteratorReply>(cmd, spi::IteratorId(result.getIteratorId())));
     }
diff --git a/storage/src/vespa/storage/persistence/persistenceutil.cpp b/storage/src/vespa/storage/persistence/persistenceutil.cpp
index 63ac5405fab..6605e3f6363 100644
--- a/storage/src/vespa/storage/persistence/persistenceutil.cpp
+++ b/storage/src/vespa/storage/persistence/persistenceutil.cpp
@@ -162,7 +162,7 @@ PersistenceUtil::PersistenceUtil(
       _nodeIndex(_component.getIndex()),
       _metrics(metrics),
       _bucketFactory(_component.getBucketIdFactory()),
-      _repo(_component.getTypeRepo()->documentTypeRepo),
+      _repo(_component.getTypeRepo()),
       _spi(provider)
 {
 }
diff --git a/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp b/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp
index 0884d807eda..a5564282d17 100644
--- a/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp
+++ b/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp
@@ -111,8 +111,8 @@ ProviderErrorWrapper::get(const spi::Bucket& bucket, const document::FieldSet& f
 }
 
 spi::CreateIteratorResult
-ProviderErrorWrapper::createIterator(const spi::Bucket &bucket, FieldSetSP fieldSet, const spi::Selection &selection,
-                                     spi::IncludedVersions versions, spi::Context &context)
+ProviderErrorWrapper::createIterator(const spi::Bucket& bucket, const document::FieldSet& fieldSet,
+                                     const spi::Selection& selection, spi::IncludedVersions versions, spi::Context& context)
 {
     return checkResult(_impl.createIterator(bucket, fieldSet, selection, versions, context));
 }
diff --git a/storage/src/vespa/storage/persistence/provider_error_wrapper.h b/storage/src/vespa/storage/persistence/provider_error_wrapper.h
index 54abf0e96fb..602877e0b02 100644
--- a/storage/src/vespa/storage/persistence/provider_error_wrapper.h
+++ b/storage/src/vespa/storage/persistence/provider_error_wrapper.h
@@ -52,9 +52,8 @@ public:
     spi::RemoveResult removeIfFound(const spi::Bucket&, spi::Timestamp, const document::DocumentId&, spi::Context&) override;
     spi::UpdateResult update(const spi::Bucket&, spi::Timestamp, spi::DocumentUpdateSP, spi::Context&) override;
     spi::GetResult get(const spi::Bucket&, const document::FieldSet&, const document::DocumentId&, spi::Context&) const override;
-    spi::CreateIteratorResult
-    createIterator(const spi::Bucket &bucket, FieldSetSP, const spi::Selection &, spi::IncludedVersions versions,
-                   spi::Context &context) override;
+    spi::CreateIteratorResult createIterator(const spi::Bucket&, const document::FieldSet&, const spi::Selection&,
+                                             spi::IncludedVersions versions, spi::Context&) override;
     spi::IterateResult iterate(spi::IteratorId, uint64_t maxByteSize, spi::Context&) const override;
     spi::Result destroyIterator(spi::IteratorId, spi::Context&) override;
     spi::Result createBucket(const spi::Bucket&, spi::Context&) override;
diff --git a/storage/src/vespa/storage/persistence/testandsethelper.cpp b/storage/src/vespa/storage/persistence/testandsethelper.cpp
index 57586249817..9232abc5c8a 100644
--- a/storage/src/vespa/storage/persistence/testandsethelper.cpp
+++ b/storage/src/vespa/storage/persistence/testandsethelper.cpp
@@ -1,8 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // @author Vegard Sjonfjell
 
-#include "fieldvisitor.h"
-#include "testandsethelper.h"
+#include <vespa/storage/persistence/fieldvisitor.h>
+#include <vespa/storage/persistence/testandsethelper.h>
 #include <vespa/document/select/parser.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/vespalib/util/stringfmt.h>
@@ -11,19 +11,19 @@ using namespace std::string_literals;
 
 namespace storage {
 
-void TestAndSetHelper::getDocumentType(const document::DocumentTypeRepo & documentTypeRepo) {
+void TestAndSetHelper::getDocumentType() {
     if (!_docId.hasDocType()) {
         throw TestAndSetException(api::ReturnCode(api::ReturnCode::ILLEGAL_PARAMETERS, "Document id has no doctype"));
     }
 
-    _docTypePtr = documentTypeRepo.getDocumentType(_docId.getDocType());
+    _docTypePtr = _component.getTypeRepo()->getDocumentType(_docId.getDocType());
     if (_docTypePtr == nullptr) {
         throw TestAndSetException(api::ReturnCode(api::ReturnCode::ILLEGAL_PARAMETERS, "Document type does not exist"));
     }
 }
 
-void TestAndSetHelper::parseDocumentSelection(const document::DocumentTypeRepo & documentTypeRepo) {
-    document::select::Parser parser(documentTypeRepo, _component.getBucketIdFactory());
+void TestAndSetHelper::parseDocumentSelection() {
+    document::select::Parser parser(*_component.getTypeRepo(), _component.getBucketIdFactory());
 
     try {
         _docSelectionUp = parser.parse(_cmd.getCondition().getSelection());
@@ -49,9 +49,8 @@ TestAndSetHelper::TestAndSetHelper(PersistenceThread & thread, const api::TestAn
       _docTypePtr(nullptr),
       _missingDocumentImpliesMatch(missingDocumentImpliesMatch)
 {
-    auto docTypeRepo = _component.getTypeRepo()->documentTypeRepo;
-    getDocumentType(*docTypeRepo);
-    parseDocumentSelection(*docTypeRepo);
+    getDocumentType();
+    parseDocumentSelection();
 }
 
 TestAndSetHelper::~TestAndSetHelper() = default;
diff --git a/storage/src/vespa/storage/persistence/testandsethelper.h b/storage/src/vespa/storage/persistence/testandsethelper.h
index b528b5034f9..b5fa29d0106 100644
--- a/storage/src/vespa/storage/persistence/testandsethelper.h
+++ b/storage/src/vespa/storage/persistence/testandsethelper.h
@@ -28,8 +28,8 @@ class TestAndSetHelper {
     std::unique_ptr<document::select::Node> _docSelectionUp;
     bool _missingDocumentImpliesMatch;
 
-    void getDocumentType(const document::DocumentTypeRepo & documentTypeRepo);
-    void parseDocumentSelection(const document::DocumentTypeRepo & documentTypeRepo);
+    void getDocumentType();
+    void parseDocumentSelection();
     spi::GetResult retrieveDocument(const document::FieldSet & fieldSet, spi::Context & context);
 
 public:
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
index b51394e2e64..c0adb01ad47 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
@@ -395,12 +395,10 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig>
 
         // Configure messagebus here as we for legacy reasons have
         // config here.
-        auto documentTypeRepo = _component.getTypeRepo()->documentTypeRepo;
-        auto loadTypes = _component.getLoadTypes();
         _mbus = std::make_unique<mbus::RPCMessageBus>(
                 mbus::ProtocolSet()
-                        .add(std::make_shared<documentapi::DocumentProtocol>(*loadTypes, documentTypeRepo))
-                        .add(std::make_shared<mbusprot::StorageProtocol>(documentTypeRepo, *loadTypes)),
+                        .add(std::make_shared<documentapi::DocumentProtocol>(*_component.getLoadTypes(), _component.getTypeRepo()))
+                        .add(std::make_shared<mbusprot::StorageProtocol>(_component.getTypeRepo(), *_component.getLoadTypes())),
                 params,
                 _configUri);
 
diff --git a/storage/src/vespa/storage/visiting/visitorthread.cpp b/storage/src/vespa/storage/visiting/visitorthread.cpp
index 73f4a70d80d..c6e75735690 100644
--- a/storage/src/vespa/storage/visiting/visitorthread.cpp
+++ b/storage/src/vespa/storage/visiting/visitorthread.cpp
@@ -31,7 +31,7 @@ VisitorThread::Event::Event(Event&& other)
 {
 }
 
-VisitorThread::Event::~Event() = default;
+VisitorThread::Event::~Event() {}
 
 VisitorThread::Event&
 VisitorThread::Event::operator= (Event&& other)
@@ -44,7 +44,9 @@ VisitorThread::Event::operator= (Event&& other)
     return *this;
 }
 
-VisitorThread::Event::Event(api::VisitorId visitor, const std::shared_ptr<api::StorageMessage>& msg)
+VisitorThread::Event::Event(
+        api::VisitorId visitor,
+        const std::shared_ptr<api::StorageMessage>& msg)
     : _visitorId(visitor),
       _message(msg),
       _timer(),
@@ -52,7 +54,9 @@ VisitorThread::Event::Event(api::VisitorId visitor, const std::shared_ptr<api::S
 {
 }
 
-VisitorThread::Event::Event(api::VisitorId visitor, mbus::Reply::UP reply)
+VisitorThread::Event::Event(
+        api::VisitorId visitor,
+        mbus::Reply::UP reply)
     : _visitorId(visitor),
       _mbusReply(std::move(reply)),
       _timer(),
@@ -327,7 +331,7 @@ VisitorThread::handleNonExistingVisitorCall(const Event& entry,
                                             ReturnCode& code)
 {
     // Get current time. Set the time that is the oldest still recent.
-    framework::SecondTime currentTime(_component.getClock().getTimeInSeconds());
+    framework::SecondTime currentTime(_component.getClock().getTimeInSeconds());;
     trimRecentlyCompletedList(currentTime);
 
     // Go through all recent visitors. Ignore request if recent
@@ -431,7 +435,8 @@ VisitorThread::onCreateVisitor(
     do {
         // If no buckets are specified, fail command
         if (cmd->getBuckets().empty()) {
-            result = ReturnCode(ReturnCode::ILLEGAL_PARAMETERS, "No buckets specified");
+            result = ReturnCode(ReturnCode::ILLEGAL_PARAMETERS,
+                                     "No buckets specified");
             LOG(warning, "CreateVisitor(%s): No buckets specified. Aborting.",
                          cmd->getInstanceId().c_str());
             break;
@@ -475,7 +480,7 @@ VisitorThread::onCreateVisitor(
         // Parse document selection
         try{
             if (!cmd->getDocumentSelection().empty()) {
-                std::shared_ptr<const document::DocumentTypeRepo> repo(_component.getTypeRepo()->documentTypeRepo);
+                std::shared_ptr<const document::DocumentTypeRepo> repo(_component.getTypeRepo());
                 const document::BucketIdFactory& idFactory(_component.getBucketIdFactory());
                 document::select::Parser parser(*repo, idFactory);
                 docSelection = parser.parse(cmd->getDocumentSelection());