fix base trait

Signed-off-by: Kosuke Morimoto <[email protected]>
vdaas · Feb 21, 2024 · dbf693f · dbf693f
1 parent eab39ea
commit dbf693f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 12 deletions.
diff --git a/rust/libs/algorithm/src/base.rs b/rust/libs/algorithm/src/base.rs
@@ -1,11 +1,13 @@
 pub mod algorithm {
     use anyhow::Result;
 
-    pub trait Base<T, U, SP, SR, IP, IR, UP, UR, RP, RR, CP, CR> {
-        fn search(&self, v: &Vec<T>, p: Option<&SP>) -> Result<&SR>;
-        fn insert(&self, v: &Vec<T>, id: &U, p: Option<&IP>) -> Result<&IR>;
-        fn update(&self, v: &Vec<T>, id: &U, p: Option<&UP>) -> Result<&UR>;
-        fn remove(&self, id: &U, p: Option<&RP>) -> Result<&RR>;
-        fn commit(&self, p: Option<&CP>) -> Result<&CR>;
+    pub trait Base<T, U, SP, SR, IP, IR, UP, UR, RP, RR, CP, CR, P> {
+        fn search(&self, v: &Vec<T>, p: Option<SP>) -> Result<SR>;
+        fn insert(&self, v: &Vec<T>, id: &U, p: Option<IP>) -> Result<IR>;
+        fn update(&self, v: &Vec<T>, id: &U, p: Option<UP>) -> Result<UR>;
+        fn remove(&self, id: &U, p: Option<RP>) -> Result<RR>;
+        fn commit(&self, p: Option<CP>) -> Result<CR>;
+
+        fn new(p: Option<P>) -> Result<Self>;
     }
 }
diff --git a/rust/libs/algorithm/src/ngt.rs b/rust/libs/algorithm/src/ngt.rs
@@ -27,22 +27,44 @@ pub mod ngt {
         num: u32,
     }
 
-    #[derive(Debug)]    
+    #[derive(Debug)]
     pub struct InsertParam {}
-    
+
     #[derive(Debug)]
     pub struct UpdateParam {}
 
     #[derive(Debug)]
     pub struct RemoveParam {}
 
     #[derive(Debug)]
-    pub struct CommitParam{}
+    pub struct CommitParam {}
 
     #[derive(Debug)]
     pub struct NGTParam {}
 
-    impl Base<f32, String, SearchParam, SearchResponse, InsertParam, (), UpdateParam, (), RemoveParam, (), CommitParam, ()> for NGT {
-        fn search()
+    impl
+        Base<
+            f32,
+            String,
+            SearchParam,
+            SearchResponse,
+            InsertParam,
+            (),
+            UpdateParam,
+            (),
+            RemoveParam,
+            (),
+            CommitParam,
+            (),
+            NGTParam,
+        > for NGT
+    {
+        fn search(&self, v: &Vec<T>, p: Option<SearchParam>) -> Result<SearchResponse>;
+        fn insert(&self, v: &Vec<T>, id: &U, p: Option<InsertParam>) -> Result<()>;
+        fn update(&self, v: &Vec<T>, id: &U, p: Option<UpdateParam>) -> Result<()>;
+        fn remove(&self, id: &U, p: Option<RemoveParam>) -> Result<()>;
+        fn commit(&self, p: Option<CommitParam>) -> Result<()>;
+
+        fn new(p: Option<NGTParam>) -> Result<Self>;
     }
-}
+}