diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-27 22:19:38 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-27 22:19:38 +0000 |
| commit | 48830aa130c67574cdf2ffefc43072e6704f8c65 (patch) | |
| tree | d5051b375e31ea21e7fcc17aa1c68e8fda4af691 /searchcore | |
| parent | 031e0b85bb6498f3071598a3daaf6bc5721745e1 (diff) | |
Simplify AttributeVector by moving out ValueModifier, EnumModifier and BaseName.
Diffstat (limited to 'searchcore')
3 files changed, 4 insertions, 5 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp index ea815d102f7..82e1aa3b57c 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.cpp @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "search_context.h" +#include "documentmetastore.h" #include <vespa/searchlib/attribute/attributeiterators.h> #include <vespa/searchlib/query/query_term_simple.h> #include <vespa/vespalib/util/exceptions.h> diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.h index a2a265ad519..ca4b026e2a4 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/search_context.h @@ -3,10 +3,9 @@ #pragma once #include <vespa/document/base/globalid.h> -#include <vespa/searchlib/attribute/attributevector.h> #include <vespa/searchlib/attribute/search_context.h> -#include "documentmetastore.h" +namespace proton { class DocumentMetaStore; } namespace proton::documentmetastore { /** @@ -15,7 +14,7 @@ namespace proton::documentmetastore { class SearchContext : public search::attribute::SearchContext { private: - using DocId = search::AttributeVector::DocId; + using DocId = uint32_t; bool _isWord; document::GlobalId _gid; @@ -24,7 +23,7 @@ private: int32_t onFind(DocId docId, int32_t elemId, int32_t &weight) const override; int32_t onFind(DocId docId, int32_t elemId) const override; - search::queryeval::SearchIterator::UP + std::unique_ptr<search::queryeval::SearchIterator> createIterator(search::fef::TermFieldMatchData *matchData, bool strict) override; const DocumentMetaStore &getStore() const; diff --git a/searchcore/src/vespa/searchcore/proton/server/matchview.h b/searchcore/src/vespa/searchcore/proton/server/matchview.h index ee0c10cd333..f7bf0abff39 100644 --- a/searchcore/src/vespa/searchcore/proton/server/matchview.h +++ b/searchcore/src/vespa/searchcore/proton/server/matchview.h @@ -9,7 +9,6 @@ #include <vespa/searchcore/proton/matching/match_context.h> #include <vespa/searchcore/proton/summaryengine/isearchhandler.h> #include <vespa/searchcorespi/index/indexsearchable.h> -#include <vespa/searchlib/attribute/attributevector.h> namespace proton { |