From 451c0a6d03eef741497c5d0f889913f2ad2ea78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= <renault.cle@gmail.com>
Date: Thu, 22 Aug 2019 11:08:54 +0200
Subject: [PATCH] feat: Introduce synonyms addition using the update system

---
 meilidb-data/src/database/index/mod.rs        | 21 ++++++----
 meilidb-data/src/database/mod.rs              |  2 +-
 .../src/database/synonyms_addition.rs         | 39 +++++++++++++++++--
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/meilidb-data/src/database/index/mod.rs b/meilidb-data/src/database/index/mod.rs
index 70a2eb176..6167d9f08 100644
--- a/meilidb-data/src/database/index/mod.rs
+++ b/meilidb-data/src/database/index/mod.rs
@@ -1,4 +1,4 @@
-use std::collections::HashSet;
+use std::collections::{HashSet, BTreeMap};
 use std::convert::TryInto;
 use std::sync::Arc;
 use std::thread;
@@ -26,7 +26,7 @@ use self::words_index::WordsIndex;
 use super::{
     DocumentsAddition, FinalDocumentsAddition,
     DocumentsDeletion, FinalDocumentsDeletion,
-    SynonymsAddition,
+    SynonymsAddition, FinalSynonymsAddition,
     SynonymsDeletion,
 };
 
@@ -48,7 +48,7 @@ fn event_is_set(event: &sled::Event) -> bool {
 enum UpdateOwned {
     DocumentsAddition(Vec<serde_json::Value>),
     DocumentsDeletion(Vec<DocumentId>),
-    SynonymsAddition( () /*SynonymsAddition*/),
+    SynonymsAddition(BTreeMap<String, Vec<String>>),
     SynonymsDeletion( () /*SynonymsDeletion*/),
 }
 
@@ -56,7 +56,7 @@ enum UpdateOwned {
 enum Update<D: serde::Serialize> {
     DocumentsAddition(Vec<D>),
     DocumentsDeletion(Vec<DocumentId>),
-    SynonymsAddition( () /*SynonymsAddition*/),
+    SynonymsAddition(BTreeMap<String, Vec<String>>),
     SynonymsDeletion( () /*SynonymsDeletion*/),
 }
 
@@ -91,8 +91,9 @@ fn spawn_update_system(index: Index) -> thread::JoinHandle<()> {
                                 deletion.extend(documents);
                                 deletion.finalize()?;
                             },
-                            UpdateOwned::SynonymsAddition(_) => {
-                                // ...
+                            UpdateOwned::SynonymsAddition(synonyms) => {
+                                let addition = FinalSynonymsAddition::from_map(&index, synonyms);
+                                addition.finalize()?;
                             },
                             UpdateOwned::SynonymsDeletion(_) => {
                                 // ...
@@ -313,8 +314,12 @@ impl Index {
         self.raw_push_update(update)
     }
 
-    pub(crate) fn push_synonyms_addition(&self, addition: SynonymsAddition) -> Result<u64, Error> {
-        let update = bincode::serialize(&())?;
+    pub(crate) fn push_synonyms_addition(
+        &self,
+        addition: BTreeMap<String, Vec<String>>,
+    ) -> Result<u64, Error>
+    {
+        let update = bincode::serialize(&addition)?;
         self.raw_push_update(update)
     }
 
diff --git a/meilidb-data/src/database/mod.rs b/meilidb-data/src/database/mod.rs
index 82229c169..78b154bfd 100644
--- a/meilidb-data/src/database/mod.rs
+++ b/meilidb-data/src/database/mod.rs
@@ -17,7 +17,7 @@ pub use self::index::{Index, CustomSettingsIndex};
 
 use self::documents_addition::{DocumentsAddition, FinalDocumentsAddition};
 use self::documents_deletion::{DocumentsDeletion, FinalDocumentsDeletion};
-use self::synonyms_addition::SynonymsAddition;
+use self::synonyms_addition::{SynonymsAddition, FinalSynonymsAddition};
 use self::synonyms_deletion::SynonymsDeletion;
 
 fn load_indexes(tree: &sled::Tree) -> Result<HashSet<String>, Error> {
diff --git a/meilidb-data/src/database/synonyms_addition.rs b/meilidb-data/src/database/synonyms_addition.rs
index 68945af2d..69d1c9a9c 100644
--- a/meilidb-data/src/database/synonyms_addition.rs
+++ b/meilidb-data/src/database/synonyms_addition.rs
@@ -9,13 +9,46 @@ use super::{Error, Index};
 use super::index::Cache;
 
 pub struct SynonymsAddition<'a> {
-    inner: &'a Index,
+    index: &'a Index,
     synonyms: BTreeMap<String, Vec<String>>,
 }
 
 impl<'a> SynonymsAddition<'a> {
-    pub fn new(inner: &'a Index) -> SynonymsAddition<'a> {
-        SynonymsAddition { inner, synonyms: BTreeMap::new() }
+    pub fn new(index: &'a Index) -> SynonymsAddition<'a> {
+        SynonymsAddition { index, synonyms: BTreeMap::new() }
+    }
+
+    pub fn add_synonym<S, T, I>(&mut self, synonym: S, alternatives: I)
+    where S: AsRef<str>,
+          T: AsRef<str>,
+          I: Iterator<Item=T>,
+    {
+        let synonym = normalize_str(synonym.as_ref());
+        let alternatives = alternatives.map(|s| s.as_ref().to_lowercase());
+        self.synonyms.entry(synonym).or_insert_with(Vec::new).extend(alternatives);
+    }
+
+    pub fn finalize(self) -> Result<u64, Error> {
+        self.index.push_synonyms_addition(self.synonyms)
+    }
+}
+
+pub struct FinalSynonymsAddition<'a> {
+    inner: &'a Index,
+    synonyms: BTreeMap<String, Vec<String>>,
+}
+
+impl<'a> FinalSynonymsAddition<'a> {
+    pub fn new(inner: &'a Index) -> FinalSynonymsAddition<'a> {
+        FinalSynonymsAddition { inner, synonyms: BTreeMap::new() }
+    }
+
+    pub fn from_map(
+        inner: &'a Index,
+        synonyms: BTreeMap<String, Vec<String>>,
+    ) -> FinalSynonymsAddition<'a>
+    {
+        FinalSynonymsAddition { inner, synonyms }
     }
 
     pub fn add_synonym<S, T, I>(&mut self, synonym: S, alternatives: I)