diff options
author | Tor Egge <Tor.Egge@online.no> | 2022-09-28 13:19:22 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2022-09-28 13:19:22 +0200 |
commit | 9b380244ea6dd7c7ff775dfacd9fefba563e097c (patch) | |
tree | 3d28d8806c5697c9a9a3693604772d262c005ba2 /searchlib/src | |
parent | ceae7c63e4ab5b8ec5badb188a43c08eb321e829 (diff) |
Normalize includes in searchcore and searchlib.
Diffstat (limited to 'searchlib/src')
24 files changed, 27 insertions, 27 deletions
diff --git a/searchlib/src/vespa/searchcommon/attribute/attribute_utils.cpp b/searchlib/src/vespa/searchcommon/attribute/attribute_utils.cpp index cd5cc58c75c..ce7d0470a56 100644 --- a/searchlib/src/vespa/searchcommon/attribute/attribute_utils.cpp +++ b/searchlib/src/vespa/searchcommon/attribute/attribute_utils.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "attribute_utils.h" -#include <vespa/searchcommon/attribute/config.h> +#include "config.h" namespace search::attribute { diff --git a/searchlib/src/vespa/searchcommon/attribute/collectiontype.cpp b/searchlib/src/vespa/searchcommon/attribute/collectiontype.cpp index b77382f6126..bcf11f26795 100644 --- a/searchlib/src/vespa/searchcommon/attribute/collectiontype.cpp +++ b/searchlib/src/vespa/searchcommon/attribute/collectiontype.cpp @@ -1,6 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchcommon/attribute/collectiontype.h> +#include "collectiontype.h" #include <vespa/vespalib/util/exceptions.h> namespace search::attribute { diff --git a/searchlib/src/vespa/searchcommon/common/schemaconfigurer.cpp b/searchlib/src/vespa/searchcommon/common/schemaconfigurer.cpp index fd23b699f01..e0aa3f0d154 100644 --- a/searchlib/src/vespa/searchcommon/common/schemaconfigurer.cpp +++ b/searchlib/src/vespa/searchcommon/common/schemaconfigurer.cpp @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "schemaconfigurer.h" +#include "schema.h" #include "subscriptionproxyng.h" #include <vespa/config-attributes.h> #include <vespa/config-imported-fields.h> #include <vespa/config-indexschema.h> #include <vespa/config-summary.h> -#include <vespa/searchcommon/common/schema.h> #include <vespa/searchcommon/attribute/collectiontype.h> #include <vespa/searchcommon/attribute/basictype.h> diff --git a/searchlib/src/vespa/searchlib/common/locationiterators.h b/searchlib/src/vespa/searchlib/common/locationiterators.h index 0584e93b63f..bd8fb865f54 100644 --- a/searchlib/src/vespa/searchlib/common/locationiterators.h +++ b/searchlib/src/vespa/searchlib/common/locationiterators.h @@ -2,8 +2,8 @@ #pragma once +#include "location.h" #include <vespa/searchlib/queryeval/searchiterator.h> -#include <vespa/searchlib/common/location.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> namespace search::common { diff --git a/searchlib/src/vespa/searchlib/common/sortresults.cpp b/searchlib/src/vespa/searchlib/common/sortresults.cpp index 59a47dd3312..1add3501f61 100644 --- a/searchlib/src/vespa/searchlib/common/sortresults.cpp +++ b/searchlib/src/vespa/searchlib/common/sortresults.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "sortresults.h" -#include <vespa/searchlib/common/sort.h> +#include "sort.h" #include <vespa/searchcommon/attribute/iattributecontext.h> #include <vespa/vespalib/util/array.hpp> diff --git a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp index 3c157bb22d4..f0964de23f5 100644 --- a/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp +++ b/searchlib/src/vespa/searchlib/diskindex/indexbuilder.cpp @@ -1,13 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "indexbuilder.h" +#include "fieldwriter.h" #include <vespa/searchlib/index/docidandfeatures.h> #include <vespa/searchlib/index/field_length_info.h> #include <vespa/searchlib/index/i_field_length_inspector.h> #include <vespa/searchlib/index/schemautil.h> #include <vespa/searchlib/common/documentsummary.h> #include <vespa/vespalib/io/fileutil.h> -#include <vespa/searchlib/diskindex/fieldwriter.h> #include <vespa/vespalib/util/array.hpp> #include <vespa/vespalib/util/error.h> #include <filesystem> diff --git a/searchlib/src/vespa/searchlib/docstore/liddatastore.h b/searchlib/src/vespa/searchlib/docstore/liddatastore.h index c710158be77..e431f33af05 100644 --- a/searchlib/src/vespa/searchlib/docstore/liddatastore.h +++ b/searchlib/src/vespa/searchlib/docstore/liddatastore.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/docstore/idatastore.h> +#include "idatastore.h" namespace search { diff --git a/searchlib/src/vespa/searchlib/engine/docsumreply.h b/searchlib/src/vespa/searchlib/engine/docsumreply.h index e9f2898bc82..e45ca96a3d5 100644 --- a/searchlib/src/vespa/searchlib/engine/docsumreply.h +++ b/searchlib/src/vespa/searchlib/engine/docsumreply.h @@ -2,13 +2,13 @@ #pragma once -#include <vector> +#include "docsumrequest.h" #include <vespa/document/base/globalid.h> -#include <vespa/vespalib/util/memory.h> #include <vespa/searchlib/common/unique_issues.h> -#include <memory> -#include <vespa/searchlib/engine/docsumrequest.h> +#include <vespa/vespalib/util/memory.h> #include <cassert> +#include <memory> +#include <vector> namespace vespalib { class Slime; } namespace vespalib::slime { struct Inspector; } diff --git a/searchlib/src/vespa/searchlib/engine/search_protocol_proto.h b/searchlib/src/vespa/searchlib/engine/search_protocol_proto.h index a8cea62276c..e9fad0e8d1b 100644 --- a/searchlib/src/vespa/searchlib/engine/search_protocol_proto.h +++ b/searchlib/src/vespa/searchlib/engine/search_protocol_proto.h @@ -7,6 +7,6 @@ #pragma GCC diagnostic ignored "-Wsuggest-override" #endif -#include <vespa/searchlib/engine/search_protocol.pb.h> +#include "search_protocol.pb.h" #pragma GCC diagnostic pop diff --git a/searchlib/src/vespa/searchlib/engine/searchreply.h b/searchlib/src/vespa/searchlib/engine/searchreply.h index fc64566acf1..8f862d8dcf7 100644 --- a/searchlib/src/vespa/searchlib/engine/searchreply.h +++ b/searchlib/src/vespa/searchlib/engine/searchreply.h @@ -2,12 +2,12 @@ #pragma once +#include "searchrequest.h" #include <vespa/document/base/globalid.h> #include <vespa/searchlib/common/hitrank.h> #include <vespa/searchlib/common/unique_issues.h> #include <vespa/searchlib/common/featureset.h> #include <vespa/vespalib/util/array.h> -#include <vespa/searchlib/engine/searchrequest.h> #include <vector> namespace search::engine { diff --git a/searchlib/src/vespa/searchlib/fef/symmetrictable.h b/searchlib/src/vespa/searchlib/fef/symmetrictable.h index 0fdb7568d49..b1a87933246 100644 --- a/searchlib/src/vespa/searchlib/fef/symmetrictable.h +++ b/searchlib/src/vespa/searchlib/fef/symmetrictable.h @@ -2,8 +2,8 @@ #pragma once +#include "table.h" #include <vector> -#include <vespa/searchlib/fef/table.h> namespace search { namespace fef { diff --git a/searchlib/src/vespa/searchlib/grouping/groupengine.h b/searchlib/src/vespa/searchlib/grouping/groupengine.h index 778ed2956a8..8396f7fc9e2 100644 --- a/searchlib/src/vespa/searchlib/grouping/groupengine.h +++ b/searchlib/src/vespa/searchlib/grouping/groupengine.h @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "collect.h" #include <vespa/searchlib/aggregation/groupinglevel.h> -#include <vespa/searchlib/grouping/collect.h> #include <vespa/vespalib/util/sort.h> namespace search::grouping { diff --git a/searchlib/src/vespa/searchlib/grouping/groupingengine.h b/searchlib/src/vespa/searchlib/grouping/groupingengine.h index b0dbb3f8528..1b696996e37 100644 --- a/searchlib/src/vespa/searchlib/grouping/groupingengine.h +++ b/searchlib/src/vespa/searchlib/grouping/groupingengine.h @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "groupengine.h" #include <vespa/searchlib/aggregation/grouping.h> -#include <vespa/searchlib/grouping/groupengine.h> namespace search::grouping { diff --git a/searchlib/src/vespa/searchlib/index/postinglistcountfile.cpp b/searchlib/src/vespa/searchlib/index/postinglistcountfile.cpp index edf4f8c43b2..594e4499f6a 100644 --- a/searchlib/src/vespa/searchlib/index/postinglistcountfile.cpp +++ b/searchlib/src/vespa/searchlib/index/postinglistcountfile.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "postinglistcountfile.h" -#include <vespa/searchlib/index/postinglistparams.h> +#include "postinglistparams.h" namespace search::index { diff --git a/searchlib/src/vespa/searchlib/index/postinglistfile.cpp b/searchlib/src/vespa/searchlib/index/postinglistfile.cpp index 4d53790bd73..acb1d40e353 100644 --- a/searchlib/src/vespa/searchlib/index/postinglistfile.cpp +++ b/searchlib/src/vespa/searchlib/index/postinglistfile.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "postinglistfile.h" -#include <vespa/searchlib/index/postinglistparams.h> +#include "postinglistparams.h" #include <vespa/fastos/file.h> namespace search::index { diff --git a/searchlib/src/vespa/searchlib/index/postinglisthandle.cpp b/searchlib/src/vespa/searchlib/index/postinglisthandle.cpp index 714331bc161..82737531d69 100644 --- a/searchlib/src/vespa/searchlib/index/postinglisthandle.cpp +++ b/searchlib/src/vespa/searchlib/index/postinglisthandle.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "postinglisthandle.h" -#include <vespa/searchlib/index/postinglistfile.h> +#include "postinglistfile.h" namespace search::index { diff --git a/searchlib/src/vespa/searchlib/index/postinglisthandle.h b/searchlib/src/vespa/searchlib/index/postinglisthandle.h index 1fe35f318fb..86d283df537 100644 --- a/searchlib/src/vespa/searchlib/index/postinglisthandle.h +++ b/searchlib/src/vespa/searchlib/index/postinglisthandle.h @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/searchlib/index/postinglistcounts.h> +#include "postinglistcounts.h" #include <memory> #include <cstdlib> diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h index ca3e3f6be10..46b89fdfeb4 100644 --- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h +++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/parsequery/parse.h> +#include "parse.h" #include <vespa/searchlib/query/tree/predicate_query_term.h> #include <vespa/vespalib/stllike/string.h> diff --git a/searchlib/src/vespa/searchlib/queryeval/fake_requestcontext.h b/searchlib/src/vespa/searchlib/queryeval/fake_requestcontext.h index 9f829c9473c..0b727dcea42 100644 --- a/searchlib/src/vespa/searchlib/queryeval/fake_requestcontext.h +++ b/searchlib/src/vespa/searchlib/queryeval/fake_requestcontext.h @@ -2,6 +2,7 @@ #pragma once +#include "irequestcontext.h" #include <vespa/eval/eval/tensor_spec.h> #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/fast_value.h> @@ -9,7 +10,6 @@ #include <vespa/searchcommon/attribute/iattributecontext.h> #include <vespa/searchlib/attribute/attributevector.h> #include <vespa/searchlib/attribute/attribute_blueprint_params.h> -#include <vespa/searchlib/queryeval/irequestcontext.h> #include <vespa/vespalib/util/doom.h> #include <limits> diff --git a/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.h b/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.h index 5b0c1401c85..9bc59c6eed4 100644 --- a/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.h +++ b/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.h @@ -3,7 +3,7 @@ #pragma once #include "andsearch.h" -#include <vespa/searchlib/queryeval/irequestcontext.h> +#include "irequestcontext.h" #include <vespa/searchlib/fef/matchdata.h> #include <vespa/searchlib/fef/termfieldmatchdataarray.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> diff --git a/searchlib/src/vespa/searchlib/util/comprbuffer.h b/searchlib/src/vespa/searchlib/util/comprbuffer.h index 6524c49ae7c..9c0ccfec228 100644 --- a/searchlib/src/vespa/searchlib/util/comprbuffer.h +++ b/searchlib/src/vespa/searchlib/util/comprbuffer.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/util/filealign.h> +#include "filealign.h" #include <vespa/vespalib/util/alloc.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/util/comprfile.h b/searchlib/src/vespa/searchlib/util/comprfile.h index dc8cf6185fc..9be26f38a1a 100644 --- a/searchlib/src/vespa/searchlib/util/comprfile.h +++ b/searchlib/src/vespa/searchlib/util/comprfile.h @@ -2,8 +2,8 @@ #pragma once +#include "comprbuffer.h" #include <utility> -#include <vespa/searchlib/util/comprbuffer.h> class FastOS_FileInterface; diff --git a/searchlib/src/vespa/searchlib/util/drainingbufferwriter.h b/searchlib/src/vespa/searchlib/util/drainingbufferwriter.h index a2bf1c557c5..0891c298539 100644 --- a/searchlib/src/vespa/searchlib/util/drainingbufferwriter.h +++ b/searchlib/src/vespa/searchlib/util/drainingbufferwriter.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/util/bufferwriter.h> +#include "bufferwriter.h" #include <vector> #include <cstdint> diff --git a/searchlib/src/vespa/searchlib/util/logutil.cpp b/searchlib/src/vespa/searchlib/util/logutil.cpp index 7f10c1598df..2fd3205cdb2 100644 --- a/searchlib/src/vespa/searchlib/util/logutil.cpp +++ b/searchlib/src/vespa/searchlib/util/logutil.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "logutil.h" -#include <vespa/searchlib/util/dirtraverse.h> +#include "dirtraverse.h" #include <vector> using vespalib::JSONStringer; |