diff options
author | Geir Storli <geirstorli@yahoo.no> | 2018-04-04 14:44:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 14:44:13 +0200 |
commit | a3d2dad8b01377a87754b714f54ff05c87bf1f8c (patch) | |
tree | 870e326f7d7f25b3caf4d029638c977f0c1712f3 /storageapi | |
parent | f86708b7b67e38289384d03079f461f532b8763c (diff) | |
parent | 8cfeaeba255ccea54f8345724e72adf53280e33d (diff) |
Merge pull request #5455 from vespa-engine/toregge/use-shared-ptr-to-const-document-type-repo
Use shared pointer to const DocumentTypeRepo.
Diffstat (limited to 'storageapi')
13 files changed, 15 insertions, 15 deletions
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp index 98beda4d483..d08464da715 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp @@ -18,7 +18,7 @@ LOG_SETUP(".storage.api.mbusprot.serialization.base"); namespace storage::mbusprot { -ProtocolSerialization::ProtocolSerialization(const document::DocumentTypeRepo::SP& repo) +ProtocolSerialization::ProtocolSerialization(const std::shared_ptr<const document::DocumentTypeRepo>& repo) : _repo(repo) { } diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.h index 532b50ac680..c27bdfe2013 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.h @@ -64,7 +64,7 @@ class StorageCommand; class StorageReply; class ProtocolSerialization { - const document::DocumentTypeRepo::SP _repo; + const std::shared_ptr<const document::DocumentTypeRepo> _repo; public: virtual mbus::Blob encode(const api::StorageMessage&) const; @@ -74,10 +74,10 @@ public: protected: const document::DocumentTypeRepo& getTypeRepo() const { return *_repo; } - const document::DocumentTypeRepo::SP getTypeRepoSp() const + const std::shared_ptr<const document::DocumentTypeRepo> getTypeRepoSp() const { return _repo; } - ProtocolSerialization(const document::DocumentTypeRepo::SP &repo); + ProtocolSerialization(const std::shared_ptr<const document::DocumentTypeRepo> &repo); virtual ~ProtocolSerialization() {} typedef api::StorageCommand SCmd; diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp index 0f8a7bc0206..2532f76f3a0 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp @@ -20,7 +20,7 @@ using document::BucketSpace; namespace storage::mbusprot { ProtocolSerialization4_2::ProtocolSerialization4_2( - const document::DocumentTypeRepo::SP& repo) + const std::shared_ptr<const document::DocumentTypeRepo>& repo) : ProtocolSerialization(repo) { } diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.h index 56d832ad4f8..3a6f77e46a3 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.h @@ -7,7 +7,7 @@ namespace storage::mbusprot { class ProtocolSerialization4_2 : public ProtocolSerialization { public: - ProtocolSerialization4_2(const document::DocumentTypeRepo::SP&); + ProtocolSerialization4_2(const std::shared_ptr<const document::DocumentTypeRepo>&); protected: void onEncode(GBBuf&, const api::GetCommand&) const override; diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp index 6351818df6b..f1e96cc1631 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp @@ -111,7 +111,7 @@ ProtocolSerialization5_0::onDecodeCommand(BBuf& buf, ProtocolSerialization5_0::ProtocolSerialization5_0( - const document::DocumentTypeRepo::SP& repo, + const std::shared_ptr<const document::DocumentTypeRepo>& repo, const documentapi::LoadTypeSet& loadTypes) : ProtocolSerialization4_2(repo), _loadTypes(loadTypes) diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.h index 933be68158f..042ec7850ef 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.h @@ -11,7 +11,7 @@ private: const documentapi::LoadTypeSet& _loadTypes; public: - ProtocolSerialization5_0(const document::DocumentTypeRepo::SP&, + ProtocolSerialization5_0(const std::shared_ptr<const document::DocumentTypeRepo>&, const documentapi::LoadTypeSet& loadTypes); document::Bucket getBucket(document::ByteBuffer& buf) const override; diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp index 07bab044dca..b5c066eef7d 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp @@ -44,7 +44,7 @@ ProtocolSerialization5_1::putBucketInfo( } ProtocolSerialization5_1::ProtocolSerialization5_1( - const document::DocumentTypeRepo::SP& repo, + const std::shared_ptr<const document::DocumentTypeRepo>& repo, const documentapi::LoadTypeSet& loadTypes) : ProtocolSerialization5_0(repo, loadTypes) { diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.h index ba0a7a3c6ad..5df0d757ce2 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.h @@ -13,7 +13,7 @@ class ProtocolSerialization5_1 : public ProtocolSerialization5_0 BUCKET_ACTIVE = 0x2, }; public: - ProtocolSerialization5_1(const document::DocumentTypeRepo::SP&, + ProtocolSerialization5_1(const std::shared_ptr<const document::DocumentTypeRepo>&, const documentapi::LoadTypeSet& loadTypes); api::BucketInfo getBucketInfo(document::ByteBuffer& buf) const override; diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.h index 18f07fc9d4a..42e9c17e192 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.h @@ -13,7 +13,7 @@ namespace mbusprot { class ProtocolSerialization5_2 : public ProtocolSerialization5_1 { public: - ProtocolSerialization5_2(const document::DocumentTypeRepo::SP& repo, + ProtocolSerialization5_2(const std::shared_ptr<const document::DocumentTypeRepo>& repo, const documentapi::LoadTypeSet & loadTypes) : ProtocolSerialization5_1(repo, loadTypes) {} diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization6_0.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization6_0.cpp index 7257b6bc284..930879082ed 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization6_0.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization6_0.cpp @@ -6,7 +6,7 @@ namespace storage { namespace mbusprot { -ProtocolSerialization6_0::ProtocolSerialization6_0(const document::DocumentTypeRepo::SP &repo, +ProtocolSerialization6_0::ProtocolSerialization6_0(const std::shared_ptr<const document::DocumentTypeRepo> &repo, const documentapi::LoadTypeSet &loadTypes) : ProtocolSerialization5_2(repo, loadTypes) { diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization6_0.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization6_0.h index 015ec33b32f..c24873f5e57 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization6_0.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization6_0.h @@ -16,7 +16,7 @@ namespace mbusprot { class ProtocolSerialization6_0 : public ProtocolSerialization5_2 { public: - ProtocolSerialization6_0(const document::DocumentTypeRepo::SP &repo, + ProtocolSerialization6_0(const std::shared_ptr<const document::DocumentTypeRepo> &repo, const documentapi::LoadTypeSet &loadTypes); document::Bucket getBucket(document::ByteBuffer &buf) const override; diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp index 30d6f5bd45c..678cd1747e7 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.cpp @@ -15,7 +15,7 @@ namespace storage::mbusprot { mbus::string StorageProtocol::NAME = "StorageProtocol"; -StorageProtocol::StorageProtocol(const document::DocumentTypeRepo::SP repo, +StorageProtocol::StorageProtocol(const std::shared_ptr<const document::DocumentTypeRepo> repo, const documentapi::LoadTypeSet& loadTypes, bool activateBucketSpaceSerialization) : _serializer5_0(repo, loadTypes), diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h index 437be5dcbe6..d85e9d55d1a 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h +++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h @@ -14,7 +14,7 @@ public: static mbus::string NAME; - StorageProtocol(const document::DocumentTypeRepo::SP, + StorageProtocol(const std::shared_ptr<const document::DocumentTypeRepo>, const documentapi::LoadTypeSet& loadTypes, bool activateBucketSpaceSerialization = false); ~StorageProtocol(); |