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

Merge pull request #715 from meilisearch/bump-heed

Browse Source 
Bump heed to 0.8.0 and handle abort errors
This commit is contained in:
Clément Renault 2020-05-26 17:39:10 +02:00 committed by GitHub
commit a3a389cae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1234,9 +1234,9 @@ dependencies = [
[[package]] [[package]]
name = "heed" name = "heed"
version = "0.7.1" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d432af60d4dada5bc2d391b98ed258a16e659a4b5ec88b0c90e148062ed1a5c" checksum = "fd7882b766b4be1b90d8ce5ce4c7aca2539b43176a708dbc8e79576dbbdbba93"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"heed-traits", "heed-traits",

2
meilisearch-core/Cargo.toml
View File

@ -18,7 +18,7 @@ either = "1.5.3"
env_logger = "0.7.1" env_logger = "0.7.1"
fst = "0.4.4" fst = "0.4.4"
hashbrown = { version = "0.7.1", features = ["serde"] } hashbrown = { version = "0.7.1", features = ["serde"] }
heed = "0.7.0" heed = "0.8.0"
indexmap = { version = "1.3.2", features = ["serde-1"] } indexmap = { version = "1.3.2", features = ["serde-1"] }
intervaltree = "0.2.5" intervaltree = "0.2.5"
itertools = "0.9.0" 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 // 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 // instantiate a transaction to touch to the main env
let result = env.typed_write_txn::<MainT>(); let result = env.typed_write_txn::<MainT>();
@ -118,7 +118,7 @@ fn update_awaiter(
if status.error.is_none() { if status.error.is_none() {
break_try!(main_writer.commit(), "commit nested transaction failed"); break_try!(main_writer.commit(), "commit nested transaction failed");
} else { } else {
main_writer.abort() break_try!(main_writer.abort(), "abborting nested transaction failed");
} }
// now that the update has been processed we can instantiate // now that the update has been processed we can instantiate
@ -178,7 +178,7 @@ impl Database {
must_open.push(index_uid.to_owned()); must_open.push(index_uid.to_owned());
} }
reader.abort(); reader.abort()?;
// open the previously aggregated indexes // open the previously aggregated indexes
let mut indexes = HashMap::new(); let mut indexes = HashMap::new();

2
meilisearch-http/Cargo.toml
View File

@ -29,7 +29,7 @@ chrono = { version = "0.4.11", features = ["serde"] }
crossbeam-channel = "0.4.2" crossbeam-channel = "0.4.2"
env_logger = "0.7.1" env_logger = "0.7.1"
futures = "0.3.4" futures = "0.3.4"
heed = "0.7.0" heed = "0.8.0"
http = "0.1.19" http = "0.1.19"
indexmap = { version = "1.3.2", features = ["serde-1"] } indexmap = { version = "1.3.2", features = ["serde-1"] }
log = "0.4.8" log = "0.4.8"