Merge pull request #23946 from vespa-engine/havardpe/rank-profile-report-name-mapping-support

support mapping names in execution profiling output

3 files changed, 36 insertions, 36 deletions

diff --git a/searchlib/src/tests/fef/resolver/resolver_test.cpp b/searchlib/src/tests/fef/resolver/resolver_test.cpp
index 536507f3776..942c70dd6aa 100644
--- a/searchlib/src/tests/fef/resolver/resolver_test.cpp
+++ b/searchlib/src/tests/fef/resolver/resolver_test.cpp
@@ -87,9 +87,9 @@ TEST_F("require_that_bad_input_is_handled", Fixture) {
 }
 
 TEST("require that features can be described") {
-    EXPECT_EQUAL(BlueprintResolver::describe_feature("featureName"), vespalib::string("rank feature 'featureName'"));
-    EXPECT_EQUAL(BlueprintResolver::describe_feature("rankingExpression(foo)"), vespalib::string("function 'foo'"));
-    EXPECT_EQUAL(BlueprintResolver::describe_feature("rankingExpression(foo@1234.5678)"), vespalib::string("function 'foo'"));
+    EXPECT_EQUAL(BlueprintResolver::describe_feature("featureName"), vespalib::string("rank feature featureName"));
+    EXPECT_EQUAL(BlueprintResolver::describe_feature("rankingExpression(foo)"), vespalib::string("function foo"));
+    EXPECT_EQUAL(BlueprintResolver::describe_feature("rankingExpression(foo@1234.5678)"), vespalib::string("function foo"));
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp
index 6d49704e7c1..50c089ce8dc 100644
--- a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp
+++ b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp
@@ -65,28 +65,28 @@ TEST_F("verify valid rank feature", RankFixture) {
 
 TEST_F("verify unknown feature", RankFixture) {
     EXPECT_FALSE(f1.verify("unknown",
-                           {{equal, {Level::WARNING, "invalid rank feature 'unknown': unknown basename: 'unknown'"}},
-                            {equal, {Level::ERROR, "verification failed: rank feature 'unknown' (feature verification test)"}}}));
+                           {{equal, {Level::WARNING, "invalid rank feature unknown: unknown basename: 'unknown'"}},
+                            {equal, {Level::ERROR, "verification failed: rank feature unknown (feature verification test)"}}}));
 }
 
 TEST_F("verify unknown output", RankFixture) {
     EXPECT_FALSE(f1.verify("value(1, 2, 3).3",
-                           {{equal, {Level::WARNING, "invalid rank feature 'value(1,2,3).3': unknown output: '3'"}},
-                            {equal, {Level::ERROR, "verification failed: rank feature 'value(1, 2, 3).3' (feature verification test)"}}}));
+                           {{equal, {Level::WARNING, "invalid rank feature value(1,2,3).3: unknown output: '3'"}},
+                            {equal, {Level::ERROR, "verification failed: rank feature value(1, 2, 3).3 (feature verification test)"}}}));
 }
 
 TEST_F("verify illegal input parameters", RankFixture) {
     EXPECT_FALSE(f1.verify("value.0",
-                           {{equal, {Level::WARNING, "invalid rank feature 'value.0':"
+                           {{equal, {Level::WARNING, "invalid rank feature value.0:"
                                                      " The parameter list used for setting up rank feature value is not valid:"
                                                      " Expected 1+1x parameter(s), but got 0"}},
-                            {equal, {Level::ERROR, "verification failed: rank feature 'value.0' (feature verification test)"}}}));
+                            {equal, {Level::ERROR, "verification failed: rank feature value.0 (feature verification test)"}}}));
 }
 
 TEST_F("verify illegal feature name", RankFixture) {
     EXPECT_FALSE(f1.verify("value(2).",
-                           {{equal, {Level::WARNING, "invalid rank feature 'value(2).': malformed name"}},
-                            {equal, {Level::ERROR, "verification failed: rank feature 'value(2).' (feature verification test)"}}}));
+                           {{equal, {Level::WARNING, "invalid rank feature value(2).: malformed name"}},
+                            {equal, {Level::ERROR, "verification failed: rank feature value(2). (feature verification test)"}}}));
 }
 
 TEST_F("verify too deep dependency graph", RankFixture) {
@@ -94,37 +94,37 @@ TEST_F("verify too deep dependency graph", RankFixture) {
     EXPECT_FALSE(f1.verify("chain(basic, 256, 4)",
                            {{equal,
                              {Level::WARNING,
-                              "invalid rank feature 'value(4)': dependency graph too deep\n"
-                              "  ... needed by rank feature 'chain(basic,1,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,2,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,3,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,4,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,5,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,6,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,7,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,8,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,9,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,10,4)'\n"
+                              "invalid rank feature value(4): dependency graph too deep\n"
+                              "  ... needed by rank feature chain(basic,1,4)\n"
+                              "  ... needed by rank feature chain(basic,2,4)\n"
+                              "  ... needed by rank feature chain(basic,3,4)\n"
+                              "  ... needed by rank feature chain(basic,4,4)\n"
+                              "  ... needed by rank feature chain(basic,5,4)\n"
+                              "  ... needed by rank feature chain(basic,6,4)\n"
+                              "  ... needed by rank feature chain(basic,7,4)\n"
+                              "  ... needed by rank feature chain(basic,8,4)\n"
+                              "  ... needed by rank feature chain(basic,9,4)\n"
+                              "  ... needed by rank feature chain(basic,10,4)\n"
                               "  (skipped 241 entries)\n"
-                              "  ... needed by rank feature 'chain(basic,252,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,253,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,254,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,255,4)'\n"
-                              "  ... needed by rank feature 'chain(basic,256,4)'\n"}},
+                              "  ... needed by rank feature chain(basic,252,4)\n"
+                              "  ... needed by rank feature chain(basic,253,4)\n"
+                              "  ... needed by rank feature chain(basic,254,4)\n"
+                              "  ... needed by rank feature chain(basic,255,4)\n"
+                              "  ... needed by rank feature chain(basic,256,4)\n"}},
                             {regex, {Level::WARNING, "high stack usage: [0-9]+ bytes"}},
-                            {equal, {Level::ERROR, "verification failed: rank feature 'chain(basic, 256, 4)' (feature verification test)"}}}));
+                            {equal, {Level::ERROR, "verification failed: rank feature chain(basic, 256, 4) (feature verification test)"}}}));
 }
 
 TEST_F("verify dependency cycle", RankFixture) {
     EXPECT_FALSE(f1.verify("chain(cycle, 4, 2)",
                            {{equal,
                              {Level::WARNING,
-                              "invalid rank feature 'chain(cycle,2,2)': dependency cycle detected\n"
-                              "  ... needed by rank feature 'chain(cycle,1,2)'\n"
-                              "  ... needed by rank feature 'chain(cycle,2,2)'\n"
-                              "  ... needed by rank feature 'chain(cycle,3,2)'\n"
-                              "  ... needed by rank feature 'chain(cycle,4,2)'\n"}},
-                            {equal, {Level::ERROR, "verification failed: rank feature 'chain(cycle, 4, 2)' (feature verification test)"}}}));
+                              "invalid rank feature chain(cycle,2,2): dependency cycle detected\n"
+                              "  ... needed by rank feature chain(cycle,1,2)\n"
+                              "  ... needed by rank feature chain(cycle,2,2)\n"
+                              "  ... needed by rank feature chain(cycle,3,2)\n"
+                              "  ... needed by rank feature chain(cycle,4,2)\n"}},
+                            {equal, {Level::ERROR, "verification failed: rank feature chain(cycle, 4, 2) (feature verification test)"}}}));
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
index b672d754b72..0cc70d7fa6a 100644
--- a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
+++ b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
@@ -281,9 +281,9 @@ BlueprintResolver::describe_feature(const vespalib::string &name)
     {
         auto param = parser->parameters()[0];
         param = param.substr(0, param.find("@"));
-        return fmt("function '%s'", param.c_str());
+        return fmt("function %s", param.c_str());
     }
-    return fmt("rank feature '%s'", name.c_str());
+    return fmt("rank feature %s", name.c_str());
 }
 
 void