diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-05 23:00:27 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-05 23:00:27 +0000 |
commit | d59d1cdb2b4872c2309cfad2e96012fdbdfc6ff9 (patch) | |
tree | 64bf053dd750d9ae2c1ec5f9ce7500d0945f22ee /streamingvisitors | |
parent | c48eb091494ccb39d2edd0a1b50073f3c5dc4c2b (diff) |
Wire QueryNormalization in to JuniperQueryAdapter and use it there.
Diffstat (limited to 'streamingvisitors')
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp | 9 | ||||
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchvisitor.h | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index 8e75fe858d9..02a2196e6d6 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -174,7 +174,8 @@ SearchVisitor::StreamingDocsumsState::StreamingDocsumsState(search::docsummary:: SearchVisitor::StreamingDocsumsState::~StreamingDocsumsState() = default; -SearchVisitor::SummaryGenerator::SummaryGenerator(const search::IAttributeManager& attr_manager) +SearchVisitor::SummaryGenerator::SummaryGenerator(const search::IAttributeManager& attr_manager, + const search::QueryNormalization & query_normalization) : HitsAggregationResult::SummaryGenerator(), _callback(), _docsum_states(), @@ -185,7 +186,8 @@ SearchVisitor::SummaryGenerator::SummaryGenerator(const search::IAttributeManage _dump_features(), _location(), _stack_dump(), - _attr_manager(attr_manager) + _attr_manager(attr_manager), + _query_normalization(query_normalization) { } @@ -206,6 +208,7 @@ SearchVisitor::SummaryGenerator::get_streaming_docsums_state(const vespalib::str auto &ds = state->get_state(); ds._args.setResultClassName(summary_class); ds._args.set_fields(fields); + ds.query_normalization(&_query_normalization); if (_dump_features.has_value()) { ds._args.dumpFeatures(_dump_features.value()); } @@ -297,7 +300,7 @@ SearchVisitor::SearchVisitor(StorageComponent& component, _summaryClass("default"), _attrMan(), _attrCtx(_attrMan.createContext()), - _summaryGenerator(_attrMan), + _summaryGenerator(_attrMan, *this), _groupingList(), _attributeFields(), _sortList(), diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h index 9ad31b7559c..1c8cdad1b48 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h @@ -413,7 +413,7 @@ private: class SummaryGenerator : public HitsAggregationResult::SummaryGenerator { public: - explicit SummaryGenerator(const search::IAttributeManager& attr_manager); + explicit SummaryGenerator(const search::IAttributeManager&, const search::QueryNormalization &); ~SummaryGenerator() override; vsm::GetDocsumsStateCallback & getDocsumCallback() { return _callback; } void setFilter(std::unique_ptr<vsm::DocsumFilter> filter) { _docsumFilter = std::move(filter); } @@ -436,6 +436,7 @@ private: std::optional<vespalib::string> _location; std::optional<std::vector<char>> _stack_dump; const search::IAttributeManager& _attr_manager; + const search::QueryNormalization & _query_normalization; }; class HitsResultPreparator : public vespalib::ObjectOperation, public vespalib::ObjectPredicate @@ -477,8 +478,8 @@ private: std::vector<size_t> _sortList; vsm::SharedSearcherBuf _searchBuffer; std::vector<char> _tmpSortBuffer; - search::AttributeVector::SP _documentIdAttributeBacking; - search::AttributeVector::SP _rankAttributeBacking; + search::AttributeVector::SP _documentIdAttributeBacking; + search::AttributeVector::SP _rankAttributeBacking; search::SingleStringExtAttribute & _documentIdAttribute; search::SingleFloatExtAttribute & _rankAttribute; bool _shouldFillRankAttribute; |