Rename existing rank drop limit and rank score drop limit to

first phase rank score drop limit.
Stop using std::isnan to mark no value.

2 files changed, 12 insertions, 10 deletions

diff --git a/searchlib/src/tests/fef/properties/properties_test.cpp b/searchlib/src/tests/fef/properties/properties_test.cpp
index d3890c8f9fc..5e9c3a25ef8 100644
--- a/searchlib/src/tests/fef/properties/properties_test.cpp
+++ b/searchlib/src/tests/fef/properties/properties_test.cpp
@@ -409,16 +409,18 @@ TEST(PropertiesTest, test_stuff)
             EXPECT_EQ(hitcollector::EstimateLimit::lookup(p), 50u);
         }
         { // vespa.hitcollector.rankscoredroplimit
-            EXPECT_EQ(hitcollector::RankScoreDropLimit::NAME, vespalib::string("vespa.hitcollector.rankscoredroplimit"));
-            search::feature_t got1 = hitcollector::RankScoreDropLimit::DEFAULT_VALUE;
-            EXPECT_TRUE(got1 != got1);
-            Properties p;
-            search::feature_t got2= hitcollector::RankScoreDropLimit::lookup(p);
-            EXPECT_TRUE(got2 != got2);
+            EXPECT_EQ(vespalib::string("vespa.hitcollector.rankscoredroplimit"), hitcollector::FirstPhaseRankScoreDropLimit::NAME);
+            Properties p;
+            auto got2 = hitcollector::FirstPhaseRankScoreDropLimit::lookup(p);
+            EXPECT_EQ(std::optional<search::feature_t>(), got2);
+            got2 = hitcollector::FirstPhaseRankScoreDropLimit::lookup(p, std::nullopt);
+            EXPECT_EQ(std::optional<search::feature_t>(), got2);
+            got2 = hitcollector::FirstPhaseRankScoreDropLimit::lookup(p, 4.5);
+            EXPECT_EQ(std::optional<search::feature_t>(4.5), got2);
             p.add("vespa.hitcollector.rankscoredroplimit", "-123456789.12345");
-            EXPECT_EQ(hitcollector::RankScoreDropLimit::lookup(p), -123456789.12345);
+            EXPECT_EQ(std::optional<search::feature_t>(-123456789.12345), hitcollector::FirstPhaseRankScoreDropLimit::lookup(p));
             p.clear().add("vespa.hitcollector.rankscoredroplimit", "123456789.12345");
-            EXPECT_EQ(hitcollector::RankScoreDropLimit::lookup(p), 123456789.12345);
+            EXPECT_EQ(std::optional<search::feature_t>(123456789.12345), hitcollector::FirstPhaseRankScoreDropLimit::lookup(p));
         }
         { // vespa.fieldweight.
             EXPECT_EQ(FieldWeight::BASE_NAME, vespalib::string("vespa.fieldweight."));
diff --git a/searchlib/src/tests/ranksetup/ranksetup_test.cpp b/searchlib/src/tests/ranksetup/ranksetup_test.cpp
index 348326c3936..595b2065feb 100644
--- a/searchlib/src/tests/ranksetup/ranksetup_test.cpp
+++ b/searchlib/src/tests/ranksetup/ranksetup_test.cpp
@@ -525,7 +525,7 @@ void RankSetupTest::testRankSetup()
     env.getProperties().add(hitcollector::ArraySize::NAME, "60");
     env.getProperties().add(hitcollector::EstimatePoint::NAME, "70");
     env.getProperties().add(hitcollector::EstimateLimit::NAME, "80");
-    env.getProperties().add(hitcollector::RankScoreDropLimit::NAME, "90.5");
+    env.getProperties().add(hitcollector::FirstPhaseRankScoreDropLimit::NAME, "90.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");
@@ -567,7 +567,7 @@ void RankSetupTest::testRankSetup()
     EXPECT_EQUAL(rs.getArraySize(), 60u);
     EXPECT_EQUAL(rs.getEstimatePoint(), 70u);
     EXPECT_EQUAL(rs.getEstimateLimit(), 80u);
-    EXPECT_EQUAL(rs.getRankScoreDropLimit(), 90.5);
+    EXPECT_EQUAL(rs.get_first_phase_rank_score_drop_limit().value(), 90.5);
     EXPECT_EQUAL(rs.getMutateOnMatch()._attribute, "a");
     EXPECT_EQUAL(rs.getMutateOnMatch()._operation, "+=3");
     EXPECT_EQUAL(rs.getMutateOnFirstPhase()._attribute, "b");