diff options
| author | Geir Storli <geirstorli@yahoo.no> | 2016-12-16 11:05:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 11:05:08 +0100 |
| commit | ed2ade0445a1124195762234957b7af362079a6b (patch) | |
| tree | 095c651acaabc2e8f27e3b5006311634cb4e6703 /searchcorespi | |
| parent | fb3dfdeb2383dfac33ba56c80590ed8b84701a99 (diff) | |
| parent | 2baf2f8195b1a3224ed7989eff1d85a1e64ba46c (diff) | |
Merge pull request #1336 from yahoo/balder/split-in-hpp-rebased-1
Balder/split in hpp rebased 1
Diffstat (limited to 'searchcorespi')
| -rw-r--r-- | searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp | 7 | ||||
| -rw-r--r-- | searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp index 7a3d5bd5579..2ada2a5d038 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp +++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp @@ -9,19 +9,16 @@ #include "indexreadutilities.h" #include "indexwriteutilities.h" #include <vespa/searchlib/common/serialnumfileheadercontext.h> -#include <vespa/searchlib/attribute/fixedsourceselector.h> -#include <vespa/searchlib/common/fileheadercontext.h> -#include <vespa/searchlib/queryeval/isourceselector.h> #include <vespa/searchlib/util/dirtraverse.h> #include <vespa/searchlib/util/filekit.h> #include <vespa/vespalib/util/autoclosurecaller.h> -#include <vespa/vespalib/util/closure.h> #include <vespa/vespalib/util/closuretask.h> #include <sstream> -#include <vector> #include <vespa/searchcorespi/flush/closureflushtask.h> #include <vespa/vespalib/util/exceptions.h> +#include <vespa/vespalib/util/array.hpp> #include <vespa/log/log.h> + LOG_SETUP(".searchcorespi.index.indexmaintainer"); using document::Document; diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp index ad96184cb57..90daea72703 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp +++ b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp @@ -1,9 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchcorespi/index/warmupindexcollection.h> -#include <vespa/searchcorespi/index/idiskindex.h> +#include "warmupindexcollection.h" +#include "idiskindex.h" #include <vespa/vespalib/util/closuretask.h> #include <vespa/searchlib/fef/matchdatalayout.h> #include <vespa/searchlib/query/tree/termnodes.h> +#include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/stllike/hash_set.h> #include <vespa/log/log.h> |