Merge pull request #20412 from vespa-engine/balder/split-bloat-and-spread

Separate spread and bloat

1 files changed, 10 insertions, 8 deletions

diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
index 0460f10f88f..1851455e321 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
@@ -703,29 +703,31 @@ assertTarget(const vespalib::string &name,
 TEST_F("require that flush targets can be retrieved", FastAccessFixture)
 {
     IFlushTarget::List targets = getFlushTargets(f);
-    EXPECT_EQUAL(7u, targets.size());
+    EXPECT_EQUAL(8u, targets.size());
     EXPECT_EQUAL("subdb.attribute.flush.attr1", targets[0]->getName());
     EXPECT_EQUAL("subdb.attribute.shrink.attr1", targets[1]->getName());
     EXPECT_EQUAL("subdb.documentmetastore.flush", targets[2]->getName());
     EXPECT_EQUAL("subdb.documentmetastore.shrink", targets[3]->getName());
-    EXPECT_EQUAL("subdb.summary.compact", targets[4]->getName());
-    EXPECT_EQUAL("subdb.summary.flush", targets[5]->getName());
-    EXPECT_EQUAL("subdb.summary.shrink", targets[6]->getName());
+    EXPECT_EQUAL("subdb.summary.compact_bloat", targets[4]->getName());
+    EXPECT_EQUAL("subdb.summary.compact_spread", targets[5]->getName());
+    EXPECT_EQUAL("subdb.summary.flush", targets[6]->getName());
+    EXPECT_EQUAL("subdb.summary.shrink", targets[7]->getName());
 }
 
 TEST_F("require that flush targets can be retrieved", SearchableFixture)
 {
     IFlushTarget::List targets = getFlushTargets(f);
-    EXPECT_EQUAL(9u, targets.size());
+    EXPECT_EQUAL(10u, targets.size());
     EXPECT_TRUE(assertTarget("subdb.attribute.flush.attr1", FType::SYNC, FComponent::ATTRIBUTE, *targets[0]));
     EXPECT_TRUE(assertTarget("subdb.attribute.shrink.attr1", FType::GC, FComponent::ATTRIBUTE, *targets[1]));
     EXPECT_TRUE(assertTarget("subdb.documentmetastore.flush", FType::SYNC, FComponent::ATTRIBUTE, *targets[2]));
     EXPECT_TRUE(assertTarget("subdb.documentmetastore.shrink", FType::GC, FComponent::ATTRIBUTE, *targets[3]));
     EXPECT_TRUE(assertTarget("subdb.memoryindex.flush", FType::FLUSH, FComponent::INDEX, *targets[4]));
     EXPECT_TRUE(assertTarget("subdb.memoryindex.fusion", FType::GC, FComponent::INDEX, *targets[5]));
-    EXPECT_TRUE(assertTarget("subdb.summary.compact", FType::GC, FComponent::DOCUMENT_STORE, *targets[6]));
-    EXPECT_TRUE(assertTarget("subdb.summary.flush", FType::SYNC, FComponent::DOCUMENT_STORE, *targets[7]));
-    EXPECT_TRUE(assertTarget("subdb.summary.shrink", FType::GC, FComponent::DOCUMENT_STORE, *targets[8]));
+    EXPECT_TRUE(assertTarget("subdb.summary.compact_bloat", FType::GC, FComponent::DOCUMENT_STORE, *targets[6]));
+    EXPECT_TRUE(assertTarget("subdb.summary.compact_spread", FType::GC, FComponent::DOCUMENT_STORE, *targets[7]));
+    EXPECT_TRUE(assertTarget("subdb.summary.flush", FType::SYNC, FComponent::DOCUMENT_STORE, *targets[8]));
+    EXPECT_TRUE(assertTarget("subdb.summary.shrink", FType::GC, FComponent::DOCUMENT_STORE, *targets[9]));
 }
 
 TEST_F("require that only fast-access attributes are instantiated", FastAccessOnlyFixture)