use explicit expression name

2 files changed, 4 insertions, 3 deletions

diff --git a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
index 31557f13a54..fc70bafed7f 100644
--- a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
+++ b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
@@ -98,7 +98,9 @@ struct Setup {
         property(fmt("rankingExpression(%s).rankingScript", name.c_str()), expr);
     }
     void ext_rank_expr(const std::string &name, const std::string &file) {
-        ranking_expressions.insert_or_assign(name, TEST_PATH(file));
+        auto expr_name = fmt("my_expr_%s", name.c_str());
+        property(fmt("rankingExpression(%s).expressionName", name.c_str()), expr_name);
+        ranking_expressions.insert_or_assign(expr_name, TEST_PATH(file));
     }
     void first_phase(const std::string &feature) {
         property(rank::FirstPhase::NAME, feature);
diff --git a/searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp b/searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp
index 9b74f76aa6e..49cf08d76c0 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/ranking_expressions.cpp
@@ -40,8 +40,7 @@ RankingExpressions::loadExpression(const vespalib::string &name) const
 {
     auto pos = _expressions.find(name);
     if (pos == _expressions.end()) {
-        // not warning about missing expression here since what we
-        // think is a name might be an expression itself.
+        LOG(warning, "no such ranking expression: '%s'", name.c_str());
         return {};
     }
     auto path = pos->second;