From e727cf35fb1cbc56deab569e3aea56fa0acd34b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 7 Nov 2024 17:35:07 +0100 Subject: [PATCH] WIP --- .../milli/src/update/new/extract/geo/mod.rs | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/crates/milli/src/update/new/extract/geo/mod.rs b/crates/milli/src/update/new/extract/geo/mod.rs index 1dca78e34..a571184dd 100644 --- a/crates/milli/src/update/new/extract/geo/mod.rs +++ b/crates/milli/src/update/new/extract/geo/mod.rs @@ -5,22 +5,18 @@ use std::io::{self, BufWriter}; use std::mem::{self, size_of}; use bincode::ErrorKind; +use bumpalo::Bump; use heed::RoTxn; use raw_collections::bbbul::BitPacker4x; use raw_collections::Bbbul; use uell::Uell; use crate::update::new::document::Document; -use crate::update::new::indexer::document_changes::{ - DocumentChangeContext, Extractor, FullySend, MostlySend, -}; +use crate::update::new::indexer::document_changes::{DocumentChangeContext, Extractor, MostlySend}; use crate::update::new::ref_cell_ext::RefCellExt as _; use crate::update::new::DocumentChange; use crate::update::GrenadParameters; -use crate::{ - CboRoaringBitmapCodec, DocumentId, Error, FieldId, GeoPoint, GlobalFieldsIdsMap, Index, - InternalError, Result, -}; +use crate::{DocumentId, Index, Result}; pub struct GeoExtractor { grenad_parameters: GrenadParameters, @@ -36,7 +32,6 @@ impl GeoExtractor { let is_sortable = index.sortable_fields(rtxn)?.contains("_geo"); let is_filterable = index.filterable_fields(rtxn)?.contains("_geo"); if is_sortable || is_filterable { - // Ok(Some(GeoExtractor { rtree: index.geo_rtree(rtxn)? })) Ok(Some(GeoExtractor { grenad_parameters })) } else { Ok(None) @@ -61,14 +56,12 @@ unsafe impl MostlySend for GeoExtractorData<'_> {} impl<'extractor> Extractor<'extractor> for GeoExtractor { type Data = RefCell>; - fn init_data<'doc>( - &'doc self, - extractor_alloc: &'extractor bumpalo::Bump, - ) -> Result { + fn init_data<'doc>(&'doc self, extractor_alloc: &'extractor Bump) -> Result { Ok(RefCell::new(GeoExtractorData { inserted: Uell::new_in(extractor_alloc), removed: Bbbul::new_in(extractor_alloc), - spilled: None, + spilled_removed: None, + spilled_inserted: None, })) } @@ -91,7 +84,7 @@ impl<'extractor> Extractor<'extractor> for GeoExtractor { let updated_geo = update.updated().geo_field()?; // ... } - DocumentChange::Insertion(insertion) => todo!(), + DocumentChange::Insertion(insertion) => {} } }