Map [relevance] to [rank]

2 files changed, 4 insertions, 0 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
index bbdb3b796a2..82148cf54e6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/ValidateSortingSearcher.java
@@ -119,6 +119,9 @@ public class ValidateSortingSearcher extends Searcher {
             String name = f.getFieldName();
             if ("[rank]".equals(name) || "[docid]".equals(name)) {
                 // built-in constants - ok
+            } else if ("[relevance]".equals(name)) {
+                // built-in constant '[relevance]' must map to '[rank]'
+                f.getSorter().setName("[rank]");
             } else if ("[relevancy]".equals(name)) {
                 // built-in constant '[relevancy]' must map to '[rank]'
                 f.getSorter().setName("[rank]");
diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java
index 65011ffb562..f4bf957e29a 100644
--- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java
@@ -52,6 +52,7 @@ public class ValidateSortingSearcherTestCase {
         assertEquals("[ASCENDING:[rank]]", quoteAndTransform("+[rank]"));
         assertEquals("[ASCENDING:[docid]]", quoteAndTransform("+[docid]"));
         assertEquals("[ASCENDING:[rank]]", quoteAndTransform("+[relevancy]"));
+        assertEquals("[ASCENDING:[rank]]", quoteAndTransform("+[relevance]"));
     }
 
     @Test