Merge branch 'master' into disk_node_perf

Pometry · Nov 28, 2024 · 367b06c · 367b06c
2 parents 73e7bac + cc14fff
commit 367b06c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/raphtory/src/db/api/view/graph.rs b/raphtory/src/db/api/view/graph.rs
@@ -340,11 +340,6 @@ impl<'graph, G: BoxableGraphView + Sized + Clone + 'graph> GraphViewOps<'graph>
     }
 
     fn subgraph<I: IntoIterator<Item = V>, V: AsNodeRef>(&self, nodes: I) -> NodeSubgraph<G> {
-        let _layer_ids = self.layer_ids();
-        let nodes: FxHashSet<VID> = nodes
-            .into_iter()
-            .flat_map(|v| (&self).node(v).map(|v| v.node))
-            .collect();
         NodeSubgraph::new(self.clone(), nodes)
     }
 

diff --git a/raphtory/src/db/graph/views/node_subgraph.rs b/raphtory/src/db/graph/views/node_subgraph.rs
@@ -1,5 +1,5 @@
 use crate::{
-    core::entities::{LayerIds, VID},
+    core::entities::{nodes::node_ref::AsNodeRef, LayerIds, VID},
     db::api::{
         properties::internal::InheritPropertiesOps,
         state::Index,
@@ -50,11 +50,14 @@ impl<'graph, G: GraphViewOps<'graph>> InheritMaterialize for NodeSubgraph<G> {}
 impl<'graph, G: GraphViewOps<'graph>> InheritLayerOps for NodeSubgraph<G> {}
 
 impl<'graph, G: GraphViewOps<'graph>> NodeSubgraph<G> {
-    pub fn new(graph: G, nodes: impl IntoIterator<Item = VID>) -> Self {
+    pub fn new(graph: G, nodes: impl IntoIterator<Item = impl AsNodeRef>) -> Self {
+        let nodes = nodes
+            .into_iter()
+            .flat_map(|v| graph.internalise_node(v.as_node_ref()));
         let mut nodes: Vec<_> = if graph.nodes_filtered() {
-            nodes.into_iter().filter(|n| graph.has_node(*n)).collect()
+            nodes.filter(|n| graph.has_node(*n)).collect()
         } else {
-            nodes.into_iter().collect()
+            nodes.collect()
         };
         nodes.sort();
         let nodes = Index::new(nodes, graph.unfiltered_num_nodes());