impl edge node filtering, add few tests

Author: shivamka1

raphtory/src/db/graph/views/filter/edge_field_filtered_graph.rs

@@ -0,0 +1,92 @@
+use crate::{
+    db::{
+        api::{
+            properties::internal::InheritPropertiesOps,
+            view::internal::{
+                Immutable, InheritEdgeHistoryFilter, InheritEdgeLayerFilterOps,
+                InheritExplodedEdgeFilterOps, InheritLayerOps, InheritListOps, InheritMaterialize,
+                InheritNodeFilterOps, InheritNodeHistoryFilter, InheritStorageOps,
+                InheritTimeSemantics, InternalEdgeFilterOps, Static,
+            },
+        },
+        graph::views::filter::model::{edge_filter::Endpoint, node_filter::CompositeNodeFilter},
+    },
+    prelude::GraphViewOps,
+};
+use raphtory_api::{core::entities::LayerIds, inherit::Base};
+use raphtory_storage::{
+    core_ops::InheritCoreGraphOps,
+    graph::edges::{edge_ref::EdgeStorageRef, edge_storage_ops::EdgeStorageOps},
+};
+
+#[derive(Debug, Clone)]
+pub struct EdgeNodeFilteredGraph<G> {
+    graph: G,
+    endpoint: Endpoint,
+    filter: CompositeNodeFilter,
+}
+
+impl<G> EdgeNodeFilteredGraph<G> {
+    #[inline]
+    pub fn new(graph: G, endpoint: Endpoint, node_cf: CompositeNodeFilter) -> Self {
+        Self {
+            graph,
+            endpoint,
+            filter: node_cf,
+        }
+    }
+}
+
+impl<G> Base for EdgeNodeFilteredGraph<G> {
+    type Base = G;
+    #[inline]
+    fn base(&self) -> &Self::Base {
+        &self.graph
+    }
+}
+
+impl<G> Static for EdgeNodeFilteredGraph<G> {}
+impl<G> Immutable for EdgeNodeFilteredGraph<G> {}
+
+impl<'graph, G: GraphViewOps<'graph>> InheritCoreGraphOps for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritStorageOps for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritLayerOps for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritListOps for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritMaterialize for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritNodeFilterOps for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritPropertiesOps for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritTimeSemantics for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritNodeHistoryFilter for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritEdgeHistoryFilter for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritEdgeLayerFilterOps for EdgeNodeFilteredGraph<G> {}
+impl<'graph, G: GraphViewOps<'graph>> InheritExplodedEdgeFilterOps for EdgeNodeFilteredGraph<G> {}
+
+impl<'graph, G: GraphViewOps<'graph>> InternalEdgeFilterOps for EdgeNodeFilteredGraph<G> {
+    #[inline]
+    fn internal_edge_filtered(&self) -> bool {
+        true
+    }
+
+    #[inline]
+    fn internal_edge_list_trusted(&self) -> bool {
+        false
+    }
+
+    #[inline]
+    fn internal_filter_edge(&self, edge: EdgeStorageRef, layer_ids: &LayerIds) -> bool {
+        if !self.graph.internal_filter_edge(edge, layer_ids) {
+            return false;
+        }
+
+        // Fetch the endpoint node and delegate to the node composite filter.
+        let ok = match self.endpoint {
+            Endpoint::Src => self
+                .filter
+                .matches_node(&self.graph, self.graph.core_node(edge.src()).as_ref()),
+            Endpoint::Dst => self
+                .filter
+                .matches_node(&self.graph, self.graph.core_node(edge.dst()).as_ref()),
+        };
+        ok
+    }
+}

raphtory/src/db/graph/views/filter/edge_node_filtered_graph.rs

@@ -107,14 +107,12 @@ mod test_edge_property_filtered_graph {
                 views::{
                     deletion_graph::PersistentGraph,
                     filter::model::{
-                        edge_filter::{EdgeFilter, EdgeFilterOps},
-                        property_filter::PropertyFilterOps,
+                        edge_filter::EdgeFilter, property_filter::PropertyFilterOps,
                         ComposableFilter, PropertyFilterFactory,
                     },
                 },
             },
         },
-        errors::GraphError,
         prelude::*,
         test_utils::{
             build_edge_deletions, build_edge_list, build_graph_from_edge_list, build_window,

raphtory/src/db/graph/views/filter/edge_property_filtered_graph.rs

@@ -10,9 +10,8 @@ use crate::{
                 InheritTimeSemantics, InternalExplodedEdgeFilterOps, Static,
             },
         },
-        graph::views::filter::{internal::CreateFilter, model::edge_filter::ExplodedEdgeFilter},
+        graph::views::filter::model::exploded_edge_filter::ExplodedEdgeFilter,
     },
-    errors::GraphError,
     prelude::{GraphViewOps, LayerOps, PropertyFilter},
 };
 use raphtory_api::{
@@ -53,22 +52,6 @@ impl<'graph, G: GraphViewOps<'graph>> ExplodedEdgePropertyFilteredGraph<G> {
     }
 }
 
-impl CreateFilter for PropertyFilter<ExplodedEdgeFilter> {
-    type EntityFiltered<'graph, G: GraphViewOps<'graph>> = ExplodedEdgePropertyFilteredGraph<G>;
-
-    fn create_filter<'graph, G: GraphViewOps<'graph>>(
-        self,
-        graph: G,
-    ) -> Result<Self::EntityFiltered<'graph, G>, GraphError> {
-        let prop_id = self.resolve_prop_id(graph.edge_meta(), graph.num_layers() > 1)?;
-        Ok(ExplodedEdgePropertyFilteredGraph::new(
-            graph.clone(),
-            prop_id,
-            self,
-        ))
-    }
-}
-
 impl<G> Base for ExplodedEdgePropertyFilteredGraph<G> {
     type Base = G;
 
@@ -158,8 +141,9 @@ mod test_exploded_edge_property_filtered_graph {
                         exploded_edge_property_filter::ExplodedEdgePropertyFilteredGraph,
                         internal::CreateFilter,
                         model::{
-                            edge_filter::ExplodedEdgeFilter, property_filter::PropertyFilterOps,
-                            PropertyFilterFactory, TryAsCompositeFilter,
+                            exploded_edge_filter::ExplodedEdgeFilter,
+                            property_filter::PropertyFilterOps, PropertyFilterFactory,
+                            TryAsCompositeFilter,
                         },
                     },
                 },