fixex for Send and Sync iterators

Pometry · Dec 13, 2024 · a3e5126 · a3e5126
1 parent 01d1dd6
commit a3e5126
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 25 deletions.
diff --git a/raphtory-api/src/core/storage/timeindex.rs b/raphtory-api/src/core/storage/timeindex.rs
@@ -24,12 +24,11 @@ pub trait AsTime: fmt::Debug + Copy + Ord + Eq + Send + Sync + 'static {
 }
 
 pub trait TimeIndexLike: TimeIndexOps {
-    fn range_iter(
-        &self,
-        w: Range<Self::IndexType>,
-    ) -> Box<dyn Iterator<Item = Self::IndexType> + Send + '_>;
+    fn range_iter(&self, w: Range<Self::IndexType>) -> BoxedLIter<Self::IndexType>;
 
-    fn first_range(&self, w: Range<Self::IndexType>) -> Option<Self::IndexType>;
+    fn first_range(&self, w: Range<Self::IndexType>) -> Option<Self::IndexType> {
+        self.range_iter(w).next()
+    }
 
     fn last_range(&self, w: Range<Self::IndexType>) -> Option<Self::IndexType>;
 }

diff --git a/raphtory/src/core/entities/properties/tcell.rs b/raphtory/src/core/entities/properties/tcell.rs
@@ -157,17 +157,10 @@ impl<A: Sync + Send> TCell<A> {
 }
 
 impl<A: Send + Sync> TimeIndexLike for TCell<A> {
-    fn range_iter(
-        &self,
-        w: Range<Self::IndexType>,
-    ) -> Box<dyn Iterator<Item = Self::IndexType> + Send + '_> {
+    fn range_iter(&self, w: Range<Self::IndexType>) -> BoxedLIter<Self::IndexType> {
         Box::new(self.iter_window(w).map(|(ti, _)| *ti))
     }
 
-    fn first_range(&self, w: Range<Self::IndexType>) -> Option<Self::IndexType> {
-        self.iter_window(w).next().map(|(ti, _)| *ti)
-    }
-
     fn last_range(&self, w: Range<Self::IndexType>) -> Option<Self::IndexType> {
         self.iter_window(w).next_back().map(|(ti, _)| *ti)
     }
@@ -236,7 +229,7 @@ impl<A: Send + Sync> TimeIndexOps for TCell<A> {
         }
     }
 
-    fn iter(&self) -> Box<dyn Iterator<Item = Self::IndexType> + Send + '_> {
+    fn iter(&self) -> BoxedLIter<Self::IndexType> {
         match self {
             TCell::Empty => Box::new(std::iter::empty()),
             TCell::TCell1(t, _) => Box::new(std::iter::once(*t)),

diff --git a/raphtory/src/core/storage/node_entry.rs b/raphtory/src/core/storage/node_entry.rs
@@ -69,7 +69,7 @@ impl<'a> NodeEntry<'a> {
     pub fn into_rows_window(
         self,
         w: Range<TimeIndexEntry>,
-    ) -> impl Iterator<Item = (TimeIndexEntry, Row<'a>)> {
+    ) -> impl Iterator<Item = (TimeIndexEntry, Row<'a>)> + Send + Sync {
         let tcell = &self.node.timestamps().props_ts;
         tcell.range(w).iter_values().filter_map(move |(t, row)| {
             let row = MemRow::new(self.t_props_log, row);

diff --git a/raphtory/src/core/storage/timeindex.rs b/raphtory/src/core/storage/timeindex.rs
@@ -130,10 +130,7 @@ impl<T: AsTime> TimeIndex<T> {
 }
 
 impl<T: AsTime> TimeIndexLike for TimeIndex<T> {
-    fn range_iter(
-        &self,
-        w: Range<Self::IndexType>,
-    ) -> Box<dyn Iterator<Item = Self::IndexType> + Send + '_> {
+    fn range_iter(&self, w: Range<Self::IndexType>) -> BoxedLIter<Self::IndexType> {
         Box::new(self.range_iter(w))
     }
 
@@ -154,7 +151,7 @@ pub enum TimeIndexWindow<'a, T: AsTime, TI> {
 }
 
 impl<'a, A: Copy + Send + Sync> TimeIndexWindow<'a, TimeIndexEntry, TCell<A>> {
-    pub fn iter_values(self) -> Box<dyn Iterator<Item = (TimeIndexEntry, A)> + Send + 'a> {
+    pub fn iter_values(self) -> Box<dyn Iterator<Item = (TimeIndexEntry, A)> + Send + Sync + 'a> {
         match self {
             TimeIndexWindow::Empty => Box::new(iter::empty()),
             TimeIndexWindow::TimeIndexRange { timeindex, range } => {

diff --git a/raphtory/src/db/api/view/internal/core_ops.rs b/raphtory/src/db/api/view/internal/core_ops.rs
@@ -368,7 +368,7 @@ impl TimeIndexOps for NodeTimestamps {
             .or_else(|| last.or(other))
     }
 
-    fn iter(&self) -> Box<dyn Iterator<Item = Self::IndexType> + Send + '_> {
+    fn iter(&self) -> BoxedLIter<Self::IndexType> {
         Box::new(
             self.edge_ts
                 .iter()
@@ -383,10 +383,7 @@ impl TimeIndexOps for NodeTimestamps {
 }
 
 impl TimeIndexLike for NodeTimestamps {
-    fn range_iter(
-        &self,
-        w: Range<Self::IndexType>,
-    ) -> Box<dyn Iterator<Item = Self::IndexType> + Send + '_> {
+    fn range_iter(&self, w: Range<Self::IndexType>) -> BoxedLIter<Self::IndexType> {
         Box::new(
             self.edge_ts
                 .range_iter(w.clone())