searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 11:57:07 +02:00
Code Issues Releases Wiki Activity

Bump heed to 0.8.0 and handle abort errors

Browse source
This commit is contained in:
Kerollmops 2020-05-26 17:03:53 +02:00
parent 166a301c7f
commit 8cebf78485
No known key found for this signature in database
GPG key ID: 92ADA4E935E71FA4
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meilisearch-core/Cargo.toml
View file

@ -18,7 +18,7 @@ either = "1.5.3"
env_logger = "0.7.1"
fst = "0.4.4"
hashbrown = { version = "0.7.1", features = ["serde"] }
heed = "0.7.0"
heed = "0.8.0"
indexmap = { version = "1.3.2", features = ["serde-1"] }
intervaltree = "0.2.5"
itertools = "0.9.0"

6
meilisearch-core/src/database.rs
View file

@ -104,7 +104,7 @@ fn update_awaiter(
};
// do not keep the reader for too long
update_reader.abort();
break_try!(update_reader.abort(), "aborting update transaction failed");
// instantiate a transaction to touch to the main env
let result = env.typed_write_txn::<MainT>();
@ -118,7 +118,7 @@ fn update_awaiter(
if status.error.is_none() {
break_try!(main_writer.commit(), "commit nested transaction failed");
} else {
main_writer.abort()
break_try!(main_writer.abort(), "abborting nested transaction failed");
}
// now that the update has been processed we can instantiate
@ -178,7 +178,7 @@ impl Database {
must_open.push(index_uid.to_owned());
}
reader.abort();
reader.abort()?;
// open the previously aggregated indexes
let mut indexes = HashMap::new();