rid nodetypefilteredgraph

Author: shivamka1

raphtory/src/db/api/view/graph.rs

@@ -19,7 +19,7 @@ use crate::{
             views::{
                 cached_view::CachedView,
                 filter::{
-                    model::TryAsCompositeFilter, node_type_filtered_graph::NodeTypeFilteredGraph,
+                    model::TryAsCompositeFilter,
                 },
                 node_subgraph::NodeSubgraph,
                 valid_graph::ValidGraph,
@@ -50,6 +50,8 @@ use raphtory_storage::{
 use rayon::prelude::*;
 use rustc_hash::FxHashSet;
 use std::sync::{atomic::Ordering, Arc};
+use crate::db::api::state::ops::NodeTypeFilterOp;
+use crate::db::graph::views::filter::node_filtered_graph::NodeFilteredGraph;
 
 /// This trait GraphViewOps defines operations for accessing
 /// information about a graph. The trait has associated types
@@ -80,7 +82,7 @@ pub trait GraphViewOps<'graph>: BoxableGraphView + Sized + Clone + 'graph {
     fn subgraph_node_types<I: IntoIterator<Item = V>, V: AsRef<str>>(
         &self,
         nodes_types: I,
-    ) -> NodeTypeFilteredGraph<Self>;
+    ) -> NodeFilteredGraph<Self, NodeTypeFilterOp>;
 
     fn exclude_nodes<I: IntoIterator<Item = V>, V: AsNodeRef>(
         &self,
@@ -443,10 +445,8 @@ impl<'graph, G: GraphView + 'graph> GraphViewOps<'graph> for G {
     fn subgraph_node_types<I: IntoIterator<Item = V>, V: AsRef<str>>(
         &self,
         node_types: I,
-    ) -> NodeTypeFilteredGraph<Self> {
-        let node_types_filter =
-            create_node_type_filter(self.node_meta().node_type_meta(), node_types);
-        NodeTypeFilteredGraph::new(self.clone(), node_types_filter)
+    ) -> NodeFilteredGraph<Self, NodeTypeFilterOp> {
+        NodeFilteredGraph::new(self.clone(), NodeTypeFilterOp::new_from_values(node_types, self))
     }
 
     fn exclude_nodes<I: IntoIterator<Item = V>, V: AsNodeRef>(&self, nodes: I) -> NodeSubgraph<G> {

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

@@ -5,7 +5,6 @@ pub mod exploded_edge_property_filter;
 pub(crate) mod internal;
 pub mod model;
 pub(crate) mod node_filtered_graph;
-pub mod node_type_filtered_graph;
 pub mod not_filtered_graph;
 pub mod or_filtered_graph;
 

raphtory/src/db/graph/views/filter/model/mod.rs

@@ -6,7 +6,7 @@ use crate::db::graph::views::filter::model::node_filter::{
     InternalNodeFilterBuilderOps, InternalNodeIdFilterBuilderOps,
 };
 use crate::db::graph::views::filter::model::property_filter::{
-    CombinedFilter, InternalPropertyFilterBuilderOps, Op, OpChainBuilder, PropertyFilterOps,
+    CombinedFilter, InternalPropertyFilterBuilderOps, OpChainBuilder, PropertyFilterOps,
     PropertyRef,
 };
 use crate::db::graph::views::window_graph::WindowedGraph;

raphtory/src/db/graph/views/filter/model/node_filter.rs

@@ -1,3 +1,4 @@
+use crate::db::api::state::ops::filter::NodeNameFilterOp;
 use crate::{
     db::{
         api::{
@@ -19,7 +20,6 @@ use crate::{
                 Filter, FilterValue, NotFilter, OrFilter, TryAsCompositeFilter, Windowed, Wrap,
             },
             node_filtered_graph::NodeFilteredGraph,
-            node_type_filtered_graph::NodeTypeFilteredGraph,
         },
     },
     errors::GraphError,
@@ -28,7 +28,6 @@ use crate::{
 use raphtory_api::core::entities::{GidType, GID};
 use raphtory_core::utils::time::IntoTime;
 use std::{fmt, fmt::Display, ops::Deref, sync::Arc};
-use crate::db::api::state::ops::filter::NodeNameFilterOp;
 
 #[derive(Debug, Clone)]
 pub struct NodeIdFilter(pub Filter);
@@ -82,7 +81,7 @@ impl From<Filter> for NodeNameFilter {
 }
 
 impl CreateFilter for NodeNameFilter {
-    type EntityFiltered<'graph, G: GraphViewOps<'graph>> = NodeFilteredGraph<G,NodeNameFilterOp>;
+    type EntityFiltered<'graph, G: GraphViewOps<'graph>> = NodeFilteredGraph<G, NodeNameFilterOp>;
 
     type NodeFilter<'graph, G: GraphView + 'graph> = NodeNameFilterOp;
 
@@ -117,7 +116,7 @@ impl From<Filter> for NodeTypeFilter {
 }
 
 impl CreateFilter for NodeTypeFilter {
-    type EntityFiltered<'graph, G: GraphViewOps<'graph>> = NodeTypeFilteredGraph<G>;
+    type EntityFiltered<'graph, G: GraphViewOps<'graph>> = NodeFilteredGraph<G, NodeTypeFilterOp>;
 
     type NodeFilter<'graph, G: GraphView + 'graph> = NodeTypeFilterOp;
 
@@ -132,7 +131,10 @@ impl CreateFilter for NodeTypeFilter {
             .iter()
             .map(|k| self.0.matches(Some(k))) // TODO: _default check
             .collect::<Vec<_>>();
-        Ok(NodeTypeFilteredGraph::new(graph, node_types_filter.into()))
+        Ok(NodeFilteredGraph::new(
+            graph,
+            TypeId.mask(node_types_filter.into()),
+        ))
     }
 
     fn create_node_filter<'graph, G: GraphView + 'graph>(