snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-24 13:46:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Iter top level fields with fid for DocumentFromDb

Browse Source
This commit is contained in:
Louis Dureuil
2024-12-07 14:45:04 +01:00
parent 9ac4a69fe4
commit e580a8e27c
1 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
crates/milli/src/update/new/document.rs
View File

@ -65,33 +65,7 @@ impl<'t, Mapper: FieldIdMapper> Copy for DocumentFromDb<'t, Mapper> {}
impl<'t, Mapper: FieldIdMapper> Document<'t> for DocumentFromDb<'t, Mapper> { impl<'t, Mapper: FieldIdMapper> Document<'t> for DocumentFromDb<'t, Mapper> {
fn iter_top_level_fields(&self) -> impl Iterator<Item = Result<(&'t str, &'t RawValue)>> { fn iter_top_level_fields(&self) -> impl Iterator<Item = Result<(&'t str, &'t RawValue)>> {
let mut it = self.content.iter(); self.iter_top_level_fields_with_fid().map(|res| res.map(|(_, name, value)| (name, value)))
std::iter::from_fn(move || loop {
let (fid, value) = it.next()?;
let name = match self.fields_ids_map.name(fid).ok_or(
InternalError::FieldIdMapMissingEntry(crate::FieldIdMapMissingEntry::FieldId {
field_id: fid,
process: "getting current document",
}),
) {
Ok(name) => name,
Err(error) => return Some(Err(error.into())),
};
if name == RESERVED_VECTORS_FIELD_NAME || name == "_geo" {
continue;
}
let res = (|| {
let value =
serde_json::from_slice(value).map_err(crate::InternalError::SerdeJson)?;
Ok((name, value))
})();
return Some(res);
})
} }
fn vectors_field(&self) -> Result<Option<&'t RawValue>> { fn vectors_field(&self) -> Result<Option<&'t RawValue>> {
@ -140,6 +114,38 @@ impl<'t, Mapper: FieldIdMapper> DocumentFromDb<'t, Mapper> {
let Some(value) = self.content.get(fid) else { return Ok(None) }; let Some(value) = self.content.get(fid) else { return Ok(None) };
Ok(Some(serde_json::from_slice(value).map_err(InternalError::SerdeJson)?)) Ok(Some(serde_json::from_slice(value).map_err(InternalError::SerdeJson)?))
} }
pub fn iter_top_level_fields_with_fid(
&self,
) -> impl Iterator<Item = Result<(FieldId, &'t str, &'t RawValue)>> + '_ {
let mut it = self.content.iter();
std::iter::from_fn(move || loop {
let (fid, value) = it.next()?;
let name = match self.fields_ids_map.name(fid).ok_or(
InternalError::FieldIdMapMissingEntry(crate::FieldIdMapMissingEntry::FieldId {
field_id: fid,
process: "getting current document",
}),
) {
Ok(name) => name,
Err(error) => return Some(Err(error.into())),
};
if name == RESERVED_VECTORS_FIELD_NAME || name == "_geo" {
continue;
}
let res = (|| {
let value =
serde_json::from_slice(value).map_err(crate::InternalError::SerdeJson)?;
Ok((fid, name, value))
})();
return Some(res);
})
}
} }
#[derive(Debug)] #[derive(Debug)]