From d47a2bcd9c2e3bd7214012ec4dc696184208ff70 Mon Sep 17 00:00:00 2001 From: Fabian Murariu Date: Wed, 26 Jun 2024 17:22:12 +0100 Subject: [PATCH] fixes for benches --- Cargo.lock | 1 + pometry-storage-private | 2 +- raphtory-benchmark/Cargo.toml | 1 + raphtory-benchmark/benches/graph_ops.rs | 2 +- raphtory/src/db/api/storage/storage_ops.rs | 3 --- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 993fa9ae7e..ecba55f5a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4472,6 +4472,7 @@ dependencies = [ "pometry-storage", "rand 0.8.5", "raphtory", + "raphtory-api", "raphtory-graphql", "rayon", "sorted_vector_map", diff --git a/pometry-storage-private b/pometry-storage-private index 7a99bad373..daf72073f4 160000 --- a/pometry-storage-private +++ b/pometry-storage-private @@ -1 +1 @@ -Subproject commit 7a99bad37344cbbf985b842d989771edea135387 +Subproject commit daf72073f4a3dbdc3824b50ac15f3399f0686bb3 diff --git a/raphtory-benchmark/Cargo.toml b/raphtory-benchmark/Cargo.toml index f9f773c1a4..af908f34bc 100644 --- a/raphtory-benchmark/Cargo.toml +++ b/raphtory-benchmark/Cargo.toml @@ -8,6 +8,7 @@ edition = "2021" [dependencies] criterion = { workspace = true } raphtory = { path = "../raphtory", features = ["io"] } +raphtory-api = { path = "../raphtory-api" } raphtory-graphql = { path = "../raphtory-graphql", version = "0.9.3" } pometry-storage.workspace = true sorted_vector_map = { workspace = true } diff --git a/raphtory-benchmark/benches/graph_ops.rs b/raphtory-benchmark/benches/graph_ops.rs index 9aee4f630c..9ac99c52d8 100644 --- a/raphtory-benchmark/benches/graph_ops.rs +++ b/raphtory-benchmark/benches/graph_ops.rs @@ -1,13 +1,13 @@ use common::run_graph_ops_benches; use criterion::{criterion_group, criterion_main, Criterion}; use raphtory::{ - core::utils::hashing::calculate_hash, graph_loader::{ example::sx_superuser_graph::{sx_superuser_file, sx_superuser_graph, TEdge}, source::csv_loader::CsvLoader, }, prelude::*, }; +use raphtory_api::core::utils::hashing::calculate_hash; mod common; diff --git a/raphtory/src/db/api/storage/storage_ops.rs b/raphtory/src/db/api/storage/storage_ops.rs index 5250bad8bf..50ccdaf35b 100644 --- a/raphtory/src/db/api/storage/storage_ops.rs +++ b/raphtory/src/db/api/storage/storage_ops.rs @@ -232,9 +232,6 @@ impl GraphStorage { .as_ref() .map_or(true, |type_filter| type_filter[node.node_type_id()]); let s = view.filter_node(self.node(vid).as_ref(), view.layer_ids()); - - println!("name = {:?}, id = {}, r = {}, s = {}", n, i, r, s); - r && s }) }