Move query classes used in streaming search to separate sub-folder and sub-library.

18 files changed, 21 insertions, 14 deletions

diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index fadd05ec50d..2c8eff4f4ad 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -41,6 +41,7 @@ vespa_define_module(
     src/vespa/searchlib/parsequery
     src/vespa/searchlib/predicate
     src/vespa/searchlib/query
+    src/vespa/searchlib/query/streaming
     src/vespa/searchlib/query/tree
     src/vespa/searchlib/queryeval
     src/vespa/searchlib/queryeval/test
diff --git a/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp b/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
index 03187215f3a..e8dbaefc2ba 100644
--- a/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
+++ b/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
@@ -4,7 +4,7 @@
 #include <vespa/searchlib/attribute/attribute_read_guard.h>
 #include <vespa/searchlib/attribute/imported_search_context.h>
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
-#include <vespa/searchlib/query/queryterm.h>
+#include <vespa/searchlib/query/query_term_ucs4.h>
 #include <vespa/searchlib/queryeval/simpleresult.h>
 #include <vespa/searchlib/test/imported_attribute_fixture.h>
 #include <vespa/vespalib/test/insertion_operators.h>
diff --git a/searchlib/src/tests/query/query-old-large.cpp b/searchlib/src/tests/query/query-old-large.cpp
index f1ff391cc2c..b807c861b28 100644
--- a/searchlib/src/tests/query/query-old-large.cpp
+++ b/searchlib/src/tests/query/query-old-large.cpp
@@ -1,5 +1,5 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/searchlib/query/query.h>
+#include <vespa/searchlib/query/streaming/query.h>
 #include <vespa/searchlib/query/tree/querybuilder.h>
 #include <vespa/searchlib/query/tree/simplequery.h>
 #include <vespa/searchlib/query/tree/stackdumpcreator.h>
diff --git a/searchlib/src/tests/query/query-old.cpp b/searchlib/src/tests/query/query-old.cpp
index f3731b1ec72..7690c37a640 100644
--- a/searchlib/src/tests/query/query-old.cpp
+++ b/searchlib/src/tests/query/query-old.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 <vespa/searchlib/query/query.h>
+#include <vespa/searchlib/query/streaming/query.h>
 #include <vespa/searchlib/query/tree/querybuilder.h>
 #include <vespa/searchlib/query/tree/simplequery.h>
 #include <vespa/searchlib/query/tree/stackdumpcreator.h>
diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt
index f6f9ad2259a..4a255a8f63a 100644
--- a/searchlib/src/vespa/searchlib/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/CMakeLists.txt
@@ -20,6 +20,7 @@ vespa_add_library(searchlib
     $<TARGET_OBJECTS:searchlib_parsequery>
     $<TARGET_OBJECTS:searchlib_predicate>
     $<TARGET_OBJECTS:searchlib_query>
+    $<TARGET_OBJECTS:searchlib_query_streaming>
     $<TARGET_OBJECTS:searchlib_query_tree>
     $<TARGET_OBJECTS:searchlib_queryeval>
     $<TARGET_OBJECTS:searchlib_queryeval_wand>
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index 00f45575d17..e79db2fae11 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -16,7 +16,7 @@
 #include <vespa/searchlib/common/tunefileinfo.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/parsequery/stackdumpiterator.h>
-#include <vespa/searchlib/query/query.h>
+#include <vespa/searchlib/query/query_term_simple.h>
 #include <vespa/searchlib/query/query_term_decoder.h>
 #include <vespa/searchlib/queryeval/emptysearch.h>
 #include <vespa/vespalib/util/exceptions.h>
diff --git a/searchlib/src/vespa/searchlib/query/CMakeLists.txt b/searchlib/src/vespa/searchlib/query/CMakeLists.txt
index a8adb31f9e1..b4282bb1251 100644
--- a/searchlib/src/vespa/searchlib/query/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/query/CMakeLists.txt
@@ -3,10 +3,6 @@ vespa_add_library(searchlib_query OBJECT
     SOURCES
     query_term_simple.cpp
     query_term_ucs4.cpp
-    queryterm.cpp
-    querynode.cpp
-    query.cpp
     query_term_decoder.cpp
-    querynoderesultbase.cpp
     DEPENDS
 )
diff --git a/searchlib/src/vespa/searchlib/query/query_term_decoder.cpp b/searchlib/src/vespa/searchlib/query/query_term_decoder.cpp
index c9350ecc5f3..10f0f27f540 100644
--- a/searchlib/src/vespa/searchlib/query/query_term_decoder.cpp
+++ b/searchlib/src/vespa/searchlib/query/query_term_decoder.cpp
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "query_term_decoder.h"
-#include "query.h"
+#include <vespa/searchlib/query/streaming/query.h>
 #include <vespa/vespalib/util/exceptions.h>
 
 namespace search {
diff --git a/searchlib/src/vespa/searchlib/query/streaming/CMakeLists.txt b/searchlib/src/vespa/searchlib/query/streaming/CMakeLists.txt
new file mode 100644
index 00000000000..990895d4f30
--- /dev/null
+++ b/searchlib/src/vespa/searchlib/query/streaming/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_library(searchlib_query_streaming OBJECT
+    SOURCES
+    query.cpp
+    querynode.cpp
+    querynoderesultbase.cpp
+    queryterm.cpp
+    DEPENDS
+)
diff --git a/searchlib/src/vespa/searchlib/query/hit.h b/searchlib/src/vespa/searchlib/query/streaming/hit.h
index fcabef0297f..fcabef0297f 100644
--- a/searchlib/src/vespa/searchlib/query/hit.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/hit.h
diff --git a/searchlib/src/vespa/searchlib/query/query.cpp b/searchlib/src/vespa/searchlib/query/streaming/query.cpp
index 73ad9b5f458..73ad9b5f458 100644
--- a/searchlib/src/vespa/searchlib/query/query.cpp
+++ b/searchlib/src/vespa/searchlib/query/streaming/query.cpp
diff --git a/searchlib/src/vespa/searchlib/query/query.h b/searchlib/src/vespa/searchlib/query/streaming/query.h
index f86e7861d06..ad4fdbdd0a3 100644
--- a/searchlib/src/vespa/searchlib/query/query.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/query.h
@@ -2,8 +2,8 @@
 #pragma once
 
 #include "queryterm.h"
-#include "base.h"
 #include <vespa/searchlib/parsequery/parse.h>
+#include <vespa/searchlib/query/base.h>
 
 namespace search
 {
diff --git a/searchlib/src/vespa/searchlib/query/querynode.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
index 234e64b2718..234e64b2718 100644
--- a/searchlib/src/vespa/searchlib/query/querynode.cpp
+++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
diff --git a/searchlib/src/vespa/searchlib/query/querynode.h b/searchlib/src/vespa/searchlib/query/streaming/querynode.h
index 87322fcf88e..87322fcf88e 100644
--- a/searchlib/src/vespa/searchlib/query/querynode.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.h
diff --git a/searchlib/src/vespa/searchlib/query/querynoderesultbase.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp
index acf0f39ebfc..acf0f39ebfc 100644
--- a/searchlib/src/vespa/searchlib/query/querynoderesultbase.cpp
+++ b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.cpp
diff --git a/searchlib/src/vespa/searchlib/query/querynoderesultbase.h b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h
index 8f584a13837..8f584a13837 100644
--- a/searchlib/src/vespa/searchlib/query/querynoderesultbase.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/querynoderesultbase.h
diff --git a/searchlib/src/vespa/searchlib/query/queryterm.cpp b/searchlib/src/vespa/searchlib/query/streaming/queryterm.cpp
index ba6862c82ca..ba6862c82ca 100644
--- a/searchlib/src/vespa/searchlib/query/queryterm.cpp
+++ b/searchlib/src/vespa/searchlib/query/streaming/queryterm.cpp
diff --git a/searchlib/src/vespa/searchlib/query/queryterm.h b/searchlib/src/vespa/searchlib/query/streaming/queryterm.h
index 6bde48d36c7..57526589a84 100644
--- a/searchlib/src/vespa/searchlib/query/queryterm.h
+++ b/searchlib/src/vespa/searchlib/query/streaming/queryterm.h
@@ -2,14 +2,14 @@
 #pragma once
 
 #include "hit.h"
-#include "query_term_ucs4.h"
 #include "querynode.h"
 #include "querynoderesultbase.h"
-#include "weight.h"
+#include <vespa/fastlib/text/unicodeutil.h>
+#include <vespa/searchlib/query/query_term_ucs4.h>
+#include <vespa/searchlib/query/weight.h>
+#include <vespa/vespalib/objects/objectvisitor.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/memory.h>
-#include <vespa/vespalib/objects/objectvisitor.h>
-#include <vespa/fastlib/text/unicodeutil.h>
 
 namespace search {