aboutsummaryrefslogtreecommitdiffstats
path: root/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2023-04-20 13:53:05 +0000
committerGeir Storli <geirst@yahooinc.com>2023-04-20 14:07:29 +0000
commitea513ec5e898b82c97a1a161c06698843bf43d69 (patch)
tree32187aaf1cb1274c791c75754438e74bfa67f91a /streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
parent687be0d6e22caca23708de1493fb483069bbab0a (diff)
Provide FieldPathMap and IQueryEnvironment when preparing streaming searchers.
This is required to prepare the NearestNeighborFieldSearcher.
Diffstat (limited to 'streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp')
-rw-r--r--streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
index aad4f9d5aa2..cbf8903caab 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
@@ -105,7 +105,10 @@ bool FieldSearcher::search(const StorageDocument & doc)
return true;
}
-void FieldSearcher::prepare(QueryTermList & qtl, const SharedSearcherBuf &)
+void FieldSearcher::prepare(QueryTermList& qtl,
+ const SharedSearcherBuf&,
+ const vsm::FieldPathMapT&,
+ search::fef::IQueryEnvironment&)
{
FieldSearcherBase::prepare(qtl);
prepareFieldId();
@@ -220,7 +223,11 @@ void FieldSearcher::init()
}
}
-void FieldIdTSearcherMap::prepare(const DocumentTypeIndexFieldMapT & difm, const SharedSearcherBuf & searcherBuf, Query & query)
+void FieldIdTSearcherMap::prepare(const DocumentTypeIndexFieldMapT& difm,
+ const SharedSearcherBuf& searcherBuf,
+ Query& query,
+ const vsm::FieldPathMapT& field_paths,
+ search::fef::IQueryEnvironment& query_env)
{
QueryTermList qtl;
query.getLeafs(qtl);
@@ -244,7 +251,7 @@ void FieldIdTSearcherMap::prepare(const DocumentTypeIndexFieldMapT & difm, const
}
}
/// Should perhaps do a unique on onlyInIndex
- (*it)->prepare(onlyInIndex, searcherBuf);
+ (*it)->prepare(onlyInIndex, searcherBuf, field_paths, query_env);
if (LOG_WOULD_LOG(spam)) {
char tmpBuf[16];
snprintf(tmpBuf, sizeof(tmpBuf), "%d", fid);