diff options
| author | Tor Egge <Tor.Egge@oath.com> | 2018-04-23 09:08:10 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@oath.com> | 2018-04-23 09:08:10 +0000 |
| commit | dc10c2f5fbd33f3a83d0dade44ceffa7425b1fcb (patch) | |
| tree | bd8eb0298000830573fe2e351019ce43a0bb90e2 /searchcore | |
| parent | bce60d6fb42dcd38ae30fedfbfdc23ec05ec3270 (diff) | |
Use proton::IAttributeManager instead of proton::AttributeManager in
proton::DocumentDBReference.
Diffstat (limited to 'searchcore')
3 files changed, 6 insertions, 8 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 db90f2ed464..9192960b4c6 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp +++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp @@ -6,12 +6,12 @@ #include <vespa/searchcore/proton/documentmetastore/documentmetastore.h> #include <vespa/searchlib/attribute/attributeguard.h> #include <vespa/searchlib/attribute/imported_attribute_vector.h> -#include <vespa/searchcore/proton/attribute/attributemanager.h> +#include <vespa/searchcore/proton/attribute/i_attribute_manager.h> #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h> namespace proton { -DocumentDBReference::DocumentDBReference(std::shared_ptr<AttributeManager> attrMgr, +DocumentDBReference::DocumentDBReference(std::shared_ptr<IAttributeManager> attrMgr, std::shared_ptr<DocumentMetaStore> dms, std::shared_ptr<IGidToLidChangeHandler> gidToLidChangeHandler) : _attrMgr(std::move(attrMgr)), 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 85b49f6b6bd..7c6aea9c2e6 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h +++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.h @@ -5,7 +5,7 @@ namespace proton { -class AttributeManager; +class IAttributeManager; class DocumentMetaStore; class IGidToLidChangeHandler; @@ -16,11 +16,11 @@ class IGidToLidChangeHandler; */ class DocumentDBReference : public IDocumentDBReference { - std::shared_ptr<AttributeManager> _attrMgr; + std::shared_ptr<IAttributeManager> _attrMgr; std::shared_ptr<DocumentMetaStore> _dms; std::shared_ptr<IGidToLidChangeHandler> _gidToLidChangeHandler; public: - DocumentDBReference(std::shared_ptr<AttributeManager> attrMgr, + DocumentDBReference(std::shared_ptr<IAttributeManager> attrMgr, std::shared_ptr<DocumentMetaStore> dms, std::shared_ptr<IGidToLidChangeHandler> gidToLidChangeHandler); virtual ~DocumentDBReference(); diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp index d1e0ba658e4..e05ab4b798f 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp @@ -364,9 +364,7 @@ SearchableDocSubDB::close() std::shared_ptr<IDocumentDBReference> SearchableDocSubDB::getDocumentDBReference() { - auto attrMgr = std::dynamic_pointer_cast<AttributeManager>(getAttributeManager()); - assert(attrMgr); - return std::make_shared<DocumentDBReference>(attrMgr, _dms, _gidToLidChangeHandler); + return std::make_shared<DocumentDBReference>(getAttributeManager(), _dms, _gidToLidChangeHandler); } void |