mirror of
https://github.com/meilisearch/meilisearch.git
synced 2025-06-19 19:08:10 +00:00
Add a settings change extractor
This commit is contained in:
parent
367a15893d
commit
64b570abe2
@ -37,6 +37,11 @@ pub struct Insertion<'doc> {
|
|||||||
new: Versions<'doc>,
|
new: Versions<'doc>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct SettingsChangeDocument<'doc> {
|
||||||
|
docid: DocumentId,
|
||||||
|
external_document_id: &'doc str,
|
||||||
|
}
|
||||||
|
|
||||||
impl<'doc> DocumentChange<'doc> {
|
impl<'doc> DocumentChange<'doc> {
|
||||||
pub fn docid(&self) -> DocumentId {
|
pub fn docid(&self) -> DocumentId {
|
||||||
match &self {
|
match &self {
|
||||||
@ -304,3 +309,28 @@ impl<'doc> Update<'doc> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'doc> SettingsChangeDocument<'doc> {
|
||||||
|
pub fn create(docid: DocumentId, external_document_id: &'doc str) -> Self {
|
||||||
|
Self { docid, external_document_id }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn docid(&self) -> DocumentId {
|
||||||
|
self.docid
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn external_document_id(&self) -> &'doc str {
|
||||||
|
self.external_document_id
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn current<'a, Mapper: FieldIdMapper>(
|
||||||
|
&self,
|
||||||
|
rtxn: &'a RoTxn,
|
||||||
|
index: &'a Index,
|
||||||
|
mapper: &'a Mapper,
|
||||||
|
) -> Result<DocumentFromDb<'a, Mapper>> {
|
||||||
|
Ok(DocumentFromDb::new(self.docid, rtxn, index, mapper)?.ok_or(
|
||||||
|
crate::error::UserError::UnknownInternalDocumentId { document_id: self.docid },
|
||||||
|
)?)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -43,7 +43,7 @@ pub struct DocumentChangeContext<
|
|||||||
pub extractor_alloc: &'extractor Bump,
|
pub extractor_alloc: &'extractor Bump,
|
||||||
|
|
||||||
/// Pool of doc allocators, used to retrieve the doc allocator we provided for the documents
|
/// Pool of doc allocators, used to retrieve the doc allocator we provided for the documents
|
||||||
doc_allocs: &'doc ThreadLocal<FullySend<Cell<Bump>>>,
|
pub doc_allocs: &'doc ThreadLocal<FullySend<Cell<Bump>>>,
|
||||||
|
|
||||||
/// Extractor-specific data
|
/// Extractor-specific data
|
||||||
pub data: &'doc T,
|
pub data: &'doc T,
|
||||||
|
@ -32,6 +32,7 @@ mod extract;
|
|||||||
mod guess_primary_key;
|
mod guess_primary_key;
|
||||||
mod partial_dump;
|
mod partial_dump;
|
||||||
mod post_processing;
|
mod post_processing;
|
||||||
|
mod settings_changes;
|
||||||
mod update_by_function;
|
mod update_by_function;
|
||||||
mod write;
|
mod write;
|
||||||
|
|
||||||
|
139
crates/milli/src/update/new/indexer/settings_changes.rs
Normal file
139
crates/milli/src/update/new/indexer/settings_changes.rs
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
use std::cell::{Cell, RefCell};
|
||||||
|
use std::sync::atomic::Ordering;
|
||||||
|
use std::sync::{Arc, RwLock};
|
||||||
|
|
||||||
|
use bumpalo::Bump;
|
||||||
|
use heed::{RoTxn, WithoutTls};
|
||||||
|
use rayon::iter::IndexedParallelIterator;
|
||||||
|
|
||||||
|
use super::super::document_change::DocumentChange;
|
||||||
|
use super::document_changes::IndexingContext;
|
||||||
|
use crate::fields_ids_map::metadata::FieldIdMapWithMetadata;
|
||||||
|
use crate::progress::{AtomicDocumentStep, Progress};
|
||||||
|
use crate::update::new::document_change::SettingsChangeDocument;
|
||||||
|
use crate::update::new::indexer::document_changes::DocumentChangeContext;
|
||||||
|
use crate::update::new::parallel_iterator_ext::ParallelIteratorExt as _;
|
||||||
|
use crate::update::new::steps::IndexingStep;
|
||||||
|
use crate::update::new::thread_local::{FullySend, MostlySend, ThreadLocal};
|
||||||
|
use crate::update::GrenadParameters;
|
||||||
|
use crate::{FieldsIdsMap, GlobalFieldsIdsMap, Index, InternalError, Result};
|
||||||
|
|
||||||
|
/// An internal iterator (i.e. using `foreach`) of `DocumentChange`s
|
||||||
|
pub trait SettingsChangeExtractor<'extractor>: Sync {
|
||||||
|
type Data: MostlySend;
|
||||||
|
|
||||||
|
fn init_data<'doc>(&'doc self, extractor_alloc: &'extractor Bump) -> Result<Self::Data>;
|
||||||
|
|
||||||
|
fn process<'doc>(
|
||||||
|
&'doc self,
|
||||||
|
changes: impl Iterator<Item = Result<SettingsChangeDocument<'doc>>>,
|
||||||
|
context: &'doc DocumentChangeContext<Self::Data>,
|
||||||
|
) -> Result<()>;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait SettingsChangeDocuments<'pl // lifetime of the underlying payload
|
||||||
|
>: Sync {
|
||||||
|
type Item: Send;
|
||||||
|
|
||||||
|
fn iter(&self, chunk_size: usize) -> impl IndexedParallelIterator<Item = impl AsRef<[Self::Item]>>;
|
||||||
|
|
||||||
|
fn len(&self) -> usize;
|
||||||
|
|
||||||
|
fn is_empty(&self) -> bool {
|
||||||
|
self.len() == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
fn item_to_settings_change_document<'doc, // lifetime of a single `process` call
|
||||||
|
T: MostlySend>(
|
||||||
|
&'doc self,
|
||||||
|
context: &'doc DocumentChangeContext<T>,
|
||||||
|
item: &'doc Self::Item,
|
||||||
|
) -> Result<Option<SettingsChangeDocument<'doc>>> where 'pl: 'doc // the payload must survive the process calls
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
|
const CHUNK_SIZE: usize = 100;
|
||||||
|
|
||||||
|
pub fn settings_change_extract<
|
||||||
|
'pl, // covariant lifetime of the underlying payload
|
||||||
|
'extractor, // invariant lifetime of extractor_alloc
|
||||||
|
'fid, // invariant lifetime of fields ids map
|
||||||
|
'indexer, // covariant lifetime of objects that are borrowed during the entire indexing
|
||||||
|
'data, // invariant on EX::Data lifetime of datastore
|
||||||
|
'index, // covariant lifetime of the index
|
||||||
|
EX,
|
||||||
|
SCD: SettingsChangeDocuments<'pl>,
|
||||||
|
MSP,
|
||||||
|
>(
|
||||||
|
document_changes: &SCD,
|
||||||
|
extractor: &EX,
|
||||||
|
IndexingContext {
|
||||||
|
index,
|
||||||
|
db_fields_ids_map,
|
||||||
|
new_fields_ids_map,
|
||||||
|
doc_allocs,
|
||||||
|
fields_ids_map_store,
|
||||||
|
must_stop_processing,
|
||||||
|
progress,
|
||||||
|
grenad_parameters: _,
|
||||||
|
}: IndexingContext<'fid, 'indexer, 'index, MSP>,
|
||||||
|
extractor_allocs: &'extractor mut ThreadLocal<FullySend<Bump>>,
|
||||||
|
datastore: &'data ThreadLocal<EX::Data>,
|
||||||
|
step: IndexingStep,
|
||||||
|
) -> Result<()>
|
||||||
|
where
|
||||||
|
EX: SettingsChangeExtractor<'extractor>,
|
||||||
|
MSP: Fn() -> bool + Sync,
|
||||||
|
{
|
||||||
|
tracing::trace!("We are resetting the extractor allocators");
|
||||||
|
progress.update_progress(step);
|
||||||
|
// Clean up and reuse the extractor allocs
|
||||||
|
for extractor_alloc in extractor_allocs.iter_mut() {
|
||||||
|
tracing::trace!("\tWith {} bytes reset", extractor_alloc.0.allocated_bytes());
|
||||||
|
extractor_alloc.0.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
let total_documents = document_changes.len() as u32;
|
||||||
|
let (step, progress_step) = AtomicDocumentStep::new(total_documents);
|
||||||
|
progress.update_progress(progress_step);
|
||||||
|
|
||||||
|
let pi = document_changes.iter(CHUNK_SIZE);
|
||||||
|
pi.try_arc_for_each_try_init(
|
||||||
|
|| {
|
||||||
|
DocumentChangeContext::new(
|
||||||
|
index,
|
||||||
|
db_fields_ids_map,
|
||||||
|
new_fields_ids_map,
|
||||||
|
extractor_allocs,
|
||||||
|
doc_allocs,
|
||||||
|
datastore,
|
||||||
|
fields_ids_map_store,
|
||||||
|
move |index_alloc| extractor.init_data(index_alloc),
|
||||||
|
)
|
||||||
|
},
|
||||||
|
|context, items| {
|
||||||
|
if (must_stop_processing)() {
|
||||||
|
return Err(Arc::new(InternalError::AbortedIndexation.into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean up and reuse the document-specific allocator
|
||||||
|
context.doc_alloc.reset();
|
||||||
|
|
||||||
|
let items = items.as_ref();
|
||||||
|
let changes = items.iter().filter_map(|item| {
|
||||||
|
document_changes.item_to_settings_change_document(context, item).transpose()
|
||||||
|
});
|
||||||
|
|
||||||
|
let res = extractor.process(changes, context).map_err(Arc::new);
|
||||||
|
step.fetch_add(items.as_ref().len() as u32, Ordering::Relaxed);
|
||||||
|
|
||||||
|
// send back the doc_alloc in the pool
|
||||||
|
context.doc_allocs.get_or_default().0.set(std::mem::take(&mut context.doc_alloc));
|
||||||
|
|
||||||
|
res
|
||||||
|
},
|
||||||
|
)?;
|
||||||
|
step.store(total_documents, Ordering::Relaxed);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user