diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-26 22:08:30 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-01-26 22:08:30 +0100 |
commit | d25696f75dadc146fe26515d099b513bc7dfde99 (patch) | |
tree | 5fa90a38f7a051260d9100b2d43bf240bbfc9889 /searchcore | |
parent | 91aa559fa5d10f669859b80f6f0ba6e17a9617dc (diff) |
Unify includes
Diffstat (limited to 'searchcore')
25 files changed, 17 insertions, 97 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp b/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp index 95559e9671e..950db02d193 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/attribute_limiter.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "attribute_limiter.h" #include <vespa/vespalib/util/stringfmt.h> #include <vespa/searchlib/fef/matchdatalayout.h> diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp index 4392a5d112e..213f7ec13ae 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp @@ -1,21 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".proton.matching.blueprintbuilder"); - #include "querynodes.h" #include "blueprintbuilder.h" #include <vespa/searchlib/query/tree/customtypevisitor.h> -#include <vespa/searchlib/queryeval/blueprint.h> #include <vespa/searchlib/queryeval/leaf_blueprints.h> #include <vespa/searchlib/queryeval/intermediate_blueprints.h> #include <vespa/searchlib/queryeval/equiv_blueprint.h> -#include <vespa/searchlib/queryeval/searchable.h> #include <vespa/searchlib/queryeval/get_weight_from_node.h> -#include <vespa/searchlib/fef/handle.h> -#include <vespa/searchlib/fef/fieldinfo.h> -#include <vector> using namespace search::queryeval; diff --git a/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.cpp b/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.cpp index 916825d0956..cf0736b79c6 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "constant_value_repo.h" #include "error_constant_value.h" diff --git a/searchcore/src/vespa/searchcore/proton/matching/document_scorer.cpp b/searchcore/src/vespa/searchcore/proton/matching/document_scorer.cpp index 1fe65c10b88..5eccfee6034 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/document_scorer.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/document_scorer.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "document_scorer.h" using search::feature_t; diff --git a/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.cpp b/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.cpp index 6c6e8bb869d..29043874ba8 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.cpp @@ -1,9 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".proton.matching.fakesearchcontext"); - #include "fakesearchcontext.h" namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp b/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp index b7d30a6b051..c8af6440414 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp @@ -2,10 +2,8 @@ #include "handlerecorder.h" #include <vespa/vespalib/stllike/asciistream.h> -#include <vespa/vespalib/util/backtrace.h> -#include <vespa/log/log.h> +#include <cassert> -LOG_SETUP(".proton.matching.handlerecorder"); using search::fef::TermFieldHandle; @@ -75,7 +73,6 @@ void HandleRecorder::registerHandle(TermFieldHandle handle) // There should be no registration of handles that is not recorded. // That will lead to issues later on. if (_T_recorder != NULL) { - LOG(spam, "Handle %d - StackTrace : %s", handle, vespalib::getStackTrace(0).c_str()); _T_recorder->add(handle); } else if (_T_assert_all_handles_are_registered) { assert(_T_recorder != NULL); diff --git a/searchcore/src/vespa/searchcore/proton/matching/i_match_loop_communicator.cpp b/searchcore/src/vespa/searchcore/proton/matching/i_match_loop_communicator.cpp index 7e040019de2..04673806938 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/i_match_loop_communicator.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/i_match_loop_communicator.cpp @@ -1,4 +1,3 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "i_match_loop_communicator.h" diff --git a/searchcore/src/vespa/searchcore/proton/matching/i_match_loop_communicator.h b/searchcore/src/vespa/searchcore/proton/matching/i_match_loop_communicator.h index bc10db2bd65..f7ee953a415 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/i_match_loop_communicator.h +++ b/searchcore/src/vespa/searchcore/proton/matching/i_match_loop_communicator.h @@ -5,6 +5,8 @@ #include <vespa/searchlib/common/feature.h> #include <vespa/searchlib/queryeval/scores.h> #include <utility> +#include <cstddef> +#include <vector> namespace proton { namespace matching { diff --git a/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.cpp b/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.cpp index 7cec043a162..ff7706230a2 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/indexenvironment.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "indexenvironment.h" #include <vespa/searchlib/fef/functiontablefactory.h> diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.cpp index 5ca7915ab3a..52af7fa0f39 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_loop_communicator.cpp @@ -1,9 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "match_loop_communicator.h" #include <vespa/vespalib/util/priority_queue.h> -#include <algorithm> namespace proton { namespace matching { diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_params.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_params.cpp index a52bdac59a1..e89fe75a9fb 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_params.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_params.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "match_params.h" namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.cpp index b15358ee5e1..09382c4711e 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "match_phase_limit_calculator.h" namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp index bbec59e521b..5f6e360587a 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "match_phase_limiter.h" #include <vespa/searchlib/queryeval/andsearchstrict.h> #include <vespa/log/log.h> diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp index 6203881a7dd..c6bc2d5fe32 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_thread.cpp @@ -1,27 +1,16 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "match_thread.h" -#include "match_tools.h" -#include "handlerecorder.h" -#include "i_match_loop_communicator.h" -#include "matching_stats.h" #include "document_scorer.h" -#include <memory> #include <vespa/searchlib/common/featureset.h> -#include <vespa/searchlib/common/resultset.h> -#include <vespa/searchlib/fef/fef.h> #include <vespa/searchlib/query/base.h> -#include <vespa/searchlib/queryeval/hitcollector.h> -#include <vespa/searchlib/queryeval/searchiterator.h> #include <vespa/searchlib/queryeval/multibitvectoriterator.h> #include <vespa/searchlib/queryeval/andnotsearch.h> -#include <vespa/vespalib/util/clock.h> #include <vespa/vespalib/util/closure.h> #include <vespa/vespalib/util/thread_bundle.h> #include <vespa/searchcore/grouping/groupingmanager.h> #include <vespa/log/log.h> -#include <cmath> + LOG_SETUP(".proton.matching.match_thread"); diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp index 72511e1d217..2bcd8dfd6d0 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp @@ -6,20 +6,13 @@ #include "match_tools.h" #include "match_params.h" #include "matcher.h" -#include "query.h" -#include "queryenvironment.h" -#include "result_processor.h" #include "sessionmanager.h" -#include <vespa/searchlib/common/resultset.h> #include <vespa/searchlib/engine/errorcodes.h> #include <vespa/searchlib/engine/docsumrequest.h> #include <vespa/searchlib/engine/searchrequest.h> #include <vespa/searchlib/engine/searchreply.h> #include <vespa/searchlib/features/setup.h> -#include <vespa/searchlib/fef/properties.h> #include <vespa/searchlib/fef/test/plugin/setup.h> -#include <vespa/searchlib/queryeval/searchiterator.h> -#include <vespa/vespalib/util/exceptions.h> #include <vespa/log/log.h> LOG_SETUP(".proton.matching.matcher"); diff --git a/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp b/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp index 8f5e09fac7d..c560f84ada3 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "partial_result.h" namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.cpp b/searchcore/src/vespa/searchcore/proton/matching/query.cpp index 5bc4d3bf54e..ffe4cf98991 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/query.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/query.cpp @@ -1,29 +1,21 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".proton.matching.query"); - #include "query.h" - #include "blueprintbuilder.h" #include "matchdatareservevisitor.h" -#include "querynodes.h" #include "resolveviewvisitor.h" #include "termdataextractor.h" #include <vespa/document/datatype/positiondatatype.h> #include <vespa/searchlib/common/location.h> -#include <vespa/searchlib/fef/iindexenvironment.h> #include <vespa/searchlib/parsequery/stackdumpiterator.h> -#include <vespa/searchlib/query/tree/location.h> #include <vespa/searchlib/query/tree/point.h> -#include <vespa/searchlib/query/tree/querytreecreator.h> #include <vespa/searchlib/query/tree/rectangle.h> -#include <vespa/searchlib/query/weight.h> -#include <vespa/searchlib/queryeval/searchiterator.h> -#include <vespa/searchlib/queryeval/blueprint.h> #include <vespa/searchlib/queryeval/intermediate_blueprints.h> +#include <vespa/log/log.h> +LOG_SETUP(".proton.matching.query"); +#include <vespa/searchlib/query/tree/querytreecreator.h> + using document::PositionDataType; using search::SimpleQueryStackDumpIterator; using search::fef::IIndexEnvironment; @@ -92,8 +84,7 @@ Query::buildTree(const vespalib::stringref &stack, const string &location, const ViewResolver &resolver, const IIndexEnvironment &indexEnv) { SimpleQueryStackDumpIterator stack_dump_iterator(stack); - _query_tree = - QueryTreeCreator<ProtonNodeTypes>::create(stack_dump_iterator); + _query_tree = QueryTreeCreator<ProtonNodeTypes>::create(stack_dump_iterator); if (_query_tree.get()) { AddLocationNode(location, _query_tree, _location); ResolveViewVisitor resolve_visitor(resolver, indexEnv); diff --git a/searchcore/src/vespa/searchcore/proton/matching/querylimiter.cpp b/searchcore/src/vespa/searchcore/proton/matching/querylimiter.cpp index 77232db1d5a..6db6f2d5510 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/querylimiter.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/querylimiter.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchcore/proton/matching/querylimiter.h> -#include <limits> +#include "querylimiter.h" namespace proton { namespace matching { diff --git a/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp b/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp index 8667cdb234b..1843a67b507 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp @@ -1,23 +1,14 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".proton.matching.querynodes"); - #include "querynodes.h" #include "termdatafromnode.h" #include "viewresolver.h" #include "handlerecorder.h" -#include <vespa/searchlib/fef/fieldinfo.h> -#include <vespa/searchlib/fef/iindexenvironment.h> -#include <vespa/searchlib/fef/matchdata.h> -#include <vespa/searchlib/fef/matchdatalayout.h> -#include <vespa/searchlib/fef/simpletermdata.h> #include <vespa/searchlib/query/tree/templatetermvisitor.h> #include <vespa/searchlib/queryeval/orsearch.h> -#include <vespa/searchlib/queryeval/searchiterator.h> -#include <map> -#include <vector> + +#include <vespa/log/log.h> +LOG_SETUP(".proton.matching.querynodes"); using search::fef::FieldInfo; using search::fef::FieldType; diff --git a/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.cpp b/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.cpp index 3f98e8e6e19..894f36ef144 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "ranking_constants.h" namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp index 787178de76e..a6bf98b2ccf 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp @@ -1,15 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> + #include "result_processor.h" +#include "partial_result.h" +#include "sessionmanager.h" #include <vespa/searchlib/common/docstamp.h> #include <vespa/searchlib/uca/ucaconverter.h> #include <vespa/searchlib/engine/searchreply.h> -#include <vespa/searchcore/grouping/groupingcontext.h> -#include <vespa/searchcore/grouping/groupingmanager.h> -#include <vespa/searchcore/grouping/groupingsession.h> -#include "partial_result.h" -#include "sessionmanager.h" #include <vespa/log/log.h> LOG_SETUP(".proton.matching.result_processor"); diff --git a/searchcore/src/vespa/searchcore/proton/matching/session_manager_explorer.cpp b/searchcore/src/vespa/searchcore/proton/matching/session_manager_explorer.cpp index 33f002f6bf8..02052cf2a58 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/session_manager_explorer.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/session_manager_explorer.cpp @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "session_manager_explorer.h" #include <vespa/vespalib/data/slime/slime.h> diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp index 020809d080f..aa97a891d7f 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp @@ -1,11 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".proton.matching.termdataextractor"); - #include "termdataextractor.h" - #include "querynodes.h" #include <vespa/searchlib/query/tree/templatetermvisitor.h> diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp index 6914e9f8702..81589cb38fd 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/termdatafromnode.cpp @@ -1,12 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".proton.matching.termdatafromnode"); - #include "termdatafromnode.h" -#include <vespa/searchlib/query/tree/customtypevisitor.h> #include "querynodes.h" +#include <vespa/searchlib/query/tree/customtypevisitor.h> namespace proton { namespace matching { diff --git a/searchcore/src/vespa/searchcore/proton/matching/viewresolver.cpp b/searchcore/src/vespa/searchcore/proton/matching/viewresolver.cpp index 44b7cfe20c1..ba9e1c0fc7a 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/viewresolver.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/viewresolver.cpp @@ -1,9 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".proton.matching.viewresolver"); - #include "viewresolver.h" #include <vespa/searchcommon/common/schema.h> |