Merge branch 'docbrownv4_merge' of github.com:Pometry/Raphtory into vacuum

Author: fabubaker

raphtory-benchmark/benches/edge_add.rs

@@ -1,6 +1,6 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 use rand::{
-    distributions::{Alphanumeric, DistString},
+    distr::{Alphanumeric, SampleString},
     rng, Rng,
 };
 use raphtory::prelude::*;

raphtory-benchmark/benches/tgraph_benchmarks.rs

@@ -1,5 +1,5 @@
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
-use rand::{distributions::Uniform, Rng};
+use rand::{distr::Uniform, Rng};
 use raphtory::core::entities::nodes::structure::adjset::AdjSet;
 use sorted_vector_map::SortedVectorSet;
 use std::collections::BTreeSet;
@@ -10,7 +10,7 @@ fn btree_set_u64(c: &mut Criterion) {
         group.throughput(Throughput::Elements(*size as u64));
 
         let mut rng = rand::rng();
-        let range = Uniform::new(u64::MIN, u64::MAX);
+        let range = Uniform::new(u64::MIN, u64::MAX).unwrap();
         let init_vals: Vec<u64> = (&mut rng).sample_iter(&range).take(*size).collect();
 
         group.bench_with_input(
@@ -50,7 +50,8 @@ fn bm_tadjset(c: &mut Criterion) {
         group.throughput(Throughput::Elements(*size as u64));
 
         let mut rng = rand::rng();
-        let range = Uniform::new(0, size * 10);
+        let range = Uniform::new(0, size * 10).unwrap();
+
         let init_srcs: Vec<usize> = (&mut rng)
             .sample_iter(&range)
             .take(*size as usize)
@@ -59,7 +60,7 @@ fn bm_tadjset(c: &mut Criterion) {
             .sample_iter(&range)
             .take(*size as usize)
             .collect();
-        let t_range = Uniform::new(1646838523i64, 1678374523);
+        let t_range = Uniform::new(1646838523i64, 1678374523).unwrap();
         let init_time: Vec<i64> = (&mut rng)
             .sample_iter(&t_range)
             .take(*size as usize)

raphtory-benchmark/src/common/mod.rs

@@ -8,7 +8,7 @@ use criterion::{
 use rand::{distr::Uniform, seq::*, Rng, SeedableRng};
 use raphtory::{db::api::view::StaticGraphViewOps, prelude::*};
 use raphtory_api::core::utils::logging::global_info_logger;
-use std::{collections::HashSet, path::PathBuf};
+use std::collections::HashSet;
 use tempfile::TempDir;
 use tracing::info;
 

raphtory/src/algorithms/dynamics/temporal/epidemics.rs

@@ -10,8 +10,12 @@ use crate::{
     prelude::*,
 };
 use indexmap::IndexSet;
-use rand::{distr::Bernoulli, seq::IteratorRandom, Rng};
-use rand_distr::{Distribution, Exp};
+use rand::{
+    distr::{Bernoulli, Distribution},
+    seq::IteratorRandom,
+    Rng,
+};
+use rand_distr::Exp;
 use raphtory_core::utils::time::ParseTimeError;
 use std::{
     cmp::Reverse,
@@ -258,8 +262,8 @@ mod test {
         algorithms::dynamics::temporal::epidemics::{temporal_SEIR, Number},
         prelude::*,
     };
-    use rand::{rngs::SmallRng, Rng, SeedableRng};
-    use rand_distr::{Distribution, Exp};
+    use rand::{distr::Distribution, rngs::SmallRng, Rng, SeedableRng};
+    use rand_distr::Exp;
     use raphtory_api::core::utils::logging::global_info_logger;
     use rayon::prelude::*;
     use stats::{mean, stddev};

raphtory/src/db/api/state/node_state_ord_ops.rs

@@ -434,15 +434,16 @@ where
 mod test {
     use crate::db::api::state::node_state_ord_ops::{par_top_k, top_k};
 
-    use rand; // 0.8.5
-
-    use rand::distr::{Distribution, Uniform};
+    use rand::{
+        distr::{Distribution, Uniform},
+        Rng,
+    };
     use tokio::time::Instant;
 
     fn gen_x_ints(
         count: u32,
         distribution: impl Distribution<u32>,
-        rng: &mut (impl rand::Rng + ?Sized),
+        rng: &mut (impl Rng + ?Sized),
     ) -> Vec<u32> {
         let mut results = Vec::with_capacity(count as usize);
         let iter = distribution.sample_iter(rng);

raphtory/src/serialise/graph_folder.rs

@@ -1,7 +1,7 @@
 use crate::{
     db::api::view::MaterializedGraph,
     errors::GraphError,
-    prelude::{GraphViewOps, PropertiesOps},
+    prelude::{Graph, GraphViewOps, PropertiesOps},
     serialise::{metadata::GraphMetadata, serialise::StableDecode},
 };
 use std::{
@@ -122,9 +122,20 @@ impl GraphFolder {
                             "Metadata file does not exist or is invalid. Attempting to recreate..."
                         );
 
-                        let graph: MaterializedGraph = MaterializedGraph::decode(self, None)?;
+                        // Either decode a graph serialized using encode or load using underlying storage.
+                        let graph = if MaterializedGraph::is_decodable(self.get_graph_path()) {
+                            MaterializedGraph::decode(self, None)?
+                        } else {
+                            // We currently do not have a way of figuring out the graph type
+                            // from storage, so for now default to an EventGraph.
+                            let graph = Graph::load_from_path(self.get_graph_path());
+                            MaterializedGraph::EventGraph(graph)
+                        };
 
                         self.write_metadata(&graph)?;
+
+                        info!("Metadata file recreated successfully");
+
                         Ok(self.try_read_metadata()?)
                     }
                     _ => Err(e.into()),
@@ -296,10 +307,8 @@ impl From<&GraphFolder> for GraphFolder {
     }
 }
 
-// this mod focuses on the zip format, as the folder format is
-// the default and is largely exercised in other places
 #[cfg(test)]
-mod zip_tests {
+mod tests {
     use super::*;
     use crate::{
         db::graph::graph::assert_graph_equal,