Change parent class of search::streaming::SameElementQueryNode from

search::streaming::AndQueryNode to search:streaming::MultiTerm.

4 files changed, 10 insertions, 10 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
index 2a95bf8251b..cfaaac8b197 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
@@ -56,7 +56,7 @@ getFeature(const RankProgram &rankProgram) {
 }
 
 void
-RankProcessor::resolve_fields_from_children(QueryTermData& qtd, MultiTerm& mt)
+RankProcessor::resolve_fields_from_children(QueryTermData& qtd, const MultiTerm& mt)
 {
     vespalib::hash_set<uint32_t> field_ids;
     for (auto& subterm : mt.get_terms()) {
@@ -83,7 +83,7 @@ RankProcessor::resolve_fields_from_children(QueryTermData& qtd, MultiTerm& mt)
 }
 
 void
-RankProcessor::resolve_fields_from_term(QueryTermData& qtd, search::streaming::QueryTerm& term)
+RankProcessor::resolve_fields_from_term(QueryTermData& qtd, const search::streaming::QueryTerm& term)
 {
     vespalib::string expandedIndexName = vsm::FieldSearchSpecMap::stripNonFields(term.index());
     const RankManager::View *view = _rankManagerSnapshot->getView(expandedIndexName);
diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h
index f384f7d7acf..9cb3e49fc32 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h
@@ -45,8 +45,8 @@ private:
     HitCollector::UP                     _hitCollector;
     std::unique_ptr<RankProgram>         _match_features_program;
 
-    void resolve_fields_from_children(QueryTermData& qtd, search::streaming::MultiTerm& mt);
-    void resolve_fields_from_term(QueryTermData& qtd, search::streaming::QueryTerm& term);
+    void resolve_fields_from_children(QueryTermData& qtd, const search::streaming::MultiTerm& mt);
+    void resolve_fields_from_term(QueryTermData& qtd, const search::streaming::QueryTerm& term);
     void initQueryEnvironment();
     void initHitCollector(size_t wantedHitCount, bool use_sort_blob);
     void setupRankProgram(search::fef::RankProgram &program);
diff --git a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
index 72807bc6c34..b03ae07c910 100644
--- a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
@@ -192,9 +192,9 @@ FieldSearcher::init()
 void
 FieldIdTSearcherMap::prepare_term(const DocumentTypeIndexFieldMapT& difm, QueryTerm* qt, FieldIdT fid, vespalib::hash_set<const void*>& seen, QueryTermList& onlyInIndex)
 {
-    auto equiv = qt->as_equiv_query_node();
-    if (equiv != nullptr) {
-        for (auto& subterm : equiv->get_terms()) {
+    auto mimt = qt->as_multi_index_multi_term();
+    if (mimt != nullptr) {
+        for (auto& subterm : mimt->get_terms()) {
             prepare_term(difm, subterm.get(), fid, seen, onlyInIndex);
         }
         return;
diff --git a/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp
index c596b46a774..35ce1a07cfb 100644
--- a/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp
@@ -223,9 +223,9 @@ FieldSearchSpecMap::buildFieldsInQuery(const Query & query) const
     query.getLeaves(qtl);
 
     for (const auto & term : qtl) {
-        auto equiv = term->as_equiv_query_node();
-        if (equiv != nullptr) {
-            for (const auto& subterm : equiv->get_terms()) {
+        auto mimt = term->as_multi_index_multi_term();
+        if (mimt != nullptr) {
+            for (const auto& subterm : mimt->get_terms()) {
                 addFieldsFromIndex(subterm->index(), fieldsInQuery);
             }
         } else {