snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-06-06 20:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add macro_rules to factorize

Browse Source
This commit is contained in:
nnethercott 2025-05-26 09:46:14 +02:00
parent 24e94b28c1
commit f690fa0686
1 changed files with 72 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,8 +90,48 @@ impl FacetedDocidsExtractor {
let mut cached_sorter = context.data.borrow_mut_or_yield(); let mut cached_sorter = context.data.borrow_mut_or_yield();
let mut del_add_facet_value = DelAddFacetValue::new(&context.doc_alloc); let mut del_add_facet_value = DelAddFacetValue::new(&context.doc_alloc);
let docid = document_change.docid(); let docid = document_change.docid();
macro_rules! facet_fn_factory {
(del) => {
|fid: FieldId, meta: Metadata, depth: perm_json_p::Depth, value: &Value| {
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_del_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_del,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
}
};
(add) => {
|fid: FieldId, meta: Metadata, depth: perm_json_p::Depth, value: &Value| {
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_add_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_add,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
}
};
}
match document_change { match document_change {
DocumentChange::Deletion(inner) => { DocumentChange::Deletion(inner) => {
let mut del = facet_fn_factory!(del);
extract_document_facets( extract_document_facets(
inner.current(rtxn, index, context.db_fields_ids_map)?, inner.current(rtxn, index, context.db_fields_ids_map)?,
inner.external_document_id(), inner.external_document_id(),
@ -100,21 +140,7 @@ impl FacetedDocidsExtractor {
sortable_fields, sortable_fields,
asc_desc_fields, asc_desc_fields,
distinct_field, distinct_field,
&mut |fid, meta, depth, value| { &mut del,
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_del_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_del,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
},
)?; )?;
if is_geo_enabled { if is_geo_enabled {
@ -123,21 +149,7 @@ impl FacetedDocidsExtractor {
inner.external_document_id(), inner.external_document_id(),
new_fields_ids_map.deref_mut(), new_fields_ids_map.deref_mut(),
asc_desc_fields, asc_desc_fields,
&mut |fid, meta, depth, value| { &mut del,
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_del_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_del,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
},
)?; )?;
} }
} }
@ -160,6 +172,9 @@ impl FacetedDocidsExtractor {
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)?;
if has_changed { if has_changed {
// 1. Delete old facet values
let mut del = facet_fn_factory!(del);
extract_document_facets( extract_document_facets(
inner.current(rtxn, index, context.db_fields_ids_map)?, inner.current(rtxn, index, context.db_fields_ids_map)?,
inner.external_document_id(), inner.external_document_id(),
@ -168,96 +183,46 @@ impl FacetedDocidsExtractor {
sortable_fields, sortable_fields,
asc_desc_fields, asc_desc_fields,
distinct_field, distinct_field,
&mut |fid, meta, depth, value| { &mut del,
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_del_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_del,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
},
)?; )?;
extract_document_facets(
inner.merged(rtxn, index, context.db_fields_ids_map)?,
inner.external_document_id(),
new_fields_ids_map.deref_mut(),
filterable_attributes,
sortable_fields,
asc_desc_fields,
distinct_field,
&mut |fid, meta, depth, value| {
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_add_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_add,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
},
)?;
}
if is_geo_enabled && has_changed_for_geo_fields { if is_geo_enabled && has_changed_for_geo_fields {
extract_geo_document( extract_geo_document(
inner.current(rtxn, index, context.db_fields_ids_map)?, inner.current(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(),
asc_desc_fields, asc_desc_fields,
&mut |fid, meta, depth, value| { &mut del,
Self::facet_fn_with_options( )?;
&context.doc_alloc, }
cached_sorter.deref_mut(),
BalancedCaches::insert_del_u32, let mut add = facet_fn_factory!(add);
&mut del_add_facet_value,
DelAddFacetValue::insert_del, extract_document_facets(
docid, inner.merged(rtxn, index, context.db_fields_ids_map)?,
fid, inner.external_document_id(),
meta, new_fields_ids_map.deref_mut(),
filterable_attributes, filterable_attributes,
depth, sortable_fields,
value, asc_desc_fields,
) distinct_field,
}, &mut add,
)?; )?;
if is_geo_enabled && has_changed_for_geo_fields {
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(),
asc_desc_fields, asc_desc_fields,
&mut |fid, meta, depth, value| { &mut add,
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_add_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_add,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
},
)?; )?;
} }
} }
}
DocumentChange::Insertion(inner) => { DocumentChange::Insertion(inner) => {
let mut add = facet_fn_factory!(add);
extract_document_facets( extract_document_facets(
inner.inserted(), inner.inserted(),
inner.external_document_id(), inner.external_document_id(),
@ -266,21 +231,7 @@ impl FacetedDocidsExtractor {
sortable_fields, sortable_fields,
asc_desc_fields, asc_desc_fields,
distinct_field, distinct_field,
&mut |fid, meta, depth, value| { &mut add,
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_add_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_add,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
},
)?; )?;
if is_geo_enabled { if is_geo_enabled {
extract_geo_document( extract_geo_document(
@ -288,21 +239,7 @@ impl FacetedDocidsExtractor {
inner.external_document_id(), inner.external_document_id(),
new_fields_ids_map.deref_mut(), new_fields_ids_map.deref_mut(),
asc_desc_fields, asc_desc_fields,
&mut |fid, meta, depth, value| { &mut add,
Self::facet_fn_with_options(
&context.doc_alloc,
cached_sorter.deref_mut(),
BalancedCaches::insert_add_u32,
&mut del_add_facet_value,
DelAddFacetValue::insert_add,
docid,
fid,
meta,
filterable_attributes,
depth,
value,
)
},
)?; )?;
} }
} }