edges const prop iter do not aligh keys with values

Author: fabianmurariu

raphtory/src/core/mod.rs

@@ -163,6 +163,11 @@ impl PartialOrd for Prop {
 }
 
 impl Prop {
+    pub fn map(vals: impl IntoIterator<Item = (impl Into<ArcStr>, Prop)>) -> Self {
+        let h_map: HashMap<_, _> = vals.into_iter().map(|(k, v)| (k.into(), v)).collect();
+        Prop::Map(h_map.into())
+    }
+
     pub fn from_arr<TT: ArrowPrimitiveType>(vals: Vec<TT::Native>) -> Self
     where
         arrow_array::PrimitiveArray<TT>: From<Vec<TT::Native>>,

raphtory/src/db/api/properties/constant_props.rs

@@ -21,7 +21,7 @@ impl<'a, P: ConstPropertiesOps + Sync> ConstantProperties<'a, P> {
         self.props.const_prop_keys()
     }
 
-    pub fn values(&self) -> BoxedLIter<Prop> {
+    pub fn values(&self) -> BoxedLIter<Option<Prop>> {
         self.props.const_prop_values()
     }
 
@@ -55,7 +55,11 @@ impl<'a, P: ConstPropertiesOps + Sync + 'a> IntoIterator for ConstantProperties<
         Box::new(GenLockedIter::from(self, |const_prop| {
             let keys = const_prop.keys();
             let vals = const_prop.values();
-            Box::new(keys.into_iter().zip(vals))
+            Box::new(
+                keys.into_iter()
+                    .zip(vals)
+                    .filter_map(|(k, v)| Some((k, v?))),
+            )
         }))
     }
 }
@@ -67,7 +71,11 @@ impl<'a, P: ConstPropertiesOps + Sync> IntoIterator for &'a ConstantProperties<'
     fn into_iter(self) -> Self::IntoIter {
         let keys = self.keys();
         let vals = self.values();
-        Box::new(keys.into_iter().zip(vals))
+        Box::new(
+            keys.into_iter()
+                .zip(vals)
+                .filter_map(|(k, v)| Some((k, v?))),
+        )
     }
 }
 

raphtory/src/db/api/properties/internal.rs

@@ -53,8 +53,8 @@ pub trait ConstPropertiesOps: Send + Sync {
     fn const_prop_keys(&self) -> BoxedLIter<ArcStr> {
         Box::new(self.const_prop_ids().map(|id| self.get_const_prop_name(id)))
     }
-    fn const_prop_values(&self) -> BoxedLIter<Prop> {
-        Box::new(self.const_prop_ids().filter_map(|k| self.get_const_prop(k)))
+    fn const_prop_values(&self) -> BoxedLIter<Option<Prop>> {
+        Box::new(self.const_prop_ids().map(|k| self.get_const_prop(k)))
     }
     fn get_const_prop(&self, id: usize) -> Option<Prop>;
 }
@@ -173,7 +173,7 @@ where
     }
 
     #[inline]
-    fn const_prop_values(&self) -> BoxedLIter<Prop> {
+    fn const_prop_values(&self) -> BoxedLIter<Option<Prop>> {
         self.base().const_prop_values()
     }
 

raphtory/src/db/graph/graph.rs

@@ -425,6 +425,7 @@ mod db_tests {
         db::{
             api::{
                 properties::internal::{ConstPropertiesOps, TemporalPropertiesRowView},
+                storage::graph::edges::edge_storage_ops::EdgeStorageOps,
                 view::{
                     internal::{CoreGraphOps, EdgeFilterOps, TimeSemantics},
                     time::internal::InternalTimeOps,
@@ -442,7 +443,7 @@ mod db_tests {
     use itertools::Itertools;
     use quickcheck_macros::quickcheck;
     use raphtory_api::core::{
-        entities::{GID, VID},
+        entities::{EID, GID, VID},
         storage::{
             arc_str::{ArcStr, OptionAsStr},
             timeindex::TimeIndexEntry,
@@ -457,6 +458,56 @@ mod db_tests {
     use tempfile::TempDir;
     use tracing::{error, info};
 
+    #[test]
+    fn edge_const_props() {
+        let g = Graph::new();
+
+        g.add_edge(0, 0, 0, NO_PROPS, None);
+        g.add_edge(0, 0, 1, NO_PROPS, None);
+
+        g.edge(0, 0)
+            .unwrap()
+            .update_constant_properties(
+                vec![("x".to_string(), Prop::map([("n", Prop::U64(23))]))],
+                None,
+            )
+            .unwrap();
+        g.edge(0, 1)
+            .unwrap()
+            .update_constant_properties(
+                vec![(
+                    "a".to_string(),
+                    Prop::map([("a", Prop::U8(1)), ("b", Prop::str("baa"))]),
+                )],
+                None,
+            )
+            .unwrap();
+
+        let e1 = g.edge(0, 0).unwrap();
+        let actual = e1
+            .properties()
+            .constant()
+            .iter()
+            .map(|(k, v)| (k.to_string(), v))
+            .collect::<Vec<_>>();
+        assert!(actual.contains(&("x".to_string(), Prop::map([("n", Prop::U64(23))]))));
+
+        let e2 = g.edge(0, 1).unwrap();
+        let actual = e2
+            .properties()
+            .constant()
+            .iter()
+            .map(|(k, v)| (k.to_string(), v))
+            .collect::<Vec<_>>();
+        assert_eq!(
+            actual,
+            vec![(
+                "a".to_string(),
+                Prop::map([("b", Prop::str("baa")), ("a", Prop::U8(1))])
+            )]
+        );
+    }
+
     #[test]
     fn test_empty_graph() {
         let graph = Graph::new();
@@ -486,7 +537,7 @@ mod db_tests {
             );
             assert_eq!(
                 graph.const_prop_values().collect::<Vec<_>>(),
-                Vec::<Prop>::new()
+                Vec::<Option<Prop>>::new()
             );
             assert!(graph.constant_prop(1).is_none());
             assert!(graph.get_const_prop_id("1").is_none());

raphtory/src/python/graph/properties/constant_props.rs

@@ -60,7 +60,7 @@ impl PyConstantProperties {
     ///
     /// Returns:
     ///     list | Array: the property values
-    pub fn values(&self) -> Vec<Prop> {
+    pub fn values(&self) -> Vec<Option<Prop>> {
         self.props.values().collect()
     }