Factor out portions of get_state() to helper functions.

1 files changed, 27 insertions, 10 deletions

diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.cpp b/searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.cpp
index 448dde9bac2..959f5ccdc59 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.cpp
@@ -11,9 +11,34 @@ LOG_SETUP(".searchcorespi.index.index_manager_explorer");
 using vespalib::slime::Cursor;
 using vespalib::slime::Inserter;
 using search::SearchableStats;
+using searchcorespi::index::DiskIndexStats;
+using searchcorespi::index::MemoryIndexStats;
 
 namespace searchcorespi {
 
+namespace {
+
+void insertDiskIndex(Cursor &arrayCursor, const DiskIndexStats &diskIndex)
+{
+    Cursor &diskIndexCursor = arrayCursor.addObject();
+    const SearchableStats &sstats = diskIndex.getSearchableStats();
+    diskIndexCursor.setLong("serialNum", diskIndex.getSerialNum());
+    diskIndexCursor.setString("indexDir", diskIndex.getIndexdir());
+    diskIndexCursor.setLong("sizeOnDisk", sstats.sizeOnDisk());
+}
+
+void insertMemoryIndex(Cursor &arrayCursor, const MemoryIndexStats &memoryIndex)
+{
+    Cursor &memoryIndexCursor = arrayCursor.addObject();
+    const SearchableStats &sstats = memoryIndex.getSearchableStats();
+    memoryIndexCursor.setLong("serialNum", memoryIndex.getSerialNum());
+    memoryIndexCursor.setLong("docsInMemory", sstats.docsInMemory());
+    memoryIndexCursor.setLong("memoryUsage", sstats.memoryUsage());
+}
+
+}
+
+
 IndexManagerExplorer::IndexManagerExplorer(IIndexManager::SP mgr)
     : _mgr(std::move(mgr))
 {
@@ -28,19 +53,11 @@ IndexManagerExplorer::get_state(const Inserter &inserter, bool full) const
         IndexManagerStats stats(*_mgr);
         Cursor &diskIndexArrayCursor = object.setArray("diskIndexes");
         for (const auto &diskIndex : stats.getDiskIndexes()) {
-            Cursor &diskIndexCursor = diskIndexArrayCursor.addObject();
-            const SearchableStats &sstats = diskIndex.getSearchableStats();
-            diskIndexCursor.setLong("serialNum", diskIndex.getSerialNum());
-            diskIndexCursor.setString("indexDir", diskIndex.getIndexdir());
-            diskIndexCursor.setLong("sizeOnDisk", sstats.sizeOnDisk());
+            insertDiskIndex(diskIndexArrayCursor, diskIndex);
         }
         Cursor &memoryIndexArrayCursor = object.setArray("memoryIndexes");
         for (const auto &memoryIndex : stats.getMemoryIndexes()) {
-            Cursor &memoryIndexCursor = memoryIndexArrayCursor.addObject();
-            const SearchableStats &sstats = memoryIndex.getSearchableStats();
-            memoryIndexCursor.setLong("serialNum", memoryIndex.getSerialNum());
-            memoryIndexCursor.setLong("docsInMemory", sstats.docsInMemory());
-            memoryIndexCursor.setLong("memoryUsage", sstats.memoryUsage());
+            insertMemoryIndex(memoryIndexArrayCursor, memoryIndex);
         }
     }
 }