diff options
54 files changed, 141 insertions, 128 deletions
diff --git a/searchlib/src/tests/query/query-old-large.cpp b/searchlib/src/tests/query/query-old-large.cpp index b807c861b28..e2a49311aac 100644 --- a/searchlib/src/tests/query/query-old-large.cpp +++ b/searchlib/src/tests/query/query-old-large.cpp @@ -8,6 +8,7 @@ using namespace search; using namespace search::query; +using namespace search::streaming; namespace { diff --git a/searchlib/src/tests/query/query-old.cpp b/searchlib/src/tests/query/query-old.cpp index 7690c37a640..94851c72886 100644 --- a/searchlib/src/tests/query/query-old.cpp +++ b/searchlib/src/tests/query/query-old.cpp @@ -10,6 +10,7 @@ using namespace search; using namespace search::query; +using namespace search::streaming; void assertHit(const Hit & h, size_t expWordpos, size_t expContext, int32_t weight) { EXPECT_EQUAL(h.wordpos(), expWordpos); diff --git a/searchlib/src/vespa/searchlib/query/query_term_decoder.cpp b/searchlib/src/vespa/searchlib/query/query_term_decoder.cpp index 10f0f27f540..f1aebf1c207 100644 --- a/searchlib/src/vespa/searchlib/query/query_term_decoder.cpp +++ b/searchlib/src/vespa/searchlib/query/query_term_decoder.cpp @@ -6,6 +6,8 @@ namespace search { +using namespace search::streaming; + QueryTermSimple::UP QueryTermDecoder::decodeTerm(QueryPacketT term) { diff --git a/searchlib/src/vespa/searchlib/query/streaming/hit.h b/searchlib/src/vespa/searchlib/query/streaming/hit.h index fcabef0297f..64b71a70df9 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/hit.h +++ b/searchlib/src/vespa/searchlib/query/streaming/hit.h @@ -4,7 +4,7 @@ #include <cstdint> #include <vector> -namespace search { +namespace search::streaming { class Hit { diff --git a/searchlib/src/vespa/searchlib/query/streaming/query.cpp b/searchlib/src/vespa/searchlib/query/streaming/query.cpp index 73ad9b5f458..bec1bdfc8ae 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/query.cpp +++ b/searchlib/src/vespa/searchlib/query/streaming/query.cpp @@ -3,7 +3,7 @@ #include <vespa/searchlib/parsequery/stackdumpiterator.h> #include <vespa/vespalib/objects/visit.hpp> -namespace search { +namespace search::streaming { void QueryConnector::visitMembers(vespalib::ObjectVisitor &visitor) const { diff --git a/searchlib/src/vespa/searchlib/query/streaming/query.h b/searchlib/src/vespa/searchlib/query/streaming/query.h index ad4fdbdd0a3..7e30e7428f6 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/query.h +++ b/searchlib/src/vespa/searchlib/query/streaming/query.h @@ -5,8 +5,7 @@ #include <vespa/searchlib/parsequery/parse.h> #include <vespa/searchlib/query/base.h> -namespace search -{ +namespace search::streaming { /** Base class for all N-ary query operators. diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp index 234e64b2718..24c458c7e32 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp +++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp @@ -6,7 +6,7 @@ #include <vespa/log/log.h> LOG_SETUP(".vsm.querynode"); -namespace search { +namespace search::streaming { namespace { vespalib::stringref DEFAULT("default"); diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynode.h b/searchlib/src/vespa/searchlib/query/streaming/querynode.h index 87322fcf88e..5a306e2049f 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/querynode.h +++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.h @@ -4,9 +4,10 @@ #include "hit.h" #include <vespa/vespalib/stllike/string.h> -namespace search { +namespace search { class SimpleQueryStackDumpIterator; } + +namespace search::streaming { -class SimpleQueryStackDumpIterator; class QueryTerm; class QueryNode; class QueryNodeResultFactory; diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp index acf0f39ebfc..22f76bf9419 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp +++ b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp @@ -1,6 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "querynoderesultbase.h" -namespace search { +namespace search::streaming { } diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h index 8f584a13837..44527c80b2f 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h +++ b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h @@ -4,7 +4,7 @@ #include <vespa/vespalib/objects/cloneable.h> #include <memory> -namespace search { +namespace search::streaming { /** This is the base of any item that can be attached to the leafs in a querytree. diff --git a/searchlib/src/vespa/searchlib/query/streaming/queryterm.cpp b/searchlib/src/vespa/searchlib/query/streaming/queryterm.cpp index ba6862c82ca..164e9cea809 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/queryterm.cpp +++ b/searchlib/src/vespa/searchlib/query/streaming/queryterm.cpp @@ -38,7 +38,7 @@ static CharInfo _G_charTable; } -namespace search { +namespace search::streaming { QueryTerm::QueryTerm() : QueryTermUCS4(), diff --git a/searchlib/src/vespa/searchlib/query/streaming/queryterm.h b/searchlib/src/vespa/searchlib/query/streaming/queryterm.h index 57526589a84..82ed0eae9a5 100644 --- a/searchlib/src/vespa/searchlib/query/streaming/queryterm.h +++ b/searchlib/src/vespa/searchlib/query/streaming/queryterm.h @@ -11,7 +11,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/memory.h> -namespace search { +namespace search::streaming { /** This is a leaf in the Query tree. All terms are leafs. diff --git a/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp b/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp index f85d3046d69..ee8e5a322e2 100644 --- a/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp +++ b/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp @@ -26,11 +26,11 @@ using document::ArrayDataType; using document::ArrayFieldValue; -using document::Field; -using document::FieldPath; using document::DataType; using document::DocumentId; using document::DocumentType; +using document::Field; +using document::FieldPath; using document::IntFieldValue; using document::MapDataType; using document::MapFieldValue; @@ -38,11 +38,12 @@ using document::StringFieldValue; using document::StructDataType; using document::StructFieldValue; using search::MatchingElements; -using search::Query; using search::StructFieldMapper; using search::fef::MatchData; using search::query::StackDumpCreator; using search::query::Weight; +using search::streaming::Query; +using search::streaming::QueryNodeResultFactory; using storage::HitCollector; using storage::MatchingElementsFiller; using vdslib::SearchResult; @@ -84,7 +85,7 @@ struct BoundTerm { Query make_query(std::unique_ptr<search::query::Node> root) { vespalib::string stack_dump = StackDumpCreator::create(*root); - search::QueryNodeResultFactory empty; + QueryNodeResultFactory empty; Query query(empty, stack_dump); return query; } @@ -278,7 +279,7 @@ class MatchingElementsFillerTest : public ::testing::Test { vsm::DocumentTypeIndexFieldMapT _index_to_field_ids; HitCollector _hit_collector; SearchResult _search_result; - search::Query _query; + Query _query; vsm::SharedSearcherBuf _shared_searcher_buf; std::unique_ptr<MatchingElementsFiller> _matching_elements_filler; std::unique_ptr<MatchingElements> _matching_elements; diff --git a/streamingvisitors/src/tests/querywrapper/querywrapper.cpp b/streamingvisitors/src/tests/querywrapper/querywrapper.cpp index 53df76c0db7..ffdddec676e 100644 --- a/streamingvisitors/src/tests/querywrapper/querywrapper.cpp +++ b/streamingvisitors/src/tests/querywrapper/querywrapper.cpp @@ -9,6 +9,7 @@ using namespace search; using namespace search::query; +using namespace search::streaming; namespace storage { diff --git a/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.cpp b/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.cpp index 950d32f89b4..780b67ada0c 100644 --- a/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.cpp @@ -8,15 +8,15 @@ #include "hitcollector.h" #include <algorithm> -using search::AndNotQueryNode; -using search::HitList; using search::MatchingElements; -using search::Query; -using search::QueryConnector; -using search::QueryNode; -using search::QueryTerm; -using search::SameElementQueryNode; using search::StructFieldMapper; +using search::streaming::AndNotQueryNode; +using search::streaming::HitList; +using search::streaming::Query; +using search::streaming::QueryConnector; +using search::streaming::QueryNode; +using search::streaming::QueryTerm; +using search::streaming::SameElementQueryNode; using vdslib::SearchResult; using vsm::FieldIdTSearcherMap; using vsm::StorageDocument; @@ -141,7 +141,8 @@ Matcher::find_matching_elements(const StorageDocument& doc, uint32_t doc_lid, Ma } -MatchingElementsFiller::MatchingElementsFiller(FieldIdTSearcherMap& field_searcher_map, search::Query& query, HitCollector& hit_collector, SearchResult& search_result) +MatchingElementsFiller::MatchingElementsFiller(FieldIdTSearcherMap& field_searcher_map, Query& query, + HitCollector& hit_collector, SearchResult& search_result) : vsm::IMatchingElementsFiller(), _field_searcher_map(field_searcher_map), _query(query), diff --git a/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.h b/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.h index e6475762354..9a18fb818b1 100644 --- a/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.h +++ b/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.h @@ -4,7 +4,7 @@ #include <vespa/vsm/vsm/i_matching_elements_filler.h> -namespace search { class Query; } +namespace search::streaming { class Query; } namespace vdslib { class SearchResult; } namespace vsm { class FieldIdTSearcherMap; @@ -21,12 +21,13 @@ class HitCollector; */ class MatchingElementsFiller : public vsm::IMatchingElementsFiller { vsm::FieldIdTSearcherMap& _field_searcher_map; - search::Query& _query; + search::streaming::Query& _query; HitCollector& _hit_collector; vdslib::SearchResult& _search_result; public: - MatchingElementsFiller(vsm::FieldIdTSearcherMap& field_searcher_map, search::Query& query, HitCollector& hit_collector, vdslib::SearchResult& search_result); + MatchingElementsFiller(vsm::FieldIdTSearcherMap& field_searcher_map, search::streaming::Query& query, + HitCollector& hit_collector, vdslib::SearchResult& search_result); virtual ~MatchingElementsFiller(); std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::StructFieldMapper& struct_field_mapper) override; }; diff --git a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h index e8e9c77ece5..99179dba691 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h +++ b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h @@ -11,7 +11,7 @@ namespace storage { /** * This class keeps data for a query term that is used by the ranking framework. **/ -class QueryTermData : public search::QueryNodeResultBase +class QueryTermData : public search::streaming::QueryNodeResultBase { private: search::fef::SimpleTermData _termData; @@ -20,9 +20,9 @@ public: search::fef::SimpleTermData &getTermData() { return _termData; } }; -class QueryTermDataFactory final : public search::QueryNodeResultFactory { +class QueryTermDataFactory final : public search::streaming::QueryNodeResultFactory { public: - std::unique_ptr<search::QueryNodeResultBase> create() const override { + std::unique_ptr<search::streaming::QueryNodeResultBase> create() const override { return std::make_unique<QueryTermData>(); } bool getRewriteFloatTerms() const override { return true; } diff --git a/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp b/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp index 9cb9ed33efb..73aa0c8a97e 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp @@ -2,7 +2,7 @@ #include "querywrapper.h" -using namespace search; +using namespace search::streaming; namespace storage { diff --git a/streamingvisitors/src/vespa/searchvisitor/querywrapper.h b/streamingvisitors/src/vespa/searchvisitor/querywrapper.h index efa68f6bdfb..8952ca302fb 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querywrapper.h +++ b/streamingvisitors/src/vespa/searchvisitor/querywrapper.h @@ -15,17 +15,17 @@ class QueryWrapper public: class PhraseList { private: - std::vector<search::PhraseQueryNode *> _phrases; + std::vector<search::streaming::PhraseQueryNode *> _phrases; public: - PhraseList(search::Query & query); - search::PhraseQueryNode * findPhrase(search::QueryTerm * term, size_t & index); + PhraseList(search::streaming::Query & query); + search::streaming::PhraseQueryNode * findPhrase(search::streaming::QueryTerm * term, size_t & index); }; class Term { private: - search::QueryTerm * _term; - search::PhraseQueryNode * _parent; + search::streaming::QueryTerm * _term; + search::streaming::PhraseQueryNode * _parent; size_t _index; public: @@ -35,14 +35,14 @@ public: _index(0) { } - Term(search::QueryTerm * term, search::PhraseQueryNode * parent, size_t index) : + Term(search::streaming::QueryTerm * term, search::streaming::PhraseQueryNode * parent, size_t index) : _term(term), _parent(parent), _index(index) { } - search::QueryTerm * getTerm() { return _term; } - search::PhraseQueryNode * getParent() { return _parent; } + search::streaming::QueryTerm * getTerm() { return _term; } + search::streaming::PhraseQueryNode * getParent() { return _parent; } size_t getIndex() const { return _index; } bool isPhraseTerm() const { return _parent != nullptr; } bool isFirstPhraseTerm() const { return isPhraseTerm() && getIndex() == 0; } @@ -56,7 +56,7 @@ private: TermList _termList; public: - QueryWrapper(search::Query & query); + QueryWrapper(search::streaming::Query & query); ~QueryWrapper(); TermList & getTermList() { return _termList; } const TermList & getTermList() const { return _termList; } diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp index 6fbf0134f45..690e750503b 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp @@ -10,21 +10,22 @@ LOG_SETUP(".searchvisitor.rankprocessor"); using search::FeatureSet; -using search::HitList; -using search::Query; -using search::QueryTerm; -using search::QueryTermList; using search::fef::FeatureHandle; +using search::fef::ITermData; +using search::fef::ITermFieldData; +using search::fef::IllegalHandle; using search::fef::MatchData; using search::fef::Properties; using search::fef::RankProgram; using search::fef::RankSetup; -using search::fef::IllegalHandle; -using search::fef::ITermData; -using search::fef::ITermFieldData; using search::fef::TermFieldHandle; using search::fef::TermFieldMatchData; using search::fef::TermFieldMatchDataPosition; +using search::streaming::Hit; +using search::streaming::HitList; +using search::streaming::Query; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using vdslib::SearchResult; namespace storage { @@ -128,7 +129,7 @@ RankProcessor::init(bool forRanking, size_t wantedHitCount) RankProcessor::RankProcessor(RankManager::Snapshot::SP snapshot, const vespalib::string &rankProfile, - search::Query & query, + Query & query, const vespalib::string & location, Properties & queryProperties, const search::IAttributeManager * attrMgr) : @@ -246,7 +247,7 @@ RankProcessor::unpackMatchData(MatchData &matchData) uint32_t fieldLen = search::fef::FieldPositionsIterator::UNKNOWN_LENGTH; // optimize for hitlist giving all hits for a single field in one chunk - for (const search::Hit & hit : hitList) { + for (const Hit & hit : hitList) { uint32_t fieldId = hit.context(); if (fieldId != lastFieldId) { // reset to notfound/unknown values diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h index 244cc6b2cd9..7dd921af69e 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h +++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h @@ -57,7 +57,7 @@ public: RankProcessor(RankManager::Snapshot::SP snapshot, const vespalib::string &rankProfile, - search::Query & query, + search::streaming::Query & query, const vespalib::string & location, search::fef::Properties & queryProperties, const search::IAttributeManager * attrMgr); diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index 082ccd789f9..55a3d313da9 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -22,18 +22,20 @@ LOG_SETUP(".visitor.instance.searchvisitor"); namespace storage { -using vsm::DocsumFilter; -using vsm::FieldPath; -using vsm::StorageDocument; -using vsm::StringFieldIdTMap; +using document::DataType; +using document::PositionDataType; using search::AttributeGuard; using search::AttributeVector; -using search::attribute::IAttributeVector; using search::aggregation::HitsAggregationResult; +using search::attribute::IAttributeVector; using search::expression::ConfigureStaticParams; +using search::streaming::Query; +using search::streaming::QueryTermList; using vdslib::Parameters; -using document::PositionDataType; -using document::DataType; +using vsm::DocsumFilter; +using vsm::FieldPath; +using vsm::StorageDocument; +using vsm::StringFieldIdTMap; class ForceWordfolderInit { @@ -292,7 +294,7 @@ void SearchVisitor::init(const Parameters & params) LOG(spam, "Received query blob of %zu bytes", queryBlob.size()); VISITOR_TRACE(9, vespalib::make_string("Setting up for query blob of %zu bytes", queryBlob.size())); QueryTermDataFactory addOnFactory; - _query = search::Query(addOnFactory, search::QueryPacketT(queryBlob.data(), queryBlob.size())); + _query = Query(addOnFactory, search::QueryPacketT(queryBlob.data(), queryBlob.size())); _searchBuffer->reserve(0x10000); int stackCount = 0; @@ -469,7 +471,7 @@ SearchVisitor::RankController::RankController() : SearchVisitor::RankController::~RankController() {} void -SearchVisitor::RankController::setupRankProcessors(search::Query & query, +SearchVisitor::RankController::setupRankProcessors(Query & query, const vespalib::string & location, size_t wantedHitCount, const search::IAttributeManager & attrMan, @@ -651,7 +653,7 @@ SearchVisitor::setupFieldSearchers(const std::vector<vespalib::string> & additio void SearchVisitor::setupSnippetModifiers() { - search::QueryTermList qtl; + QueryTermList qtl; _query.getLeafs(qtl); _snippetModifierManager.setup(qtl, _fieldSearchSpecMap.specMap(), _fieldSearchSpecMap.documentTypeMap().begin()->second); } diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h index 61fe5446e7c..c7463f7c7b7 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h @@ -153,7 +153,7 @@ private: * @param attrMan the attribute manager. * @param attributeFields the list of attribute vectors needed. **/ - void setupRankProcessors(search::Query & query, + void setupRankProcessors(search::streaming::Query & query, const vespalib::string & location, size_t wantedHitCount, const search::IAttributeManager & attrMan, @@ -424,7 +424,7 @@ private: size_t _docSearchedCount; size_t _hitCount; size_t _hitsRejectedCount; - search::Query _query; + search::streaming::Query _query; std::unique_ptr<documentapi::QueryResultMessage> _queryResult; vsm::FieldIdTSearcherMap _fieldSearcherMap; vsm::SharedFieldPathMap _fieldPathMap; diff --git a/vsm/src/tests/searcher/searcher.cpp b/vsm/src/tests/searcher/searcher.cpp index 855dad65a39..a31f5451e89 100644 --- a/vsm/src/tests/searcher/searcher.cpp +++ b/vsm/src/tests/searcher/searcher.cpp @@ -17,9 +17,10 @@ #include <vespa/document/fieldvalue/fieldvalues.h> using namespace document; -using search::QueryNodeResultFactory; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::HitList; +using search::streaming::QueryNodeResultFactory; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using namespace vsm; template <typename T> @@ -328,7 +329,7 @@ assertSearch(FieldSearcher & fs, const StringList & query, const FieldValue & fv EXPECT_EQUAL(qtv.size(), exp.size()); ASSERT_TRUE(qtv.size() == exp.size()); for (size_t i = 0; i < qtv.size(); ++i) { - const search::HitList & hl = qtv[i].getHitList(); + const HitList & hl = qtv[i].getHitList(); EXPECT_EQUAL(hl.size(), exp[i].size()); ASSERT_TRUE(hl.size() == exp[i].size()); for (size_t j = 0; j < hl.size(); ++j) { diff --git a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp index a9f765546a8..88342cb8d3b 100644 --- a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "boolfieldsearcher.h" #include <vespa/document/fieldvalue/boolfieldvalue.h> -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h b/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h index b7f9419465d..5ff4b14ffd1 100644 --- a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h @@ -11,7 +11,7 @@ public: std::unique_ptr<FieldSearcher> duplicate() const override; BoolFieldSearcher(FieldIdT fId); ~BoolFieldSearcher(); - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; void onValue(const document::FieldValue & fv) override; private: std::vector<bool> _terms; diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp index 4bb36d3f968..74e55c958fe 100644 --- a/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp @@ -8,10 +8,10 @@ LOG_SETUP(".vsm.searcher.fieldsearcher"); using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::Query; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using search::v16qi; -using search::Query; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.h b/vsm/src/vespa/vsm/searcher/fieldsearcher.h index dd0efd32631..d3cb5415ec1 100644 --- a/vsm/src/vespa/vsm/searcher/fieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/fieldsearcher.h @@ -25,7 +25,7 @@ typedef std::vector<char> CharVector; class FieldSearcherBase { protected: - search::QueryTermList _qtl; + search::streaming::QueryTermList _qtl; private: CharVector _qtlFastBuffer; protected: @@ -33,7 +33,7 @@ protected: FieldSearcherBase(const FieldSearcherBase & org); virtual ~FieldSearcherBase(void); FieldSearcherBase & operator = (const FieldSearcherBase & org); - void prepare(const search::QueryTermList & qtl); + void prepare(const search::streaming::QueryTermList & qtl); size_t _qtlFastSize; search::v16qi *_qtlFast; }; @@ -53,7 +53,7 @@ public: ~FieldSearcher() override; virtual std::unique_ptr<FieldSearcher> duplicate() const = 0; bool search(const StorageDocument & doc); - virtual void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf); + virtual void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf); const FieldIdT & field() const { return _field; } void field(const FieldIdT & v) { _field = v; prepareFieldId(); } bool prefix() const { return _matchType == PREFIX; } @@ -126,7 +126,7 @@ protected: * Adds a hit to the given query term. * For each call to onValue() a batch of words are processed, and the position is local to this batch. **/ - void addHit(search::QueryTerm & qt, uint32_t pos) const { + void addHit(search::streaming::QueryTerm & qt, uint32_t pos) const { qt.add(_words + pos, field(), _currentElementId, getCurrentWeight()); } public: @@ -140,7 +140,7 @@ typedef std::vector<FieldSearcherContainer> FieldIdTSearcherMapT; class FieldIdTSearcherMap : public FieldIdTSearcherMapT { public: - void prepare(const DocumentTypeIndexFieldMapT & difm, const SharedSearcherBuf & searcherBuf, search::Query & query); + void prepare(const DocumentTypeIndexFieldMapT & difm, const SharedSearcherBuf & searcherBuf, search::streaming::Query & query); }; } diff --git a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp index 41a07a03bf2..6043a88fc22 100644 --- a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "floatfieldsearcher.h" -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h index 5f56ff67b30..efbdb961081 100644 --- a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h @@ -11,7 +11,7 @@ class FloatFieldSearcherT : public FieldSearcher public: FloatFieldSearcherT(FieldIdT fId=0); ~FloatFieldSearcherT(); - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; void onValue(const document::FieldValue & fv) override; protected: class FloatInfo diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp index e85cc20d418..de67272946b 100644 --- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp @@ -3,10 +3,10 @@ #include "futf8strchrfieldsearcher.h" #include "fold.h" -using vespalib::Optimized; using search::byte; -using search::QueryTerm; +using search::streaming::QueryTerm; using search::v16qi; +using vespalib::Optimized; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h index 0539bdc6ea6..4876654a2b6 100644 --- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h @@ -16,10 +16,10 @@ public: static bool lfoldaa(const char * toFold, size_t sz, char * folded, size_t & unalignedStart); static bool lfoldua(const char * toFold, size_t sz, char * folded, size_t & alignedStart); private: - size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; size_t matchTerms(const FieldRef&, const size_t shortestTerm) override; - virtual size_t match(const char *folded, size_t sz, search::QueryTerm & qt); - size_t match(const char *folded, size_t sz, size_t mintsz, search::QueryTerm ** qtl, size_t qtlSize); + virtual size_t match(const char *folded, size_t sz, search::streaming::QueryTerm & qt); + size_t match(const char *folded, size_t sz, size_t mintsz, search::streaming::QueryTerm ** qtl, size_t qtlSize); std::vector<char> _folded; }; diff --git a/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp index 5886a17cf4a..f4e68c60119 100644 --- a/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp @@ -1,8 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "intfieldsearcher.h" -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/intfieldsearcher.h b/vsm/src/vespa/vsm/searcher/intfieldsearcher.h index ea190bf07cd..47fde7cd0ad 100644 --- a/vsm/src/vespa/vsm/searcher/intfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/intfieldsearcher.h @@ -11,7 +11,7 @@ public: std::unique_ptr<FieldSearcher> duplicate() const override; IntFieldSearcher(FieldIdT fId=0); ~IntFieldSearcher(); - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; void onValue(const document::FieldValue & fv) override; protected: class IntInfo diff --git a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp index 1be1326807e..ccc37340ff7 100644 --- a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "strchrfieldsearcher.h" #include <vespa/document/fieldvalue/stringfieldvalue.h> -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h index 147e0667ffe..15f7c177afe 100644 --- a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h @@ -11,11 +11,11 @@ public: StrChrFieldSearcher() : FieldSearcher(0) { } StrChrFieldSearcher(FieldIdT fId) : FieldSearcher(fId) { } void onValue(const document::FieldValue & fv) override; - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; private: size_t shortestTerm() const; bool matchDoc(const FieldRef & field); - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) = 0; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) = 0; virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) = 0; }; diff --git a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp index 1de8c40c93a..2105ceec426 100644 --- a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "utf8exactstringfieldsearcher.h" using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h index 49557b8097d..f6595d917aa 100644 --- a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h @@ -12,7 +12,7 @@ namespace vsm class UTF8ExactStringFieldSearcher : public UTF8StringFieldSearcherBase { protected: - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; public: diff --git a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp index 77708a682a2..a6fb4794cc4 100644 --- a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp @@ -4,8 +4,8 @@ #include <vespa/log/log.h> LOG_SETUP(".vsm.searcher.utf8flexiblestringfieldsearcher"); -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h index f91bb48a068..deea42ff5c1 100644 --- a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h @@ -17,7 +17,7 @@ private: * Tries to match the given query term against the content of the given field reference. * Search strategy is choosen based on the query term type. **/ - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; /** * Tries to match each query term in the underlying query against the content of the given field reference. diff --git a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp index fc78101737e..eb3dc3540a1 100644 --- a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp @@ -1,8 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "utf8strchrfieldsearcher.h" -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using search::byte; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h index acfe1256ee5..a175ae8b48a 100644 --- a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h @@ -17,7 +17,7 @@ public: UTF8StrChrFieldSearcher(FieldIdT fId) : UTF8StringFieldSearcherBase(fId) { } protected: - size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; }; diff --git a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp b/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp index 872cfebfd70..4055a886421 100644 --- a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp @@ -3,8 +3,8 @@ #include "utf8stringfieldsearcherbase.h" #include <cassert> -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; using search::byte; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h b/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h index f1315285714..c0aa21a248d 100644 --- a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h +++ b/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h @@ -71,7 +71,7 @@ protected: * @param qt the query term trying to match. * @return the number of words in the field ref. **/ - size_t matchTermRegular(const FieldRef & f, search::QueryTerm & qt); + size_t matchTermRegular(const FieldRef & f, search::streaming::QueryTerm & qt); /** * Matches the given query term against the characters in the given field reference @@ -81,7 +81,7 @@ protected: * @param qt the query term trying to match. * @return the number of words in the field ref. **/ - size_t matchTermSubstring(const FieldRef & f, search::QueryTerm & qt); + size_t matchTermSubstring(const FieldRef & f, search::streaming::QueryTerm & qt); /** * Matches the given query term against the words in the given field reference @@ -91,7 +91,7 @@ protected: * @param qt the query term trying to match. * @return the number of words in the field ref. **/ - size_t matchTermSuffix(const FieldRef & f, search::QueryTerm & qt); + size_t matchTermSuffix(const FieldRef & f, search::streaming::QueryTerm & qt); /** * Matches the given query term against the words in the given field reference @@ -101,13 +101,13 @@ protected: * @param qt the query term trying to match. * @return the number of words in the field ref. **/ - size_t matchTermExact(const FieldRef & f, search::QueryTerm & qt); + size_t matchTermExact(const FieldRef & f, search::streaming::QueryTerm & qt); public: UTF8StringFieldSearcherBase(); UTF8StringFieldSearcherBase(FieldIdT fId); ~UTF8StringFieldSearcherBase(); - void prepare(search::QueryTermList & qtl, const SharedSearcherBuf & buf) override; + void prepare(search::streaming::QueryTermList & qtl, const SharedSearcherBuf & buf) override; /** * Matches the given query term against the given word using suffix match strategy. * diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp index 8cda3e27bd5..03b79bb2ae2 100644 --- a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp @@ -3,8 +3,8 @@ #include <vespa/vsm/searcher/utf8substringsearcher.h> using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h b/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h index 9e01a56bdba..b284b1bf76c 100644 --- a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h @@ -15,7 +15,7 @@ public: UTF8SubStringFieldSearcher() : UTF8StringFieldSearcherBase() { } UTF8SubStringFieldSearcher(FieldIdT fId) : UTF8StringFieldSearcherBase(fId) { } protected: - size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; }; diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp index c19259273d0..d2ae8ad89fa 100644 --- a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp @@ -3,8 +3,8 @@ #include <cassert> using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h index fce0fdc2175..bac183dd1d5 100644 --- a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h +++ b/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h @@ -23,7 +23,7 @@ private: const char * _readPtr; // buffer to read from (field reference) char _unitSep; // the unit separator character to use - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; /** @@ -65,7 +65,7 @@ public: UTF8SubstringSnippetModifier(FieldIdT fId, const CharBuffer::SP & modBuf, const SharedOffsetBuffer & offBuf); const CharBuffer & getModifiedBuf() const { return *_modified; } - const search::QueryTermList & getQueryTerms() const { return _qtl; } + const search::streaming::QueryTermList & getQueryTerms() const { return _qtl; } }; } diff --git a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp index 1e9ec246743..93a78554620 100644 --- a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp @@ -2,8 +2,8 @@ #include "utf8suffixstringfieldsearcher.h" using search::byte; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; namespace vsm { diff --git a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h index cc55ee7bb43..999c85a7f12 100644 --- a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h @@ -12,7 +12,7 @@ namespace vsm class UTF8SuffixStringFieldSearcher : public UTF8StringFieldSearcherBase { protected: - virtual size_t matchTerm(const FieldRef & f, search::QueryTerm & qt) override; + virtual size_t matchTerm(const FieldRef & f, search::streaming::QueryTerm & qt) override; virtual size_t matchTerms(const FieldRef & f, const size_t shortestTerm) override; public: diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp index e56df354d2a..3b1c98cd319 100644 --- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp +++ b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp @@ -18,8 +18,9 @@ LOG_SETUP(".vsm.fieldsearchspec"); #define DEBUGMASK 0x01 -using search::Query; -using search::ConstQueryTermList; +using search::streaming::ConstQueryTermList; +using search::streaming::Query; +using search::streaming::QueryTerm; namespace vsm { @@ -112,7 +113,7 @@ FieldSearchSpec::FieldSearchSpec(const FieldIdT & fid, const vespalib::string & } void -FieldSearchSpec::reconfig(const search::QueryTerm & term) +FieldSearchSpec::reconfig(const QueryTerm & term) { if (_reconfigured) { return; @@ -269,7 +270,7 @@ bool FieldSearchSpecMap::buildFromConfig(const VsmfieldsHandle & conf) } void -FieldSearchSpecMap::reconfigFromQuery(const search::Query & query) +FieldSearchSpecMap::reconfigFromQuery(const Query & query) { ConstQueryTermList qtl; query.getLeafs(qtl); diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.h b/vsm/src/vespa/vsm/vsm/fieldsearchspec.h index d3feb8621b5..f8631cc0ace 100644 --- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.h +++ b/vsm/src/vespa/vsm/vsm/fieldsearchspec.h @@ -24,7 +24,7 @@ public: /** * Reconfigures the field searcher based on information in the given query term. **/ - void reconfig(const search::QueryTerm & term); + void reconfig(const search::streaming::QueryTerm & term); friend vespalib::asciistream & operator <<(vespalib::asciistream & os, const FieldSearchSpec & f); @@ -61,13 +61,13 @@ public: /** * Reconfigures some of the field searchers based on information in the given query. **/ - void reconfigFromQuery(const search::Query & query); + void reconfigFromQuery(const search::streaming::Query & query); /** * Adds a [field name, field id] entry to the given mapping for each field name used in the given query. * This is achieved by mapping from query term index name -> list of field ids -> [field name, field id] pairs. **/ - bool buildFieldsInQuery(const search::Query & query, StringFieldIdTMap & fieldsInQuery) const; + bool buildFieldsInQuery(const search::streaming::Query & query, StringFieldIdTMap & fieldsInQuery) const; /** * Adds a [field name, field id] entry to the given mapping for each field name in the given vector. diff --git a/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp b/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp index 9704902c598..d3c952f78a4 100644 --- a/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp +++ b/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp @@ -8,8 +8,8 @@ LOG_SETUP(".vsm.snippetmodifier"); using namespace document; -using search::QueryTerm; -using search::QueryTermList; +using search::streaming::QueryTerm; +using search::streaming::QueryTermList; typedef vespalib::hash_map<vsm::FieldIdT, QueryTermList> FieldQueryTermMap; namespace { diff --git a/vsm/src/vespa/vsm/vsm/snippetmodifier.h b/vsm/src/vespa/vsm/vsm/snippetmodifier.h index 82badf97ef3..81b8c447341 100644 --- a/vsm/src/vespa/vsm/vsm/snippetmodifier.h +++ b/vsm/src/vespa/vsm/vsm/snippetmodifier.h @@ -100,7 +100,7 @@ public: * @param specMap mapping from field id to search spec objects. * @param fieldMap mapping from index (used in the query) to a list of field ids. **/ - void setup(const search::QueryTermList & queryTerms, + void setup(const search::streaming::QueryTermList & queryTerms, const FieldSearchSpecMapT & specMap, const IndexFieldMapT & fieldMap); const FieldModifierMap & getModifiers() const { return _modifiers; } |