Skip to content

Commit 8da0111

Browse files
committed
refactor: drop extra code
1 parent 7d7461d commit 8da0111

File tree

3 files changed

+9
-24
lines changed

3 files changed

+9
-24
lines changed

src/core/search/hnsw_index.cc

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -264,27 +264,7 @@ struct HnswlibAdapter {
264264
size_t internal_id = node.internal_id;
265265

266266
// Validate internal_id is within bounds - invalid internal_id indicates corrupted data
267-
if (internal_id >= world_.max_elements_) {
268-
LOG(ERROR) << "RestoreFromNodes: internal_id " << internal_id << " exceeds max_elements "
269-
<< world_.max_elements_ << ", aborting restoration (corrupted snapshot data)";
270-
// Clean up all state modified for previously processed nodes
271-
for (size_t id : restored_internal_ids) {
272-
// Free allocated linkLists_ to prevent memory leak
273-
if (world_.linkLists_[id]) {
274-
mi_free(world_.linkLists_[id]);
275-
world_.linkLists_[id] = nullptr;
276-
}
277-
// Reset element_levels_ entry
278-
world_.element_levels_[id] = 0;
279-
// Clear level 0 memory that was modified
280-
memset(world_.data_level0_memory_ + id * world_.size_data_per_element_, 0,
281-
world_.size_data_per_element_);
282-
}
283-
// Reset global state
284-
world_.cur_element_count.store(0);
285-
world_.label_lookup_.clear();
286-
return;
287-
}
267+
CHECK(internal_id < world_.max_elements_);
288268

289269
// Register label in lookup table
290270
world_.label_lookup_[node.global_id] = internal_id;

src/server/rdb_load.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2311,9 +2311,10 @@ error_code RdbLoader::Load(io::Source* src) {
23112311

23122312
LOG(INFO) << "Restored HNSW index " << index_key << " with " << nodes.size() << " nodes";
23132313
} else if (elements_number > 0) {
2314-
VLOG(2) << "Skipping HNSW vector index restore: " << index_key
2315-
<< " elements_number=" << elements_number << " shard_count_=" << shard_count_
2316-
<< " current_shards=" << (shard_set ? shard_set->size() : 0);
2314+
LOG(INFO) << "Skipping HNSW vector index restore: " << index_key
2315+
<< " elements_number=" << elements_number << " shard_count_=" << shard_count_
2316+
<< " current_shards=" << (shard_set ? shard_set->size() : 0)
2317+
<< ". Index will be rebuilt from data.";
23172318
}
23182319
continue;
23192320
}

src/server/search/doc_index.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,9 +483,13 @@ void ShardDocIndex::RebuildGlobalVectorIndices(std::string_view index_name, cons
483483

484484
if (any_restored) {
485485
// Iterate by index keys - more efficient for restored indices
486+
LOG(INFO) << "Restoring vector index '" << index_name << "' from serialized graph on shard "
487+
<< EngineShard::tlocal()->shard_id();
486488
RebuildGlobalVectorIndicesByIndexKeys(index_name, op_args);
487489
} else {
488490
// Iterate by database - needed when building new index
491+
LOG(INFO) << "Rebuilding vector index '" << index_name << "' from database on shard "
492+
<< EngineShard::tlocal()->shard_id() << " (no serialized graph available)";
489493
RebuildGlobalVectorIndicesByDatabase(index_name, op_args);
490494
}
491495
}

0 commit comments

Comments
 (0)