snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-06-12 15:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor for readability

Browse Source
This commit is contained in:
nnethercott 2025-05-26 18:32:59 +02:00
parent 18aed75d3b
commit c9ec502ed9
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/milli/src/update/new/extract/faceted/extract_facets.rs
View File

@ -170,9 +170,7 @@ impl FacetedDocidsExtractor {
let has_changed_for_geo_fields = let has_changed_for_geo_fields =
inner.has_changed_for_geo_fields(rtxn, index, context.db_fields_ids_map)?; inner.has_changed_for_geo_fields(rtxn, index, context.db_fields_ids_map)?;
// 1. Delete old facet values // 1. Maybe update doc
let mut del = facet_fn!(del);
if has_changed { if has_changed {
extract_document_facets( extract_document_facets(
inner.current(rtxn, index, context.db_fields_ids_map)?, inner.current(rtxn, index, context.db_fields_ids_map)?,
@ -181,22 +179,9 @@ impl FacetedDocidsExtractor {
sortable_fields, sortable_fields,
asc_desc_fields, asc_desc_fields,
distinct_field, distinct_field,
&mut del, &mut facet_fn!(del),
)?; )?;
}
if is_geo_enabled && has_changed_for_geo_fields {
extract_geo_document(
inner.current(rtxn, index, context.db_fields_ids_map)?,
inner.external_document_id(),
new_fields_ids_map.deref_mut(),
&mut del,
)?;
}
// 2. Insert new facet values
let mut add = facet_fn!(add);
if has_changed {
extract_document_facets( extract_document_facets(
inner.merged(rtxn, index, context.db_fields_ids_map)?, inner.merged(rtxn, index, context.db_fields_ids_map)?,
new_fields_ids_map.deref_mut(), new_fields_ids_map.deref_mut(),
@ -204,15 +189,23 @@ impl FacetedDocidsExtractor {
sortable_fields, sortable_fields,
asc_desc_fields, asc_desc_fields,
distinct_field, distinct_field,
&mut add, &mut facet_fn!(add),
)?; )?;
} }
// 2. Maybe update geo
if is_geo_enabled && has_changed_for_geo_fields { if is_geo_enabled && has_changed_for_geo_fields {
extract_geo_document(
inner.current(rtxn, index, context.db_fields_ids_map)?,
inner.external_document_id(),
new_fields_ids_map.deref_mut(),
&mut facet_fn!(del),
)?;
extract_geo_document( extract_geo_document(
inner.merged(rtxn, index, context.db_fields_ids_map)?, inner.merged(rtxn, index, context.db_fields_ids_map)?,
inner.external_document_id(), inner.external_document_id(),
new_fields_ids_map.deref_mut(), new_fields_ids_map.deref_mut(),
&mut add, &mut facet_fn!(add),
)?; )?;
} }
} }