aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2023-07-04 22:30:44 +0200
committerGitHub <noreply@github.com>2023-07-04 22:30:44 +0200
commitba7e9f22595053f893cff684ed8d83b7647f023e (patch)
tree76ebc0d6c090484fe30817fd5782c6f7116619bd
parent9eb82078bfb84f265f3425f25610bcc1a80fc0d1 (diff)
parent99d11714a1c2b78a7f40d1c6d8359ebd3badda7a (diff)
Merge pull request #27629 from vespa-engine/arnej/handle-nested-array-in-blocks
handle nested arrays also inside the "blocks" format
-rw-r--r--document/src/main/java/com/yahoo/document/json/readers/TensorReader.java4
1 files changed, 3 insertions, 1 deletions
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 227a87ebefb..f33529256a7 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
@@ -229,8 +229,10 @@ public class TensorReader {
} else {
expectArrayStart(buffer.current());
int initNesting = buffer.nesting();
- for (buffer.next(); buffer.nesting() >= initNesting; buffer.next())
+ for (buffer.next(); buffer.nesting() >= initNesting; buffer.next()) {
+ if (buffer.current() == JsonToken.START_ARRAY || buffer.current() == JsonToken.END_ARRAY) continue; // nested arrays: Skip
values[index++] = readDouble(buffer);
+ }
expectCompositeEnd(buffer.current());
}
if (index != size)