Decode tensor summary features

3 files changed, 59 insertions, 27 deletions

diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json
index b2b895040bc..3b733105d2e 100644
--- a/vespajlib/abi-spec.json
+++ b/vespajlib/abi-spec.json
@@ -104,14 +104,22 @@
       "com.yahoo.data.access.ObjectTraverser"
     ],
     "attributes": [
-      "public",
-      "final"
+      "public"
     ],
     "methods": [
       "public void <init>(java.lang.StringBuilder, boolean)",
       "public void encode(com.yahoo.data.access.Inspector)",
+      "protected void encodeEMPTY()",
+      "protected void encodeBOOL(boolean)",
+      "protected void encodeLONG(long)",
+      "protected void encodeDOUBLE(double)",
+      "protected void encodeSTRING(java.lang.String)",
+      "protected void encodeDATA(byte[])",
+      "protected void encodeARRAY(com.yahoo.data.access.Inspector)",
+      "protected void encodeOBJECT(com.yahoo.data.access.Inspector)",
       "public void entry(int, com.yahoo.data.access.Inspector)",
-      "public void field(java.lang.String, com.yahoo.data.access.Inspector)"
+      "public void field(java.lang.String, com.yahoo.data.access.Inspector)",
+      "public java.lang.StringBuilder target()"
     ],
     "fields": []
   },
@@ -124,7 +132,8 @@
     ],
     "methods": [
       "public void <init>()",
-      "public static java.lang.StringBuilder render(com.yahoo.data.access.Inspectable, java.lang.StringBuilder, boolean)"
+      "public static java.lang.StringBuilder render(com.yahoo.data.access.Inspectable, java.lang.StringBuilder, boolean)",
+      "public static java.lang.StringBuilder render(com.yahoo.data.access.Inspectable, com.yahoo.data.access.simple.JsonRender$StringEncoder)"
     ],
     "fields": []
   },
diff --git a/vespajlib/src/main/java/com/yahoo/data/access/simple/JsonRender.java b/vespajlib/src/main/java/com/yahoo/data/access/simple/JsonRender.java
index 253b0c60927..9f662c77c59 100644
--- a/vespajlib/src/main/java/com/yahoo/data/access/simple/JsonRender.java
+++ b/vespajlib/src/main/java/com/yahoo/data/access/simple/JsonRender.java
@@ -11,19 +11,25 @@ import com.yahoo.data.access.ObjectTraverser;
  *
  * @author arnej27959
  */
-public final class JsonRender
-{
+public final class JsonRender {
+
     public static StringBuilder render(Inspectable value,
                                        StringBuilder target,
-                                       boolean compact)
-    {
-        StringEncoder enc = new StringEncoder(target, compact);
-        enc.encode(value.inspect());
-        return target;
+                                       boolean compact) {
+        return render(value, new StringEncoder(target, compact));
+    }
+
+    /**
+     * Renders the given value to the target stringbuilder with a given encoder.
+     * This is useful to use an encoder where rendering of some value types is customized.
+     */
+    public static StringBuilder render(Inspectable value, StringEncoder encoder) {
+        encoder.encode(value.inspect());
+        return encoder.target();
     }
 
-    public static final class StringEncoder implements ArrayTraverser, ObjectTraverser
-    {
+    public static class StringEncoder implements ArrayTraverser, ObjectTraverser {
+
         private final StringBuilder out;
         private boolean head = true;
         private boolean compact;
@@ -41,21 +47,21 @@ public final class JsonRender
             }
         }
 
-        private void encodeEMPTY() {
+        protected void encodeEMPTY() {
             out.append("null");
         }
 
-        private void encodeBOOL(boolean value) {
+        protected void encodeBOOL(boolean value) {
             out.append(value ? "true" : "false");
         }
 
-        private void encodeLONG(long value) {
-            out.append(String.valueOf(value));
+        protected void encodeLONG(long value) {
+            out.append(value);
         }
 
-        private void encodeDOUBLE(double value) {
+        protected void encodeDOUBLE(double value) {
             if (Double.isFinite(value)) {
-                out.append(String.valueOf(value));
+                out.append(value);
             } else {
                 out.append("null");
             }
@@ -63,7 +69,7 @@ public final class JsonRender
 
         static final char[] hex = "0123456789ABCDEF".toCharArray();
 
-        private void encodeSTRING(String value) {
+        protected void encodeSTRING(String value) {
             out.append('"');
             for (char c : value.toCharArray()) {
                 switch (c) {
@@ -89,7 +95,7 @@ public final class JsonRender
             out.append('"');
         }
 
-        private void encodeDATA(byte[] value) {
+        protected void encodeDATA(byte[] value) {
             out.append('"');
             out.append("0x");
             for (int pos = 0; pos < value.length; pos++) {
@@ -99,14 +105,14 @@ public final class JsonRender
             out.append('"');
         }
 
-        private void encodeARRAY(Inspector inspector) {
+        protected void encodeARRAY(Inspector inspector) {
             openScope("[");
             ArrayTraverser at = this;
             inspector.traverse(at);
             closeScope("]");
         }
 
-        private void encodeOBJECT(Inspector inspector) {
+        protected void encodeOBJECT(Inspector inspector) {
             openScope("{");
             ObjectTraverser ot = this;
             inspector.traverse(ot);
@@ -164,5 +170,10 @@ public final class JsonRender
                 out.append(' ');
             encodeValue(inspector);
         }
+
+        /** Returns the target this is encoding values to */
+        public StringBuilder target() { return out; }
+
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
index 52635905d72..1a210a614cc 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
@@ -19,21 +19,33 @@ import java.util.Iterator;
  * A JSON map containing a 'cells' array.
  * See http://docs.vespa.ai/documentation/reference/document-json-put-format.html#tensor
  */
-// TODO: We should probably move reading of this format from the document module to here
 public class JsonFormat {
 
-    /** Serializes the given tensor into JSON format */
+    /** Serializes the given tensor value into JSON format */
     public static byte[] encode(Tensor tensor) {
         Slime slime = new Slime();
         Cursor root = slime.setObject();
-        Cursor cellsArray = root.setArray("cells");
+        encodeCells(tensor, root);
+        return com.yahoo.slime.JsonFormat.toJsonBytes(slime);
+    }
+
+    /** Serializes the given tensor type and value into JSON format */
+    public static byte[] encodeWithType(Tensor tensor) {
+        Slime slime = new Slime();
+        Cursor root = slime.setObject();
+        root.setString("type", tensor.type().toString());
+        encodeCells(tensor, root);
+        return com.yahoo.slime.JsonFormat.toJsonBytes(slime);
+    }
+
+    private static void encodeCells(Tensor tensor, Cursor rootObject) {
+        Cursor cellsArray = rootObject.setArray("cells");
         for (Iterator<Tensor.Cell> i = tensor.cellIterator(); i.hasNext(); ) {
             Tensor.Cell cell = i.next();
             Cursor cellObject = cellsArray.addObject();
             encodeAddress(tensor.type(), cell.getKey(), cellObject.setObject("address"));
             cellObject.setDouble("value", cell.getValue());
         }
-        return com.yahoo.slime.JsonFormat.toJsonBytes(slime);
     }
 
     private static void encodeAddress(TensorType type, TensorAddress address, Cursor addressObject) {