Clean up

Author: the2pizza

codegen/src/persist_table/generator/space_file/mod.rs

@@ -129,7 +129,7 @@ impl Generator {
                     lock_map: LockMap::new(),
                     table_name: "",
                     pk_phantom: std::marker::PhantomData,
-                    available_types_phantom: std::marker::PhantomData,
+                    types_phantom: std::marker::PhantomData,
                 };
 
                 #wt_ident(

codegen/src/worktable/generator/index.rs

@@ -132,6 +132,8 @@ impl Generator {
         }
     }
 
+    /// Generates `process_difference` function of `TableIndex` trait for index. It updates `Link` for all secondary indexes.
+    /// Uses HashMap<&str, Difference<AvaialableTypes>> for storing all changes
     fn gen_process_difference_index_fn(&self) -> TokenStream {
         let name_generator = WorktableNameGenerator::from_table_name(self.name.to_string());
         let avt_type_ident = name_generator.get_available_type_ident();

src/index/mod.rs

@@ -1,3 +1,4 @@
+use std::hash::Hash;
 use std::sync::Arc;
 
 use data_bucket::Link;
@@ -9,9 +10,46 @@ mod table_secondary_index;
 
 pub use indexset::concurrent::map::BTreeMap as IndexMap;
 pub use indexset::concurrent::multimap::BTreeMultiMap as IndexMultiMap;
-pub use table_secondary_index::{Difference, TableIndex, TableSecondaryIndex};
+pub use table_secondary_index::TableSecondaryIndex;
 
 pub enum IndexType<'a, T> {
     Unique(&'a TreeIndex<T, Link>),
     NonUnique(&'a TreeIndex<T, Arc<LockFreeSet<Link>>>),
 }
+
+#[derive(Debug)]
+pub struct Difference<AvailableTypes> {
+    pub old: AvailableTypes,
+    pub new: AvailableTypes,
+}
+
+pub trait TableIndex<T> {
+    fn insert(&self, value: T, link: Link) -> Option<Link>;
+    fn remove(&self, value: T, link: Link) -> Option<(T, Link)>;
+}
+
+impl<T> TableIndex<T> for IndexMultiMap<T, Link>
+where
+    T: Eq + Hash + Clone + std::marker::Send + std::cmp::Ord,
+{
+    fn insert(&self, value: T, link: Link) -> Option<Link> {
+        self.insert(value, link)
+    }
+
+    fn remove(&self, value: T, link: Link) -> Option<(T, Link)> {
+        self.remove(&value, &link)
+    }
+}
+
+impl<T> TableIndex<T> for IndexMap<T, Link>
+where
+    T: Eq + Hash + Clone + std::marker::Send + std::cmp::Ord,
+{
+    fn insert(&self, value: T, link: Link) -> Option<Link> {
+        self.insert(value, link)
+    }
+
+    fn remove(&self, value: T, _link: Link) -> Option<(T, Link)> {
+        self.remove(&value)
+    }
+}

src/index/table_secondary_index.rs

@@ -1,48 +1,9 @@
-use data_bucket::Link;
-use indexset::concurrent::map::BTreeMap as IndexMap;
-use indexset::concurrent::multimap::BTreeMultiMap as IndexMultiMap;
 use std::collections::HashMap;
-use std::fmt::Debug;
-use std::hash::Hash;
-
-use crate::WorkTableError;
-
-#[derive(Debug)]
-pub struct Difference<AvailableTypes> {
-    pub old: AvailableTypes,
-    pub new: AvailableTypes,
-}
-
-pub trait TableIndex<T> {
-    fn insert(&self, value: T, link: Link) -> Option<Link>;
-    fn remove(&self, value: T, link: Link) -> Option<(T, Link)>;
-}
-
-impl<T> TableIndex<T> for IndexMultiMap<T, Link>
-where
-    T: Eq + Hash + Clone + std::marker::Send + std::cmp::Ord,
-{
-    fn insert(&self, value: T, link: Link) -> Option<Link> {
-        self.insert(value, link)
-    }
 
-    fn remove(&self, value: T, link: Link) -> Option<(T, Link)> {
-        self.remove(&value, &link)
-    }
-}
-
-impl<T> TableIndex<T> for IndexMap<T, Link>
-where
-    T: Eq + Hash + Clone + std::marker::Send + std::cmp::Ord,
-{
-    fn insert(&self, value: T, link: Link) -> Option<Link> {
-        self.insert(value, link)
-    }
+use data_bucket::Link;
 
-    fn remove(&self, value: T, _link: Link) -> Option<(T, Link)> {
-        self.remove(&value)
-    }
-}
+use crate::Difference;
+use crate::WorkTableError;
 
 pub trait TableSecondaryIndex<Row, AvailableTypes>
 where

src/table/mod.rs

@@ -45,7 +45,7 @@ pub struct WorkTable<
 
     pub pk_phantom: PhantomData<PrimaryKey>,
 
-    pub available_types_phantom: PhantomData<AvailableTypes>,
+    pub types_phantom: PhantomData<AvailableTypes>,
 }
 
 // Manual implementations to avoid unneeded trait bounds.
@@ -67,7 +67,7 @@ where
             lock_map: LockMap::new(),
             table_name: "",
             pk_phantom: PhantomData,
-            available_types_phantom: PhantomData,
+            types_phantom: PhantomData,
         }
     }
 }