Merge pull request #26541 from vespa-engine/toregge/handle-removal-of…

…-docid-with-empty-tensor Handle removal of docid with empty tensor in HNSW index.
vespa-engine · Mar 22, 2023 · c0e8ae2 · c0e8ae2
2 parents 8741b01 + 4e5da07
commit c0e8ae2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
@@ -816,6 +816,14 @@ TEST_F(HnswMultiIndexTest, duplicate_docid_is_removed)
     EXPECT_EQ(2, filter->max_docid());
 };
 
+TEST_F(HnswMultiIndexTest, docid_with_empty_tensor_can_be_removed)
+{
+    this->init(false);
+    this->vectors.set(1, {});
+    this->add_document(1);
+    this->remove_document(1);
+}
+
 TEST(LevelGeneratorTest, gives_various_levels)
 {
     InvLogLevelGenerator generator(4);

diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_nodeid_mapping.cpp b/searchlib/src/vespa/searchlib/tensor/hnsw_nodeid_mapping.cpp
@@ -91,7 +91,9 @@ HnswNodeidMapping::free_ids(uint32_t docid)
 {
     assert(docid < _refs.size());
     EntryRef ref = _refs[docid];
-    assert(ref.valid());
+    if (!ref.valid()) {
+        return;
+    }
     auto nodeids = _nodeids.get(ref);
     for (auto nodeid : nodeids) {
         _hold_list.insert(nodeid);