diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 10:38:06 +0200 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2018-06-20 10:38:06 +0200 |
commit | d161b6bcb87566a31cb5e0700b84f968539f502f (patch) | |
tree | cfbc4612f439510afffd8fc190bf7eeec2a52ae7 /searchcore | |
parent | 2915ddaa1c176a47d6c62d3b25bad9bb369c1448 (diff) |
move LOG_SETUP after other includes
Diffstat (limited to 'searchcore')
19 files changed, 49 insertions, 52 deletions
diff --git a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp index da1a7cdaa01..48c02215732 100644 --- a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp +++ b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("applyattrupdates_test"); - #include <vespa/document/base/testdocrepo.h> #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/bytefieldvalue.h> @@ -24,6 +21,9 @@ LOG_SETUP("applyattrupdates_test"); #include <vespa/searchlib/attribute/reference_attribute.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/log/log.h> +LOG_SETUP("applyattrupdates_test"); + using namespace document; using search::attribute::BasicType; using search::attribute::Config; diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp index 7c396d6d281..7e21fffe9fd 100644 --- a/searchcore/src/tests/grouping/grouping.cpp +++ b/searchcore/src/tests/grouping/grouping.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("grouping_test"); - #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/searchlib/aggregation/grouping.h> #include <vespa/searchlib/aggregation/sumaggregationresult.h> @@ -15,6 +12,9 @@ LOG_SETUP("grouping_test"); #include <vespa/searchcore/proton/matching/sessionmanager.h> #include <iostream> +#include <vespa/log/log.h> +LOG_SETUP("grouping_test"); + using namespace search::attribute; using namespace search::aggregation; using namespace search::expression; diff --git a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp index 716db497424..24c38ad118b 100644 --- a/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_aspect_delayer/attribute_aspect_delayer_test.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("attibute_aspect_delayer_test"); - #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/searchcore/proton/test/attribute_utils.h> @@ -14,6 +11,9 @@ LOG_SETUP("attibute_aspect_delayer_test"); #include <vespa/config-attributes.h> #include <vespa/config-summarymap.h> +#include <vespa/log/log.h> +LOG_SETUP("attibute_aspect_delayer_test"); + using vespa::config::search::AttributesConfig; using vespa::config::search::AttributesConfigBuilder; using vespa::config::search::IndexschemaConfig; diff --git a/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp b/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp index e95543dab69..4957d3aead2 100644 --- a/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("attribute_initializer_test"); - #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchcore/proton/attribute/attribute_directory.h> #include <vespa/searchcore/proton/attribute/attribute_factory.h> @@ -13,6 +10,9 @@ LOG_SETUP("attribute_initializer_test"); #include <vespa/searchlib/test/directory_handler.h> #include <vespa/vespalib/stllike/string.h> +#include <vespa/log/log.h> +LOG_SETUP("attribute_initializer_test"); + using search::attribute::Config; using search::attribute::BasicType; using search::attribute::CollectionType; diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp index 346f94180b5..0e6bd2c74fe 100644 --- a/searchcore/src/tests/proton/attribute/attribute_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("attribute_test"); - #include <vespa/config-attributes.h> #include <vespa/document/fieldvalue/document.h> #include <vespa/document/predicate/predicate_slime_builder.h> @@ -47,6 +44,9 @@ LOG_SETUP("attribute_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchcommon/attribute/iattributevector.h> +#include <vespa/log/log.h> +LOG_SETUP("attribute_test"); + namespace vespa { namespace config { namespace search {}}} using namespace config; diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp index 5de2728fa59..dcba8fda1c6 100644 --- a/searchcore/src/tests/proton/common/cachedselect_test.cpp +++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("cachedselect_test"); - #include <vespa/document/base/documentid.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/fieldvalue/document.h> @@ -26,6 +23,9 @@ LOG_SETUP("cachedselect_test"); #include <vespa/searchlib/test/mock_attribute_manager.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/log/log.h> +LOG_SETUP("cachedselect_test"); + using document::DataType; using document::Document; using document::DocumentId; diff --git a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp index 4e66b9a8589..3add3b727b9 100644 --- a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp +++ b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("document_iterator_test"); - #include <vespa/document/fieldset/fieldsets.h> #include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/document/datatype/documenttype.h> @@ -20,6 +17,9 @@ LOG_SETUP("document_iterator_test"); #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/log/log.h> +LOG_SETUP("document_iterator_test"); + using document::BucketId; using document::DataType; using document::Document; diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp b/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp index 0af15f0bd05..dc4e88ae005 100644 --- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp @@ -1,7 +1,4 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("cluster_state_handler_test"); - #include <vespa/searchcore/proton/server/clusterstatehandler.h> #include <vespa/searchcore/proton/server/iclusterstatechangedhandler.h> #include <vespa/searchcore/proton/test/test.h> @@ -9,6 +6,9 @@ LOG_SETUP("cluster_state_handler_test"); #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/state/clusterstate.h> +#include <vespa/log/log.h> +LOG_SETUP("cluster_state_handler_test"); + using namespace proton; using document::BucketId; using storage::lib::Distribution; diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp index 7daab40c40f..af6a9d38385 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("document_bucket_mover_test"); - #include <vespa/searchcore/proton/bucketdb/bucketdbhandler.h> #include <vespa/searchcore/proton/bucketdb/bucket_create_notifier.h> #include <vespa/searchcore/proton/test/bucketfactory.h> @@ -21,6 +18,9 @@ LOG_SETUP("document_bucket_mover_test"); #include <vespa/document/test/make_bucket_space.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/log/log.h> +LOG_SETUP("document_bucket_mover_test"); + using namespace proton; using document::BucketId; using document::Document; diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index 3ddcebbc428..4a3ced6891c 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("maintenancecontroller_test"); - #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/test/make_bucket_space.h> #include <vespa/searchcore/proton/attribute/attribute_usage_filter.h> @@ -41,6 +38,9 @@ LOG_SETUP("maintenancecontroller_test"); #include <vespa/vespalib/util/threadstackexecutor.h> #include <unistd.h> +#include <vespa/log/log.h> +LOG_SETUP("maintenancecontroller_test"); + using namespace proton; using namespace vespalib::slime; using document::BucketId; diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp index 0280f377549..0d474fc57cf 100644 --- a/searchcore/src/tests/proton/matching/matching_test.cpp +++ b/searchcore/src/tests/proton/matching/matching_test.cpp @@ -1,9 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/log/log.h> -LOG_SETUP("matching_test"); - #include <vespa/document/base/globalid.h> #include <initializer_list> #include <vespa/searchcommon/attribute/iattributecontext.h> @@ -36,6 +33,9 @@ LOG_SETUP("matching_test"); #include <vespa/searchcore/proton/matching/match_tools.h> #include <vespa/searchcore/proton/matching/match_context.h> +#include <vespa/log/log.h> +LOG_SETUP("matching_test"); + using namespace proton::matching; using namespace proton; using namespace search::aggregation; diff --git a/searchcore/src/tests/proton/matching/querynodes_test.cpp b/searchcore/src/tests/proton/matching/querynodes_test.cpp index 3b8b85924c2..297f75054b2 100644 --- a/searchcore/src/tests/proton/matching/querynodes_test.cpp +++ b/searchcore/src/tests/proton/matching/querynodes_test.cpp @@ -30,12 +30,11 @@ #include <vespa/searchlib/queryeval/fake_search.h> #include <vespa/searchlib/queryeval/fake_requestcontext.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/searchlib/attribute/singlenumericattribute.hpp> #include <vespa/log/log.h> LOG_SETUP("querynodes_test"); -#include <vespa/searchlib/attribute/singlenumericattribute.hpp> - using search::fef::FieldInfo; using search::fef::FieldType; using search::fef::MatchData; diff --git a/searchcore/src/tests/proton/reference/document_db_reference/document_db_reference_test.cpp b/searchcore/src/tests/proton/reference/document_db_reference/document_db_reference_test.cpp index 18ee8667ecc..9b268350b0d 100644 --- a/searchcore/src/tests/proton/reference/document_db_reference/document_db_reference_test.cpp +++ b/searchcore/src/tests/proton/reference/document_db_reference/document_db_reference_test.cpp @@ -1,14 +1,14 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/log/log.h> -LOG_SETUP("document_db_reference_test"); - #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h> #include <vespa/searchcore/proton/reference/document_db_reference.h> #include <vespa/searchcore/proton/test/mock_attribute_manager.h> #include <vespa/searchlib/attribute/attributefactory.h> #include <vespa/searchlib/attribute/imported_attribute_vector.h> +#include <vespa/log/log.h> +LOG_SETUP("document_db_reference_test"); + using namespace proton; using search::AttributeFactory; diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp index 6f74596b538..f8ec0d20d33 100644 --- a/searchcore/src/tests/proton/server/documentretriever_test.cpp +++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp @@ -1,9 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for documentretriever. -#include <vespa/log/log.h> -LOG_SETUP("document_retriever_test"); - #include <vespa/document/base/documentid.h> #include <vespa/document/bucket/bucketid.h> #include <vespa/document/datatype/datatype.h> @@ -36,6 +33,9 @@ LOG_SETUP("document_retriever_test"); #include <vespa/searchlib/attribute/stringbase.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/log/log.h> +LOG_SETUP("document_retriever_test"); + using document::ArrayFieldValue; using document::FieldValue; using document::BucketId; diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp index 506f4b5164c..eb6020b8d5f 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".proton.attribute.attribute_writer"); - #include "attribute_writer.h" #include "ifieldupdatecallback.h" #include "attributemanager.h" @@ -18,6 +15,9 @@ LOG_SETUP(".proton.attribute.attribute_writer"); #include <vespa/document/fieldvalue/document.h> #include <vespa/vespalib/stllike/hash_map.hpp> +#include <vespa/log/log.h> +LOG_SETUP(".proton.attribute.attribute_writer"); + using namespace document; using namespace search; using search::attribute::ImportedAttributeVector; diff --git a/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.cpp b/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.cpp index 8faa6e03401..b76451b377d 100644 --- a/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/attributefieldvaluenode.cpp @@ -4,10 +4,10 @@ #include "selectcontext.h" #include <vespa/searchcommon/attribute/attributecontent.h> #include <vespa/searchlib/attribute/attributevector.h> + #include <vespa/log/log.h> LOG_SETUP(".proton.common.attribute_field_value_node"); - namespace proton { using document::select::Context; diff --git a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp index f3ef4856631..dac0fbc2cc7 100644 --- a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp @@ -1,7 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".proton.common.attrupdate"); #include "attrupdate.h" #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/predicatefieldvalue.h> @@ -19,11 +17,13 @@ LOG_SETUP(".proton.common.attrupdate"); #include <vespa/searchlib/common/base.h> #include <vespa/searchlib/tensor/tensor_attribute.h> #include <vespa/searchlib/attribute/reference_attribute.h> - #include <vespa/searchlib/attribute/attributevector.hpp> #include <vespa/searchlib/attribute/changevector.hpp> #include <sstream> +#include <vespa/log/log.h> +LOG_SETUP(".proton.common.attrupdate"); + using namespace document; using vespalib::make_string; using search::tensor::TensorAttribute; diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp index b81cfae0ee7..838efdfe5a4 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp @@ -1,8 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP(".proton.documentmetastore"); - #include "documentmetastore.h" #include "search_context.h" #include "documentmetastoresaver.h" @@ -24,6 +21,8 @@ LOG_SETUP(".proton.documentmetastore"); #include <vespa/fastos/file.h> #include "document_meta_store_versions.h" +#include <vespa/log/log.h> +LOG_SETUP(".proton.documentmetastore"); using document::BucketId; using document::GlobalId; diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp index fa43ce370ae..d52d0fcd841 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp @@ -3,7 +3,6 @@ #include "match_tools.h" #include "querynodes.h" #include <vespa/searchlib/parsequery/stackdumpiterator.h> - #include <vespa/log/log.h> LOG_SETUP(".proton.matching.match_tools"); #include <vespa/searchlib/query/tree/querytreecreator.h> |