diff --git a/crates/index-scheduler/src/index_mapper/mod.rs b/crates/index-scheduler/src/index_mapper/mod.rs index 7014f87cb..6103fe7fc 100644 --- a/crates/index-scheduler/src/index_mapper/mod.rs +++ b/crates/index-scheduler/src/index_mapper/mod.rs @@ -143,10 +143,10 @@ impl IndexStats { /// /// - rtxn: a RO transaction for the index, obtained from `Index::read_txn()`. pub fn new(index: &Index, rtxn: &RoTxn) -> milli::Result { - let hannoy_stats = index.hannoy_stats(rtxn)?; + let vector_store_stats = index.vector_store_stats(rtxn)?; Ok(IndexStats { - number_of_embeddings: Some(hannoy_stats.number_of_embeddings), - number_of_embedded_documents: Some(hannoy_stats.documents.len()), + number_of_embeddings: Some(vector_store_stats.number_of_embeddings), + number_of_embedded_documents: Some(vector_store_stats.documents.len()), documents_database_stats: index.documents_stats(rtxn)?.unwrap_or_default(), number_of_documents: None, database_size: index.on_disk_size()?, diff --git a/crates/milli/src/index.rs b/crates/milli/src/index.rs index 7485df855..0f4f7c455 100644 --- a/crates/milli/src/index.rs +++ b/crates/milli/src/index.rs @@ -31,7 +31,7 @@ use crate::prompt::PromptData; use crate::proximity::ProximityPrecision; use crate::update::new::StdResult; use crate::vector::db::IndexEmbeddingConfigs; -use crate::vector::{Embedding, HannoyStats, VectorStore, VectorStoreBackend}; +use crate::vector::{Embedding, VectorStore, VectorStoreBackend, VectorStoreStats}; use crate::{ default_criteria, CboRoaringBitmapCodec, Criterion, DocumentId, ExternalDocumentsIds, FacetDistribution, FieldDistribution, FieldId, FieldIdMapMissingEntry, FieldIdWordCountCodec, @@ -1825,8 +1825,8 @@ impl Index { Ok(PrefixSettings { compute_prefixes, max_prefix_length: 4, prefix_count_threshold: 100 }) } - pub fn hannoy_stats(&self, rtxn: &RoTxn<'_>) -> Result { - let mut stats = HannoyStats::default(); + pub fn vector_store_stats(&self, rtxn: &RoTxn<'_>) -> Result { + let mut stats = VectorStoreStats::default(); let embedding_configs = self.embedding_configs(); let backend = self.get_vector_store(rtxn)?; diff --git a/crates/milli/src/search/facet/filter_vector.rs b/crates/milli/src/search/facet/filter_vector.rs index d8e007760..04dbc1eef 100644 --- a/crates/milli/src/search/facet/filter_vector.rs +++ b/crates/milli/src/search/facet/filter_vector.rs @@ -3,7 +3,7 @@ use roaring::{MultiOps, RoaringBitmap}; use crate::error::{DidYouMean, Error}; use crate::vector::db::IndexEmbeddingConfig; -use crate::vector::{HannoyStats, VectorStore}; +use crate::vector::{VectorStoreStats, VectorStore}; use crate::Index; #[derive(Debug, thiserror::Error)] @@ -134,7 +134,7 @@ fn evaluate_inner( } let user_provided_docids = embedder_info.embedding_status.user_provided_docids(); - let mut stats = HannoyStats::default(); + let mut stats = VectorStoreStats::default(); vector_store.aggregate_stats(rtxn, &mut stats)?; stats.documents - user_provided_docids.clone() } @@ -143,13 +143,13 @@ fn evaluate_inner( user_provided_docids.clone() } VectorFilter::Regenerate => { - let mut stats = HannoyStats::default(); + let mut stats = VectorStoreStats::default(); vector_store.aggregate_stats(rtxn, &mut stats)?; let skip_regenerate = embedder_info.embedding_status.skip_regenerate_docids(); stats.documents - skip_regenerate } VectorFilter::None => { - let mut stats = HannoyStats::default(); + let mut stats = VectorStoreStats::default(); vector_store.aggregate_stats(rtxn, &mut stats)?; stats.documents } diff --git a/crates/milli/src/vector/mod.rs b/crates/milli/src/vector/mod.rs index be747f459..fa8b2dba0 100644 --- a/crates/milli/src/vector/mod.rs +++ b/crates/milli/src/vector/mod.rs @@ -19,7 +19,7 @@ pub use distribution::DistributionShift; pub use embedder::{Embedder, EmbedderOptions, EmbeddingConfig, SearchQuery}; pub use embeddings::Embeddings; pub use runtime::{RuntimeEmbedder, RuntimeEmbedders, RuntimeFragment}; -pub use store::{HannoyStats, VectorStore, VectorStoreBackend}; +pub use store::{VectorStore, VectorStoreBackend, VectorStoreStats}; pub const REQUEST_PARALLELISM: usize = 40; diff --git a/crates/milli/src/vector/store.rs b/crates/milli/src/vector/store.rs index e15c690a6..11385a0e4 100644 --- a/crates/milli/src/vector/store.rs +++ b/crates/milli/src/vector/store.rs @@ -645,7 +645,7 @@ impl VectorStore { pub fn aggregate_stats( &self, rtxn: &RoTxn, - stats: &mut HannoyStats, + stats: &mut VectorStoreStats, ) -> Result<(), crate::Error> { if self.backend == VectorStoreBackend::Arroy { if self.quantized { @@ -1161,7 +1161,7 @@ where } #[derive(Debug, Default, Clone)] -pub struct HannoyStats { +pub struct VectorStoreStats { pub number_of_embeddings: u64, pub documents: RoaringBitmap, }