diff --git a/crates/milli/src/update/new/extract/documents/compression.rs b/crates/milli/src/update/new/extract/documents/compression.rs index 8f84bf42d..6ad11ffc1 100644 --- a/crates/milli/src/update/new/extract/documents/compression.rs +++ b/crates/milli/src/update/new/extract/documents/compression.rs @@ -10,11 +10,11 @@ use zstd::dict::{from_continuous, EncoderDictionary}; use crate::heed_codec::CompressedObkvU16; use crate::update::new::document::Document as _; use crate::update::new::indexer::document_changes::{ - DocumentChangeContext, DocumentChanges, Extractor, IndexingContext, Progress, + DocumentChangeContext, DocumentChanges, Extractor, IndexingContext, }; use crate::update::new::indexer::extract; use crate::update::new::ref_cell_ext::RefCellExt as _; -use crate::update::new::steps::Step; +use crate::update::new::steps::IndexingStep; use crate::update::new::thread_local::{FullySend, MostlySend, ThreadLocal}; use crate::update::new::DocumentChange; use crate::{Index, Result}; @@ -42,17 +42,16 @@ const COMPRESS_LIMIT: usize = 5_000_000; /// If there are too many documents already in the database and no /// compression dictionary we prefer not to generate a dictionary to avoid /// compressing all of the documents and potentially blow up disk space. -pub fn retrieve_or_compute_document_compression_dictionary<'pl, 'extractor, DC, MSP, SP>( +pub fn retrieve_or_compute_document_compression_dictionary<'pl, 'extractor, DC, MSP>( index: &Index, wtxn: &mut RwTxn<'_>, document_changes: &DC, - indexing_context: IndexingContext, + indexing_context: IndexingContext, extractor_allocs: &'extractor mut ThreadLocal>, ) -> Result>> where DC: DocumentChanges<'pl>, MSP: Fn() -> bool + Sync, - SP: Fn(Progress) + Sync, { let number_of_documents = index.number_of_documents(wtxn)? as usize; match index.document_compression_raw_dictionary(wtxn)? { @@ -87,7 +86,7 @@ where indexing_context, extractor_allocs, &datastore, - Step::PreparingCompressionDictionary, + IndexingStep::PreparingCompressionDictionary, )?; let mut all_documents_seen = RoaringBitmap::new(); diff --git a/crates/milli/src/update/new/indexer/mod.rs b/crates/milli/src/update/new/indexer/mod.rs index cc58d8264..80fe4f177 100644 --- a/crates/milli/src/update/new/indexer/mod.rs +++ b/crates/milli/src/update/new/indexer/mod.rs @@ -5,7 +5,7 @@ use std::thread::{self, Builder}; use big_s::S; use bumparaw_collections::RawMap; -pub use document_changes::{extract, DocumentChanges, IndexingContext, Progress}; +pub use document_changes::{extract, DocumentChanges, IndexingContext}; pub use document_deletion::DocumentDeletion; pub use document_operation::{DocumentOperation, PayloadStats}; use hashbrown::HashMap;