diff --git a/crates/meilisearch/tests/documents/add_documents.rs b/crates/meilisearch/tests/documents/add_documents.rs index 6569bb9a5..39ad57750 100644 --- a/crates/meilisearch/tests/documents/add_documents.rs +++ b/crates/meilisearch/tests/documents/add_documents.rs @@ -2039,6 +2039,14 @@ async fn update_documents_with_geo_field() { @r###" { "hits": [ + { + "id": "4", + "_geo": { + "lat": "4", + "lng": "0" + }, + "_geoDistance": 667170 + }, { "id": "3", "_geo": { @@ -2048,14 +2056,6 @@ async fn update_documents_with_geo_field() { "doggo": "kefir", "_geoDistance": 555975 }, - { - "id": "4", - "_geo": { - "lat": "4", - "lng": "0" - }, - "_geoDistance": 667170 - }, { "id": "1" }, 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 de0edc164..3086d25e4 100644 --- a/crates/milli/src/update/new/extract/faceted/extract_facets.rs +++ b/crates/milli/src/update/new/extract/faceted/extract_facets.rs @@ -135,7 +135,6 @@ impl FacetedDocidsExtractor { extract_document_facets( inner.current(rtxn, index, context.db_fields_ids_map)?, - inner.external_document_id(), new_fields_ids_map.deref_mut(), filterable_attributes, sortable_fields, @@ -177,7 +176,6 @@ impl FacetedDocidsExtractor { extract_document_facets( inner.current(rtxn, index, context.db_fields_ids_map)?, - inner.external_document_id(), new_fields_ids_map.deref_mut(), filterable_attributes, sortable_fields, @@ -200,7 +198,6 @@ impl FacetedDocidsExtractor { 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, @@ -224,7 +221,6 @@ impl FacetedDocidsExtractor { extract_document_facets( inner.inserted(), - inner.external_document_id(), new_fields_ids_map.deref_mut(), filterable_attributes, sortable_fields, @@ -232,6 +228,7 @@ impl FacetedDocidsExtractor { distinct_field, &mut add, )?; + if is_geo_enabled { extract_geo_document( inner.inserted(), diff --git a/crates/milli/src/update/new/extract/faceted/facet_document.rs b/crates/milli/src/update/new/extract/faceted/facet_document.rs index 68bc98b64..359c32e58 100644 --- a/crates/milli/src/update/new/extract/faceted/facet_document.rs +++ b/crates/milli/src/update/new/extract/faceted/facet_document.rs @@ -16,7 +16,6 @@ use crate::filterable_attributes_rules::match_faceted_field; #[allow(clippy::too_many_arguments)] pub fn extract_document_facets<'doc>( document: impl Document<'doc>, - external_document_id: &str, field_id_map: &mut GlobalFieldsIdsMap, filterable_attributes: &[FilterableAttributesRule], sortable_fields: &HashSet,