diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-09 13:29:59 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:46 +0100 |
| commit | cdbddff2612dbaf16d6f26c92041040ed9a131b2 (patch) | |
| tree | b3c949439e81e8f8ff11094c665b05be6c1d9c86 /searchcorespi | |
| parent | 887053e9be8e0ac9995224ecd89586bfab911fc0 (diff) | |
Decouple so that not all config is pulled in everywhere.
Diffstat (limited to 'searchcorespi')
3 files changed, 6 insertions, 13 deletions
diff --git a/searchcorespi/src/vespa/searchcorespi/flush/flushtask.h b/searchcorespi/src/vespa/searchcorespi/flush/flushtask.h index cfcd6fd914d..86ce3ea8768 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/flushtask.h +++ b/searchcorespi/src/vespa/searchcorespi/flush/flushtask.h @@ -2,7 +2,6 @@ #pragma once #include <vespa/vespalib/util/executor.h> -#include <vespa/vespalib/util/closure.h> #include <vespa/searchlib/common/serialnum.h> namespace searchcorespi { @@ -12,8 +11,7 @@ class FlushTask : public vespalib::Executor::Task public: typedef std::unique_ptr<FlushTask> UP; - virtual search::SerialNum - getFlushSerial() const = 0; + virtual search::SerialNum getFlushSerial() const = 0; }; } // namespace searchcorespi diff --git a/searchcorespi/src/vespa/searchcorespi/flush/iflushtarget.h b/searchcorespi/src/vespa/searchcorespi/flush/iflushtarget.h index 724ffe5e2bd..313f7a5b0db 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/iflushtarget.h +++ b/searchcorespi/src/vespa/searchcorespi/flush/iflushtarget.h @@ -2,9 +2,6 @@ #pragma once #include "flushstats.h" -#include <string> -#include <vespa/searchlib/common/serialnum.h> -#include <vespa/vespalib/util/executor.h> #include "flushtask.h" namespace searchcorespi { @@ -79,8 +76,7 @@ public: : _name(name), _type(Type::OTHER), _component(Component::OTHER) - { - } + { } /** * Constructs a new instance of this class. @@ -95,8 +91,7 @@ public: : _name(name), _type(type), _component(component) - { - } + { } /** * Virtual destructor required for inheritance. diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h index 39e3d116d44..c7e0a304db6 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h +++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "iindexmanager.h" #include "activediskindexes.h" #include "fusionspec.h" #include "idiskindex.h" @@ -11,9 +12,8 @@ #include "imemoryindex.h" #include "warmupindexcollection.h" #include "ithreadingservice.h" -#include <vespa/searchcorespi/index/iindexmanager.h> -#include <vespa/searchcorespi/index/indexsearchable.h> -#include <vespa/searchcorespi/index/indexcollection.h> +#include "indexsearchable.h" +#include "indexcollection.h" #include <vespa/searchcorespi/flush/iflushtarget.h> #include <vespa/searchcorespi/flush/flushstats.h> #include <vespa/searchlib/attribute/fixedsourceselector.h> |