less string clones in node lookups

Pometry · Jul 2, 2024 · 61c2e42 · 61c2e42
1 parent fd400bc
commit 61c2e42
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 11 deletions.
diff --git a/pometry-storage-private b/pometry-storage-private
diff --git a/python/src/lib.rs b/python/src/lib.rs
@@ -1,5 +1,3 @@
-#![allow(non_local_definitions)]
-
 extern crate core;
 use pyo3::prelude::*;
 use raphtory_core::python::packages::base_modules::{

diff --git a/raphtory/src/disk_graph/graph_impl/core_ops.rs b/raphtory/src/disk_graph/graph_impl/core_ops.rs
@@ -33,7 +33,7 @@ use crate::{
 };
 use itertools::Itertools;
 use polars_arrow::datatypes::ArrowDataType;
-use pometry_storage::{properties::ConstProps, GidRef, GID};
+use pometry_storage::{properties::ConstProps, GidRef};
 use raphtory_api::core::{input::input_node::InputNode, storage::arc_str::ArcStr};
 use rayon::prelude::*;
 
@@ -121,8 +121,8 @@ impl CoreGraphOps for DiskGraph {
     fn internalise_node(&self, v: NodeRef) -> Option<VID> {
         match v {
             NodeRef::Internal(vid) => Some(vid),
-            NodeRef::External(vid) => self.inner.find_node(&GID::U64(vid)),
-            NodeRef::ExternalStr(string) => self.inner.find_node(&GID::Str(string.into())),
+            NodeRef::External(vid) => self.inner.find_node(GidRef::U64(vid)),
+            NodeRef::ExternalStr(string) => self.inner.find_node(GidRef::Str(string)),
         }
     }
 

diff --git a/raphtory/src/disk_graph/query/mod.rs b/raphtory/src/disk_graph/query/mod.rs
@@ -38,7 +38,7 @@ impl NodeSource {
             NodeSource::ExternalIds(ext_ids) => Box::new(
                 ext_ids
                     .into_iter()
-                    .filter_map(move |gid| graph.inner.find_node(&gid)),
+                    .filter_map(move |gid| graph.inner.find_node(gid.as_ref())),
             ),
         }
     }

diff --git a/raphtory/src/python/graph/mod.rs b/raphtory/src/python/graph/mod.rs
@@ -1,5 +1,3 @@
-#![allow(non_local_definitions)]
-
 pub mod algorithm_result;
 #[cfg(feature = "storage")]
 pub mod disk_graph;

diff --git a/raphtory/src/python/types/macros/trait_impl/node_state.rs b/raphtory/src/python/types/macros/trait_impl/node_state.rs
@@ -1,4 +1,3 @@
-#![allow(non_local_definitions)]
 use crate::{
     core::entities::nodes::node_ref::NodeRef,
     db::{

diff --git a/raphtory/src/python/types/wrappers/document.rs b/raphtory/src/python/types/wrappers/document.rs
@@ -1,4 +1,3 @@
-#![allow(non_local_definitions)]
 use crate::core::{DocumentInput, Lifespan};
 use itertools::Itertools;
 use pyo3::{exceptions::PyAttributeError, prelude::*, types::PyTuple};