Merge pull request #31431 from vespa-engine/toregge/extend-index-properties-api-to-cover-second-phase-rank-score-drop-limit-try-2

Extend index properties api to cover second phase rank score drop limit.

2 files changed, 18 insertions, 1 deletions

diff --git a/searchlib/src/tests/fef/properties/properties_test.cpp b/searchlib/src/tests/fef/properties/properties_test.cpp
index 5e9c3a25ef8..712bd0e3426 100644
--- a/searchlib/src/tests/fef/properties/properties_test.cpp
+++ b/searchlib/src/tests/fef/properties/properties_test.cpp
@@ -629,4 +629,19 @@ TEST(PropertiesTest, test_integer_lookup)
     }
 }
 
+TEST(PropertiesTest, second_phase_rank_score_drop_limit)
+{
+    vespalib::stringref name = hitcollector::SecondPhaseRankScoreDropLimit::NAME;
+    EXPECT_EQ(vespalib::string("vespa.hitcollector.second-phase.rankscoredroplimit"), name);
+    Properties p;
+    EXPECT_EQ(std::optional<search::feature_t>(), hitcollector::SecondPhaseRankScoreDropLimit::lookup(p));
+    EXPECT_EQ(std::optional<search::feature_t>(4.0), hitcollector::SecondPhaseRankScoreDropLimit::lookup(p, 4.0));
+    p.add(name, "-123456789.12345");
+    EXPECT_EQ(std::optional<search::feature_t>(-123456789.12345), hitcollector::SecondPhaseRankScoreDropLimit::lookup(p));
+    EXPECT_EQ(std::optional<search::feature_t>(-123456789.12345), hitcollector::SecondPhaseRankScoreDropLimit::lookup(p, 4.0));
+    p.clear().add(name, "123456789.12345");
+    EXPECT_EQ(std::optional<search::feature_t>(123456789.12345), hitcollector::SecondPhaseRankScoreDropLimit::lookup(p));
+    EXPECT_EQ(std::optional<search::feature_t>(123456789.12345), hitcollector::SecondPhaseRankScoreDropLimit::lookup(p, 4.0));
+}
+
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchlib/src/tests/ranksetup/ranksetup_test.cpp b/searchlib/src/tests/ranksetup/ranksetup_test.cpp
index 8ac82eeb14e..a5e7fed5685 100644
--- a/searchlib/src/tests/ranksetup/ranksetup_test.cpp
+++ b/searchlib/src/tests/ranksetup/ranksetup_test.cpp
@@ -548,6 +548,7 @@ TEST_F(RankSetupTest, rank_setup)
     env.getProperties().add(hitcollector::EstimatePoint::NAME, "70");
     env.getProperties().add(hitcollector::EstimateLimit::NAME, "80");
     env.getProperties().add(hitcollector::FirstPhaseRankScoreDropLimit::NAME, "90.5");
+    env.getProperties().add(hitcollector::SecondPhaseRankScoreDropLimit::NAME, "91.5");
     env.getProperties().add(mutate::on_match::Attribute::NAME, "a");
     env.getProperties().add(mutate::on_match::Operation::NAME, "+=3");
     env.getProperties().add(mutate::on_first_phase::Attribute::NAME, "b");
@@ -589,7 +590,8 @@ TEST_F(RankSetupTest, rank_setup)
     EXPECT_EQ(rs.getArraySize(), 60u);
     EXPECT_EQ(rs.getEstimatePoint(), 70u);
     EXPECT_EQ(rs.getEstimateLimit(), 80u);
-    EXPECT_EQ(rs.get_first_phase_rank_score_drop_limit().value(), 90.5);
+    EXPECT_EQ(std::optional<feature_t>(90.5), rs.get_first_phase_rank_score_drop_limit());
+    EXPECT_EQ(std::optional<feature_t>(91.5), rs.get_second_phase_rank_score_drop_limit());
     EXPECT_EQ(rs.getMutateOnMatch()._attribute, "a");
     EXPECT_EQ(rs.getMutateOnMatch()._operation, "+=3");
     EXPECT_EQ(rs.getMutateOnFirstPhase()._attribute, "b");