From c9ec502ed9e37ca970f9a0954780003696452913 Mon Sep 17 00:00:00 2001 From: nnethercott Date: Mon, 26 May 2025 18:32:59 +0200 Subject: [PATCH] refactor for readability --- .../new/extract/faceted/extract_facets.rs | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/crates/milli/src/update/new/extract/faceted/extract_facets.rs b/crates/milli/src/update/new/extract/faceted/extract_facets.rs index 861c67bbe..2640ac462 100644 --- a/crates/milli/src/update/new/extract/faceted/extract_facets.rs +++ b/crates/milli/src/update/new/extract/faceted/extract_facets.rs @@ -170,9 +170,7 @@ impl FacetedDocidsExtractor { let has_changed_for_geo_fields = inner.has_changed_for_geo_fields(rtxn, index, context.db_fields_ids_map)?; - // 1. Delete old facet values - let mut del = facet_fn!(del); - + // 1. Maybe update doc if has_changed { extract_document_facets( inner.current(rtxn, index, context.db_fields_ids_map)?, @@ -181,22 +179,9 @@ impl FacetedDocidsExtractor { sortable_fields, asc_desc_fields, 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( inner.merged(rtxn, index, context.db_fields_ids_map)?, new_fields_ids_map.deref_mut(), @@ -204,15 +189,23 @@ impl FacetedDocidsExtractor { sortable_fields, asc_desc_fields, distinct_field, - &mut add, + &mut facet_fn!(add), )?; } + + // 2. Maybe update geo 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( inner.merged(rtxn, index, context.db_fields_ids_map)?, inner.external_document_id(), new_fields_ids_map.deref_mut(), - &mut add, + &mut facet_fn!(add), )?; } }