Handle type rendering

- Always output type for consistency.
- Ignore type in input.

4 files changed, 11 insertions, 4 deletions

diff --git a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
index 0f6d6cb4a65..a3cda4034ac 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
@@ -80,7 +80,7 @@ public class JsonSerializationHelper {
             fieldNameIfNotNull(generator, field);
             if (value.getTensor().isPresent()) {
                 Tensor tensor = value.getTensor().get();
-                byte[] encoded = shortForm ? JsonFormat.encodeShortForm(tensor) : JsonFormat.encode(tensor);
+                byte[] encoded = shortForm ? JsonFormat.encodeShortForm(tensor) : JsonFormat.encodeWithType(tensor);
                 generator.writeRawValue(new String(encoded, StandardCharsets.UTF_8));
             }
             else {
diff --git a/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java b/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
index 0d971859550..914ab670142 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/TensorReader.java
@@ -22,6 +22,7 @@ import static com.yahoo.tensor.serialization.JsonFormat.decodeHexString;
  */
 public class TensorReader {
 
+    public static final String TENSOR_TYPE = "type";
     public static final String TENSOR_ADDRESS = "address";
     public static final String TENSOR_CELLS = "cells";
     public static final String TENSOR_VALUES = "values";
@@ -43,6 +44,9 @@ public class TensorReader {
             else if (TENSOR_BLOCKS.equals(buffer.currentName())) {
                 readTensorBlocks(buffer, builder);
             }
+            else if (TENSOR_TYPE.equals(buffer.currentName()) && buffer.current() == JsonToken.VALUE_STRING) {
+                // Ignore input tensor type
+            }
             else {
                 buffer.previous(); // Back up to the start of the enclosing block
                 readDirectTensorValue(buffer, builder);
diff --git a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
index 7bdb526bb1c..08a5c9a124c 100644
--- a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
+++ b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
@@ -285,6 +285,7 @@ public class DocumentUpdateJsonSerializerTest {
                 "    'fields': {",
                 "        'sparse_tensor': {",
                 "            'assign': {",
+                "                'type': 'tensor(x{},y{})',",
                 "                'cells': [",
                 "                    { 'address': { 'x': 'a', 'y': 'b' }, 'value': 2.0 },",
                 "                    { 'address': { 'x': 'c', 'y': 'b' }, 'value': 3.0 }",
diff --git a/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java
index e7368a691ab..edf410b312e 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java
@@ -396,19 +396,21 @@ public class JsonWriterTestCase {
 
     @Test
     public void testWritingOfEmptyTensor() throws IOException {
-        assertTensorRoundTripEquality("{}","{ \"cells\": [] }");
+        assertTensorRoundTripEquality("{}","{ \"type\":\"tensor(x{},y{})\", \"cells\": [] }");
     }
 
     @Test
     public void testWritingOfTensorWithCellsOnly() throws IOException {
         assertTensorRoundTripEquality("{ "
-                + "  \"cells\": [ "
+        + "  \"type\": \"tensor(x{},y{})\","
+        + "  \"cells\": [ "
                 + "    { \"address\": { \"x\": \"a\", \"y\": \"b\" }, "
                 + "      \"value\": 2.0 }, "
                 + "    { \"address\": { \"x\": \"c\", \"y\": \"b\" }, "
                 + "      \"value\": 3.0 } "
                 + "  ]"
                 + "}", "{ "
+                + "  \"type\": \"tensor(x{},y{})\","
                 + "  \"cells\": [ "
                 + "    { \"address\": { \"x\": \"a\", \"y\": \"b\" }, "
                 + "      \"value\": 2.0 }, "
@@ -449,7 +451,7 @@ public class JsonWriterTestCase {
         Tensor tensor = Tensor.from("tensor(x[3]):[1,2,3]");
         doc.setFieldValue(tensorField, new TensorFieldValue(tensor));
 
-        assertEqualJson(asDocument(docId, "{ \"tensorfield\": {\"cells\":[{\"address\":{\"x\":\"0\"},\"value\":1.0},{\"address\":{\"x\":\"1\"},\"value\":2.0},{\"address\":{\"x\":\"2\"},\"value\":3.0}]} }"),
+        assertEqualJson(asDocument(docId, "{ \"tensorfield\": {\"type\":\"tensor(x[3])\", \"cells\":[{\"address\":{\"x\":\"0\"},\"value\":1.0},{\"address\":{\"x\":\"1\"},\"value\":2.0},{\"address\":{\"x\":\"2\"},\"value\":3.0}]} }"),
                         writeDocument(doc, false));
         assertEqualJson(asDocument(docId, "{ \"tensorfield\": {\"type\":\"tensor(x[3])\", \"values\":[1.0, 2.0, 3.0] } }"),
                         writeDocument(doc, true));