From b98c9b94ca1c31ecbb6aa30c49950ad39bae71ce Mon Sep 17 00:00:00 2001 From: Aidar Samerkhanov Date: Thu, 27 Apr 2023 13:34:10 +0000 Subject: [PATCH] Fix build of full memgraph --- tests/benchmark/expansion.cpp | 24 +++--- tests/benchmark/query/eval.cpp | 15 ++-- tests/benchmark/query/execution.cpp | 118 ++++++++++++++-------------- tests/benchmark/query/planner.cpp | 32 ++++---- tests/manual/query_planner.cpp | 10 +-- tests/manual/single_query.cpp | 2 +- 6 files changed, 101 insertions(+), 100 deletions(-) diff --git a/tests/benchmark/expansion.cpp b/tests/benchmark/expansion.cpp index 5ff412eea..db43b3c6b 100644 --- a/tests/benchmark/expansion.cpp +++ b/tests/benchmark/expansion.cpp @@ -1,4 +1,4 @@ -// Copyright 2022 Memgraph Ltd. +// Copyright 2023 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source @@ -15,34 +15,34 @@ #include "query/config.hpp" #include "query/interpreter.hpp" #include "query/typed_value.hpp" +#include "storage/v2/inmemory/storage.hpp" #include "storage/v2/isolation_level.hpp" -#include "storage/v2/storage.hpp" class ExpansionBenchFixture : public benchmark::Fixture { protected: - std::optional db; + std::unique_ptr db; std::optional interpreter_context; std::optional interpreter; std::filesystem::path data_directory{std::filesystem::temp_directory_path() / "expansion-benchmark"}; void SetUp(const benchmark::State &state) override { - db.emplace(); + db.reset(new memgraph::storage::InMemoryStorage()); auto label = db->NameToLabel("Starting"); { auto dba = db->Access(); - for (int i = 0; i < state.range(0); i++) dba.CreateVertex(); + for (int i = 0; i < state.range(0); i++) dba->CreateVertex(); // the fixed part is one vertex expanding to 1000 others - auto start = dba.CreateVertex(); - MG_ASSERT(start.AddLabel(label).HasValue()); - auto edge_type = dba.NameToEdgeType("edge_type"); + auto start = dba->CreateVertex(); + MG_ASSERT(start->AddLabel(label).HasValue()); + auto edge_type = dba->NameToEdgeType("edge_type"); for (int i = 0; i < 1000; i++) { - auto dest = dba.CreateVertex(); - MG_ASSERT(dba.CreateEdge(&start, &dest, edge_type).HasValue()); + auto dest = dba->CreateVertex(); + MG_ASSERT(dba->CreateEdge(start.get(), dest.get(), edge_type).HasValue()); } - MG_ASSERT(!dba.Commit().HasError()); + MG_ASSERT(!dba->Commit().HasError()); } MG_ASSERT(!db->CreateIndex(label).HasError()); @@ -54,7 +54,7 @@ class ExpansionBenchFixture : public benchmark::Fixture { void TearDown(const benchmark::State &) override { interpreter = std::nullopt; interpreter_context = std::nullopt; - db = std::nullopt; + db.reset(nullptr); std::filesystem::remove_all(data_directory); } }; diff --git a/tests/benchmark/query/eval.cpp b/tests/benchmark/query/eval.cpp index 7320c0cc7..321169c7b 100644 --- a/tests/benchmark/query/eval.cpp +++ b/tests/benchmark/query/eval.cpp @@ -1,4 +1,4 @@ -// Copyright 2022 Memgraph Ltd. +// Copyright 2023 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source @@ -14,6 +14,7 @@ #include "query/db_accessor.hpp" #include "query/interpret/eval.hpp" #include "query/interpreter.hpp" +#include "storage/v2/inmemory/storage.hpp" #include "storage/v2/storage.hpp" // The following classes are wrappers for memgraph::utils::MemoryResource, so that we can @@ -38,9 +39,9 @@ static void MapLiteral(benchmark::State &state) { memgraph::query::SymbolTable symbol_table; TMemory memory; memgraph::query::Frame frame(symbol_table.max_position(), memory.get()); - memgraph::storage::Storage db; - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); std::unordered_map elements; for (int64_t i = 0; i < state.range(0); ++i) { elements.emplace(ast.GetPropertyIx("prop" + std::to_string(i)), ast.Create(i)); @@ -67,9 +68,9 @@ static void AdditionOperator(benchmark::State &state) { memgraph::query::SymbolTable symbol_table; TMemory memory; memgraph::query::Frame frame(symbol_table.max_position(), memory.get()); - memgraph::storage::Storage db; - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); memgraph::query::Expression *expr = ast.Create(0); for (int64_t i = 0; i < state.range(0); ++i) { expr = ast.Create(expr, ast.Create(i)); diff --git a/tests/benchmark/query/execution.cpp b/tests/benchmark/query/execution.cpp index 69aedaff9..010bd170d 100644 --- a/tests/benchmark/query/execution.cpp +++ b/tests/benchmark/query/execution.cpp @@ -1,4 +1,4 @@ -// Copyright 2022 Memgraph Ltd. +// Copyright 2023 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source @@ -30,7 +30,7 @@ #include "query/frontend/semantic/required_privileges.hpp" #include "query/frontend/semantic/symbol_generator.hpp" #include "query/interpreter.hpp" -#include "storage/v2/storage.hpp" +#include "storage/v2/inmemory/storage.hpp" // The following classes are wrappers for memgraph::utils::MemoryResource, so that we can // use BENCHMARK_TEMPLATE @@ -62,8 +62,8 @@ class PoolResource final { static void AddVertices(memgraph::storage::Storage *db, int vertex_count) { auto dba = db->Access(); - for (int i = 0; i < vertex_count; i++) dba.CreateVertex(); - MG_ASSERT(!dba.Commit().HasError()); + for (int i = 0; i < vertex_count; i++) dba->CreateVertex(); + MG_ASSERT(!dba->Commit().HasError()); } static const char *kStartLabel = "start"; @@ -71,17 +71,17 @@ static const char *kStartLabel = "start"; static void AddStarGraph(memgraph::storage::Storage *db, int spoke_count, int depth) { { auto dba = db->Access(); - auto center_vertex = dba.CreateVertex(); - MG_ASSERT(center_vertex.AddLabel(dba.NameToLabel(kStartLabel)).HasValue()); + auto center_vertex = dba->CreateVertex(); + MG_ASSERT(center_vertex->AddLabel(dba->NameToLabel(kStartLabel)).HasValue()); for (int i = 0; i < spoke_count; ++i) { - auto prev_vertex = center_vertex; + auto prev_vertex = std::move(center_vertex); for (int j = 0; j < depth; ++j) { - auto dest = dba.CreateVertex(); - MG_ASSERT(dba.CreateEdge(&prev_vertex, &dest, dba.NameToEdgeType("Type")).HasValue()); - prev_vertex = dest; + auto dest = dba->CreateVertex(); + MG_ASSERT(dba->CreateEdge(prev_vertex.get(), dest.get(), dba->NameToEdgeType("Type")).HasValue()); + prev_vertex = std::move(dest); } } - MG_ASSERT(!dba.Commit().HasError()); + MG_ASSERT(!dba->Commit().HasError()); } MG_ASSERT(!db->CreateIndex(db->NameToLabel(kStartLabel)).HasError()); } @@ -89,21 +89,21 @@ static void AddStarGraph(memgraph::storage::Storage *db, int spoke_count, int de static void AddTree(memgraph::storage::Storage *db, int vertex_count) { { auto dba = db->Access(); - std::vector vertices; + std::vector> vertices; vertices.reserve(vertex_count); - auto root = dba.CreateVertex(); - MG_ASSERT(root.AddLabel(dba.NameToLabel(kStartLabel)).HasValue()); - vertices.push_back(root); + auto root = dba->CreateVertex(); + MG_ASSERT(root->AddLabel(dba->NameToLabel(kStartLabel)).HasValue()); + vertices.push_back(std::move(root)); // NOLINTNEXTLINE(cert-msc32-c,cert-msc51-cpp) std::mt19937_64 rg(42); for (int i = 1; i < vertex_count; ++i) { - auto v = dba.CreateVertex(); + auto v = dba->CreateVertex(); std::uniform_int_distribution<> dis(0U, vertices.size() - 1U); auto &parent = vertices.at(dis(rg)); - MG_ASSERT(dba.CreateEdge(&parent, &v, dba.NameToEdgeType("Type")).HasValue()); - vertices.push_back(v); + MG_ASSERT(dba->CreateEdge(parent.get(), v.get(), dba->NameToEdgeType("Type")).HasValue()); + vertices.push_back(std::move(v)); } - MG_ASSERT(!dba.Commit().HasError()); + MG_ASSERT(!dba->Commit().HasError()); } MG_ASSERT(!db->CreateIndex(db->NameToLabel(kStartLabel)).HasError()); } @@ -124,16 +124,16 @@ template static void Distinct(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddVertices(&db, state.range(0)); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddVertices(db.get(), state.range(0)); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); auto query_string = "MATCH (s) RETURN DISTINCT s"; auto *cypher_query = ParseCypherQuery(query_string, &ast); auto symbol_table = memgraph::query::MakeSymbolTable(cypher_query); auto context = memgraph::query::plan::MakePlanningContext(&ast, &symbol_table, cypher_query, &dba); auto plan_and_cost = memgraph::query::plan::MakeLogicalPlan(&context, parameters, false); - ResultStreamFaker results(&db); + ResultStreamFaker results(db.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -174,12 +174,12 @@ template static void ExpandVariable(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddStarGraph(&db, state.range(0), state.range(1)); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddStarGraph(db.get(), state.range(0), state.range(1)); memgraph::query::SymbolTable symbol_table; auto expand_variable = MakeExpandVariable(memgraph::query::EdgeAtom::Type::DEPTH_FIRST, &symbol_table); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -213,12 +213,12 @@ template static void ExpandBfs(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddTree(&db, state.range(0)); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddTree(db.get(), state.range(0)); memgraph::query::SymbolTable symbol_table; auto expand_variable = MakeExpandVariable(memgraph::query::EdgeAtom::Type::BREADTH_FIRST, &symbol_table); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -246,14 +246,14 @@ template static void ExpandShortest(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddTree(&db, state.range(0)); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddTree(db.get(), state.range(0)); memgraph::query::SymbolTable symbol_table; auto expand_variable = MakeExpandVariable(memgraph::query::EdgeAtom::Type::BREADTH_FIRST, &symbol_table); expand_variable.common_.existing_node = true; auto dest_symbol = expand_variable.common_.node_symbol; - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -284,8 +284,8 @@ template static void ExpandWeightedShortest(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddTree(&db, state.range(0)); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddTree(db.get(), state.range(0)); memgraph::query::SymbolTable symbol_table; auto expand_variable = MakeExpandVariable(memgraph::query::EdgeAtom::Type::WEIGHTED_SHORTEST_PATH, &symbol_table); expand_variable.common_.existing_node = true; @@ -293,8 +293,8 @@ static void ExpandWeightedShortest(benchmark::State &state) { symbol_table.CreateSymbol("edge", false), symbol_table.CreateSymbol("vertex", false), ast.Create(1)}; auto dest_symbol = expand_variable.common_.node_symbol; - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -327,8 +327,8 @@ template static void Accumulate(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddVertices(&db, state.range(1)); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddVertices(db.get(), state.range(1)); memgraph::query::SymbolTable symbol_table; auto scan_all = std::make_shared(nullptr, symbol_table.CreateSymbol("v", false)); std::vector symbols; @@ -338,8 +338,8 @@ static void Accumulate(benchmark::State &state) { } memgraph::query::plan::Accumulate accumulate(scan_all, symbols, /* advance_command= */ false); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -368,8 +368,8 @@ template static void Aggregate(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddVertices(&db, state.range(1)); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddVertices(db.get(), state.range(1)); memgraph::query::SymbolTable symbol_table; auto scan_all = std::make_shared(nullptr, symbol_table.CreateSymbol("v", false)); std::vector symbols; @@ -387,8 +387,8 @@ static void Aggregate(benchmark::State &state) { symbol_table.CreateSymbol("out" + std::to_string(i), false)}); } memgraph::query::plan::Aggregate aggregate(scan_all, aggregations, group_by, symbols); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -421,8 +421,8 @@ template static void OrderBy(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddVertices(&db, state.range(1)); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddVertices(db.get(), state.range(1)); memgraph::query::SymbolTable symbol_table; auto scan_all = std::make_shared(nullptr, symbol_table.CreateSymbol("v", false)); std::vector symbols; @@ -437,8 +437,8 @@ static void OrderBy(benchmark::State &state) { sort_items.push_back({memgraph::query::Ordering::ASC, ast.Create(rand_value)}); } memgraph::query::plan::OrderBy order_by(scan_all, sort_items, symbols); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -467,16 +467,16 @@ template static void Unwind(benchmark::State &state) { memgraph::query::AstStorage ast; memgraph::query::Parameters parameters; - memgraph::storage::Storage db; - AddVertices(&db, state.range(0)); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + AddVertices(db.get(), state.range(0)); memgraph::query::SymbolTable symbol_table; auto scan_all = std::make_shared(nullptr, symbol_table.CreateSymbol("v", false)); auto list_sym = symbol_table.CreateSymbol("list", false); auto *list_expr = ast.Create("list")->MapTo(list_sym); auto out_sym = symbol_table.CreateSymbol("out", false); memgraph::query::plan::Unwind unwind(scan_all, list_expr, out_sym); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); // We need to only set the memory for temporary (per pull) evaluations TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; @@ -503,7 +503,7 @@ template // NOLINTNEXTLINE(google-runtime-references) static void Foreach(benchmark::State &state) { memgraph::query::AstStorage ast; - memgraph::storage::Storage db; + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); memgraph::query::SymbolTable symbol_table; auto list_sym = symbol_table.CreateSymbol("list", false); auto *list_expr = ast.Create("list")->MapTo(list_sym); @@ -512,8 +512,8 @@ static void Foreach(benchmark::State &state) { std::make_shared(nullptr, memgraph::query::plan::NodeCreationInfo{}); auto foreach = std::make_shared(nullptr, std::move(create_node), list_expr, out_sym); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); TMemory per_pull_memory; memgraph::query::EvaluationContext evaluation_context{per_pull_memory.get()}; while (state.KeepRunning()) { diff --git a/tests/benchmark/query/planner.cpp b/tests/benchmark/query/planner.cpp index b73258a87..1648ebd6d 100644 --- a/tests/benchmark/query/planner.cpp +++ b/tests/benchmark/query/planner.cpp @@ -17,7 +17,7 @@ #include "query/plan/cost_estimator.hpp" #include "query/plan/planner.hpp" #include "query/plan/vertex_count_cache.hpp" -#include "storage/v2/storage.hpp" +#include "storage/v2/inmemory/storage.hpp" // Add chained MATCH (node1) -- (node2), MATCH (node2) -- (node3) ... clauses. static memgraph::query::CypherQuery *AddChainedMatches(int num_matches, memgraph::query::AstStorage &storage) { @@ -43,9 +43,9 @@ static memgraph::query::CypherQuery *AddChainedMatches(int num_matches, memgraph } static void BM_PlanChainedMatches(benchmark::State &state) { - memgraph::storage::Storage db; - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); while (state.KeepRunning()) { state.PauseTiming(); memgraph::query::AstStorage storage; @@ -98,24 +98,24 @@ static auto CreateIndexedVertices(int index_count, int vertex_count, memgraph::s auto dba = db->Access(); for (int vi = 0; vi < vertex_count; ++vi) { for (int index = 0; index < index_count; ++index) { - auto vertex = dba.CreateVertex(); - MG_ASSERT(vertex.AddLabel(label).HasValue()); - MG_ASSERT(vertex.SetProperty(prop, memgraph::storage::PropertyValue(index)).HasValue()); + auto vertex = dba->CreateVertex(); + MG_ASSERT(vertex->AddLabel(label).HasValue()); + MG_ASSERT(vertex->SetProperty(prop, memgraph::storage::PropertyValue(index)).HasValue()); } } - MG_ASSERT(!dba.Commit().HasError()); + MG_ASSERT(!dba->Commit().HasError()); return std::make_pair("label", "prop"); } static void BM_PlanAndEstimateIndexedMatching(benchmark::State &state) { - memgraph::storage::Storage db; + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); std::string label; std::string prop; int index_count = state.range(0); int vertex_count = state.range(1); - std::tie(label, prop) = CreateIndexedVertices(index_count, vertex_count, &db); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + std::tie(label, prop) = CreateIndexedVertices(index_count, vertex_count, db.get()); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); memgraph::query::Parameters parameters; while (state.KeepRunning()) { state.PauseTiming(); @@ -137,14 +137,14 @@ static void BM_PlanAndEstimateIndexedMatching(benchmark::State &state) { } static void BM_PlanAndEstimateIndexedMatchingWithCachedCounts(benchmark::State &state) { - memgraph::storage::Storage db; + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); std::string label; std::string prop; int index_count = state.range(0); int vertex_count = state.range(1); - std::tie(label, prop) = CreateIndexedVertices(index_count, vertex_count, &db); - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + std::tie(label, prop) = CreateIndexedVertices(index_count, vertex_count, db.get()); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); auto vertex_counts = memgraph::query::plan::MakeVertexCountCache(&dba); memgraph::query::Parameters parameters; while (state.KeepRunning()) { diff --git a/tests/manual/query_planner.cpp b/tests/manual/query_planner.cpp index 67875734b..700b70a7a 100644 --- a/tests/manual/query_planner.cpp +++ b/tests/manual/query_planner.cpp @@ -1,4 +1,4 @@ -// Copyright 2022 Memgraph Ltd. +// Copyright 2023 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source @@ -13,16 +13,16 @@ #include -#include "storage/v2/storage.hpp" +#include "storage/v2/inmemory/storage.hpp" DECLARE_int32(min_log_level); int main(int argc, char *argv[]) { gflags::ParseCommandLineFlags(&argc, &argv, true); spdlog::set_level(spdlog::level::err); - memgraph::storage::Storage db; - auto storage_dba = db.Access(); - memgraph::query::DbAccessor dba(&storage_dba); + std::unique_ptr db(new memgraph::storage::InMemoryStorage()); + auto storage_dba = db->Access(); + memgraph::query::DbAccessor dba(storage_dba.get()); RunInteractivePlanning(&dba); return 0; } diff --git a/tests/manual/single_query.cpp b/tests/manual/single_query.cpp index d9bdac10b..806ae7b03 100644 --- a/tests/manual/single_query.cpp +++ b/tests/manual/single_query.cpp @@ -13,8 +13,8 @@ #include "license/license.hpp" #include "query/config.hpp" #include "query/interpreter.hpp" +#include "storage/v2/inmemory/storage.hpp" #include "storage/v2/isolation_level.hpp" -#include "storage/v2/storage.hpp" #include "utils/on_scope_exit.hpp" int main(int argc, char *argv[]) {