From d7e56ec35cf1e83d0f7a5089a80a01d2918013cb Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Tue, 6 Feb 2024 16:20:53 +0100 Subject: Stop getting phrase index from subterm in streaming mode. --- searchlib/src/vespa/searchlib/query/streaming/querynode.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp index d1f894063f8..0b277dbe221 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp +++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp @@ -262,7 +262,11 @@ QueryNode::build_weighted_set_term(const QueryNodeResultFactory& factory, Simple std::unique_ptr QueryNode::build_phrase_term(const QueryNodeResultFactory& factory, SimpleQueryStackDumpIterator& queryRep) { - auto phrase = std::make_unique(factory.create(), queryRep.getIndexName(), queryRep.getArity()); + vespalib::string index = queryRep.getIndexName(); + if (index.empty()) { + index = SimpleQueryStackDumpIterator::DEFAULT_INDEX; + } + auto phrase = std::make_unique(factory.create(), index, queryRep.getArity()); auto arity = queryRep.getArity(); phrase->setWeight(queryRep.GetWeight()); phrase->setUniqueId(queryRep.getUniqueId()); @@ -275,10 +279,6 @@ QueryNode::build_phrase_term(const QueryNodeResultFactory& factory, SimpleQueryS std::unique_ptr qt(qtp); phrase->add_term(std::move(qt)); } - if (!phrase->get_terms().empty()) { - auto& first = *phrase->get_terms().front(); - phrase->setIndex(first.getIndex()); - } return phrase; } -- cgit v1.2.3