snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-22 18:17:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge #2404

Browse Source 
2404: Bring `release-v0.27.1` into `main` r=curquiza a=curquiza

Following the v0.27.1 hotfixes

Co-authored-by: ad hoc <postma.marin@protonmail.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: Tamo <tamo@meilisearch.com>
Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
This commit is contained in:
bors[bot] 2022-05-17 16:11:17 +00:00 committed by GitHub
commit 6d221058f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -1093,7 +1093,7 @@ dependencies = [
[[package]] [[package]]
name = "filter-parser" name = "filter-parser"
version = "0.26.4" version = "0.26.4"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.4#6ee67df128b63f40eedfe1cb2edfa1a59492e310" source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.5#1f6dc31e2f8ee02cdda255a856d15f253daf17ec"
dependencies = [ dependencies = [
"nom", "nom",
"nom_locate", "nom_locate",
@ -1120,7 +1120,7 @@ dependencies = [
[[package]] [[package]]
name = "flatten-serde-json" name = "flatten-serde-json"
version = "0.26.4" version = "0.26.4"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.4#6ee67df128b63f40eedfe1cb2edfa1a59492e310" source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.5#1f6dc31e2f8ee02cdda255a856d15f253daf17ec"
dependencies = [ dependencies = [
"serde_json", "serde_json",
] ]
@ -1623,7 +1623,7 @@ dependencies = [
[[package]] [[package]]
name = "json-depth-checker" name = "json-depth-checker"
version = "0.26.4" version = "0.26.4"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.4#6ee67df128b63f40eedfe1cb2edfa1a59492e310" source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.5#1f6dc31e2f8ee02cdda255a856d15f253daf17ec"
dependencies = [ dependencies = [
"serde_json", "serde_json",
] ]
@ -1950,7 +1950,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
[[package]] [[package]]
name = "meilisearch-auth" name = "meilisearch-auth"
version = "0.27.0" version = "0.27.1"
dependencies = [ dependencies = [
"enum-iterator", "enum-iterator",
"meilisearch-error", "meilisearch-error",
@ -1965,7 +1965,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-error" name = "meilisearch-error"
version = "0.27.0" version = "0.27.1"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"proptest", "proptest",
@ -1976,7 +1976,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-http" name = "meilisearch-http"
version = "0.27.0" version = "0.27.1"
dependencies = [ dependencies = [
"actix-cors", "actix-cors",
"actix-rt", "actix-rt",
@ -2048,7 +2048,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-lib" name = "meilisearch-lib"
version = "0.27.0" version = "0.27.1"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"actix-web", "actix-web",
@ -2152,7 +2152,7 @@ dependencies = [
[[package]] [[package]]
name = "milli" name = "milli"
version = "0.26.4" version = "0.26.4"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.4#6ee67df128b63f40eedfe1cb2edfa1a59492e310" source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.5#1f6dc31e2f8ee02cdda255a856d15f253daf17ec"
dependencies = [ dependencies = [
"bimap", "bimap",
"bincode", "bincode",

4
meilisearch-auth/Cargo.toml
View File

@ -1,12 +1,12 @@
[package] [package]
name = "meilisearch-auth" name = "meilisearch-auth"
version = "0.27.0" version = "0.27.1"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
enum-iterator = "0.7.0" enum-iterator = "0.7.0"
meilisearch-error = { path = "../meilisearch-error" } meilisearch-error = { path = "../meilisearch-error" }
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.4" } milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.5" }
rand = "0.8.4" rand = "0.8.4"
serde = { version = "1.0.136", features = ["derive"] } serde = { version = "1.0.136", features = ["derive"] }
serde_json = { version = "1.0.79", features = ["preserve_order"] } serde_json = { version = "1.0.79", features = ["preserve_order"] }

2
meilisearch-error/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "meilisearch-error" name = "meilisearch-error"
version = "0.27.0" version = "0.27.1"
authors = ["marin <postma.marin@protonmail.com>"] authors = ["marin <postma.marin@protonmail.com>"]
edition = "2021" edition = "2021"

2
meilisearch-http/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "Meilisearch HTTP server"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
name = "meilisearch-http" name = "meilisearch-http"
version = "0.27.0" version = "0.27.1"
[[bin]] [[bin]]
name = "meilisearch" name = "meilisearch"

13
meilisearch-http/tests/documents/add_documents.rs
View File

@ -991,7 +991,7 @@ async fn error_document_field_limit_reached() {
} }
#[actix_rt::test] #[actix_rt::test]
async fn error_add_documents_invalid_geo_field() { async fn add_documents_invalid_geo_field() {
let server = Server::new().await; let server = Server::new().await;
let index = server.index("test"); let index = server.index("test");
index.create(Some("id")).await; index.create(Some("id")).await;
@ -1010,16 +1010,7 @@ async fn error_add_documents_invalid_geo_field() {
index.wait_task(2).await; index.wait_task(2).await;
let (response, code) = index.get_task(2).await; let (response, code) = index.get_task(2).await;
assert_eq!(code, 200); assert_eq!(code, 200);
assert_eq!(response["status"], "failed"); assert_eq!(response["status"], "succeeded");
let expected_error = json!({
"message": r#"The document with the id: `11` contains an invalid `_geo` field."#,
"code": "invalid_geo_field",
"type": "invalid_request",
"link": "https://docs.meilisearch.com/errors#invalid_geo_field"
});
assert_eq!(response["error"], expected_error);
} }
#[actix_rt::test] #[actix_rt::test]

4
meilisearch-lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "meilisearch-lib" name = "meilisearch-lib"
version = "0.27.0" version = "0.27.1"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -30,7 +30,7 @@ lazy_static = "1.4.0"
log = "0.4.14" log = "0.4.14"
meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-auth = { path = "../meilisearch-auth" }
meilisearch-error = { path = "../meilisearch-error" } meilisearch-error = { path = "../meilisearch-error" }
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.4" } milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.5" }
mime = "0.3.16" mime = "0.3.16"
num_cpus = "1.13.1" num_cpus = "1.13.1"
obkv = "0.2.0" obkv = "0.2.0"

2
meilisearch-lib/src/index/index.rs
View File

@ -135,7 +135,7 @@ impl Index {
.map(|fields| fields.into_iter().map(String::from).collect()); .map(|fields| fields.into_iter().map(String::from).collect());
let searchable_attributes = self let searchable_attributes = self
.searchable_fields(txn)? .user_defined_searchable_fields(txn)?
.map(|fields| fields.into_iter().map(String::from).collect()); .map(|fields| fields.into_iter().map(String::from).collect());
let filterable_attributes = self.filterable_fields(txn)?.into_iter().collect(); let filterable_attributes = self.filterable_fields(txn)?.into_iter().collect();

5
meilisearch-lib/src/index_controller/mod.rs
View File

@ -196,10 +196,7 @@ impl IndexControllerBuilder {
task_store_size, task_store_size,
&indexer_options, &indexer_options,
)?; )?;
} } else if db_path.as_ref().exists() {
let db_exists = db_path.as_ref().exists();
if db_exists {
// Directory could be pre-created without any database in. // Directory could be pre-created without any database in.
let db_is_empty = db_path.as_ref().read_dir()?.next().is_none(); let db_is_empty = db_path.as_ref().read_dir()?.next().is_none();
if !db_is_empty { if !db_is_empty {