diff options
| author | Geir Storli <geirst@yahooinc.com> | 2023-01-25 14:41:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 14:41:59 +0100 |
| commit | 068a2f51e9132701c39659817febd608ef7364c8 (patch) | |
| tree | ad1a4e3946e22a9a455a259868e710df08db1c00 | |
| parent | 6fb49eca830e65038c0c962bd2d1dc8ecc47c160 (diff) | |
| parent | 5877b8646f3cb56164dd7a862e19594cc38ce208 (diff) | |
Merge pull request #25723 from vespa-engine/toregge/empty-index-name-means-default-index
Emtpy index name means default index.
3 files changed, 15 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; diff --git a/streamingvisitors/src/tests/keyword_extractor_factory/keyword_extractor_factory_test.cpp b/streamingvisitors/src/tests/keyword_extractor_factory/keyword_extractor_factory_test.cpp index 6ed4dfa1425..e06217a35f0 100644 --- a/streamingvisitors/src/tests/keyword_extractor_factory/keyword_extractor_factory_test.cpp +++ b/streamingvisitors/src/tests/keyword_extractor_factory/keyword_extractor_factory_test.cpp @@ -100,17 +100,24 @@ TEST_F(KeywordExtractorFactoryTest, two_source_fields_for_summary_field_and_mult add_index("bar", {"bar"}); add_index("baz", {"baz"}); add_index("both", {"bar", "baz"}); + add_index("default", {"baz"}); add_summary_field("foo", {"bar", "baz"}); EXPECT_FALSE(check_index("foo", "foo")); EXPECT_TRUE(check_index("both", "foo")); EXPECT_TRUE(check_index("bar", "foo")); EXPECT_TRUE(check_index("baz", "foo")); + EXPECT_TRUE(check_index("default", "foo")); + EXPECT_TRUE(check_index("", "foo")); EXPECT_TRUE(check_index("both", "bar")); EXPECT_TRUE(check_index("bar", "bar")); EXPECT_FALSE(check_index("baz", "bar")); + EXPECT_FALSE(check_index("default", "bar")); + EXPECT_FALSE(check_index("", "bar")); EXPECT_TRUE(check_index("both", "baz")); EXPECT_FALSE(check_index("bar", "baz")); EXPECT_TRUE(check_index("baz", "baz")); + EXPECT_TRUE(check_index("default", "baz")); + EXPECT_TRUE(check_index("", "baz")); } GTEST_MAIN_RUN_ALL_TESTS() |