diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-03-08 16:22:01 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-03-08 16:22:01 +0100 |
commit | 8f21c54b669202cdcc1a04934762dceebb929308 (patch) | |
tree | cddb1bf2cb106b5eb92594785f7daef69f41e3b4 /document | |
parent | f19b783d4014f799482daa13f8f8c26d5c4c84d9 (diff) |
Add TensorFlow variable converter
Diffstat (limited to 'document')
-rw-r--r-- | document/src/main/java/com/yahoo/document/json/document/DocumentParser.java | 5 | ||||
-rw-r--r-- | document/src/main/java/com/yahoo/document/json/readers/TensorReader.java | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java index c64950614ca..744ec12bb23 100644 --- a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java +++ b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java @@ -15,6 +15,7 @@ import java.util.Optional; * @author dybis */ public class DocumentParser { + public enum SupportedOperation { PUT, UPDATE, REMOVE } @@ -59,7 +60,7 @@ public class DocumentParser { } } - private void processIndent() throws IOException { + private void processIndent() { JsonToken currentToken = parser.currentToken(); if (currentToken == null) { throw new IllegalArgumentException("Could not read document, no document?"); @@ -70,7 +71,7 @@ public class DocumentParser { break; case END_OBJECT: indentLevel--; - return; + break; case START_ARRAY: indentLevel += 10000L; break; 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 5b08dfe3604..9a1a37caade 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 @@ -8,7 +8,12 @@ import com.yahoo.tensor.Tensor; import static com.yahoo.document.json.readers.JsonParserHelpers.*; +/** + * Reads the tensor format described at + * http://docs.vespa.ai/documentation/reference/document-json-put-format.html#tensor + */ public class TensorReader { + public static final String TENSOR_ADDRESS = "address"; public static final String TENSOR_DIMENSIONS = "dimensions"; public static final String TENSOR_CELLS = "cells"; @@ -18,7 +23,7 @@ public class TensorReader { Tensor.Builder tensorBuilder = Tensor.Builder.of(tensorFieldValue.getDataType().getTensorType()); expectObjectStart(buffer.currentToken()); int initNesting = buffer.nesting(); - /* read tensor cell fields and ignore everything else */ + // read tensor cell fields and ignore everything else for (buffer.next(); buffer.nesting() >= initNesting; buffer.next()) { if (TensorReader.TENSOR_CELLS.equals(buffer.currentName())) readTensorCells(buffer, tensorBuilder); |