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

12 files changed, 15 insertions, 11 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.