Move query classes used in streaming search to namespace search::streaming.

11 files changed, 58 insertions, 51 deletions

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;