diff options
| author | Geir Storli <geirst@verizonmedia.com> | 2019-11-28 08:28:46 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@verizonmedia.com> | 2019-11-28 10:15:37 +0000 |
| commit | 14035635959cd41fe0dec0ab7b2a4e9206e5a6c9 (patch) | |
| tree | 505cdd8ccdd49fd6f4754c7875b921aa490d260a /streamingvisitors | |
| parent | a3b4f9b6060a3987bc57c0faba3b9bcd7930955f (diff) | |
Move query classes used in streaming search to separate sub-folder and sub-library.
Diffstat (limited to 'streamingvisitors')
5 files changed, 7 insertions, 7 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 8731625fb5a..f85d3046d69 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 @@ -13,8 +13,8 @@ #include <vespa/searchlib/query/tree/querybuilder.h> #include <vespa/searchlib/query/tree/simplequery.h> #include <vespa/searchlib/query/tree/stackdumpcreator.h> -#include <vespa/searchlib/query/queryterm.h> -#include <vespa/searchlib/query/query.h> +#include <vespa/searchlib/query/streaming/queryterm.h> +#include <vespa/searchlib/query/streaming/query.h> #include <vespa/vsm/searcher/fieldsearcher.h> #include <vespa/vsm/searcher/utf8strchrfieldsearcher.h> #include <vespa/vsm/searcher/intfieldsearcher.h> diff --git a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h index a9d11619aa1..e8e9c77ece5 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h +++ b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h @@ -4,7 +4,7 @@ #include <vespa/searchlib/fef/matchdatalayout.h> #include <vespa/searchlib/fef/simpletermdata.h> -#include <vespa/searchlib/query/querynoderesultbase.h> +#include <vespa/searchlib/query/streaming/querynoderesultbase.h> namespace storage { diff --git a/streamingvisitors/src/vespa/searchvisitor/querywrapper.h b/streamingvisitors/src/vespa/searchvisitor/querywrapper.h index 53b67349099..efa68f6bdfb 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querywrapper.h +++ b/streamingvisitors/src/vespa/searchvisitor/querywrapper.h @@ -2,8 +2,8 @@ #pragma once -#include <vespa/searchlib/query/query.h> -#include <vespa/searchlib/query/querynode.h> +#include <vespa/searchlib/query/streaming/query.h> +#include <vespa/searchlib/query/streaming/querynode.h> namespace storage { diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h index bab63c36522..244cc6b2cd9 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h +++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h @@ -7,7 +7,7 @@ #include <vespa/searchlib/fef/properties.h> #include <vespa/searchlib/fef/rank_program.h> #include <vespa/searchlib/fef/ranksetup.h> -#include <vespa/searchlib/query/query.h> +#include <vespa/searchlib/query/streaming/query.h> #include <vespa/vdslib/container/searchresult.h> #include "hitcollector.h" #include "queryenvironment.h" diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h index abe66f555a1..61fe5446e7c 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h @@ -18,7 +18,7 @@ #include <vespa/vsm/vsm/vsm-adapter.h> #include <vespa/vespalib/objects/objectoperation.h> #include <vespa/vespalib/objects/objectpredicate.h> -#include <vespa/searchlib/query/query.h> +#include <vespa/searchlib/query/streaming/query.h> #include <vespa/searchlib/aggregation/aggregation.h> #include <vespa/searchlib/attribute/attributemanager.h> #include <vespa/searchlib/attribute/attributevector.h> |