more fixes for complex properties

Author: fabianmurariu

db4-storage/src/pages/edge_store.rs

@@ -20,7 +20,7 @@ use parking_lot::{RwLock, RwLockWriteGuard};
 use raphtory_api::core::entities::{EID, VID, properties::meta::Meta};
 use raphtory_core::{
     entities::{ELID, LayerIds},
-    storage::timeindex::{AsTime, TimeIndexEntry, TimeIndexOps},
+    storage::timeindex::{AsTime, TimeIndexEntry},
 };
 use rayon::prelude::*;
 

db4-storage/src/pages/locked/nodes.rs

@@ -45,7 +45,7 @@ impl<'a, EXT, NS: NodeSegmentOps<Extension = EXT>> LockedNodePage<'a, NS> {
     }
 
     pub fn vacuum(&mut self) {
-        self.page.vacuum(self.lock.deref_mut());
+        let _ = self.page.vacuum(self.lock.deref_mut());
     }
 
     #[inline(always)]

db4-storage/src/pages/test_utils/fixtures.rs

@@ -55,11 +55,8 @@ pub fn make_edges(num_edges: usize, num_nodes: usize) -> impl Strategy<Value = F
 
 pub fn make_nodes(num_nodes: usize) -> impl Strategy<Value = NodeFixture> {
     assert!(num_nodes > 0);
-    let schema = proptest::collection::hash_map(
-        (0i32..1000).prop_map(|i| i.to_string()),
-        prop_type(),
-        0..30,
-    );
+    let schema =
+        proptest::collection::hash_map((0i32..10).prop_map(|i| i.to_string()), prop_type(), 0..30);
 
     schema.prop_flat_map(move |schema| {
         let (t_props, c_props) = make_props(&schema);

db4-storage/src/pages/test_utils/props.rs

@@ -20,8 +20,9 @@ pub fn prop_type() -> impl Strategy<Value = PropType> {
     ]);
 
     leaf.prop_recursive(3, 10, 10, |inner| {
-        let dict = proptest::collection::hash_map(r"\w{1,10}", inner.clone(), 1..10)
-            .prop_map(PropType::map);
+        let keys = (0..1_000_000).prop_map(|i| format!("k_{i}"));
+        let dict =
+            proptest::collection::hash_map(keys, inner.clone(), 1..10).prop_map(PropType::map);
         let list = inner
             .clone()
             .prop_map(|p_type| PropType::List(Box::new(p_type)));

db4-storage/src/segments/edge.rs

@@ -9,7 +9,7 @@ use crate::{
     segments::edge_entry::MemEdgeRef,
     utils::Iter4,
 };
-use arrow_array::{Array, ArrayRef, BooleanArray};
+use arrow_array::{ArrayRef, BooleanArray};
 use parking_lot::lock_api::ArcRwLockReadGuard;
 use raphtory_api::core::entities::{
     VID,

db4-storage/src/segments/mod.rs

@@ -76,10 +76,6 @@ impl PageIndex {
     fn par_iter(&self) -> impl IndexedParallelIterator<Item = Option<usize>> {
         self.0.par_iter().map(|i| i.index())
     }
-
-    fn len(&self) -> usize {
-        self.0.len()
-    }
 }
 
 #[derive(Default)]

raphtory-api/src/core/entities/properties/prop/prop_enum.rs

@@ -28,7 +28,6 @@ use thiserror::Error;
 
 #[cfg(feature = "arrow")]
 use crate::core::entities::properties::prop::prop_array::*;
-use crate::core::entities::properties::prop::unify_types;
 
 pub const DECIMAL_MAX: i128 = 99999999999999999999999999999999999999i128; // equivalent to parquet decimal(38, 0)
 

raphtory-core/src/storage/lazy_vec.rs

@@ -1,7 +1,6 @@
 use arrow_array::BooleanArray;
-use raphtory_api::iter::BoxedLIter;
 use serde::{Deserialize, Serialize};
-use std::{fmt::Debug, iter};
+use std::fmt::Debug;
 
 #[derive(thiserror::Error, Debug, PartialEq)]
 #[error("Cannot set previous value '{previous_value:?}' to '{new_value:?}' in position '{index}'")]
@@ -275,24 +274,6 @@ where
         LazyVec::LazyVec1(A::default(), TupleCol::from(inner))
     }
 
-    pub(crate) fn filled_ids(&self) -> BoxedLIter<'_, usize> {
-        match self {
-            LazyVec::Empty => Box::new(iter::empty()),
-            LazyVec::LazyVec1(_, tuples) => Box::new(
-                tuples
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(id, value)| value.map(|_| id)),
-            ),
-            LazyVec::LazyVecN(_, vector) => Box::new(
-                vector
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(id, value)| value.map(|_| id)),
-            ),
-        }
-    }
-
     #[cfg(test)]
     fn iter(&self) -> Box<dyn Iterator<Item = &A> + Send + '_> {
         match self {
@@ -465,8 +446,6 @@ mod lazy_vec_tests {
         })
         .unwrap();
         assert_eq!(vec.get(9), Some(&1));
-
-        assert_eq!(vec.filled_ids().collect_vec(), vec![1, 5, 6, 8, 9]);
     }
 
     #[test]

raphtory-storage/src/mutation/addition_ops_ext.rs

@@ -19,7 +19,6 @@ use raphtory_core::{
     storage::timeindex::TimeIndexEntry,
 };
 use storage::{
-    api::{edges::EdgeSegmentOps, nodes::NodeSegmentOps},
     pages::{node_page::writer::node_info_as_props, session::WriteSession},
     persist::strategy::PersistentStrategy,
     properties::props_meta_writer::PropsMetaWriter,

raphtory/src/algorithms/dynamics/temporal/epidemics.rs

@@ -29,7 +29,7 @@ pub struct Probability(f64);
 
 impl Probability {
     pub fn sample<R: Rng + ?Sized>(self, rng: &mut R) -> bool {
-        rng.gen_bool(self.0)
+        rng.random_bool(self.0)
     }
 }