diff options
author | Jon Bratseth <bratseth@oath.com> | 2020-01-06 10:25:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-06 10:25:07 +0100 |
commit | 234be16d4d01656ee7b9bdc0917d31bef9772f69 (patch) | |
tree | 7971430929fe578edd5acf5f96b902c90fc8e0b8 /document | |
parent | 3e1d1893b23e02343942bf14de2beaf6d2b280e9 (diff) | |
parent | 52e3c956e74d03ed765ee37f7e0f7bc22a893c7f (diff) |
Merge pull request #11620 from vespa-engine/bratseth/tensor-merge
Add merge
Diffstat (limited to 'document')
-rw-r--r-- | document/src/main/java/com/yahoo/document/update/TensorAddUpdate.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/document/src/main/java/com/yahoo/document/update/TensorAddUpdate.java b/document/src/main/java/com/yahoo/document/update/TensorAddUpdate.java index f8d2464deb7..b607076e356 100644 --- a/document/src/main/java/com/yahoo/document/update/TensorAddUpdate.java +++ b/document/src/main/java/com/yahoo/document/update/TensorAddUpdate.java @@ -48,7 +48,7 @@ public class TensorAddUpdate extends ValueUpdate<TensorFieldValue> { Tensor old = ((TensorFieldValue) oldValue).getTensor().get(); Tensor update = tensor.getTensor().get(); - Tensor result = old.merge((left, right) -> right, update.cells()); // note this might be slow for large mixed tensor updates + Tensor result = old.merge(update, (left, right) -> right); // note this might be slow for large mixed tensor updates return new TensorFieldValue(result); } |