snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-02-06 19:06:43 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

move the commit before the insertion in the map

Browse Source
This commit is contained in:
Irevoire 2022-10-26 14:21:23 +02:00 committed by Clément Renault
parent 4e1b6b514e
commit 6c98752922
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
index-scheduler/src/index_mapper.rs
View File

@ -75,8 +75,11 @@ impl IndexMapper {
/// Get or create the index. /// Get or create the index.
pub fn create_index(&self, mut wtxn: RwTxn, name: &str) -> Result<Index> { pub fn create_index(&self, mut wtxn: RwTxn, name: &str) -> Result<Index> {
let ret = match self.index(&mut wtxn, name) { match self.index(&mut wtxn, name) {
Ok(index) => Ok(index), Ok(index) => {
wtxn.commit()?;
Ok(index)
}
Err(Error::IndexNotFound(_)) => { Err(Error::IndexNotFound(_)) => {
let uuid = Uuid::new_v4(); let uuid = Uuid::new_v4();
self.index_mapping.put(&mut wtxn, name, &uuid)?; self.index_mapping.put(&mut wtxn, name, &uuid)?;
@ -85,6 +88,7 @@ impl IndexMapper {
fs::create_dir_all(&index_path)?; fs::create_dir_all(&index_path)?;
let index = self.create_or_open_index(&index_path)?; let index = self.create_or_open_index(&index_path)?;
wtxn.commit()?;
// TODO: it would be better to lazyly create the index. But we need an Index::open function for milli. // TODO: it would be better to lazyly create the index. But we need an Index::open function for milli.
if let Some(BeingDeleted) = if let Some(BeingDeleted) =
self.index_map.write().unwrap().insert(uuid, Available(index.clone())) self.index_map.write().unwrap().insert(uuid, Available(index.clone()))
@ -95,10 +99,7 @@ impl IndexMapper {
Ok(index) Ok(index)
} }
error => error, error => error,
}; }
let index = ret?;
wtxn.commit()?;
Ok(index)
} }
/// Removes the index from the mapping table and the in-memory index map /// Removes the index from the mapping table and the in-memory index map