From 928fb34effc560d6f6f96de166e9a9d3e4ad57a9 Mon Sep 17 00:00:00 2001
From: Marin Postma <postma.marin@protonmail.com>
Date: Tue, 4 May 2021 15:10:22 +0200
Subject: [PATCH] bump milli and fix tests

---
 Cargo.lock                                    | 25 +++++++++++++++----
 meilisearch-http/Cargo.toml                   |  2 +-
 .../tests/documents/add_documents.rs          |  9 +++----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62cd4b300..778652bca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1761,7 +1761,7 @@ dependencies = [
  "log",
  "main_error",
  "meilisearch-error",
- "meilisearch-tokenizer",
+ "meilisearch-tokenizer 0.2.1",
  "memmap",
  "milli",
  "mime",
@@ -1814,6 +1814,22 @@ dependencies = [
  "whatlang",
 ]
 
+[[package]]
+name = "meilisearch-tokenizer"
+version = "0.2.2"
+source = "git+https://github.com/meilisearch/Tokenizer.git?tag=v0.2.2#eda4ed4968c8ac973cf1707ef89bd7012bb2722f"
+dependencies = [
+ "character_converter",
+ "cow-utils",
+ "deunicode",
+ "fst",
+ "jieba-rs",
+ "once_cell",
+ "slice-group-by",
+ "unicode-segmentation",
+ "whatlang",
+]
+
 [[package]]
 name = "memchr"
 version = "2.3.4"
@@ -1841,8 +1857,8 @@ dependencies = [
 
 [[package]]
 name = "milli"
-version = "0.1.1"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.1.1#f5ec14c54cc3ab76ca581eca9b6e0870f09fd63f"
+version = "0.2.0"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.2.0#792225eaffce6b3682f9b30b7370b6a547c4757e"
 dependencies = [
  "anyhow",
  "bstr",
@@ -1862,9 +1878,8 @@ dependencies = [
  "linked-hash-map",
  "log",
  "logging_timer",
- "meilisearch-tokenizer",
+ "meilisearch-tokenizer 0.2.2",
  "memmap",
- "num-traits",
  "obkv",
  "once_cell",
  "ordered-float",
diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml
index 12ae6e3b1..68f76ebf9 100644
--- a/meilisearch-http/Cargo.toml
+++ b/meilisearch-http/Cargo.toml
@@ -51,7 +51,7 @@ main_error = "0.1.0"
 meilisearch-error = { path = "../meilisearch-error" }
 meilisearch-tokenizer = { git = "https://github.com/meilisearch/Tokenizer.git", tag = "v0.2.1" }
 memmap = "0.7.0"
-milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.1.1" }
+milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.2.0" }
 mime = "0.3.16"
 once_cell = "1.5.2"
 oxidized-json-checker = "0.3.2"
diff --git a/meilisearch-http/tests/documents/add_documents.rs b/meilisearch-http/tests/documents/add_documents.rs
index 9de5fe9db..1ec84e046 100644
--- a/meilisearch-http/tests/documents/add_documents.rs
+++ b/meilisearch-http/tests/documents/add_documents.rs
@@ -140,9 +140,7 @@ async fn add_documents_with_primary_key_and_primary_key_already_exists() {
 
     let (response, code) = index.get_update(0).await;
     assert_eq!(code, 200);
-    assert_eq!(response["status"], "processed");
-    assert_eq!(response["updateId"], 0);
-    assert_eq!(response["success"]["DocumentsAddition"]["nb_documents"], 1);
+    assert_eq!(response["status"], "failed");
 
     let (response, code) = index.get().await;
     assert_eq!(code, 200);
@@ -168,9 +166,8 @@ async fn update_documents_with_primary_key_and_primary_key_already_exists() {
     index.wait_update_id(0).await;
     let (response, code) = index.get_update(0).await;
     assert_eq!(code, 200);
-    assert_eq!(response["status"], "processed");
-    assert_eq!(response["updateId"], 0);
-    assert_eq!(response["success"]["DocumentsAddition"]["nb_documents"], 1);
+    // Documents without a primary key are not accepted.
+    assert_eq!(response["status"], "failed");
 
     let (response, code) = index.get().await;
     assert_eq!(code, 200);