Merge pull request #25723 from vespa-engine/toregge/empty-index-name-means-default-index

Emtpy index name means default index.

2 files changed, 8 insertions, 0 deletions

diff --git a/searchsummary/src/tests/docsummary/keyword_extractor_factory/keyword_extractor_factory_test.cpp b/searchsummary/src/tests/docsummary/keyword_extractor_factory/keyword_extractor_factory_test.cpp
index 8ba91699ae6..f65df393ed9 100644
--- a/searchsummary/src/tests/docsummary/keyword_extractor_factory/keyword_extractor_factory_test.cpp
+++ b/searchsummary/src/tests/docsummary/keyword_extractor_factory/keyword_extractor_factory_test.cpp
@@ -62,12 +62,17 @@ TEST_F(KeywordExtractorFactoryTest, field_set_is_checked)
 {
     add_field_set("ab", {"cd", "de"});
     add_field_set("gh", {"cd"});
+    add_field_set("default", {"de"});
     EXPECT_TRUE(check_index("cd", "cd"));
     EXPECT_TRUE(check_index("ab", "cd"));
     EXPECT_TRUE(check_index("gh", "cd"));
+    EXPECT_FALSE(check_index("default", "cd"));
+    EXPECT_FALSE(check_index("", "cd"));
     EXPECT_TRUE(check_index("de", "de"));
     EXPECT_TRUE(check_index("ab", "de"));
     EXPECT_FALSE(check_index("gh", "de"));
+    EXPECT_TRUE(check_index("default", "de"));
+    EXPECT_TRUE(check_index("", "de"));
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keyword_extractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/keyword_extractor.cpp
index 71b685c6317..19c24cdc4f7 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/keyword_extractor.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/keyword_extractor.cpp
@@ -9,6 +9,9 @@ KeywordExtractor::KeywordExtractor(StringSet indexes)
     : IKeywordExtractor(),
       _indexes(std::move(indexes))
 {
+    if (_indexes.contains("default")) {
+        _indexes.insert("");
+    }
 }
 
 KeywordExtractor::~KeywordExtractor() = default;