diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-09-21 09:51:28 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2022-09-21 11:52:23 +0000 |
commit | 034ec90d9277634618454f827ed5095135e1e1ca (patch) | |
tree | e8bbca2a1c38fbb6ef73b7f41faf88452e6553c9 /streamingvisitors | |
parent | 04b195343586990e6a612d33e98c7fa8603ee0f4 (diff) |
Cleanup IDocsumStore and IDocsumWriter interfaces.
Diffstat (limited to 'streamingvisitors')
-rw-r--r-- | streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp | 2 | ||||
-rw-r--r-- | streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp | 8 | ||||
-rw-r--r-- | streamingvisitors/src/vespa/vsm/vsm/docsumfilter.h | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index 205bf54ce5e..4b64b7ab45b 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -175,7 +175,7 @@ SearchVisitor::SummaryGenerator::fillSummary(AttributeVector::DocId lid, const H vespalib::Slime slime; vespalib::slime::SlimeInserter inserter(slime); auto& sds = get_streaming_docsums_state(summaryClass); - _docsumWriter->insertDocsum(sds.get_resolve_class_info(), lid, sds.get_state(), _docsumFilter.get(), inserter); + _docsumWriter->insertDocsum(sds.get_resolve_class_info(), lid, sds.get_state(), *_docsumFilter, inserter); _buf.reset(); vespalib::WritableMemory magicId = _buf.reserve(4); memcpy(magicId.data, &search::docsummary::SLIME_MAGIC_ID, 4); diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp index e0ed3f6c5e4..aa9c9bd860b 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp @@ -338,12 +338,6 @@ void DocsumFilter::init(const FieldMap & fieldMap, const FieldPathMapT & fieldPa } } -uint32_t -DocsumFilter::getNumDocs() const -{ - return std::numeric_limits<uint32_t>::max(); -} - bool DocsumFilter::write_flatten_field(const DocsumFieldSpec& field_spec, const Document& doc) { @@ -379,7 +373,7 @@ DocsumFilter::write_flatten_field(const DocsumFieldSpec& field_spec, const Docum } std::unique_ptr<const IDocsumStoreDocument> -DocsumFilter::getMappedDocsum(uint32_t id) +DocsumFilter::get_document(uint32_t id) { const ResultClass *resClass = _tools->getResultClass(); if (resClass == nullptr) { diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.h b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.h index cb6ae66ae22..d7f6d88bd0c 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.h +++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.h @@ -66,8 +66,7 @@ public: void setDocSumStore(const IDocSumCache & docsumCache) { _docsumCache = &docsumCache; } // Inherit doc from IDocsumStore - std::unique_ptr<const search::docsummary::IDocsumStoreDocument> getMappedDocsum(uint32_t id) override; - uint32_t getNumDocs() const override; + std::unique_ptr<const search::docsummary::IDocsumStoreDocument> get_document(uint32_t id) override; search::docsummary::DocsumStoreFieldValue get_summary_field(uint32_t entry_idx, const Document& doc); void insert_summary_field(uint32_t entry_idx, const Document& doc, vespalib::slime::Inserter& inserter); |