Stop using nested typedef for shared pointer to const DocumentTypeRepo.

16 files changed, 37 insertions, 37 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 0338bb5506a..e6abb4f6c51 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -84,7 +84,7 @@ class BuildContext
 public:
     DirMaker _dmk;
     DocBuilder _bld;
-    DocumentTypeRepo::SP _repo;
+    std::shared_ptr<const DocumentTypeRepo> _repo;
     DummyFileHeaderContext _fileHeaderContext;
     vespalib::ThreadStackExecutor _summaryExecutor;
     search::transactionlog::NoSyncProxy _noTlSyncer;
@@ -178,14 +178,14 @@ public:
     config::DirSpec _spec;
     DocumentDBConfigHelper _configMgr;
     DocumentDBConfig::DocumenttypesConfigSP _documenttypesConfig;
-    const DocumentTypeRepo::SP _repo;
+    const std::shared_ptr<const DocumentTypeRepo> _repo;
     TuneFileDocumentDB::SP _tuneFileDocumentDB;
     HwInfo _hwInfo;
     std::unique_ptr<DocumentDB> _ddb;
     AttributeWriter::UP _aw;
     ISummaryAdapter::SP _sa;
 
-    DBContext(const DocumentTypeRepo::SP &repo, const char *docTypeName)
+    DBContext(const std::shared_ptr<const DocumentTypeRepo> &repo, const char *docTypeName)
         : _dmk(docTypeName),
           _fileHeaderContext(),
           _tls("tmp", 9013, ".", _fileHeaderContext),
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 2d0ff39efa4..7f8ce99beb9 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -135,7 +135,7 @@ FieldBlock::~FieldBlock() {}
 class Test : public vespalib::TestApp {
     std::unique_ptr<Schema> _schema;
     std::unique_ptr<SummarymapConfigBuilder> _summarymap;
-    DocumentTypeRepo::SP      _documentRepo;
+    std::shared_ptr<const DocumentTypeRepo>      _documentRepo;
     const DocumentType       *_documentType;
     document::FixedTypeRepo   _fixedRepo;
 
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
index c7006be2804..cc94441ccf6 100644
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
@@ -44,7 +44,7 @@ struct MyFeedView : public test::DummyFeedView
     uint32_t             _heartBeat;
     uint32_t             _handlePrune;
     uint32_t             _wantedLidLimit;
-    MyFeedView(const DocumentTypeRepo::SP &repo,
+    MyFeedView(const std::shared_ptr<const DocumentTypeRepo> &repo,
                std::shared_ptr<BucketDBOwner> bucketDB,
                SubDbType subDbType) :
         test::DummyFeedView(repo),
@@ -94,7 +94,7 @@ struct MyFeedView : public test::DummyFeedView
 struct MySubDb
 {
     MyFeedView::SP _view;
-    MySubDb(const DocumentTypeRepo::SP &repo,
+    MySubDb(const std::shared_ptr<const DocumentTypeRepo> &repo,
             std::shared_ptr<BucketDBOwner> bucketDB,
             SubDbType subDbType)
         : _view(new MyFeedView(repo, bucketDB, subDbType))
diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index d3567da3527..60cbfeb29b9 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -67,11 +67,11 @@ class IndexManagerDummyReconfigurer : public searchcorespi::IIndexManager::Recon
     }
 };
 
-DocumentTypeRepo::SP
+std::shared_ptr<const DocumentTypeRepo>
 createRepo()
 {
     DocumentType docType(DOC_TYPE, 0);
-    return DocumentTypeRepo::SP(new DocumentTypeRepo(docType));
+    return std::shared_ptr<const DocumentTypeRepo>(new DocumentTypeRepo(docType));
 }
 
 struct ViewPtrs
@@ -89,7 +89,7 @@ struct ViewSet
     DummyFileHeaderContext _fileHeaderContext;
     ExecutorThreadingService _writeService;
     SearchableFeedView::SerialNum serialNum;
-    DocumentTypeRepo::SP repo;
+    std::shared_ptr<const DocumentTypeRepo> repo;
     DocTypeName _docTypeName;
     DocIdLimit _docIdLimit;
     search::transactionlog::NoSyncProxy _noTlSyncer;
@@ -267,7 +267,7 @@ struct MyFastAccessFeedView
         Schema::SP schema(new Schema());
         _dmsc = make_shared<DocumentMetaStoreContext>(std::make_shared<BucketDBOwner>());
         _lidReuseDelayer.reset(new documentmetastore::LidReuseDelayer(_writeService, _dmsc->get()));
-        DocumentTypeRepo::SP repo = createRepo();
+        std::shared_ptr<const DocumentTypeRepo> repo = createRepo();
         StoreOnlyFeedView::Context storeOnlyCtx(summaryAdapter, schema, _dmsc, *_gidToLidChangeHandler, repo,
                                                 _writeService, *_lidReuseDelayer, _commitTimeTracker);
         StoreOnlyFeedView::PersistentParams params(1, 1, DocTypeName(DOC_TYPE), 0, SubDbType::NOTREADY);
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
index 7aa452c5aa3..11e9aa8c3ec 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
@@ -93,9 +93,9 @@ struct MyMoveHandler : public IDocumentMoveHandler
 
 struct MyDocumentRetriever : public DocumentRetrieverBaseForTest
 {
-    DocumentTypeRepo::SP _repo;
+    std::shared_ptr<const DocumentTypeRepo> _repo;
     DocumentVector       _docs;
-    MyDocumentRetriever(DocumentTypeRepo::SP repo) : _repo(repo), _docs() {
+    MyDocumentRetriever(std::shared_ptr<const DocumentTypeRepo> repo) : _repo(repo), _docs() {
         _docs.push_back(Document::SP()); // lid 0 invalid
     }
     virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const override { return *_repo; }
@@ -133,7 +133,7 @@ struct MySubDb
     MaintenanceDocumentSubDB _subDb;
     test::UserDocuments        _docs;
     bucketdb::BucketDBHandler _bucketDBHandler;
-    MySubDb(const DocumentTypeRepo::SP &repo, std::shared_ptr<BucketDBOwner> bucketDB,
+    MySubDb(const std::shared_ptr<const DocumentTypeRepo> &repo, std::shared_ptr<BucketDBOwner> bucketDB,
             uint32_t subDbId, SubDbType subDbType);
     ~MySubDb();
     void insertDocs(const test::UserDocuments &docs_) {
@@ -178,7 +178,7 @@ struct MySubDb
 
 };
 
-MySubDb::MySubDb(const DocumentTypeRepo::SP &repo, std::shared_ptr<BucketDBOwner> bucketDB,
+MySubDb::MySubDb(const std::shared_ptr<const DocumentTypeRepo> &repo, std::shared_ptr<BucketDBOwner> bucketDB,
                  uint32_t subDbId, SubDbType subDbType)
     : _metaStoreSP(std::make_shared<DocumentMetaStore>(bucketDB,
                                                        DocumentMetaStore::getFixedName(),
diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
index 9f6eb0ea4e1..14a0dc89b65 100644
--- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
@@ -90,7 +90,7 @@ Fixture::Fixture()
 {
     DocumentDBConfig::DocumenttypesConfigSP documenttypesConfig(new DocumenttypesConfig());
     DocumentType docType("typea", 0);
-    DocumentTypeRepo::SP repo(new DocumentTypeRepo(docType));
+    std::shared_ptr<const DocumentTypeRepo> repo(new DocumentTypeRepo(docType));
     TuneFileDocumentDB::SP tuneFileDocumentDB(new TuneFileDocumentDB);
     config::DirSpec spec(TEST_PATH("cfg"));
     DocumentDBConfigHelper mgr(spec, "typea");
diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
index 17353f89fd2..df01ae0fc02 100644
--- a/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdbconfig/documentdbconfig_test.cpp
@@ -30,7 +30,7 @@ const vespalib::string type_name = "test";
 const vespalib::string header_name = type_name + ".header";
 const vespalib::string body_name = type_name + ".body";
 
-DocumentTypeRepo::SP
+std::shared_ptr<const DocumentTypeRepo>
 makeDocTypeRepo(bool hasField)
 {
     DocumenttypesConfigBuilderHelper builder;
@@ -49,7 +49,7 @@ private:
     test::DocumentDBConfigBuilder _builder;
 
 public:
-    MyConfigBuilder(int64_t generation, const Schema::SP &schema, const DocumentTypeRepo::SP &repo)
+    MyConfigBuilder(int64_t generation, const Schema::SP &schema, const std::shared_ptr<const DocumentTypeRepo> &repo)
         : _builder(generation, schema, "client", "test")
     {
         _builder.repo(repo);
@@ -101,7 +101,7 @@ public:
 
 struct Fixture {
     Schema::SP schema;
-    DocumentTypeRepo::SP repo;
+    std::shared_ptr<const DocumentTypeRepo> repo;
     ConfigSP basicCfg;
     ConfigSP fullCfg;
     ConfigSP replayCfg;
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index b8ffc41d3cd..10718508d33 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -179,7 +179,7 @@ struct MyFeedView : public test::DummyFeedView {
     int prune_removed_count;
     int update_count;
     SerialNum update_serial;
-    MyFeedView(const DocumentTypeRepo::SP &dtr);
+    MyFeedView(const std::shared_ptr<const DocumentTypeRepo> &dtr);
     ~MyFeedView() override;
     void resetPutLatch(uint32_t count) { putLatch.reset(new vespalib::CountDownLatch(count)); }
     void preparePut(PutOperation &op) override {
@@ -229,7 +229,7 @@ struct MyFeedView : public test::DummyFeedView {
     }
 };
 
-MyFeedView::MyFeedView(const DocumentTypeRepo::SP &dtr)
+MyFeedView::MyFeedView(const std::shared_ptr<const DocumentTypeRepo> &dtr)
     : test::DummyFeedView(dtr),
       putRdz(),
       usePutRdz(false),
@@ -260,7 +260,7 @@ struct SchemaContext {
     DocTypeName getDocType() const {
         return DocTypeName(builder->getDocumentType().getName());
     }
-    const document::DocumentTypeRepo::SP &getRepo() const { return builder->getDocumentTypeRepo(); }
+    const std::shared_ptr<const document::DocumentTypeRepo> &getRepo() const { return builder->getDocumentTypeRepo(); }
 };
 
 
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 54aefef4463..00eb59f120a 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -432,7 +432,7 @@ struct SchemaContext
     std::unique_ptr<DocBuilder> _builder;
     SchemaContext();
     ~SchemaContext();
-    const document::DocumentTypeRepo::SP &getRepo() const { return _builder->getDocumentTypeRepo(); }
+    const std::shared_ptr<const document::DocumentTypeRepo> &getRepo() const { return _builder->getDocumentTypeRepo(); }
 };
 
 SchemaContext::SchemaContext() :
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
index dd35d823b99..a04e340c96f 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
@@ -41,7 +41,7 @@ makeBaseConfigSnapshot()
     DBCM dbcm(spec, "test");
     DocumenttypesConfigSP dtcfg(config::ConfigGetter<DocumenttypesConfig>::getConfig("", spec).release());
     BootstrapConfig::SP b(new BootstrapConfig(1, dtcfg,
-                                              DocumentTypeRepo::SP(new DocumentTypeRepo(*dtcfg)),
+                                              std::shared_ptr<const DocumentTypeRepo>(new DocumentTypeRepo(*dtcfg)),
                                               std::make_shared<ProtonConfig>(),
                                               std::make_shared<FiledistributorrpcConfig>(),
                                               std::make_shared<BucketspacesConfig>(),
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
index 56bd99c90f6..82566025a30 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
@@ -162,7 +162,7 @@ struct MyFrozenBucketHandler : public IFrozenBucketHandler
 
 struct MyFeedView : public test::DummyFeedView
 {
-    MyFeedView(const DocumentTypeRepo::SP &repo)
+    MyFeedView(const std::shared_ptr<const DocumentTypeRepo> &repo)
         : test::DummyFeedView(repo)
     {
     }
@@ -189,8 +189,8 @@ struct MySummaryManager : public test::DummySummaryManager
 
 struct MySubDb : public test::DummyDocumentSubDb
 {
-    DocumentTypeRepo::SP _repo;
-    MySubDb(const DocumentTypeRepo::SP &repo, std::shared_ptr<BucketDBOwner> bucketDB);
+    std::shared_ptr<const DocumentTypeRepo> _repo;
+    MySubDb(const std::shared_ptr<const DocumentTypeRepo> &repo, std::shared_ptr<BucketDBOwner> bucketDB);
     ~MySubDb();
     virtual IFeedView::SP getFeedView() const override {
         return IFeedView::SP(new MyFeedView(_repo));
@@ -198,7 +198,7 @@ struct MySubDb : public test::DummyDocumentSubDb
 };
 
 
-MySubDb::MySubDb(const DocumentTypeRepo::SP &repo, std::shared_ptr<BucketDBOwner> bucketDB)
+MySubDb::MySubDb(const std::shared_ptr<const DocumentTypeRepo> &repo, std::shared_ptr<BucketDBOwner> bucketDB)
     : test::DummyDocumentSubDb(bucketDB, SUBDB_ID),
       _repo(repo)
 {
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
index bf88a0c3003..9810b7243a5 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
@@ -87,11 +87,11 @@ class MyDocumentSubDB
     uint32_t _subDBId;
     DocumentMetaStore::SP _metaStoreSP;
     DocumentMetaStore & _metaStore;
-    const document::DocumentTypeRepo::SP &_repo;
+    const std::shared_ptr<const document::DocumentTypeRepo> &_repo;
     const DocTypeName &_docTypeName;
 
 public:
-    MyDocumentSubDB(uint32_t subDBId, SubDbType subDbType, const document::DocumentTypeRepo::SP &repo,
+    MyDocumentSubDB(uint32_t subDBId, SubDbType subDbType, const std::shared_ptr<const document::DocumentTypeRepo> &repo,
                     std::shared_ptr<BucketDBOwner> bucketDB, const DocTypeName &docTypeName);
     ~MyDocumentSubDB();
 
@@ -124,7 +124,7 @@ public:
     const IDocumentMetaStore &getMetaStore() const { return _metaStore; }
 };
 
-MyDocumentSubDB::MyDocumentSubDB(uint32_t subDBId, SubDbType subDbType, const document::DocumentTypeRepo::SP &repo,
+MyDocumentSubDB::MyDocumentSubDB(uint32_t subDBId, SubDbType subDbType, const std::shared_ptr<const document::DocumentTypeRepo> &repo,
                                  std::shared_ptr<BucketDBOwner> bucketDB, const DocTypeName &docTypeName)
     : _docs(),
       _subDBId(subDBId),
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
index bbdabe2d0ef..e8247a52199 100644
--- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp
@@ -55,10 +55,10 @@ public:
     void heartBeat(SerialNum) override { ++_heartbeatCount; }
 };
 
-DocumentTypeRepo::SP myGetDocumentTypeRepo() {
+std::shared_ptr<const DocumentTypeRepo> myGetDocumentTypeRepo() {
     Schema schema;
     DocBuilder builder(schema);
-    DocumentTypeRepo::SP repo = builder.getDocumentTypeRepo();
+    std::shared_ptr<const DocumentTypeRepo> repo = builder.getDocumentTypeRepo();
     ASSERT_TRUE(repo.get());
     return repo;
 }
diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
index 896a9debef3..a43bbd050db 100644
--- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
@@ -112,7 +112,7 @@ makeDocTypeRepo()
 
 struct Fixture
 {
-    DocumentTypeRepo::SP _repo;
+    std::shared_ptr<const DocumentTypeRepo> _repo;
     const DocumentType &_docType;
 
 public:
diff --git a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
index d59a67d73bb..9de850b37ec 100644
--- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
+++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
@@ -70,7 +70,7 @@ struct DBConfigFixture {
 
     DocumentDBConfig::SP getConfig(int64_t generation,
                                    std::shared_ptr<DocumenttypesConfig> documentTypes,
-                                   DocumentTypeRepo::SP repo,
+                                   std::shared_ptr<const DocumentTypeRepo> repo,
                                    const vespalib::string &configId,
                                    const vespalib::string &docTypeName)
     {
@@ -167,7 +167,7 @@ struct ConfigFixture {
     BootstrapConfig::SP getBootstrapConfig(int64_t generation) const {
         return BootstrapConfig::SP(new BootstrapConfig(generation,
                                                        BootstrapConfig::DocumenttypesConfigSP(new DocumenttypesConfig(_documenttypesBuilder)),
-                                                       DocumentTypeRepo::SP(new DocumentTypeRepo(_documenttypesBuilder)),
+                                                       std::shared_ptr<const DocumentTypeRepo>(new DocumentTypeRepo(_documenttypesBuilder)),
                                                        BootstrapConfig::ProtonConfigSP(new ProtonConfig(_protonBuilder)),
                                                        std::make_shared<FiledistributorrpcConfig>(),
                                                        std::make_shared<BucketspacesConfig>(_bucketspacesBuilder),
diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp
index a6f3496e1ed..edb581347c6 100644
--- a/searchcore/src/tests/proton/server/feedstates_test.cpp
+++ b/searchcore/src/tests/proton/server/feedstates_test.cpp
@@ -34,13 +34,13 @@ namespace {
 
 struct MyFeedView : public test::DummyFeedView {
     TestDocRepo repo;
-    DocumentTypeRepo::SP repo_sp;
+    std::shared_ptr<const DocumentTypeRepo> repo_sp;
     int remove_handled;
 
     MyFeedView();
     ~MyFeedView();
 
-    const DocumentTypeRepo::SP &getDocumentTypeRepo() const override { return repo_sp; }
+    const std::shared_ptr<const DocumentTypeRepo> &getDocumentTypeRepo() const override { return repo_sp; }
     void handleRemove(FeedToken , const RemoveOperation &) override { ++remove_handled; }
 };