requested changes

meilisearch-core/src/store/synonyms.rs

@@ -12,14 +12,14 @@ pub struct Synonyms {
 }
 
 impl Synonyms {
-    pub fn put_synonyms<A>(self, writer: &mut heed::RwTxn<MainT>, word: &[u8], synonyms: &fst::Set<A>) -> ZResult<()>
+    pub(crate) fn put_synonyms<A>(self, writer: &mut heed::RwTxn<MainT>, word: &[u8], synonyms: &fst::Set<A>) -> ZResult<()>
     where A: AsRef<[u8]>,
     {
         let bytes = synonyms.as_fst().as_bytes();
         self.synonyms.put(writer, word, bytes)
     }
 
-    pub fn clear(self, writer: &mut heed::RwTxn<MainT>) -> ZResult<()> {
+    pub(crate) fn clear(self, writer: &mut heed::RwTxn<MainT>) -> ZResult<()> {
         self.synonyms.clear(writer)
     }
 

meilisearch-core/src/update/settings_update.rs

@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, BTreeSet, btree_map::Entry};
+use std::collections::{BTreeMap, BTreeSet};
 
 use heed::Result as ZResult;
 use fst::{set::OpBuilder, SetBuilder};
@@ -126,7 +126,7 @@ pub fn apply_settings_update(
     }
 
     match settings.synonyms {
-        UpdateState::Update(synonyms) => apply_synonyms_update(writer, index, transform_synonyms(synonyms))? ,
+        UpdateState::Update(synonyms) => apply_synonyms_update(writer, index, canonicalize_synonyms(synonyms))? ,
         UpdateState::Clear => apply_synonyms_update(writer, index, BTreeMap::new())?,
         UpdateState::Nothing => (),
     }
@@ -138,21 +138,16 @@ pub fn apply_settings_update(
     Ok(())
 }
 
-fn transform_synonyms(synonyms: BTreeMap<String, Vec<String>>) -> BTreeMap<String, Vec<String>> {
-    synonyms
-        .into_iter()
-        .fold(BTreeMap::new(), |mut map, (key, values)| {
-            let deunicoded = deunicode::deunicode(&key);
-            match map.entry(deunicoded) {
-                Entry::Vacant(entry) => {
-                    entry.insert(values);
-                }
-                Entry::Occupied(mut entry) => {
-                    entry.get_mut().extend_from_slice(&values);
-                }
-            }
-            map
-        })
+fn canonicalize_synonyms(synonyms: BTreeMap<String, Vec<String>>) -> BTreeMap<String, Vec<String>> {
+    let mut canonicalized = BTreeMap::new();
+    for (key, values) in synonyms {
+        let deunicoded = deunicode::deunicode(&key);
+        canonicalized
+            .entry(deunicoded)
+            .or_insert_with(Vec::new)
+            .extend_from_slice(&values);
+    }
+    canonicalized
 }
 
 fn apply_attributes_for_faceting_update(

meilisearch-http/tests/search.rs

@@ -1844,7 +1844,6 @@ async fn test_search_synonyms_unicased() {
     server.update_all_settings(settings).await;
 
     let (response, _) = server.get_synonyms().await;
-    println!("response: {}", response);
     assert_json_eq!(response, json!({"case":["machin", "truc"]}));
 
     let update = json!([
@@ -1860,4 +1859,8 @@ async fn test_search_synonyms_unicased() {
     });
     let (response, _) = server.search_post(search).await;
     assert_eq!(response["hits"].as_array().unwrap().len(), 1);
+
+    server.delete_synonyms().await;
+    let (response, _) = server.get_synonyms().await;
+    assert_json_eq!(response, json!({}));
 }