Prepare for tracking the current transient disk usage across all document dbs.

The next step will be sampling the total disk usage of all current fusion indexes
and report this as the transient disk usage.

1 files changed, 7 insertions, 15 deletions

diff --git a/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp b/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp
index b89324c71f5..ed857d5776b 100644
--- a/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp
+++ b/searchlib/src/tests/util/searchable_stats/searchable_stats_test.cpp
@@ -7,43 +7,35 @@ LOG_SETUP("searchable_stats_test");
 
 using namespace search;
 
-TEST(SearchableStatsTest, merge_also_tracks_max_size_on_disk_for_component)
+TEST(SearchableStatsTest, stats_can_be_merged)
 {
     SearchableStats stats;
     EXPECT_EQ(0u, stats.memoryUsage().allocatedBytes());
     EXPECT_EQ(0u, stats.docsInMemory());
     EXPECT_EQ(0u, stats.sizeOnDisk());
-    EXPECT_EQ(0u, stats.max_component_size_on_disk());
+    EXPECT_EQ(0u, stats.fusion_size_on_disk());
     {
         SearchableStats rhs;
         EXPECT_EQ(&rhs.memoryUsage(vespalib::MemoryUsage(100,0,0,0)), &rhs);
         EXPECT_EQ(&rhs.docsInMemory(10), &rhs);
         EXPECT_EQ(&rhs.sizeOnDisk(1000), &rhs);
-        EXPECT_EQ(1000u, rhs.max_component_size_on_disk());
+        EXPECT_EQ(&rhs.fusion_size_on_disk(500), &rhs);
         EXPECT_EQ(&stats.merge(rhs), &stats);
     }
     EXPECT_EQ(100u, stats.memoryUsage().allocatedBytes());
     EXPECT_EQ(10u, stats.docsInMemory());
     EXPECT_EQ(1000u, stats.sizeOnDisk());
-    EXPECT_EQ(1000u, stats.max_component_size_on_disk());
+    EXPECT_EQ(500u, stats.fusion_size_on_disk());
 
     stats.merge(SearchableStats()
                         .memoryUsage(vespalib::MemoryUsage(150,0,0,0))
                         .docsInMemory(15)
-                        .sizeOnDisk(1500));
+                        .sizeOnDisk(1500)
+                        .fusion_size_on_disk(800));
     EXPECT_EQ(250u, stats.memoryUsage().allocatedBytes());
     EXPECT_EQ(25u, stats.docsInMemory());
     EXPECT_EQ(2500u, stats.sizeOnDisk());
-    EXPECT_EQ(1500u, stats.max_component_size_on_disk());
-
-    stats.merge(SearchableStats()
-                        .memoryUsage(vespalib::MemoryUsage(120,0,0,0))
-                        .docsInMemory(12)
-                        .sizeOnDisk(1200));
-    EXPECT_EQ(370u, stats.memoryUsage().allocatedBytes());
-    EXPECT_EQ(37u, stats.docsInMemory());
-    EXPECT_EQ(3700u, stats.sizeOnDisk());
-    EXPECT_EQ(1500u, stats.max_component_size_on_disk());
+    EXPECT_EQ(1300u, stats.fusion_size_on_disk());
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()