snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 10:37:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix the LMDB and heed invalid interactions.

Browse Source 
It is undefined behavior to keep a reference to the database while
modifying it, we were keeping references in the database and also
feeding the heed put_current methods with keys referenced inside
the database itself.

https://github.com/Kerollmops/heed/pull/108
This commit is contained in:
Clément Renault 2021-06-28 16:19:02 +02:00
parent 9e5f9a8a10
commit 0013236e5d
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
milli/src/update/delete_documents.rs
View File

@ -197,7 +197,8 @@ impl<'t, 'u, 'i> DeleteDocuments<'t, 'u, 'i> {
iter.del_current()?; iter.del_current()?;
*must_remove = true; *must_remove = true;
} else if docids.len() != previous_len { } else if docids.len() != previous_len {
iter.put_current(key, &docids)?; let key = key.to_owned();
iter.put_current(&key, &docids)?;
} }
} }
} }
@ -238,13 +239,14 @@ impl<'t, 'u, 'i> DeleteDocuments<'t, 'u, 'i> {
let mut iter = word_prefix_docids.iter_mut(self.wtxn)?; let mut iter = word_prefix_docids.iter_mut(self.wtxn)?;
while let Some(result) = iter.next() { while let Some(result) = iter.next() {
let (prefix, mut docids) = result?; let (prefix, mut docids) = result?;
let prefix = prefix.to_owned();
let previous_len = docids.len(); let previous_len = docids.len();
docids.difference_with(&self.documents_ids); docids.difference_with(&self.documents_ids);
if docids.is_empty() { if docids.is_empty() {
iter.del_current()?; iter.del_current()?;
prefixes_to_delete.insert(prefix)?; prefixes_to_delete.insert(prefix)?;
} else if docids.len() != previous_len { } else if docids.len() != previous_len {
iter.put_current(prefix, &docids)?; iter.put_current(&prefix, &docids)?;
} }
} }
@ -281,7 +283,8 @@ impl<'t, 'u, 'i> DeleteDocuments<'t, 'u, 'i> {
if docids.is_empty() { if docids.is_empty() {
iter.del_current()?; iter.del_current()?;
} else if docids.len() != previous_len { } else if docids.len() != previous_len {
iter.put_current(key, &docids)?; let key = key.to_owned();
iter.put_current(&key, &docids)?;
} }
} }
@ -299,7 +302,8 @@ impl<'t, 'u, 'i> DeleteDocuments<'t, 'u, 'i> {
if docids.is_empty() { if docids.is_empty() {
iter.del_current()?; iter.del_current()?;
} else if docids.len() != previous_len { } else if docids.len() != previous_len {
iter.put_current(bytes, &docids)?; let bytes = bytes.to_owned();
iter.put_current(&bytes, &docids)?;
} }
} }
@ -315,7 +319,8 @@ impl<'t, 'u, 'i> DeleteDocuments<'t, 'u, 'i> {
if docids.is_empty() { if docids.is_empty() {
iter.del_current()?; iter.del_current()?;
} else if docids.len() != previous_len { } else if docids.len() != previous_len {
iter.put_current(bytes, &docids)?; let bytes = bytes.to_owned();
iter.put_current(&bytes, &docids)?;
} }
} }
@ -331,7 +336,8 @@ impl<'t, 'u, 'i> DeleteDocuments<'t, 'u, 'i> {
if docids.is_empty() { if docids.is_empty() {
iter.del_current()?; iter.del_current()?;
} else if docids.len() != previous_len { } else if docids.len() != previous_len {
iter.put_current(bytes, &docids)?; let bytes = bytes.to_owned();
iter.put_current(&bytes, &docids)?;
} }
} }
@ -437,7 +443,8 @@ where
if docids.is_empty() { if docids.is_empty() {
iter.del_current()?; iter.del_current()?;
} else if docids.len() != previous_len { } else if docids.len() != previous_len {
iter.put_current(bytes, &docids)?; let bytes = bytes.to_owned();
iter.put_current(&bytes, &docids)?;
} }
} }