Test direct rendering

3 files changed, 49 insertions, 18 deletions

diff --git a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
index 7003d19e7d1..105739da508 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
@@ -166,9 +166,8 @@ public class TensorFieldValue extends FieldValue {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if ( ! (o instanceof TensorFieldValue)) return false;
+        if ( ! (o instanceof TensorFieldValue other)) return false;
 
-        TensorFieldValue other = (TensorFieldValue)o;
         if ( ! getTensorType().equals(other.getTensorType())) return false;
         if ( ! getTensor().equals(other.getTensor())) return false;
         return true;
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 914ab670142..9d66bbd25d9 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
@@ -4,6 +4,8 @@ package com.yahoo.document.json.readers;
 import com.fasterxml.jackson.core.JsonToken;
 import com.yahoo.document.datatypes.TensorFieldValue;
 import com.yahoo.document.json.TokenBuffer;
+import com.yahoo.slime.Inspector;
+import com.yahoo.slime.Type;
 import com.yahoo.tensor.IndexedTensor;
 import com.yahoo.tensor.MixedTensor;
 import com.yahoo.tensor.Tensor;
@@ -179,10 +181,12 @@ public class TensorReader {
 
     /** Reads a tensor value directly at the root, where the format is decided by the tensor type. */
     private static void readDirectTensorValue(TokenBuffer buffer, Tensor.Builder builder) {
-        boolean hasIndexed = builder.type().dimensions().stream().anyMatch(TensorType.Dimension::isIndexed);
+        boolean hasIndexed = builder.type().dimensions().stream().anyMatch(TensorType.Dimension::isIndexed) && 1==2;
         boolean hasMapped = builder.type().dimensions().stream().anyMatch(TensorType.Dimension::isMapped);
 
-        if ( ! hasMapped)
+        if (isArrayOfObjects(buffer, 0))
+            readTensorCells(buffer, builder);
+        else if ( ! hasMapped)
             readTensorValues(buffer, builder);
         else if (hasMapped && hasIndexed)
             readTensorBlocks(buffer, builder);
@@ -190,6 +194,12 @@ public class TensorReader {
             readTensorCells(buffer, builder);
     }
 
+    private static boolean isArrayOfObjects(TokenBuffer buffer, int ahead) {
+        if (buffer.peek(ahead++) != JsonToken.START_ARRAY) return false;
+        if (buffer.peek(ahead) == JsonToken.START_ARRAY) return isArrayOfObjects(buffer, ahead); // nested array
+        return buffer.peek(ahead) == JsonToken.START_OBJECT;
+    }
+
     private static TensorAddress readAddress(TokenBuffer buffer, TensorType type) {
         expectObjectStart(buffer.current());
         TensorAddress.Builder builder = new TensorAddress.Builder(type);
diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
index c19094ff231..f48c2330f82 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
@@ -1427,14 +1427,16 @@ public class JsonReaderTestCase {
     @Test
     public void testParsingOfSparseTensorWithCells() {
         Tensor tensor = assertSparseTensorField("{{x:a,y:b}:2.0,{x:c,y:b}:3.0}}",
-                                createPutWithSparseTensor(inputJson("{",
-                                                    "  'cells': [",
-                                                    "    { 'address': { 'x': 'a', 'y': 'b' },",
-                                                    "      'value': 2.0 },",
-                                                    "    { 'address': { 'x': 'c', 'y': 'b' },",
-                                                    "      'value': 3.0 }",
-                                                    "  ]",
-                                                    "}")));
+                                createPutWithSparseTensor(
+                                        """
+                                                    {
+                                                      "type": "tensor(x{},y{})",
+                                                      "cells": [
+                                                        { "address": { "x": "a", "y": "b" }, "value": 2.0 },
+                                                        { "address": { "x": "c", "y": "b" }, "value": 3.0 }
+                                                      ]
+                                                    }
+                                                    """));
         assertTrue(tensor instanceof MappedTensor); // any functional instance is fine
     }
 
@@ -1542,13 +1544,33 @@ public class JsonReaderTestCase {
         builder.cell().label("x", 1).label("y", 2).value(7.0);
         Tensor expected = builder.build();
 
-        String mixedJson = "{\"blocks\":[" +
-                           "{\"address\":{\"x\":\"0\"},\"values\":[2.0,3.0,4.0]}," +
-                           "{\"address\":{\"x\":\"1\"},\"values\":[5.0,6.0,7.0]}" +
-                           "]}";
+        String mixedJson =
+                """
+                {
+                  "blocks":[
+                    {"address":{"x":"0"},"values":[2.0,3.0,4.0]},
+                    {"address":{"x":"1"},"values":[5.0,6.0,7.0]}
+                  ]
+                }
+                """;
         Tensor tensor = assertTensorField(expected,
                                           createPutWithTensor(inputJson(mixedJson), "mixed_tensor"), "mixed_tensor");
         assertTrue(tensor instanceof MixedTensor); // this matters for performance
+
+        String mixedJsonDirect =
+                """
+                [
+                  {"address":{"x":"0","y":"0"},"value":2.0},
+                  {"address":{"x":"0","y":"1"},"value":3.0},
+                  {"address":{"x":"0","y":"2"},"value":4.0},
+                  {"address":{"x":"1","y":"0"},"value":5.0},
+                  {"address":{"x":"1","y":"1"},"value":6.0},
+                  {"address":{"x":"1","y":"2"},"value":7.0}
+                ]
+                """;
+        Tensor tensorDirect = assertTensorField(expected,
+                                                createPutWithTensor(inputJson(mixedJsonDirect), "mixed_tensor"), "mixed_tensor");
+        assertTrue(tensorDirect instanceof MixedTensor); // this matters for performance
     }
 
     @Test
@@ -1602,8 +1624,8 @@ public class JsonReaderTestCase {
     @Test
     public void testAssignUpdateOfNullTensor() {
         ClearValueUpdate clearUpdate = (ClearValueUpdate) getTensorField(createAssignUpdateWithSparseTensor(null)).getValueUpdate(0);
-        assertTrue(clearUpdate != null);
-        assertTrue(clearUpdate.getValue() == null);
+        assertNotNull(clearUpdate);
+        assertNull(clearUpdate.getValue());
     }
 
     @Test