diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-04-24 09:04:18 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-04-24 09:04:18 +0000 |
commit | 3c875a857b26cf7a4bb0113147746cb6bb915a68 (patch) | |
tree | 3bd0fac49e2bf50451e15d73de278af849c0befd | |
parent | cb4cf3943a67e12b0e2fdc597efeb5998e46c573 (diff) |
Rename accessor method to align naming with ImportedAttributeVector.
5 files changed, 5 insertions, 5 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp index 61f534fe006..229006a349b 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp +++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp @@ -40,7 +40,7 @@ DocumentDBReference::getAttribute(vespalib::stringref name) } std::shared_ptr<const search::IDocumentMetaStoreContext> -DocumentDBReference::getDocumentMetaStoreContext() const +DocumentDBReference::getDocumentMetaStore() const { return _dmsContext; } diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h index 52a06e52f1a..56f06dca58e 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h +++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h @@ -26,7 +26,7 @@ public: std::shared_ptr<IGidToLidChangeHandler> gidToLidChangeHandler); virtual ~DocumentDBReference(); virtual std::shared_ptr<search::attribute::ReadableAttributeVector> getAttribute(vespalib::stringref name) override; - virtual std::shared_ptr<const search::IDocumentMetaStoreContext> getDocumentMetaStoreContext() const override; + virtual std::shared_ptr<const search::IDocumentMetaStoreContext> getDocumentMetaStore() const override; virtual std::shared_ptr<search::IGidToLidMapperFactory> getGidToLidMapperFactory() override; virtual std::unique_ptr<GidToLidChangeRegistrator> makeGidToLidChangeRegistrator(const vespalib::string &docTypeName) override; }; diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp index cf6f0b99176..95da27cf3bd 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp +++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp @@ -145,7 +145,7 @@ DocumentDBReferenceResolver::createImportedAttributesRepo(const IAttributeManage ReferenceAttribute::SP refAttr = getReferenceAttribute(attr.referencefield, attrMgr); auto targetDocumentDB = getTargetDocumentDB(refAttr->getName()); auto targetAttr = targetDocumentDB->getAttribute(attr.targetfield); - auto targetDocumentMetaStore = targetDocumentDB->getDocumentMetaStoreContext(); + auto targetDocumentMetaStore = targetDocumentDB->getDocumentMetaStore(); auto importedAttr = ImportedAttributeVectorFactory::create(attr.name, refAttr, documentMetaStore, targetAttr, targetDocumentMetaStore, useSearchCache); result->add(importedAttr->getName(), importedAttr); } diff --git a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h index 54f8009d1b8..1029bda191c 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h +++ b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference.h @@ -27,7 +27,7 @@ public: using SP = std::shared_ptr<IDocumentDBReference>; virtual ~IDocumentDBReference() { } virtual std::shared_ptr<search::attribute::ReadableAttributeVector> getAttribute(vespalib::stringref name) = 0; - virtual std::shared_ptr<const search::IDocumentMetaStoreContext> getDocumentMetaStoreContext() const = 0; + virtual std::shared_ptr<const search::IDocumentMetaStoreContext> getDocumentMetaStore() const = 0; virtual std::shared_ptr<search::IGidToLidMapperFactory> getGidToLidMapperFactory() = 0; virtual std::unique_ptr<GidToLidChangeRegistrator> makeGidToLidChangeRegistrator(const vespalib::string &docTypeName) = 0; }; diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_document_db_reference.h b/searchcore/src/vespa/searchcore/proton/test/mock_document_db_reference.h index cc91779faef..1c3cb0719ac 100644 --- a/searchcore/src/vespa/searchcore/proton/test/mock_document_db_reference.h +++ b/searchcore/src/vespa/searchcore/proton/test/mock_document_db_reference.h @@ -18,7 +18,7 @@ struct MockDocumentDBReference : public IDocumentDBReference { virtual std::shared_ptr<search::attribute::ReadableAttributeVector> getAttribute(vespalib::stringref) override { return std::shared_ptr<search::attribute::ReadableAttributeVector>(); } - virtual std::shared_ptr<const search::IDocumentMetaStoreContext> getDocumentMetaStoreContext() const override { + virtual std::shared_ptr<const search::IDocumentMetaStoreContext> getDocumentMetaStore() const override { return std::shared_ptr<const search::IDocumentMetaStoreContext>(); } virtual std::shared_ptr<search::IGidToLidMapperFactory> getGidToLidMapperFactory() override { |