Merge #2404

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>

Cargo.lock

@@ -1093,7 +1093,7 @@ dependencies = [
 [[package]]
 name = "filter-parser"
 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 = [
  "nom",
  "nom_locate",
@@ -1120,7 +1120,7 @@ dependencies = [
 [[package]]
 name = "flatten-serde-json"
 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 = [
  "serde_json",
 ]
@@ -1623,7 +1623,7 @@ dependencies = [
 [[package]]
 name = "json-depth-checker"
 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 = [
  "serde_json",
 ]
@@ -1950,7 +1950,7 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
 [[package]]
 name = "meilisearch-auth"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "enum-iterator",
  "meilisearch-error",
@@ -1965,7 +1965,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-error"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "actix-web",
  "proptest",
@@ -1976,7 +1976,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-http"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "actix-cors",
  "actix-rt",
@@ -2048,7 +2048,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-lib"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "actix-rt",
  "actix-web",
@@ -2152,7 +2152,7 @@ dependencies = [
 [[package]]
 name = "milli"
 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 = [
  "bimap",
  "bincode",

meilisearch-auth/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "meilisearch-auth"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 [dependencies]
 enum-iterator = "0.7.0"
 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"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = { version = "1.0.79", features = ["preserve_order"] }

meilisearch-error/Cargo.toml

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

meilisearch-http/Cargo.toml

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

meilisearch-http/tests/documents/add_documents.rs

@@ -991,7 +991,7 @@ async fn error_document_field_limit_reached() {
 }
 
 #[actix_rt::test]
-async fn error_add_documents_invalid_geo_field() {
+async fn add_documents_invalid_geo_field() {
     let server = Server::new().await;
     let index = server.index("test");
     index.create(Some("id")).await;
@@ -1010,16 +1010,7 @@ async fn error_add_documents_invalid_geo_field() {
     index.wait_task(2).await;
     let (response, code) = index.get_task(2).await;
     assert_eq!(code, 200);
-    assert_eq!(response["status"], "failed");
-
-    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);
+    assert_eq!(response["status"], "succeeded");
 }
 
 #[actix_rt::test]

meilisearch-lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "meilisearch-lib"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2021"
 
 # 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"
 meilisearch-auth = { path = "../meilisearch-auth" }
 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"
 num_cpus = "1.13.1"
 obkv = "0.2.0"

meilisearch-lib/src/index/index.rs

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

meilisearch-lib/src/index_controller/mod.rs

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