diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-17 17:09:35 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-17 17:13:34 +0100 |
| commit | 4b1fcd494ab08a368c01c566b48707fe9ca42f2f (patch) | |
| tree | 3caad86c91fa05b9eadaed8de879fc99ec8d39f8 /searchcore/src/tests/proton | |
| parent | ea003d76b62ec90c62146ba8a9d5c1616283e101 (diff) | |
Use forward declarations to avoid rebuilding the world when modifying the packet protocol.
Diffstat (limited to 'searchcore/src/tests/proton')
3 files changed, 13 insertions, 7 deletions
diff --git a/searchcore/src/tests/proton/matchengine/matchengine.cpp b/searchcore/src/tests/proton/matchengine/matchengine.cpp index 617c2f81b74..0165e398262 100644 --- a/searchcore/src/tests/proton/matchengine/matchengine.cpp +++ b/searchcore/src/tests/proton/matchengine/matchengine.cpp @@ -1,11 +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("matchengine_test"); - #include <vespa/searchcore/proton/matchengine/matchengine.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/searchlib/engine/docsumreply.h> +#include <vespa/log/log.h> + +LOG_SETUP("matchengine_test"); using namespace proton; using namespace search::engine; diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp index 90225b01a41..533bbd9be1d 100644 --- a/searchcore/src/tests/proton/matching/matching_test.cpp +++ b/searchcore/src/tests/proton/matching/matching_test.cpp @@ -1,7 +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("matching_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/document/base/globalid.h> @@ -23,6 +21,9 @@ LOG_SETUP("matching_test"); #include <vespa/searchlib/attribute/extendableattributes.h> #include <vespa/searchlib/common/featureset.h> #include <vespa/searchlib/engine/docsumrequest.h> +#include <vespa/searchlib/engine/searchrequest.h> +#include <vespa/searchlib/engine/docsumreply.h> +#include <vespa/searchlib/engine/searchreply.h> #include <vespa/searchlib/fef/properties.h> #include <vespa/searchlib/query/tree/querybuilder.h> #include <vespa/searchlib/query/tree/stackdumpcreator.h> @@ -31,6 +32,8 @@ LOG_SETUP("matching_test"); #include <vespa/searchcore/proton/matching/match_params.h> #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; diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp index c0692ecd7ec..434589dc47b 100644 --- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp +++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp @@ -1,16 +1,18 @@ // 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("summaryengine_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchcore/proton/summaryengine/summaryengine.h> #include <vespa/searchcore/proton/summaryengine/docsum_by_slime.h> #include <vespa/searchlib/engine/docsumapi.h> +#include <vespa/searchlib/engine/searchreply.h> #include <vespa/searchlib/util/rawbuf.h> #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/data/databuffer.h> #include <vespa/document/util/compressor.h> +#include <vespa/log/log.h> + +LOG_SETUP("summaryengine_test"); using namespace search::engine; using namespace document; |