1 files changed, 9 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/ranking/RankFeatures.java b/container-search/src/main/java/com/yahoo/search/query/ranking/RankFeatures.java
index 9786eba163a..9b0fd45c357 100644
--- a/container-search/src/main/java/com/yahoo/search/query/ranking/RankFeatures.java
+++ b/container-search/src/main/java/com/yahoo/search/query/ranking/RankFeatures.java
@@ -1,7 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.query.ranking;
 
+import ai.vespa.searchlib.searchprotocol.protobuf.Search;
 import com.yahoo.fs4.MapEncoder;
+import com.yahoo.searchlib.protobuf.MapConverter;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.text.JSON;
 
@@ -127,4 +129,11 @@ public class RankFeatures implements Cloneable {
         return JSON.encode(features);
     }
 
+    public void addToProtobuf(Search.Request.Builder builder, boolean includeQueryData) {
+        if (includeQueryData) {
+            MapConverter.convertMapStrings(features, builder::addFeatureOverrides);
+            MapConverter.convertMapTensors(features, builder::addTensorFeatureOverrides);
+        }
+    }
+
 }