diff options
author | Henning Baldersheim <balder@oath.com> | 2018-12-03 21:39:31 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-12-03 21:39:31 +0100 |
commit | 80e5f0a300d251573dfa774f4e594899e324baef (patch) | |
tree | ada388c81f720a23098d23460b163cac0b6faa90 /searchcorespi/src | |
parent | 97cf964467aa3879efe1393ad4f49cffe60b3bf7 (diff) |
- Decouple index config from ProtonConfig.
- Decouple grow config from Protonconfig.
No semantic changes, just refactoring.
Diffstat (limited to 'searchcorespi/src')
-rw-r--r-- | searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h | 14 | ||||
-rw-r--r-- | searchcorespi/src/vespa/searchcorespi/index/warmupconfig.h | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h b/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h index 29a7be177f0..507ccf9483b 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h +++ b/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h @@ -7,19 +7,20 @@ #include <vespa/searchlib/common/serialnum.h> #include <vespa/searchlib/diskindex/docidmapper.h> -namespace searchcorespi { -namespace index { +namespace searchcorespi::index { /** * Interface for operations needed by an index maintainer. */ struct IIndexMaintainerOperations { + using Schema = search::index::Schema; + using SelectorArray = search::diskindex::SelectorArray; virtual ~IIndexMaintainerOperations() {} /** * Creates a new memory index using the given schema. */ - virtual IMemoryIndex::SP createMemoryIndex(const search::index::Schema &schema, search::SerialNum serialNum) = 0; + virtual IMemoryIndex::SP createMemoryIndex(const Schema &schema, search::SerialNum serialNum) = 0; /** * Loads a disk index from the given directory. @@ -43,14 +44,13 @@ struct IIndexMaintainerOperations { * @param selectorArray the array specifying in which input disk index a document is located. * @param lastSerialNum the serial number of the last operation in the last input disk index. */ - virtual bool runFusion(const search::index::Schema &schema, + virtual bool runFusion(const Schema &schema, const vespalib::string &outputDir, const std::vector<vespalib::string> &sources, - const search::diskindex::SelectorArray &selectorArray, + const SelectorArray &selectorArray, search::SerialNum lastSerialNum) = 0; }; -} // namespace index -} // namespace searchcorespi +} diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupconfig.h b/searchcorespi/src/vespa/searchcorespi/index/warmupconfig.h index 56542ba35f5..4c2e431f082 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/warmupconfig.h +++ b/searchcorespi/src/vespa/searchcorespi/index/warmupconfig.h @@ -1,8 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -namespace searchcorespi { -namespace index { +namespace searchcorespi::index { /** * Keeps all config for controlling warmup. @@ -19,4 +18,3 @@ private: }; } -} |