- Decouple index config from ProtonConfig.

- Decouple grow config from Protonconfig.
No semantic changes, just refactoring.

2 files changed, 10 insertions, 13 deletions

diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index 429452df2ec..650b263ff75 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -19,6 +19,7 @@
 using document::Document;
 using document::FieldValue;
 using proton::ExecutorThreadingService;
+using proton::index::IndexManager;
 using search::FixedSourceSelector;
 using search::TuneFileAttributes;
 using search::TuneFileIndexManager;
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index d88199e6ae8..c025bd257a2 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -50,6 +50,8 @@ using std::set;
 using std::string;
 using vespalib::BlockingThreadStackExecutor;
 using vespalib::ThreadStackExecutor;
+using proton::index::IndexManager;
+using proton::index::IndexConfig;
 
 using namespace proton;
 using namespace searchcorespi;
@@ -170,27 +172,21 @@ Document::UP Fixture::addDocument(uint32_t id) {
 }
 
 void Fixture::resetIndexManager() {
-    _index_manager.reset(0);
-    _index_manager.reset(
-            new IndexManager(index_dir, searchcorespi::index::WarmupConfig(), 2, 0, getSchema(), 1,
+    _index_manager.reset();
+    _index_manager = std::make_unique<IndexManager>(index_dir, IndexConfig(), getSchema(), 1,
                              _reconfigurer, _writeService, _writeService.getMasterExecutor(),
-                             TuneFileIndexManager(), TuneFileAttributes(),
-                             _fileHeaderContext));
+                             TuneFileIndexManager(), TuneFileAttributes(),_fileHeaderContext);
 }
 
 
-void Fixture::assertStats(uint32_t expNumDiskIndexes,
-                          uint32_t expNumMemoryIndexes,
-                          SerialNum expLastDiskIndexSerialNum,
-                          SerialNum expLastMemoryIndexSerialNum)
+void Fixture::assertStats(uint32_t expNumDiskIndexes, uint32_t expNumMemoryIndexes,
+                          SerialNum expLastDiskIndexSerialNum, SerialNum expLastMemoryIndexSerialNum)
 {
     searchcorespi::IndexManagerStats stats(*_index_manager);
     SerialNum lastDiskIndexSerialNum = 0;
     SerialNum lastMemoryIndexSerialNum = 0;
-    const std::vector<searchcorespi::index::DiskIndexStats> &
-        diskIndexes(stats.getDiskIndexes());
-    const std::vector<searchcorespi::index::MemoryIndexStats> &
-        memoryIndexes(stats.getMemoryIndexes());
+    const std::vector<searchcorespi::index::DiskIndexStats> & diskIndexes(stats.getDiskIndexes());
+    const std::vector<searchcorespi::index::MemoryIndexStats> & memoryIndexes(stats.getMemoryIndexes());
     if (!diskIndexes.empty()) {
         lastDiskIndexSerialNum = diskIndexes.back().getSerialNum();
     }