Merge pull request #9725 from vespa-engine/havardpe/protect-against-duplicate-cells

protect against duplicate cell addresses MERGEOK

4 files changed, 4 insertions, 4 deletions

diff --git a/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp b/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp
index 1ac524b5d0b..d2fc79f8fa2 100644
--- a/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp
+++ b/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp
@@ -118,7 +118,7 @@ struct ExecFixture
         }
     }
     void setupQueryEnvironment() {
-        test.getQueryEnv().getProperties().add("astr_query", "[d e f]");
+        test.getQueryEnv().getProperties().add("astr_query", "[d e f e]");
         test.getQueryEnv().getProperties().add("aint_query", "[11 13 17]");
     }
     const Tensor &extractTensor(uint32_t docid) {
diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h b/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h
index 14f38803dd6..b9349071617 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h
+++ b/searchlib/src/vespa/searchlib/features/tensor_from_attribute_executor.h
@@ -46,7 +46,7 @@ TensorFromAttributeExecutor<WeightedBufferType>::execute(uint32_t docId)
     for (size_t i = 0; i < _attrBuffer.size(); ++i) {
         address.clear();
         address.add(vespalib::string(_attrBuffer[i].value()));
-        builder.insertCell(address, _attrBuffer[i].weight());
+        builder.insertCell(address, _attrBuffer[i].weight(), [](double, double v){ return v; });
     }
     _tensor = builder.build();
     outputs().set_object(0, *_tensor);
diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
index 49262e95d89..e43aea0a637 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/tensor_from_labels_feature.cpp
@@ -96,7 +96,7 @@ createQueryExecutor(const search::fef::IQueryEnvironment &env,
         for (const auto &elem : vector) {
             address.clear();
             address.add(elem);
-            tensorBuilder.insertCell(address, 1.0);
+            tensorBuilder.insertCell(address, 1.0, [](double, double v){ return v; });
         }
         return ConstantTensorExecutor::create(tensorBuilder.build(), stash);
     }
diff --git a/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp b/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp
index b2ec88008ca..1c2167f4d4d 100644
--- a/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/tensor_from_weighted_set_feature.cpp
@@ -111,7 +111,7 @@ createQueryExecutor(const search::fef::IQueryEnvironment &env,
         for (const auto &elem : vector._data) {
             address.clear();
             address.add(elem.value());
-            tensorBuilder.insertCell(address, elem.weight());
+            tensorBuilder.insertCell(address, elem.weight(), [](double, double v){ return v; });
         }
         return ConstantTensorExecutor::create(tensorBuilder.build(), stash);
     }