1 files changed, 34 insertions, 5 deletions

diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp b/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp
index 1db688156e0..b542c422f50 100644
--- a/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp
@@ -672,15 +672,18 @@ HnswIndex<type>::mutual_reconnect(const LinkArrayRef &cluster, uint32_t level)
     std::vector<PairDist> pairs;
     for (uint32_t i = 0; i + 1 < cluster.size(); ++i) {
         uint32_t n_id_1 = cluster[i];
+        TypedCells n_cells_1 = get_vector(n_id_1);
+        if (n_cells_1.non_existing_attribute_value()) [[unlikely]] continue;
         LinkArrayRef n_list_1 = _graph.get_link_array(n_id_1, level);
-        std::unique_ptr<BoundDistanceFunction> df;
+        std::unique_ptr<BoundDistanceFunction> df = _distance_ff->for_insertion_vector(n_cells_1);
         for (uint32_t j = i + 1; j < cluster.size(); ++j) {
             uint32_t n_id_2 = cluster[j];
-            if (has_link_to(n_list_1, n_id_2)) continue;
-            if (!df) {
-                df = _distance_ff->for_insertion_vector(get_vector(n_id_1));
+            if ( ! has_link_to(n_list_1, n_id_2)) {
+                auto n_cells_2 = get_vector(n_id_2);
+                if (!n_cells_2.non_existing_attribute_value()) {
+                    pairs.emplace_back(n_id_1, n_id_2, df->calc(n_cells_2));
+                }
             }
-            pairs.emplace_back(n_id_1, n_id_2, calc_distance(*df, n_id_2));
         }
     }
     std::sort(pairs.begin(), pairs.end());
@@ -1120,6 +1123,32 @@ HnswIndex<type>::count_reachable_nodes() const
     return {found_cnt, true};
 }
 
+template <HnswIndexType type>
+uint32_t
+HnswIndex<type>::get_subspaces(uint32_t docid) const noexcept
+{
+    if constexpr (type == HnswIndexType::SINGLE) {
+        return (docid < _graph.nodes.get_size() && _graph.nodes.get_elem_ref(docid).levels_ref().load_relaxed().valid()) ? 1 : 0;
+    } else {
+        return _id_mapping.get_ids(docid).size();
+    }
+}
+
+template <HnswIndexType type>
+uint32_t
+HnswIndex<type>::check_consistency(uint32_t docid_limit) const noexcept
+{
+    uint32_t inconsistencies = 0;
+    for (uint32_t docid = 1; docid < docid_limit; ++docid) {
+        auto index_subspaces = get_subspaces(docid);
+        auto store_subspaces = get_vectors(docid).subspaces();
+        if (index_subspaces != store_subspaces) {
+            ++inconsistencies;
+        }
+    }
+    return inconsistencies;
+}
+
 template class HnswIndex<HnswIndexType::SINGLE>;
 template class HnswIndex<HnswIndexType::MULTI>;