Merge pull request #16017 from vespa-engine/arnej/avoid-value-copy

avoid extra Value copy when updating DirectTensorAttribute

1 files changed, 2 insertions, 6 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/common/attribute_updater.cpp b/searchcore/src/vespa/searchcore/proton/common/attribute_updater.cpp
index 063ecffe729..8fb165cb0b8 100644
--- a/searchcore/src/vespa/searchcore/proton/common/attribute_updater.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/attribute_updater.cpp
@@ -207,9 +207,8 @@ AttributeUpdater::handleUpdate(PredicateAttribute &vec, uint32_t lid, const Valu
 
 namespace {
 
-template <typename TensorUpdateType>
 void
-applyTensorUpdate(TensorAttribute &vec, uint32_t lid, const TensorUpdateType &update,
+applyTensorUpdate(TensorAttribute &vec, uint32_t lid, const document::TensorUpdate &update,
                   bool create_empty_if_non_existing)
 {
     auto oldTensor = vec.getTensor(lid);
@@ -217,10 +216,7 @@ applyTensorUpdate(TensorAttribute &vec, uint32_t lid, const TensorUpdateType &up
         oldTensor = vec.getEmptyTensor();
     }
     if (oldTensor) {
-        auto newTensor = update.applyTo(*oldTensor);
-        if (newTensor) {
-            vec.setTensor(lid, *newTensor);
-        }
+        vec.update_tensor(lid, update, *oldTensor);
     }
 }