From c53841e166a95a3c80e2dc0c3e050aa9e710c722 Mon Sep 17 00:00:00 2001
From: Kerollmops <clement@meilisearch.com>
Date: Mon, 14 Aug 2023 16:03:55 +0200
Subject: [PATCH 1/5] Accept the null JSON value as the value of _vectors

---
 meilisearch/src/search.rs                        |  1 +
 milli/src/lib.rs                                 | 12 ++++++------
 .../extract/extract_vector_points.rs             | 16 +++++++++-------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/meilisearch/src/search.rs b/meilisearch/src/search.rs
index 1a1c7721e..d484cd471 100644
--- a/meilisearch/src/search.rs
+++ b/meilisearch/src/search.rs
@@ -666,6 +666,7 @@ fn compute_semantic_score(query: &[f32], vectors: Value) -> milli::Result<Option
         .map_err(InternalError::SerdeJson)?;
     Ok(vectors
         .into_iter()
+        .flatten()
         .map(|v| OrderedFloat(dot_product_similarity(query, &v)))
         .max()
         .map(OrderedFloat::into_inner))
diff --git a/milli/src/lib.rs b/milli/src/lib.rs
index cd97d6192..cfa438609 100644
--- a/milli/src/lib.rs
+++ b/milli/src/lib.rs
@@ -293,15 +293,15 @@ pub fn normalize_facet(original: &str) -> String {
 #[derive(serde::Serialize, serde::Deserialize, Debug)]
 #[serde(transparent)]
 pub struct VectorOrArrayOfVectors {
-    #[serde(with = "either::serde_untagged")]
-    inner: either::Either<Vec<f32>, Vec<Vec<f32>>>,
+    #[serde(with = "either::serde_untagged_optional")]
+    inner: Option<either::Either<Vec<f32>, Vec<Vec<f32>>>>,
 }
 
 impl VectorOrArrayOfVectors {
-    pub fn into_array_of_vectors(self) -> Vec<Vec<f32>> {
-        match self.inner {
-            either::Either::Left(vector) => vec![vector],
-            either::Either::Right(vectors) => vectors,
+    pub fn into_array_of_vectors(self) -> Option<Vec<Vec<f32>>> {
+        match self.inner? {
+            either::Either::Left(vector) => Some(vec![vector]),
+            either::Either::Right(vectors) => Some(vectors),
         }
     }
 }
diff --git a/milli/src/update/index_documents/extract/extract_vector_points.rs b/milli/src/update/index_documents/extract/extract_vector_points.rs
index 0fad3be07..fdccb515e 100644
--- a/milli/src/update/index_documents/extract/extract_vector_points.rs
+++ b/milli/src/update/index_documents/extract/extract_vector_points.rs
@@ -33,7 +33,7 @@ pub fn extract_vector_points<R: io::Read + io::Seek>(
         // lazily get it when needed
         let document_id = || -> Value {
             let document_id = obkv.get(primary_key_id).unwrap();
-            serde_json::from_slice(document_id).unwrap()
+            from_slice(document_id).unwrap()
         };
 
         // first we retrieve the _vectors field
@@ -50,12 +50,14 @@ pub fn extract_vector_points<R: io::Read + io::Seek>(
                 }
             };
 
-            for (i, vector) in vectors.into_iter().enumerate().take(u16::MAX as usize) {
-                let index = u16::try_from(i).unwrap();
-                let mut key = docid_bytes.to_vec();
-                key.extend_from_slice(&index.to_be_bytes());
-                let bytes = cast_slice(&vector);
-                writer.insert(key, bytes)?;
+            if let Some(vectors) = vectors {
+                for (i, vector) in vectors.into_iter().enumerate().take(u16::MAX as usize) {
+                    let index = u16::try_from(i).unwrap();
+                    let mut key = docid_bytes.to_vec();
+                    key.extend_from_slice(&index.to_be_bytes());
+                    let bytes = cast_slice(&vector);
+                    writer.insert(key, bytes)?;
+                }
             }
         }
         // else => the `_vectors` object was `null`, there is nothing to do

From b947f3bb9d6c53f6c2a8885b8673187de16ede1e Mon Sep 17 00:00:00 2001
From: irevoire <irevoire@users.noreply.github.com>
Date: Wed, 16 Aug 2023 08:20:36 +0000
Subject: [PATCH 2/5] Update version for the next release (v1.3.2) in
 Cargo.toml

---
 Cargo.lock | 28 ++++++++++++++--------------
 Cargo.toml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 23cc7c290..721bd824e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -469,7 +469,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "benchmarks"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1199,7 +1199,7 @@ dependencies = [
 
 [[package]]
 name = "dump"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "anyhow",
  "big_s",
@@ -1413,7 +1413,7 @@ dependencies = [
 
 [[package]]
 name = "file-store"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "faux",
  "tempfile",
@@ -1435,7 +1435,7 @@ dependencies = [
 
 [[package]]
 name = "filter-parser"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "insta",
  "nom",
@@ -1454,7 +1454,7 @@ dependencies = [
 
 [[package]]
 name = "flatten-serde-json"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "criterion",
  "serde_json",
@@ -1572,7 +1572,7 @@ dependencies = [
 
 [[package]]
 name = "fuzzers"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "arbitrary",
  "clap",
@@ -1894,7 +1894,7 @@ dependencies = [
 
 [[package]]
 name = "index-scheduler"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "anyhow",
  "big_s",
@@ -2081,7 +2081,7 @@ dependencies = [
 
 [[package]]
 name = "json-depth-checker"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "criterion",
  "serde_json",
@@ -2493,7 +2493,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "meili-snap"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "insta",
  "md5",
@@ -2502,7 +2502,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -2591,7 +2591,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-auth"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "base64 0.21.2",
  "enum-iterator",
@@ -2610,7 +2610,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-types"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -2664,7 +2664,7 @@ dependencies = [
 
 [[package]]
 name = "milli"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "big_s",
  "bimap",
@@ -2994,7 +2994,7 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "permissive-json-pointer"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "big_s",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 714f7b289..98b484ee4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.3.1"
+version = "1.3.2"
 authors = ["Quentin de Quelen <quentin@dequelen.me>", "Clément Renault <clement@meilisearch.com>"]
 description = "Meilisearch HTTP server"
 homepage = "https://meilisearch.com"

From 717b0699074d87d6b936fec8420714db64fba700 Mon Sep 17 00:00:00 2001
From: Kerollmops <clement@meilisearch.com>
Date: Tue, 22 Aug 2023 16:25:00 +0200
Subject: [PATCH 3/5] Bump charabia to 0.8.3

---
 Cargo.lock       | 4 ++--
 milli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 721bd824e..1ab4e53d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -700,9 +700,9 @@ dependencies = [
 
 [[package]]
 name = "charabia"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57aa1b4a8dda126c03ebf2f7e31d16cfc8781c2fe80dedd1a33459efc3e07578"
+checksum = "098219a776307414866165a03a9cc68c1578764fe3616fe979e1c280790ddd73"
 dependencies = [
  "aho-corasick",
  "cow-utils",
diff --git a/milli/Cargo.toml b/milli/Cargo.toml
index 4831ea990..c56a20eec 100644
--- a/milli/Cargo.toml
+++ b/milli/Cargo.toml
@@ -17,7 +17,7 @@ bincode = "1.3.3"
 bstr = "1.4.0"
 bytemuck = { version = "1.13.1", features = ["extern_crate_alloc"] }
 byteorder = "1.4.3"
-charabia = { version = "0.8.2", default-features = false }
+charabia = { version = "0.8.3", default-features = false }
 concat-arrays = "0.1.2"
 crossbeam-channel = "0.5.8"
 deserr = "0.5.0"

From 5130e06b419b591e39641de17dd62ac32f2ff261 Mon Sep 17 00:00:00 2001
From: Kerollmops <clement@meilisearch.com>
Date: Wed, 23 Aug 2023 16:11:44 +0200
Subject: [PATCH 4/5] Temporarily disable an assert in the ranking rules

---
 milli/src/search/new/bucket_sort.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/milli/src/search/new/bucket_sort.rs b/milli/src/search/new/bucket_sort.rs
index 248dc4f7a..7f1d4febe 100644
--- a/milli/src/search/new/bucket_sort.rs
+++ b/milli/src/search/new/bucket_sort.rs
@@ -91,11 +91,11 @@ pub fn bucket_sort<'ctx, Q: RankingRuleQueryTrait>(
     /// Update the universes accordingly and inform the logger.
     macro_rules! back {
         () => {
-            assert!(
-                ranking_rule_universes[cur_ranking_rule_index].is_empty(),
-                "The ranking rule {} did not sort its bucket exhaustively",
-                ranking_rules[cur_ranking_rule_index].id()
-            );
+            // assert!(
+            //     ranking_rule_universes[cur_ranking_rule_index].is_empty(),
+            //     "The ranking rule {} did not sort its bucket exhaustively",
+            //     ranking_rules[cur_ranking_rule_index].id()
+            // );
             logger.end_iteration_ranking_rule(
                 cur_ranking_rule_index,
                 ranking_rules[cur_ranking_rule_index].as_ref(),

From 8c0ebd13316efee9fd8466cd83c21a74422b7ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= <clement@meilisearch.com>
Date: Wed, 23 Aug 2023 16:40:39 +0200
Subject: [PATCH 5/5] Update milli/src/search/new/bucket_sort.rs

Co-authored-by: Louis Dureuil <louis@meilisearch.com>
---
 milli/src/search/new/bucket_sort.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/milli/src/search/new/bucket_sort.rs b/milli/src/search/new/bucket_sort.rs
index 7f1d4febe..03e613b37 100644
--- a/milli/src/search/new/bucket_sort.rs
+++ b/milli/src/search/new/bucket_sort.rs
@@ -91,6 +91,7 @@ pub fn bucket_sort<'ctx, Q: RankingRuleQueryTrait>(
     /// Update the universes accordingly and inform the logger.
     macro_rules! back {
         () => {
+            // FIXME: temporarily disabled assert: see <https://github.com/meilisearch/meilisearch/pull/4013>
             // assert!(
             //     ranking_rule_universes[cur_ranking_rule_index].is_empty(),
             //     "The ranking rule {} did not sort its bucket exhaustively",