fix tests failing

Pometry · Jan 23, 2025 · 2f02c36 · 2f02c36
1 parent 0380159
commit 2f02c36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/raphtory/src/io/arrow/df_loaders.rs b/raphtory/src/io/arrow/df_loaders.rs
@@ -147,8 +147,6 @@ pub(crate) fn load_nodes_from_df<
     Ok(())
 }
 
-pub const NO_COLS: Option<&[&str]> = None;
-
 pub(crate) fn load_edges_from_df<
     G: StaticGraphViewOps + InternalPropertyAdditionOps + InternalAdditionOps + InternalCache,
 >(
@@ -629,7 +627,7 @@ mod tests {
         db::graph::graph::assert_graph_equal,
         io::arrow::{
             dataframe::{DFChunk, DFView},
-            df_loaders::{load_edges_from_df, NO_COLS},
+            df_loaders::load_edges_from_df,
         },
         prelude::*,
         test_utils::build_edge_list,
@@ -855,7 +853,7 @@ mod tests {
             let df_view = build_df(chunk_size, &edges);
             let g = Graph::new();
             let props = ["str_prop", "int_prop"];
-            load_edges_from_df(df_view, "time", "src", "dst", Some(&props), NO_COLS, None, None, None, &g).unwrap();
+            load_edges_from_df(df_view, "time", "src", "dst", Some(&props), None::<&[String]>, None, None, None, &g).unwrap();
             let g2 = Graph::new();
             for (src, dst, time, str_prop, int_prop) in edges {
                 g2.add_edge(time, src, dst, [("str_prop", str_prop.clone().into_prop()), ("int_prop", int_prop.into_prop())], None).unwrap();
@@ -875,7 +873,7 @@ mod tests {
             let cache_file = TempDir::new().unwrap();
             g.cache(cache_file.path()).unwrap();
             let props = ["str_prop", "int_prop"];
-            load_edges_from_df(df_view, "time", "src", "dst", Some(&props), NO_COLS, None, None, None, &g).unwrap();
+            load_edges_from_df(df_view, "time", "src", "dst", Some(&props), None::<&[String]>, None, None, None, &g).unwrap();
             let g = Graph::load_cached(cache_file.path()).unwrap();
             let g2 = Graph::new();
             for (src, dst, time, str_prop, int_prop) in edges {

diff --git a/raphtory/src/io/arrow/mod.rs b/raphtory/src/io/arrow/mod.rs
@@ -55,7 +55,7 @@ mod test {
             "src",
             "dst",
             Some(&["prop1", "prop2"]),
-            NO_COLS,
+            None::<&[String]>,
             None,
             layer_name,
             layer_col,

diff --git a/raphtory/src/serialise/parquet/mod.rs b/raphtory/src/serialise/parquet/mod.rs
@@ -7,13 +7,9 @@ use crate::{
         },
         graph::views::deletion_graph::PersistentGraph,
     },
-    io::{
-        arrow::df_loaders::NO_COLS,
-        parquet_loaders::{
-            load_edge_deletions_from_parquet, load_edge_props_from_parquet,
-            load_edges_from_parquet, load_graph_props_from_parquet, load_node_props_from_parquet,
-            load_nodes_from_parquet,
-        },
+    io::parquet_loaders::{
+        load_edge_deletions_from_parquet, load_edge_props_from_parquet, load_edges_from_parquet,
+        load_graph_props_from_parquet, load_node_props_from_parquet, load_nodes_from_parquet,
     },
     prelude::*,
     serialise::parquet::{
@@ -292,7 +288,7 @@ fn decode_graph_storage(
             SRC_COL,
             DST_COL,
             Some(&t_prop_columns),
-            NO_COLS,
+            None::<&[String]>,
             None,
             None,
             Some(LAYER_COL),