update serializer and test

2 files changed, 17 insertions, 3 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
index 38b207cc7eb..dd52b9e19b8 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
@@ -701,12 +701,18 @@ public class VespaSerializer {
             destination.append(leafAnnotations(item));
             comma(destination, initLen);
             int targetNumHits = item.getTargetNumHits();
-            destination.append("\"targetNumHits\": ").append(targetNumHits);
+            annotationKey(destination, "targetNumHits").append(targetNumHits);
             int explore = item.getHnswExploreAdditionalHits();
             if (explore != 0) {
-                destination.append(",\"hnsw.exploreAdditionalHits\": ").append(explore);
+                comma(destination, initLen);
+                String key = YqlParser.HNSW_EXPLORE_ADDITIONAL_HITS;
+                annotationKey(destination, key).append(explore);
+            }
+            boolean allow_approx = item.getAllowApproximate();
+            if (! allow_approx) {
+                comma(destination, initLen);
+                annotationKey(destination, "approximate").append(allow_approx);
             }
-            destination.append(",\"approximate\": ").append(item.getAllowApproximate());
             destination.append("}]");
             destination.append(NEAREST_NEIGHBOR).append('(');
             destination.append(item.getIndexName()).append(", ");
@@ -1352,6 +1358,11 @@ public class VespaSerializer {
         }
     }
 
+    private static StringBuilder annotationKey(StringBuilder annotation, String val) {
+        annotation.append("\"").append(val).append("\": ");
+        return annotation;
+    }
+
     private static void comma(StringBuilder annotation, int initLen) {
         if (annotation.length() > initLen) {
             annotation.append(", ");
diff --git a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java
index 1106d8c3999..d770b08d31a 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java
@@ -128,6 +128,9 @@ public class VespaSerializerTestCase {
     public void testNearestNeighbor() {
         parseAndConfirm("[{\"label\": \"foo\", \"targetNumHits\": 1000}]nearestNeighbor(semantic_embedding, my_property)");
         parseAndConfirm("[{\"targetNumHits\": 42}]nearestNeighbor(semantic_embedding, my_property)");
+        parseAndConfirm("[{\"targetNumHits\": 1, \"hnsw.exploreAdditionalHits\": 76}]nearestNeighbor(semantic_embedding, my_property)");
+        parseAndConfirm("[{\"targetNumHits\": 2, \"approximate\": false}]nearestNeighbor(semantic_embedding, my_property)");
+        parseAndConfirm("[{\"targetNumHits\": 3, \"hnsw.exploreAdditionalHits\": 67, \"approximate\": false}]nearestNeighbor(semantic_embedding, my_property)");
     }
 
     @Test