diff options
Diffstat (limited to 'document/src/main/java/com/yahoo')
-rw-r--r-- | document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java | 9 | ||||
-rw-r--r-- | document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java b/document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java index d01b54328cf..5ed4455435a 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java +++ b/document/src/main/java/com/yahoo/document/json/readers/TensorAddUpdateReader.java @@ -6,12 +6,10 @@ import com.yahoo.document.TensorDataType; import com.yahoo.document.datatypes.TensorFieldValue; import com.yahoo.document.json.TokenBuffer; import com.yahoo.document.update.TensorAddUpdate; -import com.yahoo.document.update.TensorModifyUpdate; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import static com.yahoo.document.json.readers.JsonParserHelpers.expectObjectStart; -import static com.yahoo.document.json.readers.TensorModifyUpdateReader.validateBounds; import static com.yahoo.document.json.readers.TensorReader.fillTensor; /** @@ -27,15 +25,12 @@ public class TensorAddUpdateReader { expectObjectStart(buffer.currentToken()); expectTensorTypeHasSparseDimensions(field); - // Convert update type to only have mapped dimensions - to avoid spanning out dense subspace TensorDataType tensorDataType = (TensorDataType)field.getDataType(); - TensorType originalType = tensorDataType.getTensorType(); - TensorType convertedType = TensorModifyUpdate.convertDimensionsToMapped(originalType); + TensorType tensorType = tensorDataType.getTensorType(); - TensorFieldValue tensorFieldValue = new TensorFieldValue(convertedType); + TensorFieldValue tensorFieldValue = new TensorFieldValue(tensorType); fillTensor(buffer, tensorFieldValue); expectTensorIsNonEmpty(field, tensorFieldValue.getTensor().get()); - validateBounds(tensorFieldValue.getTensor().get(), originalType); return new TensorAddUpdate(tensorFieldValue); } diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java index 65025fada8f..fb252b1a30a 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java @@ -51,9 +51,7 @@ public class VespaDocumentDeserializerHead extends VespaDocumentDeserializer6 { } TensorDataType tensorDataType = (TensorDataType)type; TensorType tensorType = tensorDataType.getTensorType(); - TensorType convertedType = TensorModifyUpdate.convertDimensionsToMapped(tensorType); - - TensorFieldValue tensor = new TensorFieldValue(convertedType); + TensorFieldValue tensor = new TensorFieldValue(tensorType); tensor.deserialize(this); return new TensorAddUpdate(tensor); } |