Propagate relevance even if sorting is used.

3 files changed, 12 insertions, 12 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java b/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
index 86f1999d8b4..8a90557fa3b 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/LeanHit.java
@@ -12,15 +12,11 @@ public class LeanHit implements Comparable<LeanHit> {
     private final int distributionKey;
 
     public LeanHit(byte [] gid, int partId, int distributionKey, double relevance) {
-        this.gid = gid;
-        this.relevance = Double.isNaN(relevance) ? Double.NEGATIVE_INFINITY : relevance;
-        this.sortData = null;
-        this.partId = partId;
-        this.distributionKey = distributionKey;
+        this(gid, partId, distributionKey, relevance, null);
     }
-    public LeanHit(byte [] gid, int partId, int distributionKey, byte [] sortData) {
+    public LeanHit(byte [] gid, int partId, int distributionKey, double relevance, byte [] sortData) {
         this.gid = gid;
-        this.relevance = 0.0;
+        this.relevance = Double.isNaN(relevance) ? Double.NEGATIVE_INFINITY : relevance;
         this.sortData = sortData;
         this.partId = partId;
         this.distributionKey = distributionKey;
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
index ae2258c4546..51290c245ac 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
@@ -214,7 +214,7 @@ public class ProtobufSerialization {
         for (var replyHit : protobuf.getHitsList()) {
             LeanHit hit = (replyHit.getSortData().isEmpty())
                     ? new LeanHit(replyHit.getGlobalId().toByteArray(), partId, distKey, replyHit.getRelevance())
-                    : new LeanHit(replyHit.getGlobalId().toByteArray(), partId, distKey, replyHit.getSortData().toByteArray());
+                    : new LeanHit(replyHit.getGlobalId().toByteArray(), partId, distKey, replyHit.getRelevance(), replyHit.getSortData().toByteArray());
             result.getLeanHits().add(hit);
         }
 
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/LeanHitTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/LeanHitTest.java
index 085a9b24993..8d81c5d8521 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/LeanHitTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/LeanHitTest.java
@@ -37,10 +37,14 @@ public class LeanHitTest {
     }
     @Test
     public void testOrderingBySortData() {
-        assertEquals(0, new LeanHit(gidA, 0, 0, gidA).compareTo(new LeanHit(gidA, 0, 0, gidA)));
-        verifyTransitiveOrdering(new LeanHit(gidA, 0, 0, gidA),
-                new LeanHit(gidA, 0, 0, gidB),
-                new LeanHit(gidA, 0, 0, gidC));
+        assertEquals(0, new LeanHit(gidA, 0, 0, 0.0, gidA).compareTo(new LeanHit(gidA, 0, 0, 0.0, gidA)));
+        verifyTransitiveOrdering(new LeanHit(gidA, 0, 0, 0.0, gidA),
+                new LeanHit(gidA, 0, 0, 0.0, gidB),
+                new LeanHit(gidA, 0, 0, 0.0, gidC));
+    }
+    @Test
+    public void testRelevanceIsKeptEvenWithBySortData() {
+        assertEquals(1.3, new LeanHit(gidA, 0, 0, 1.3, gidA).getRelevance(), 0.0);
     }
     @Test
     public void testNaN2negativeInfinity() {