snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-29 16:45:30 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Add Index::iter_documents

Browse Source
This commit is contained in:
Louis Dureuil 2023-03-08 09:44:09 +01:00 committed by Tamo
parent 745c1a2668
commit a35d3fc708
No known key found for this signature in database
GPG Key ID: 20CD8020AFA88D69
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
milli/src/index.rs
View File

@ -1032,16 +1032,15 @@ impl Index {
/* documents */ /* documents */
/// Returns a [`Vec`] of the requested documents. Returns an error if a document is missing. /// Returns an iterator over the requested documents. The next item will be an error if a document is missing.
pub fn documents<'t>( pub fn iter_documents<'a, 't: 'a>(
&self, &'a self,
rtxn: &'t RoTxn, rtxn: &'t RoTxn,
ids: impl IntoIterator<Item = DocumentId>, ids: impl IntoIterator<Item = DocumentId> + 'a,
) -> Result<Vec<(DocumentId, obkv::KvReaderU16<'t>)>> { ) -> Result<impl Iterator<Item = Result<(DocumentId, obkv::KvReaderU16<'t>)>> + 'a> {
let soft_deleted_documents = self.soft_deleted_documents_ids(rtxn)?; let soft_deleted_documents = self.soft_deleted_documents_ids(rtxn)?;
let mut documents = Vec::new();
for id in ids { Ok(ids.into_iter().map(move |id| {
if soft_deleted_documents.contains(id) { if soft_deleted_documents.contains(id) {
return Err(UserError::AccessingSoftDeletedDocument { document_id: id })?; return Err(UserError::AccessingSoftDeletedDocument { document_id: id })?;
} }
@ -1049,27 +1048,25 @@ impl Index {
.documents .documents
.get(rtxn, &BEU32::new(id))? .get(rtxn, &BEU32::new(id))?
.ok_or(UserError::UnknownInternalDocumentId { document_id: id })?; .ok_or(UserError::UnknownInternalDocumentId { document_id: id })?;
documents.push((id, kv)); Ok((id, kv))
} }))
}
Ok(documents) /// Returns a [`Vec`] of the requested documents. Returns an error if a document is missing.
pub fn documents<'t>(
&self,
rtxn: &'t RoTxn,
ids: impl IntoIterator<Item = DocumentId>,
) -> Result<Vec<(DocumentId, obkv::KvReaderU16<'t>)>> {
self.iter_documents(rtxn, ids)?.collect()
} }
/// Returns an iterator over all the documents in the index. /// Returns an iterator over all the documents in the index.
pub fn all_documents<'t>( pub fn all_documents<'a, 't: 'a>(
&self, &'a self,
rtxn: &'t RoTxn, rtxn: &'t RoTxn,
) -> Result<impl Iterator<Item = heed::Result<(DocumentId, obkv::KvReaderU16<'t>)>>> { ) -> Result<impl Iterator<Item = Result<(DocumentId, obkv::KvReaderU16<'t>)>> + 'a> {
let soft_deleted_docids = self.soft_deleted_documents_ids(rtxn)?; self.iter_documents(rtxn, self.documents_ids(rtxn)?)
Ok(self
.documents
.iter(rtxn)?
// we cast the BEU32 to a DocumentId
.map(|document| document.map(|(id, obkv)| (id.get(), obkv)))
.filter(move |document| {
document.as_ref().map_or(true, |(id, _)| !soft_deleted_docids.contains(*id))
}))
} }
pub fn facets_distribution<'a>(&'a self, rtxn: &'a RoTxn) -> FacetDistribution<'a> { pub fn facets_distribution<'a>(&'a self, rtxn: &'a RoTxn) -> FacetDistribution<'a> {