diff --git a/src/query/db_accessor.cpp b/src/query/db_accessor.cpp index 7412067ff..cef047a24 100644 --- a/src/query/db_accessor.cpp +++ b/src/query/db_accessor.cpp @@ -129,10 +129,10 @@ query::Graph *SubgraphDbAccessor::getGraph() { return graph_; } VertexAccessor SubgraphVertexAccessor::GetVertexAccessor() const { return impl_; } -auto SubgraphVertexAccessor::OutEdges(storage::View view) const -> decltype(impl_.OutEdges(view)) { +storage::Result SubgraphVertexAccessor::OutEdges(storage::View view) const { auto maybe_edges = impl_.impl_.OutEdges(view, {}); if (maybe_edges.HasError()) return maybe_edges.GetError(); - auto edges = std::move(*maybe_edges); + auto edges = std::move(maybe_edges->edges); const auto &graph_edges = graph_->edges(); std::vector filteredOutEdges; @@ -143,13 +143,18 @@ auto SubgraphVertexAccessor::OutEdges(storage::View view) const -> decltype(impl } } - return iter::imap(VertexAccessor::MakeEdgeAccessor, std::move(filteredOutEdges)); + std::vector resulting_edges; + resulting_edges.reserve(filteredOutEdges.size()); + std::ranges::transform(filteredOutEdges, std::back_inserter(resulting_edges), + [](auto const &edge) { return VertexAccessor::MakeEdgeAccessor(edge); }); + + return EdgeVertexAccessorResult{.edges = std::move(resulting_edges), .expanded_count = maybe_edges->expanded_count}; } -auto SubgraphVertexAccessor::InEdges(storage::View view) const -> decltype(impl_.InEdges(view)) { +storage::Result SubgraphVertexAccessor::InEdges(storage::View view) const { auto maybe_edges = impl_.impl_.InEdges(view, {}); if (maybe_edges.HasError()) return maybe_edges.GetError(); - auto edges = std::move(*maybe_edges); + auto edges = std::move(maybe_edges->edges); const auto &graph_edges = graph_->edges(); std::vector filteredOutEdges; @@ -160,7 +165,12 @@ auto SubgraphVertexAccessor::InEdges(storage::View view) const -> decltype(impl_ } } - return iter::imap(VertexAccessor::MakeEdgeAccessor, std::move(filteredOutEdges)); + std::vector resulting_edges; + resulting_edges.reserve(filteredOutEdges.size()); + std::ranges::transform(filteredOutEdges, std::back_inserter(resulting_edges), + [](auto const &edge) { return VertexAccessor::MakeEdgeAccessor(edge); }); + + return EdgeVertexAccessorResult{.edges = std::move(resulting_edges), .expanded_count = maybe_edges->expanded_count}; } } // namespace memgraph::query diff --git a/src/query/db_accessor.hpp b/src/query/db_accessor.hpp index 1794b8308..9e0931a6c 100644 --- a/src/query/db_accessor.hpp +++ b/src/query/db_accessor.hpp @@ -105,6 +105,11 @@ class EdgeAccessor final { bool operator!=(const EdgeAccessor &e) const noexcept { return !(*this == e); } }; +struct EdgeVertexAccessorResult { + std::vector edges; + int64_t expanded_count; +}; + class VertexAccessor final { public: storage::VertexAccessor impl_; @@ -153,37 +158,62 @@ class VertexAccessor final { return impl_.ClearProperties(); } - auto InEdges(storage::View view, const std::vector &edge_types) const - -> storage::Result { - auto maybe_edges = impl_.InEdges(view, edge_types); - if (maybe_edges.HasError()) return maybe_edges.GetError(); - return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges)); + storage::Result InEdges(storage::View view, + const std::vector &edge_types) const { + auto maybe_result = impl_.InEdges(view, edge_types); + if (maybe_result.HasError()) return maybe_result.GetError(); + + std::vector edges; + edges.reserve((*maybe_result).edges.size()); + std::ranges::transform((*maybe_result).edges, std::back_inserter(edges), + [](auto const &edge) { return EdgeAccessor(edge); }); + + return EdgeVertexAccessorResult{.edges = edges, .expanded_count = (*maybe_result).expanded_count}; } - auto InEdges(storage::View view) const { return InEdges(view, {}); } + storage::Result InEdges(storage::View view) const { return InEdges(view, {}); } - auto InEdges(storage::View view, const std::vector &edge_types, const VertexAccessor &dest) const - -> storage::Result { - auto maybe_edges = impl_.InEdges(view, edge_types, &dest.impl_); - if (maybe_edges.HasError()) return maybe_edges.GetError(); - return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges)); + storage::Result InEdges(storage::View view, + const std::vector &edge_types, + const VertexAccessor &dest) const { + auto maybe_result = impl_.InEdges(view, edge_types, &dest.impl_); + if (maybe_result.HasError()) return maybe_result.GetError(); + + std::vector edges; + edges.reserve((*maybe_result).edges.size()); + std::ranges::transform((*maybe_result).edges, std::back_inserter(edges), + [](auto const &edge) { return EdgeAccessor(edge); }); + + return EdgeVertexAccessorResult{.edges = edges, .expanded_count = (*maybe_result).expanded_count}; } - auto OutEdges(storage::View view, const std::vector &edge_types) const - -> storage::Result { - auto maybe_edges = impl_.OutEdges(view, edge_types); - if (maybe_edges.HasError()) return maybe_edges.GetError(); - return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges)); + storage::Result OutEdges(storage::View view, + const std::vector &edge_types) const { + auto maybe_result = impl_.OutEdges(view, edge_types); + if (maybe_result.HasError()) return maybe_result.GetError(); + + std::vector edges; + edges.reserve((*maybe_result).edges.size()); + std::ranges::transform((*maybe_result).edges, std::back_inserter(edges), + [](auto const &edge) { return EdgeAccessor(edge); }); + + return EdgeVertexAccessorResult{.edges = edges, .expanded_count = (*maybe_result).expanded_count}; } - auto OutEdges(storage::View view) const { return OutEdges(view, {}); } + storage::Result OutEdges(storage::View view) const { return OutEdges(view, {}); } - auto OutEdges(storage::View view, const std::vector &edge_types, - const VertexAccessor &dest) const - -> storage::Result { - auto maybe_edges = impl_.OutEdges(view, edge_types, &dest.impl_); - if (maybe_edges.HasError()) return maybe_edges.GetError(); - return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges)); + storage::Result OutEdges(storage::View view, + const std::vector &edge_types, + const VertexAccessor &dest) const { + auto maybe_result = impl_.OutEdges(view, edge_types, &dest.impl_); + if (maybe_result.HasError()) return maybe_result.GetError(); + + std::vector edges; + edges.reserve((*maybe_result).edges.size()); + std::ranges::transform((*maybe_result).edges, std::back_inserter(edges), + [](auto const &edge) { return EdgeAccessor(edge); }); + + return EdgeVertexAccessorResult{.edges = edges, .expanded_count = (*maybe_result).expanded_count}; } storage::Result InDegree(storage::View view) const { return impl_.InDegree(view); } @@ -260,7 +290,6 @@ class SubgraphVertexAccessor final { } // namespace memgraph::query namespace std { - template <> struct hash { size_t operator()(const memgraph::query::VertexAccessor &v) const { return std::hash{}(v.impl_); } diff --git a/src/query/dump.cpp b/src/query/dump.cpp index c668b460c..0158d8243 100644 --- a/src/query/dump.cpp +++ b/src/query/dump.cpp @@ -487,8 +487,8 @@ PullPlanDump::PullChunk PullPlanDump::CreateEdgePullChunk() { } auto &maybe_edges = *maybe_edge_iterable; MG_ASSERT(maybe_edges.HasValue(), "Invalid database state!"); - auto current_edge_iter = maybe_current_edge_iter ? *maybe_current_edge_iter : maybe_edges->begin(); - for (; current_edge_iter != maybe_edges->end() && (!n || local_counter < *n); ++current_edge_iter) { + auto current_edge_iter = maybe_current_edge_iter ? *maybe_current_edge_iter : maybe_edges->edges.begin(); + for (; current_edge_iter != maybe_edges->edges.end() && (!n || local_counter < *n); ++current_edge_iter) { std::ostringstream os; DumpEdge(&os, dba_, *current_edge_iter); stream->Result({TypedValue(os.str())}); @@ -496,7 +496,7 @@ PullPlanDump::PullChunk PullPlanDump::CreateEdgePullChunk() { ++local_counter; } - if (current_edge_iter != maybe_edges->end()) { + if (current_edge_iter != maybe_edges->edges.end()) { maybe_current_edge_iter.emplace(current_edge_iter); return std::nullopt; } diff --git a/src/query/dump.hpp b/src/query/dump.hpp index 3ff64e11f..b15a8d9e9 100644 --- a/src/query/dump.hpp +++ b/src/query/dump.hpp @@ -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 @@ -38,7 +38,7 @@ struct PullPlanDump { using VertexAccessorIterableIterator = decltype(std::declval().begin()); using EdgeAccessorIterable = decltype(std::declval().OutEdges(storage::View::OLD)); - using EdgeAccessorIterableIterator = decltype(std::declval().GetValue().begin()); + using EdgeAccessorIterableIterator = decltype(std::declval().GetValue().edges.begin()); VertexAccessorIterable vertices_iterable_; bool internal_index_created_ = false; diff --git a/src/query/plan/operator.cpp b/src/query/plan/operator.cpp index a275cedc6..51024ed1a 100644 --- a/src/query/plan/operator.cpp +++ b/src/query/plan/operator.cpp @@ -680,8 +680,8 @@ bool CheckExistingNode(const VertexAccessor &new_node, const Symbol &existing_no return existing_node.ValueVertex() == new_node; } -template -auto UnwrapEdgesResult(storage::Result &&result) { +template +auto UnwrapEdgesResult(storage::Result &&result) { if (result.HasError()) { switch (result.GetError()) { case storage::Error::DELETED_OBJECT: @@ -725,6 +725,13 @@ std::vector Expand::ModifiedSymbols(const SymbolTable &table) const { Expand::ExpandCursor::ExpandCursor(const Expand &self, utils::MemoryResource *mem) : self_(self), input_cursor_(self.input_->MakeCursor(mem)) {} +Expand::ExpandCursor::ExpandCursor(const Expand &self, int64_t input_degree, int64_t existing_node_degree, + utils::MemoryResource *mem) + : self_(self), + input_cursor_(self.input_->MakeCursor(mem)), + prev_input_degree_(input_degree), + prev_existing_degree_(existing_node_degree) {} + bool Expand::ExpandCursor::Pull(Frame &frame, ExecutionContext &context) { SCOPED_PROFILE_OP("Expand"); @@ -800,58 +807,131 @@ void Expand::ExpandCursor::Reset() { out_edges_it_ = std::nullopt; } +ExpansionInfo Expand::ExpandCursor::GetExpansionInfo(Frame &frame) { + TypedValue &vertex_value = frame[self_.input_symbol_]; + + if (vertex_value.IsNull()) { + return ExpansionInfo{}; + } + + ExpectType(self_.input_symbol_, vertex_value, TypedValue::Type::Vertex); + auto &vertex = vertex_value.ValueVertex(); + + auto direction = self_.common_.direction; + if (!self_.common_.existing_node) { + return ExpansionInfo{.input_node = vertex, .direction = direction}; + } + + TypedValue &existing_node = frame[self_.common_.node_symbol]; + + if (existing_node.IsNull()) { + return ExpansionInfo{.input_node = vertex, .direction = direction}; + } + + ExpectType(self_.common_.node_symbol, existing_node, TypedValue::Type::Vertex); + + auto &existing_vertex = existing_node.ValueVertex(); + + // -1 and -1 -> normal expansion + // -1 and expanded -> can't happen + // expanded and -1 -> reverse + // expanded and expanded -> see if can reverse + if ((prev_input_degree_ == -1 && prev_existing_degree_ == -1) || prev_input_degree_ < prev_existing_degree_) { + return ExpansionInfo{.input_node = vertex, .direction = direction, .existing_node = existing_vertex}; + } + + auto new_direction = direction; + switch (new_direction) { + case EdgeAtom::Direction::IN: + new_direction = EdgeAtom::Direction::OUT; + break; + case EdgeAtom::Direction::OUT: + new_direction = EdgeAtom::Direction::IN; + break; + default: + new_direction = EdgeAtom::Direction::BOTH; + break; + } + + return ExpansionInfo{ + .input_node = existing_vertex, .direction = new_direction, .existing_node = vertex, .reversed = true}; +} + bool Expand::ExpandCursor::InitEdges(Frame &frame, ExecutionContext &context) { // Input Vertex could be null if it is created by a failed optional match. In // those cases we skip that input pull and continue with the next. while (true) { if (!input_cursor_->Pull(frame, context)) return false; - TypedValue &vertex_value = frame[self_.input_symbol_]; - // Null check due to possible failed optional match. - if (vertex_value.IsNull()) continue; + expansion_info_ = GetExpansionInfo(frame); - ExpectType(self_.input_symbol_, vertex_value, TypedValue::Type::Vertex); - auto &vertex = vertex_value.ValueVertex(); + if (!expansion_info_.input_node) { + continue; + } - auto direction = self_.common_.direction; + auto vertex = *expansion_info_.input_node; + auto direction = expansion_info_.direction; + + int64_t num_expanded_first = -1; if (direction == EdgeAtom::Direction::IN || direction == EdgeAtom::Direction::BOTH) { if (self_.common_.existing_node) { - TypedValue &existing_node = frame[self_.common_.node_symbol]; - // old_node_value may be Null when using optional matching - if (!existing_node.IsNull()) { - ExpectType(self_.common_.node_symbol, existing_node, TypedValue::Type::Vertex); + if (expansion_info_.existing_node) { + auto existing_node = *expansion_info_.existing_node; context.db_accessor->PrefetchInEdges(vertex); - in_edges_.emplace( - UnwrapEdgesResult(vertex.InEdges(self_.view_, self_.common_.edge_types, existing_node.ValueVertex()))); + + auto edges_result = UnwrapEdgesResult(vertex.InEdges(self_.view_, self_.common_.edge_types, existing_node)); + in_edges_.emplace(edges_result.edges); + num_expanded_first = edges_result.expanded_count; } } else { context.db_accessor->PrefetchInEdges(vertex); - in_edges_.emplace(UnwrapEdgesResult(vertex.InEdges(self_.view_, self_.common_.edge_types))); + + auto edges_result = UnwrapEdgesResult(vertex.InEdges(self_.view_, self_.common_.edge_types)); + in_edges_.emplace(edges_result.edges); + num_expanded_first = edges_result.expanded_count; } if (in_edges_) { in_edges_it_.emplace(in_edges_->begin()); } } + int64_t num_expanded_second = -1; if (direction == EdgeAtom::Direction::OUT || direction == EdgeAtom::Direction::BOTH) { if (self_.common_.existing_node) { - TypedValue &existing_node = frame[self_.common_.node_symbol]; - // old_node_value may be Null when using optional matching - if (!existing_node.IsNull()) { - ExpectType(self_.common_.node_symbol, existing_node, TypedValue::Type::Vertex); + if (expansion_info_.existing_node) { + auto existing_node = *expansion_info_.existing_node; context.db_accessor->PrefetchOutEdges(vertex); - out_edges_.emplace( - UnwrapEdgesResult(vertex.OutEdges(self_.view_, self_.common_.edge_types, existing_node.ValueVertex()))); + + auto edges_result = UnwrapEdgesResult(vertex.OutEdges(self_.view_, self_.common_.edge_types, existing_node)); + out_edges_.emplace(edges_result.edges); + num_expanded_second = edges_result.expanded_count; } } else { context.db_accessor->PrefetchOutEdges(vertex); - out_edges_.emplace(UnwrapEdgesResult(vertex.OutEdges(self_.view_, self_.common_.edge_types))); + + auto edges_result = UnwrapEdgesResult(vertex.OutEdges(self_.view_, self_.common_.edge_types)); + out_edges_.emplace(edges_result.edges); + num_expanded_second = edges_result.expanded_count; } if (out_edges_) { out_edges_it_.emplace(out_edges_->begin()); } } + if (!expansion_info_.existing_node) { + return true; + } + + num_expanded_first = num_expanded_first == -1 ? 0 : num_expanded_first; + num_expanded_second = num_expanded_second == -1 ? 0 : num_expanded_second; + int64_t total_expanded_edges = num_expanded_first + num_expanded_second; + + if (!expansion_info_.reversed) { + prev_input_degree_ = total_expanded_edges; + } else { + prev_existing_degree_ = total_expanded_edges; + } + return true; } } @@ -911,11 +991,12 @@ auto ExpandFromVertex(const VertexAccessor &vertex, EdgeAtom::Direction directio }; storage::View view = storage::View::OLD; - utils::pmr::vector chain_elements(memory); + utils::pmr::vector chain_elements( + memory); if (direction != EdgeAtom::Direction::OUT) { db_accessor->PrefetchInEdges(vertex); - auto edges = UnwrapEdgesResult(vertex.InEdges(view, edge_types)); + auto edges = UnwrapEdgesResult(vertex.InEdges(view, edge_types)).edges; if (edges.begin() != edges.end()) { chain_elements.emplace_back(wrapper(EdgeAtom::Direction::IN, std::move(edges))); } @@ -923,7 +1004,7 @@ auto ExpandFromVertex(const VertexAccessor &vertex, EdgeAtom::Direction directio if (direction != EdgeAtom::Direction::IN) { db_accessor->PrefetchOutEdges(vertex); - auto edges = UnwrapEdgesResult(vertex.OutEdges(view, edge_types)); + auto edges = UnwrapEdgesResult(vertex.OutEdges(view, edge_types)).edges; if (edges.begin() != edges.end()) { chain_elements.emplace_back(wrapper(EdgeAtom::Direction::OUT, std::move(edges))); } @@ -1283,7 +1364,7 @@ class STShortestPathCursor : public query::plan::Cursor { for (const auto &vertex : source_frontier) { if (self_.common_.direction != EdgeAtom::Direction::IN) { context.db_accessor->PrefetchOutEdges(vertex); - auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)); + auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : out_edges) { #ifdef MG_ENTERPRISE if (license::global_license_checker.IsEnterpriseValidFast() && context.auth_checker && @@ -1310,7 +1391,7 @@ class STShortestPathCursor : public query::plan::Cursor { } if (self_.common_.direction != EdgeAtom::Direction::OUT) { dba.PrefetchInEdges(vertex); - auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)); + auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : in_edges) { #ifdef MG_ENTERPRISE if (license::global_license_checker.IsEnterpriseValidFast() && context.auth_checker && @@ -1351,7 +1432,7 @@ class STShortestPathCursor : public query::plan::Cursor { for (const auto &vertex : sink_frontier) { if (self_.common_.direction != EdgeAtom::Direction::OUT) { context.db_accessor->PrefetchOutEdges(vertex); - auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)); + auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : out_edges) { #ifdef MG_ENTERPRISE if (license::global_license_checker.IsEnterpriseValidFast() && context.auth_checker && @@ -1377,7 +1458,7 @@ class STShortestPathCursor : public query::plan::Cursor { } if (self_.common_.direction != EdgeAtom::Direction::IN) { dba.PrefetchInEdges(vertex); - auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)); + auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : in_edges) { #ifdef MG_ENTERPRISE if (license::global_license_checker.IsEnterpriseValidFast() && context.auth_checker && @@ -1469,12 +1550,12 @@ class SingleSourceShortestPathCursor : public query::plan::Cursor { auto expand_from_vertex = [this, &expand_pair, &context](const auto &vertex) { if (self_.common_.direction != EdgeAtom::Direction::IN) { context.db_accessor->PrefetchOutEdges(vertex); - auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)); + auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : out_edges) expand_pair(edge, edge.To()); } if (self_.common_.direction != EdgeAtom::Direction::OUT) { context.db_accessor->PrefetchInEdges(vertex); - auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)); + auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : in_edges) expand_pair(edge, edge.From()); } }; @@ -1672,14 +1753,14 @@ class ExpandWeightedShortestPathCursor : public query::plan::Cursor { int64_t depth) { if (self_.common_.direction != EdgeAtom::Direction::IN) { context.db_accessor->PrefetchOutEdges(vertex); - auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)); + auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : out_edges) { expand_pair(edge, edge.To(), weight, depth); } } if (self_.common_.direction != EdgeAtom::Direction::OUT) { context.db_accessor->PrefetchInEdges(vertex); - auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)); + auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : in_edges) { expand_pair(edge, edge.From(), weight, depth); } @@ -1938,7 +2019,7 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor { int64_t depth) { if (self_.common_.direction != EdgeAtom::Direction::IN) { context.db_accessor->PrefetchOutEdges(vertex); - auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)); + auto out_edges = UnwrapEdgesResult(vertex.OutEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : out_edges) { #ifdef MG_ENTERPRISE if (license::global_license_checker.IsEnterpriseValidFast() && context.auth_checker && @@ -1953,7 +2034,7 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor { } if (self_.common_.direction != EdgeAtom::Direction::OUT) { context.db_accessor->PrefetchInEdges(vertex); - auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)); + auto in_edges = UnwrapEdgesResult(vertex.InEdges(storage::View::OLD, self_.common_.edge_types)).edges; for (const auto &edge : in_edges) { #ifdef MG_ENTERPRISE if (license::global_license_checker.IsEnterpriseValidFast() && context.auth_checker && diff --git a/src/query/plan/operator.hpp b/src/query/plan/operator.hpp index b17254e8d..d243ba129 100644 --- a/src/query/plan/operator.hpp +++ b/src/query/plan/operator.hpp @@ -764,6 +764,13 @@ struct ExpandCommon { bool existing_node; }; +struct ExpansionInfo { + std::optional input_node; + EdgeAtom::Direction direction; + std::optional existing_node; + bool reversed{false}; +}; + /// Expansion operator. For a node existing in the frame it /// expands one edge and one node and places them on the frame. /// @@ -806,14 +813,16 @@ class Expand : public memgraph::query::plan::LogicalOperator { class ExpandCursor : public Cursor { public: ExpandCursor(const Expand &, utils::MemoryResource *); + ExpandCursor(const Expand &, int64_t input_degree, int64_t existing_node_degree, utils::MemoryResource *); bool Pull(Frame &, ExecutionContext &) override; void Shutdown() override; void Reset() override; + ExpansionInfo GetExpansionInfo(Frame &); private: - using InEdgeT = std::remove_reference_t().InEdges(storage::View::OLD))>; + using InEdgeT = std::vector; using InEdgeIteratorT = decltype(std::declval().begin()); - using OutEdgeT = std::remove_reference_t().OutEdges(storage::View::OLD))>; + using OutEdgeT = std::vector; using OutEdgeIteratorT = decltype(std::declval().begin()); const Expand &self_; @@ -826,6 +835,9 @@ class Expand : public memgraph::query::plan::LogicalOperator { std::optional in_edges_it_; std::optional out_edges_; std::optional out_edges_it_; + ExpansionInfo expansion_info_; + int64_t prev_input_degree_{-1}; + int64_t prev_existing_degree_{-1}; bool InitEdges(Frame &, ExecutionContext &); }; diff --git a/src/query/procedure/mg_procedure_impl.cpp b/src/query/procedure/mg_procedure_impl.cpp index 0f3ab6bbd..f7ced0f3a 100644 --- a/src/query/procedure/mg_procedure_impl.cpp +++ b/src/query/procedure/mg_procedure_impl.cpp @@ -2120,7 +2120,7 @@ mgp_error mgp_vertex_iter_in_edges(mgp_vertex *v, mgp_memory *memory, mgp_edges_ LOG_FATAL("Unexpected error when getting the inbound edges of a vertex."); } } - it->in.emplace(std::move(*maybe_edges)); + it->in.emplace(std::move(maybe_edges->edges)); it->in_it.emplace(it->in->begin()); #ifdef MG_ENTERPRISE if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) { @@ -2180,7 +2180,7 @@ mgp_error mgp_vertex_iter_out_edges(mgp_vertex *v, mgp_memory *memory, mgp_edges } } - it->out.emplace(std::move(*maybe_edges)); + it->out.emplace(std::move(maybe_edges->edges)); it->out_it.emplace(it->out->begin()); #ifdef MG_ENTERPRISE diff --git a/src/query/procedure/mg_procedure_impl.hpp b/src/query/procedure/mg_procedure_impl.hpp index a015103c7..7b5301381 100644 --- a/src/query/procedure/mg_procedure_impl.hpp +++ b/src/query/procedure/mg_procedure_impl.hpp @@ -687,12 +687,14 @@ struct mgp_edges_iterator { memgraph::utils::MemoryResource *memory; mgp_vertex source_vertex; - std::optional(source_vertex.impl).InEdges(source_vertex.graph->view))>> + std::optional(source_vertex.impl) + .InEdges(source_vertex.graph->view) + ->edges)>> in; std::optionalbegin())> in_it; - std::optional(source_vertex.impl).OutEdges(source_vertex.graph->view))>> + std::optional(source_vertex.impl) + .OutEdges(source_vertex.graph->view) + ->edges)>> out; std::optionalbegin())> out_it; std::optional current_e; diff --git a/src/query/trigger_context.cpp b/src/query/trigger_context.cpp index 2f30974e4..5accd17ca 100644 --- a/src/query/trigger_context.cpp +++ b/src/query/trigger_context.cpp @@ -306,7 +306,7 @@ void TriggerContext::AdaptForAccessor(DbAccessor *accessor) { auto maybe_out_edges = maybe_from_vertex->OutEdges(storage::View::OLD); MG_ASSERT(maybe_out_edges.HasValue()); const auto edge_gid = created_edge.object.Gid(); - for (const auto &edge : *maybe_out_edges) { + for (const auto &edge : maybe_out_edges->edges) { if (edge.Gid() == edge_gid) { *it = detail::CreatedObject{edge}; ++it; @@ -327,7 +327,7 @@ void TriggerContext::AdaptForAccessor(DbAccessor *accessor) { accessor->PrefetchOutEdges(*maybe_vertex); auto maybe_out_edges = maybe_vertex->OutEdges(storage::View::OLD); MG_ASSERT(maybe_out_edges.HasValue()); - for (const auto &edge : *maybe_out_edges) { + for (const auto &edge : maybe_out_edges->edges) { if (edge.Gid() == value.object.Gid()) { *it = std::move(value); it->object = edge; diff --git a/src/storage/v2/disk/storage.cpp b/src/storage/v2/disk/storage.cpp index c5aa69e16..fe123799f 100644 --- a/src/storage/v2/disk/storage.cpp +++ b/src/storage/v2/disk/storage.cpp @@ -1178,10 +1178,10 @@ bool DiskStorage::DiskAccessor::PrefetchEdgeFilter(const std::string_view disk_e } MG_ASSERT(edges_res.HasValue()); - auto edges = edges_res.GetValue(); - bool isEdgeAlreadyInMemory = std::any_of(edges.begin(), edges.end(), [edge_gid](const auto &edge_acc) { - return utils::SerializeIdType(edge_acc.Gid()) == edge_gid; - }); + auto edges_result = edges_res.GetValue(); + bool isEdgeAlreadyInMemory = + std::any_of(edges_result.edges.begin(), edges_result.edges.end(), + [edge_gid](const auto &edge_acc) { return utils::SerializeIdType(edge_acc.Gid()) == edge_gid; }); return !isEdgeAlreadyInMemory; } diff --git a/src/storage/v2/durability/snapshot.cpp b/src/storage/v2/durability/snapshot.cpp index 78758ba9e..38018fcd5 100644 --- a/src/storage/v2/durability/snapshot.cpp +++ b/src/storage/v2/durability/snapshot.cpp @@ -1533,14 +1533,14 @@ void CreateSnapshot(Transaction *transaction, const std::filesystem::path &snaps write_mapping(item.first); snapshot.WritePropertyValue(item.second); } - const auto &in_edges = maybe_in_edges.GetValue(); + const auto &in_edges = maybe_in_edges.GetValue().edges; snapshot.WriteUint(in_edges.size()); for (const auto &item : in_edges) { snapshot.WriteUint(item.Gid().AsUint()); snapshot.WriteUint(item.FromVertex().Gid().AsUint()); write_mapping(item.EdgeType()); } - const auto &out_edges = maybe_out_edges.GetValue(); + const auto &out_edges = maybe_out_edges.GetValue().edges; snapshot.WriteUint(out_edges.size()); for (const auto &item : out_edges) { snapshot.WriteUint(item.Gid().AsUint()); diff --git a/src/storage/v2/inmemory/replication/replication_server.cpp b/src/storage/v2/inmemory/replication/replication_server.cpp index 881b66505..95b818f9f 100644 --- a/src/storage/v2/inmemory/replication/replication_server.cpp +++ b/src/storage/v2/inmemory/replication/replication_server.cpp @@ -388,8 +388,8 @@ uint64_t InMemoryReplicationServer::ReadAndApplyDelta(InMemoryStorage *storage, auto edges = from_vertex->OutEdges(View::NEW, {transaction->NameToEdgeType(delta.edge_create_delete.edge_type)}, &*to_vertex); if (edges.HasError()) throw utils::BasicException("Invalid transaction!"); - if (edges->size() != 1) throw utils::BasicException("Invalid transaction!"); - auto &edge = (*edges)[0]; + if (edges->edges.size() != 1) throw utils::BasicException("Invalid transaction!"); + auto &edge = (*edges).edges[0]; auto ret = transaction->DeleteEdge(&edge); if (ret.HasError()) throw utils::BasicException("Invalid transaction!"); break; diff --git a/src/storage/v2/vertex_accessor.cpp b/src/storage/v2/vertex_accessor.cpp index b580191ac..795dfa996 100644 --- a/src/storage/v2/vertex_accessor.cpp +++ b/src/storage/v2/vertex_accessor.cpp @@ -423,7 +423,7 @@ Result> VertexAccessor::Properties(View view return std::move(properties); } -Result> VertexAccessor::InEdges(View view, const std::vector &edge_types, +Result VertexAccessor::InEdges(View view, const std::vector &edge_types, const VertexAccessor *destination) const { MG_ASSERT(!destination || destination->transaction_ == transaction_, "Invalid accessor!"); @@ -445,9 +445,11 @@ Result> VertexAccessor::InEdges(View view, const std:: bool deleted = false; auto in_edges = edge_store{}; Delta *delta = nullptr; + int64_t expanded_count = 0; { auto guard = std::shared_lock{vertex_->lock}; deleted = vertex_->deleted; + expanded_count = static_cast(vertex_->in_edges.size()); // TODO: a better filter copy if (edge_types.empty() && !destination) { in_edges = vertex_->in_edges; @@ -472,7 +474,7 @@ Result> VertexAccessor::InEdges(View view, const std:: auto const &cache = transaction_->manyDeltasCache; if (auto resError = HasError(view, cache, vertex_, for_deleted_); resError) return *resError; if (auto resInEdges = cache.GetInEdges(view, vertex_, destination_vertex, edge_types); resInEdges) - return {build_result(*resInEdges)}; + return EdgesVertexAccessorResult{.edges = build_result(*resInEdges), .expanded_count = expanded_count}; } auto const n_processed = ApplyDeltasForRead( @@ -497,10 +499,11 @@ Result> VertexAccessor::InEdges(View view, const std:: if (!exists) return Error::NONEXISTENT_OBJECT; if (deleted) return Error::DELETED_OBJECT; - return build_result(in_edges); + + return EdgesVertexAccessorResult{.edges = build_result(in_edges), .expanded_count = expanded_count}; } -Result> VertexAccessor::OutEdges(View view, const std::vector &edge_types, +Result VertexAccessor::OutEdges(View view, const std::vector &edge_types, const VertexAccessor *destination) const { MG_ASSERT(!destination || destination->transaction_ == transaction_, "Invalid accessor!"); @@ -521,9 +524,11 @@ Result> VertexAccessor::OutEdges(View view, const std: bool deleted = false; auto out_edges = edge_store{}; Delta *delta = nullptr; + int64_t expanded_count = 0; { auto guard = std::shared_lock{vertex_->lock}; deleted = vertex_->deleted; + expanded_count = static_cast(vertex_->out_edges.size()); if (edge_types.empty() && !destination) { out_edges = vertex_->out_edges; } else { @@ -547,7 +552,7 @@ Result> VertexAccessor::OutEdges(View view, const std: auto const &cache = transaction_->manyDeltasCache; if (auto resError = HasError(view, cache, vertex_, for_deleted_); resError) return *resError; if (auto resOutEdges = cache.GetOutEdges(view, vertex_, dst_vertex, edge_types); resOutEdges) - return {build_result(*resOutEdges)}; + return EdgesVertexAccessorResult{.edges = build_result(*resOutEdges), .expanded_count = expanded_count}; } auto const n_processed = ApplyDeltasForRead( @@ -571,7 +576,8 @@ Result> VertexAccessor::OutEdges(View view, const std: if (!exists) return Error::NONEXISTENT_OBJECT; if (deleted) return Error::DELETED_OBJECT; - return build_result(out_edges); + + return EdgesVertexAccessorResult{.edges = build_result(out_edges), .expanded_count = expanded_count}; } Result VertexAccessor::InDegree(View view) const { diff --git a/src/storage/v2/vertex_accessor.hpp b/src/storage/v2/vertex_accessor.hpp index 148abfb28..ff88272c3 100644 --- a/src/storage/v2/vertex_accessor.hpp +++ b/src/storage/v2/vertex_accessor.hpp @@ -26,6 +26,7 @@ class EdgeAccessor; class Storage; struct Constraints; struct Indices; +struct EdgesVertexAccessorResult; class VertexAccessor final { private: @@ -89,13 +90,13 @@ class VertexAccessor final { /// @throw std::bad_alloc /// @throw std::length_error if the resulting vector exceeds /// std::vector::max_size(). - Result> InEdges(View view, const std::vector &edge_types = {}, + Result InEdges(View view, const std::vector &edge_types = {}, const VertexAccessor *destination = nullptr) const; /// @throw std::bad_alloc /// @throw std::length_error if the resulting vector exceeds /// std::vector::max_size(). - Result> OutEdges(View view, const std::vector &edge_types = {}, + Result OutEdges(View view, const std::vector &edge_types = {}, const VertexAccessor *destination = nullptr) const; Result InDegree(View view) const; @@ -125,6 +126,11 @@ class VertexAccessor final { bool for_deleted_{false}; }; +struct EdgesVertexAccessorResult { + std::vector edges; + int64_t expanded_count; +}; + } // namespace memgraph::storage namespace std { diff --git a/tests/property_based/random_graph.cpp b/tests/property_based/random_graph.cpp index 5beb22930..1f12df2a1 100644 --- a/tests/property_based/random_graph.cpp +++ b/tests/property_based/random_graph.cpp @@ -71,7 +71,7 @@ RC_GTEST_PROP(RandomGraph, RandomGraph, (std::vector vertex_labels, vertices_num_check++; auto maybe_edges = vertex.OutEdges(memgraph::storage::View::OLD); RC_ASSERT(maybe_edges.HasValue()); - for (auto &edge : *maybe_edges) { + for (auto &edge : maybe_edges->edges) { const auto &type = edge_type_map.at(edge); RC_ASSERT(dba->EdgeTypeToName(edge.EdgeType()) == type); edges_num_check++; diff --git a/tests/unit/clearing_old_disk_data.cpp b/tests/unit/clearing_old_disk_data.cpp index d27938f50..f54ece1b2 100644 --- a/tests/unit/clearing_old_disk_data.cpp +++ b/tests/unit/clearing_old_disk_data.cpp @@ -131,7 +131,7 @@ TEST_F(ClearingOldDiskDataTest, TestNumOfEntriesWithEdgeTimestampUpdate) { acc2->PrefetchOutEdges(from_vertex); auto ret = from_vertex.OutEdges(memgraph::storage::View::NEW); - auto fetched_edge = ret.GetValue()[0]; + auto fetched_edge = ret.GetValue().edges[0]; /// This is the same property as in the first transaction, we just want to test /// the number of entries inside RocksDB when the timestamp changes @@ -171,7 +171,7 @@ TEST_F(ClearingOldDiskDataTest, TestNumOfEntriesWithEdgeValueUpdate) { acc2->PrefetchOutEdges(from_vertex); auto ret = from_vertex.OutEdges(memgraph::storage::View::NEW); - auto fetched_edge = ret.GetValue()[0]; + auto fetched_edge = ret.GetValue().edges[0]; auto property2 = acc2->NameToProperty("DiskProperty"); ASSERT_TRUE(fetched_edge.SetProperty(property2, memgraph::storage::PropertyValue(15)).HasValue()); diff --git a/tests/unit/query_dump.cpp b/tests/unit/query_dump.cpp index 64491eb7f..a11c1e65b 100644 --- a/tests/unit/query_dump.cpp +++ b/tests/unit/query_dump.cpp @@ -158,7 +158,7 @@ DatabaseState GetState(memgraph::storage::Storage *db) { for (const auto &vertex : dba->Vertices(memgraph::storage::View::NEW)) { auto maybe_edges = vertex.OutEdges(memgraph::storage::View::NEW); MG_ASSERT(maybe_edges.HasValue()); - for (const auto &edge : *maybe_edges) { + for (const auto &edge : maybe_edges->edges) { const auto &edge_type_name = dba->EdgeTypeToName(edge.EdgeType()); std::map props; auto maybe_properties = edge.Properties(memgraph::storage::View::NEW); diff --git a/tests/unit/query_plan_common.hpp b/tests/unit/query_plan_common.hpp index ca1106cc0..f17f000bf 100644 --- a/tests/unit/query_plan_common.hpp +++ b/tests/unit/query_plan_common.hpp @@ -224,7 +224,7 @@ inline uint64_t CountEdges(memgraph::query::DbAccessor *dba, memgraph::storage:: dba->PrefetchOutEdges(vertex); auto maybe_edges = vertex.OutEdges(view); MG_ASSERT(maybe_edges.HasValue()); - count += CountIterable(*maybe_edges); + count += CountIterable(maybe_edges->edges); } return count; } diff --git a/tests/unit/query_plan_create_set_remove_delete.cpp b/tests/unit/query_plan_create_set_remove_delete.cpp index eef708dcf..5f3c1c851 100644 --- a/tests/unit/query_plan_create_set_remove_delete.cpp +++ b/tests/unit/query_plan_create_set_remove_delete.cpp @@ -304,7 +304,7 @@ TYPED_TEST(QueryPlanTest, CreateExpand) { dba.PrefetchOutEdges(vertex); auto maybe_edges = vertex.OutEdges(memgraph::storage::View::OLD); MG_ASSERT(maybe_edges.HasValue()); - for (auto edge : *maybe_edges) { + for (auto edge : maybe_edges->edges) { EXPECT_EQ(edge.EdgeType(), edge_type); EXPECT_EQ(edge.GetProperty(memgraph::storage::View::OLD, property.second)->ValueInt(), 3); } @@ -1129,7 +1129,7 @@ TYPED_TEST(QueryPlanTest, SetProperty) { dba.PrefetchOutEdges(vertex); auto maybe_edges = vertex.OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(maybe_edges.HasValue()); - for (auto edge : *maybe_edges) { + for (auto edge : maybe_edges->edges) { ASSERT_EQ(edge.GetProperty(memgraph::storage::View::OLD, prop1)->type(), memgraph::storage::PropertyValue::Type::Int); EXPECT_EQ(edge.GetProperty(memgraph::storage::View::OLD, prop1)->ValueInt(), 42); @@ -1184,7 +1184,7 @@ TYPED_TEST(QueryPlanTest, SetProperties) { dba.PrefetchOutEdges(vertex); auto maybe_edges = vertex.OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(maybe_edges.HasValue()); - for (auto edge : *maybe_edges) { + for (auto edge : maybe_edges->edges) { auto from = edge.From(); EXPECT_EQ(from.Properties(memgraph::storage::View::OLD)->size(), update ? 2 : 1); if (update) { @@ -1365,7 +1365,7 @@ TYPED_TEST(QueryPlanTest, RemoveProperty) { dba.PrefetchOutEdges(vertex); auto maybe_edges = vertex.OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(maybe_edges.HasValue()); - for (auto edge : *maybe_edges) { + for (auto edge : maybe_edges->edges) { EXPECT_EQ(edge.GetProperty(memgraph::storage::View::OLD, prop1)->type(), memgraph::storage::PropertyValue::Type::Null); auto from = edge.From(); @@ -2258,7 +2258,7 @@ TYPED_TEST(UpdatePropertiesWithAuthFixture, SetPropertyExpandWithAuthChecker) { for (auto vertex : this->dba.Vertices(memgraph::storage::View::NEW)) { if (vertex.OutEdges(memgraph::storage::View::NEW).HasValue()) { auto maybe_edges = vertex.OutEdges(memgraph::storage::View::NEW); - for (auto edge : *maybe_edges) { + for (auto edge : maybe_edges->edges) { EXPECT_EQ(edge.EdgeType(), edge_type_id); auto maybe_properties = edge.Properties(memgraph::storage::View::NEW); ASSERT_TRUE(maybe_properties.HasValue()); @@ -2276,7 +2276,7 @@ TYPED_TEST(UpdatePropertiesWithAuthFixture, SetPropertyExpandWithAuthChecker) { for (auto vertex : this->dba.Vertices(memgraph::storage::View::NEW)) { if (vertex.OutEdges(memgraph::storage::View::NEW).HasValue()) { auto maybe_edges = vertex.OutEdges(memgraph::storage::View::NEW); - for (auto edge : *maybe_edges) { + for (auto edge : maybe_edges->edges) { EXPECT_EQ(edge.EdgeType(), edge_type_id); auto maybe_properties = edge.Properties(memgraph::storage::View::NEW); ASSERT_TRUE(maybe_properties.HasValue()); @@ -2495,3 +2495,112 @@ TYPED_TEST(UpdatePropertiesWithAuthFixture, SetPropertyExpandWithAuthChecker) { } } #endif + +template +class DynamicExpandFixture : public testing::Test { + protected: + const std::string testSuite = "query_plan_create_set_remove_delete_dynamic_expand"; + memgraph::storage::Config config = disk_test_utils::GenerateOnDiskConfig(testSuite); + std::unique_ptr db{new StorageType(config)}; + std::unique_ptr storage_dba{db->Access()}; + memgraph::query::DbAccessor dba{storage_dba.get()}; + SymbolTable symbol_table; + AstStorage storage; + + // make 2 nodes connected to the third node + memgraph::query::VertexAccessor v1{dba.InsertVertex()}; + memgraph::query::VertexAccessor v2{dba.InsertVertex()}; + memgraph::query::VertexAccessor v3{dba.InsertVertex()}; + memgraph::query::VertexAccessor v4{dba.InsertVertex()}; + memgraph::query::VertexAccessor v5{dba.InsertVertex()}; + memgraph::storage::EdgeTypeId edge_type{db->NameToEdgeType("Edge")}; + memgraph::query::EdgeAccessor r1{*dba.InsertEdge(&v1, &v5, edge_type)}; + memgraph::query::EdgeAccessor r2{*dba.InsertEdge(&v2, &v5, edge_type)}; + memgraph::query::EdgeAccessor r3{*dba.InsertEdge(&v3, &v5, edge_type)}; + memgraph::query::EdgeAccessor r4{*dba.InsertEdge(&v4, &v5, edge_type)}; + + memgraph::storage::LabelId node_label{dba.NameToLabel("Node")}; + memgraph::storage::LabelId supernode_label{dba.NameToLabel("Supernode")}; + + void SetUp() override { + ASSERT_TRUE(v1.AddLabel(node_label).HasValue()); + ASSERT_TRUE(v2.AddLabel(node_label).HasValue()); + ASSERT_TRUE(v3.AddLabel(node_label).HasValue()); + ASSERT_TRUE(v4.AddLabel(node_label).HasValue()); + ASSERT_TRUE(v5.AddLabel(supernode_label).HasValue()); + memgraph::license::global_license_checker.EnableTesting(); + + dba.AdvanceCommand(); + } + + void TearDown() override { + if (std::is_same::value) { + disk_test_utils::RemoveRocksDbDirs(testSuite); + } + } +}; + +using StorageTypes = ::testing::Types; +TYPED_TEST_CASE(DynamicExpandFixture, StorageTypes); + +TYPED_TEST(DynamicExpandFixture, Expand) { + using ExpandCursor = memgraph::query::plan::Expand::ExpandCursor; + + auto scan_node_by_label = MakeScanAllByLabel(this->storage, this->symbol_table, "n", this->node_label); + auto scan_supernode_by_label = + MakeScanAllByLabel(this->storage, this->symbol_table, "s", this->supernode_label, scan_node_by_label.op_); + + auto once = std::make_shared(); + + auto edge_sym = this->symbol_table.CreateSymbol("r", true); + auto my_expand = std::make_shared( + scan_supernode_by_label.op_, scan_supernode_by_label.sym_, scan_node_by_label.sym_, edge_sym, + EdgeAtom::Direction::OUT, std::vector{}, true, memgraph::storage::View::OLD); + + auto context = MakeContext(this->storage, this->symbol_table, &this->dba); + + Frame frame{context.symbol_table.max_position()}; + frame[scan_supernode_by_label.sym_] = this->v4; + frame[scan_node_by_label.sym_] = this->v1; + + auto *mem = memgraph::utils::NewDeleteResource(); + auto initial_cursor_ptr = MakeUniqueCursorPtr(mem, *my_expand, -1, -1, mem); + auto *initial_cursor = dynamic_cast(initial_cursor_ptr.get()); + auto expansion_info = initial_cursor->GetExpansionInfo(frame); + + ASSERT_EQ(expansion_info.input_node.value(), this->v4); + ASSERT_EQ(expansion_info.direction, EdgeAtom::Direction::OUT); + ASSERT_EQ(expansion_info.existing_node.value(), this->v1); + + auto expanded_first_cursor_ptr = MakeUniqueCursorPtr(mem, *my_expand, 1, -1, mem); + auto *expanded_first_cursor = dynamic_cast(expanded_first_cursor_ptr.get()); + expansion_info = expanded_first_cursor->GetExpansionInfo(frame); + + ASSERT_EQ(expansion_info.input_node.value(), this->v1); + ASSERT_EQ(expansion_info.direction, EdgeAtom::Direction::IN); + ASSERT_EQ(expansion_info.existing_node.value(), this->v4); + + auto expanded_both_take_first_cursor_ptr = MakeUniqueCursorPtr(mem, *my_expand, 1, 100, mem); + auto *expanded_both_take_first = dynamic_cast(expanded_both_take_first_cursor_ptr.get()); + expansion_info = expanded_both_take_first->GetExpansionInfo(frame); + + ASSERT_EQ(expansion_info.input_node.value(), this->v4); + ASSERT_EQ(expansion_info.direction, EdgeAtom::Direction::OUT); + ASSERT_EQ(expansion_info.existing_node.value(), this->v1); + + auto expanded_both_take_second_cursor_ptr = MakeUniqueCursorPtr(mem, *my_expand, 100, 1, mem); + auto *expanded_both_take_second = dynamic_cast(expanded_both_take_second_cursor_ptr.get()); + expansion_info = expanded_both_take_second->GetExpansionInfo(frame); + + ASSERT_EQ(expansion_info.input_node.value(), this->v1); + ASSERT_EQ(expansion_info.direction, EdgeAtom::Direction::IN); + ASSERT_EQ(expansion_info.existing_node.value(), this->v4); + + auto expanded_equal_take_second_cursror_ptr = MakeUniqueCursorPtr(mem, *my_expand, 5, 5, mem); + auto *expanded_equal_take_second = dynamic_cast(expanded_equal_take_second_cursror_ptr.get()); + expansion_info = expanded_equal_take_second->GetExpansionInfo(frame); + + ASSERT_EQ(expansion_info.input_node.value(), this->v1); + ASSERT_EQ(expansion_info.direction, EdgeAtom::Direction::IN); + ASSERT_EQ(expansion_info.existing_node.value(), this->v4); +} diff --git a/tests/unit/query_plan_match_filter_return.cpp b/tests/unit/query_plan_match_filter_return.cpp index e4e240a0f..ff4e4eeb9 100644 --- a/tests/unit/query_plan_match_filter_return.cpp +++ b/tests/unit/query_plan_match_filter_return.cpp @@ -1231,9 +1231,9 @@ TYPED_TEST(QueryPlanExpandVariable, NamedPath) { for (const auto &v : this->dba.Vertices(memgraph::storage::View::OLD)) { if (!*v.HasLabel(memgraph::storage::View::OLD, this->labels[0])) continue; auto maybe_edges1 = v.OutEdges(memgraph::storage::View::OLD); - for (const auto &e1 : *maybe_edges1) { + for (const auto &e1 : maybe_edges1->edges) { auto maybe_edges2 = e1.To().OutEdges(memgraph::storage::View::OLD); - for (const auto &e2 : *maybe_edges2) { + for (const auto &e2 : maybe_edges2->edges) { expected_paths.emplace_back(v, e1, e1.To(), e2, e2.To()); } } @@ -1341,7 +1341,7 @@ TYPED_TEST(QueryPlanExpandVariable, FineGrainedFilterNamedPath) { if (!*v.HasLabel(memgraph::storage::View::OLD, this->labels[0])) continue; expected_paths.emplace_back(v); auto maybe_edges1 = v.OutEdges(memgraph::storage::View::OLD); - for (const auto &e1 : *maybe_edges1) { + for (const auto &e1 : maybe_edges1->edges) { expected_paths.emplace_back(v, e1, e1.To()); } } @@ -1378,7 +1378,7 @@ TYPED_TEST(QueryPlanExpandVariable, FineGrainedFilterNamedPath) { if (!*v.HasLabel(memgraph::storage::View::OLD, this->labels[0])) continue; expected_paths.emplace_back(v); auto maybe_edges1 = v.OutEdges(memgraph::storage::View::OLD); - for (const auto &e1 : *maybe_edges1) { + for (const auto &e1 : maybe_edges1->edges) { expected_paths.emplace_back(v, e1, e1.To()); } } diff --git a/tests/unit/query_plan_v2_create_set_remove_delete.cpp b/tests/unit/query_plan_v2_create_set_remove_delete.cpp index 93aa6c601..aa87b67c8 100644 --- a/tests/unit/query_plan_v2_create_set_remove_delete.cpp +++ b/tests/unit/query_plan_v2_create_set_remove_delete.cpp @@ -66,8 +66,8 @@ TYPED_TEST(QueryPlan, CreateNodeWithAttributes) { EXPECT_EQ(v.GetProperty(memgraph::storage::View::NEW, property)->ValueInt(), 42); dba->PrefetchInEdges(v.impl_); dba->PrefetchOutEdges(v.impl_); - EXPECT_EQ(CountIterable(*v.InEdges(memgraph::storage::View::NEW)), 0); - EXPECT_EQ(CountIterable(*v.OutEdges(memgraph::storage::View::NEW)), 0); + EXPECT_EQ(CountIterable(v.InEdges(memgraph::storage::View::NEW)->edges), 0); + EXPECT_EQ(CountIterable(v.OutEdges(memgraph::storage::View::NEW)->edges), 0); // Invokes LOG(FATAL) instead of erroring out. // EXPECT_TRUE(v.HasLabel(label, memgraph::storage::View::OLD).IsError()); } diff --git a/tests/unit/query_procedures_mgp_graph.cpp b/tests/unit/query_procedures_mgp_graph.cpp index 1b8918f9d..7365be359 100644 --- a/tests/unit/query_procedures_mgp_graph.cpp +++ b/tests/unit/query_procedures_mgp_graph.cpp @@ -83,13 +83,13 @@ using MgpVertexPtr = std::unique_ptr; using MgpVerticesIteratorPtr = std::unique_ptr; using MgpValuePtr = std::unique_ptr; -template -size_t CountMaybeIterables(TMaybeIterable &&maybe_iterable) { +template +size_t CountMaybeIterables(TMaybeIterable &&maybe_iterable, TIterableAccessor func) { if (maybe_iterable.HasError()) { ADD_FAILURE() << static_cast>(maybe_iterable.GetError()); return 0; } - auto &iterable = maybe_iterable.GetValue(); + auto iterable = func(maybe_iterable.GetValue()); return std::distance(iterable.begin(), iterable.end()); } @@ -109,16 +109,20 @@ void CheckEdgeCountBetween(const MgpVertexPtr &from, const MgpVertexPtr &to, con } EXPECT_EQ( - CountMaybeIterables(std::visit([](auto impl) { return impl.InEdges(memgraph::storage::View::NEW); }, from->impl)), + CountMaybeIterables(std::visit([](auto impl) { return impl.InEdges(memgraph::storage::View::NEW); }, from->impl), + [](const auto &edge_result) { return edge_result.edges; }), 0); - EXPECT_EQ(CountMaybeIterables( - std::visit([](auto impl) { return impl.OutEdges(memgraph::storage::View::NEW); }, from->impl)), - number_of_edges_between); EXPECT_EQ( - CountMaybeIterables(std::visit([](auto impl) { return impl.InEdges(memgraph::storage::View::NEW); }, to->impl)), + CountMaybeIterables(std::visit([](auto impl) { return impl.OutEdges(memgraph::storage::View::NEW); }, from->impl), + [](const auto &edge_result) { return edge_result.edges; }), number_of_edges_between); EXPECT_EQ( - CountMaybeIterables(std::visit([](auto impl) { return impl.OutEdges(memgraph::storage::View::NEW); }, to->impl)), + CountMaybeIterables(std::visit([](auto impl) { return impl.InEdges(memgraph::storage::View::NEW); }, to->impl), + [](const auto &edge_result) { return edge_result.edges; }), + number_of_edges_between); + EXPECT_EQ( + CountMaybeIterables(std::visit([](auto impl) { return impl.OutEdges(memgraph::storage::View::NEW); }, to->impl), + [](const auto &edge_result) { return edge_result.edges; }), 0); } } // namespace @@ -624,7 +628,7 @@ TYPED_TEST(MgpGraphTest, EdgeSetProperty) { memgraph::storage::Gid from_vertex_id{}; auto get_edge = [&from_vertex_id](memgraph::storage::Storage::Accessor *accessor) -> memgraph::storage::EdgeAccessor { auto from = accessor->FindVertex(from_vertex_id, memgraph::storage::View::NEW); - return std::move(from->OutEdges(memgraph::storage::View::NEW).GetValue().front()); + return std::move(from->OutEdges(memgraph::storage::View::NEW).GetValue().edges.front()); }; { const auto vertex_ids = this->CreateEdge(); diff --git a/tests/unit/query_trigger.cpp b/tests/unit/query_trigger.cpp index 4a75391f0..5d7f9e7a9 100644 --- a/tests/unit/query_trigger.cpp +++ b/tests/unit/query_trigger.cpp @@ -208,7 +208,7 @@ TYPED_TEST(TriggerContextTest, ValidObjectsTest) { auto out_edges = vertex.OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - for (auto edge : *out_edges) { + for (auto edge : out_edges->edges) { trigger_context_collector.RegisterSetObjectProperty(edge, dba.NameToProperty("PROPERTY1"), memgraph::query::TypedValue("Value"), memgraph::query::TypedValue("ValueNew")); diff --git a/tests/unit/storage_v2.cpp b/tests/unit/storage_v2.cpp index 258fe6d37..74ac5b3fa 100644 --- a/tests/unit/storage_v2.cpp +++ b/tests/unit/storage_v2.cpp @@ -2278,8 +2278,8 @@ TYPED_TEST(StorageV2Test, VertexNonexistentLabelPropertyEdgeAPI) { ASSERT_EQ(*vertex.HasLabel(label, memgraph::storage::View::NEW), false); ASSERT_EQ(vertex.Properties(memgraph::storage::View::NEW)->size(), 0); ASSERT_EQ(*vertex.GetProperty(property, memgraph::storage::View::NEW), memgraph::storage::PropertyValue()); - ASSERT_EQ(vertex.InEdges(memgraph::storage::View::NEW)->size(), 0); - ASSERT_EQ(vertex.OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex.InEdges(memgraph::storage::View::NEW)->edges.size(), 0); + ASSERT_EQ(vertex.OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex.InDegree(memgraph::storage::View::NEW), 0); ASSERT_EQ(*vertex.OutDegree(memgraph::storage::View::NEW), 0); @@ -2305,8 +2305,8 @@ TYPED_TEST(StorageV2Test, VertexNonexistentLabelPropertyEdgeAPI) { ASSERT_EQ(*vertex.HasLabel(label, memgraph::storage::View::NEW), true); ASSERT_EQ(vertex.Properties(memgraph::storage::View::NEW)->size(), 1); ASSERT_EQ(*vertex.GetProperty(property, memgraph::storage::View::NEW), memgraph::storage::PropertyValue("value")); - ASSERT_EQ(vertex.InEdges(memgraph::storage::View::NEW)->size(), 1); - ASSERT_EQ(vertex.OutEdges(memgraph::storage::View::NEW)->size(), 1); + ASSERT_EQ(vertex.InEdges(memgraph::storage::View::NEW)->edges.size(), 1); + ASSERT_EQ(vertex.OutEdges(memgraph::storage::View::NEW)->edges.size(), 1); ASSERT_EQ(*vertex.InDegree(memgraph::storage::View::NEW), 1); ASSERT_EQ(*vertex.OutDegree(memgraph::storage::View::NEW), 1); diff --git a/tests/unit/storage_v2_durability_inmemory.cpp b/tests/unit/storage_v2_durability_inmemory.cpp index d839a8518..e6734f766 100644 --- a/tests/unit/storage_v2_durability_inmemory.cpp +++ b/tests/unit/storage_v2_durability_inmemory.cpp @@ -322,7 +322,7 @@ class DurabilityTest : public ::testing::TestWithParam { ASSERT_TRUE(vertex1); auto out_edges = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - auto edge1 = find_edge(*out_edges); + auto edge1 = find_edge(out_edges->edges); ASSERT_TRUE(edge1); if (i < kNumBaseEdges / 2) { ASSERT_EQ(edge1->EdgeType(), et1); @@ -344,7 +344,7 @@ class DurabilityTest : public ::testing::TestWithParam { ASSERT_TRUE(vertex2); auto in_edges = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(in_edges.HasValue()); - auto edge2 = find_edge(*in_edges); + auto edge2 = find_edge(in_edges->edges); ASSERT_TRUE(edge2); if (i < kNumBaseEdges / 2) { ASSERT_EQ(edge2->EdgeType(), et1); @@ -457,7 +457,7 @@ class DurabilityTest : public ::testing::TestWithParam { ASSERT_TRUE(vertex1); auto out_edges = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - auto edge1 = find_edge(*out_edges); + auto edge1 = find_edge(out_edges->edges); ASSERT_TRUE(edge1); if (i < kNumExtendedEdges / 4) { ASSERT_EQ(edge1->EdgeType(), et3); @@ -475,7 +475,7 @@ class DurabilityTest : public ::testing::TestWithParam { ASSERT_TRUE(vertex2); auto in_edges = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(in_edges.HasValue()); - auto edge2 = find_edge(*in_edges); + auto edge2 = find_edge(in_edges->edges); ASSERT_TRUE(edge2); if (i < kNumExtendedEdges / 4) { ASSERT_EQ(edge2->EdgeType(), et3); @@ -1128,7 +1128,7 @@ TEST_F(DurabilityTest, SnapshotWithPropertiesOnEdgesButUnusedRecoveryWithoutProp for (auto vertex : acc->Vertices(memgraph::storage::View::OLD)) { auto in_edges = vertex.InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(in_edges.HasValue()); - for (auto &edge : *in_edges) { + for (auto &edge : in_edges->edges) { // TODO (mferencevic): Replace with `ClearProperties()` auto props = edge.Properties(memgraph::storage::View::NEW); ASSERT_TRUE(props.HasValue()); @@ -1138,7 +1138,7 @@ TEST_F(DurabilityTest, SnapshotWithPropertiesOnEdgesButUnusedRecoveryWithoutProp } auto out_edges = vertex.InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - for (auto &edge : *out_edges) { + for (auto &edge : out_edges->edges) { // TODO (mferencevic): Replace with `ClearProperties()` auto props = edge.Properties(memgraph::storage::View::NEW); ASSERT_TRUE(props.HasValue()); @@ -1377,11 +1377,11 @@ TEST_P(DurabilityTest, WalCreateInSingleTransaction) { ASSERT_EQ(props->size(), 0); auto in_edges = v1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(in_edges.HasValue()); - ASSERT_EQ(in_edges->size(), 0); + ASSERT_EQ(in_edges->edges.size(), 0); auto out_edges = v1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - ASSERT_EQ(out_edges->size(), 1); - const auto &edge = (*out_edges)[0]; + ASSERT_EQ(out_edges->edges.size(), 1); + const auto &edge = out_edges->edges[0]; ASSERT_EQ(edge.Gid(), gid_e1); auto edge_props = edge.Properties(memgraph::storage::View::OLD); ASSERT_TRUE(edge_props.HasValue()); @@ -1404,8 +1404,8 @@ TEST_P(DurabilityTest, WalCreateInSingleTransaction) { memgraph::storage::PropertyValue("world")))); auto in_edges = v2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(in_edges.HasValue()); - ASSERT_EQ(in_edges->size(), 1); - const auto &edge = (*in_edges)[0]; + ASSERT_EQ(in_edges->edges.size(), 1); + const auto &edge = in_edges->edges[0]; ASSERT_EQ(edge.Gid(), gid_e1); auto edge_props = edge.Properties(memgraph::storage::View::OLD); ASSERT_TRUE(edge_props.HasValue()); @@ -1417,7 +1417,7 @@ TEST_P(DurabilityTest, WalCreateInSingleTransaction) { } auto out_edges = v2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - ASSERT_EQ(out_edges->size(), 0); + ASSERT_EQ(out_edges->edges.size(), 0); } { auto v3 = acc->FindVertex(gid_v3, memgraph::storage::View::OLD); @@ -1431,10 +1431,10 @@ TEST_P(DurabilityTest, WalCreateInSingleTransaction) { std::make_pair(store->NameToProperty("v3"), memgraph::storage::PropertyValue(42)))); auto in_edges = v3->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(in_edges.HasValue()); - ASSERT_EQ(in_edges->size(), 0); + ASSERT_EQ(in_edges->edges.size(), 0); auto out_edges = v3->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - ASSERT_EQ(out_edges->size(), 0); + ASSERT_EQ(out_edges->edges.size(), 0); } } diff --git a/tests/unit/storage_v2_edge_inmemory.cpp b/tests/unit/storage_v2_edge_inmemory.cpp index 966ac8790..6f3b0da02 100644 --- a/tests/unit/storage_v2_edge_inmemory.cpp +++ b/tests/unit/storage_v2_edge_inmemory.cpp @@ -59,16 +59,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -76,12 +76,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -89,28 +89,28 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -126,14 +126,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -144,7 +144,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -155,7 +155,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -166,7 +166,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -174,42 +174,42 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -250,16 +250,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -267,12 +267,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -280,22 +280,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -311,14 +311,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -329,7 +329,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -340,7 +340,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -351,7 +351,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -359,30 +359,30 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -418,12 +418,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -431,12 +431,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -448,14 +448,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -472,7 +472,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -483,7 +483,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -494,7 +494,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -505,7 +505,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -517,18 +517,18 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -569,16 +569,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -586,12 +586,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -599,22 +599,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); acc->Abort(); } @@ -628,21 +628,21 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_TRUE(vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -666,16 +666,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -683,12 +683,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -696,22 +696,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -727,14 +727,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -745,7 +745,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -756,7 +756,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -767,7 +767,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -775,30 +775,30 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -839,16 +839,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -856,12 +856,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -869,22 +869,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); acc->Abort(); } @@ -898,21 +898,21 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_TRUE(vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -936,16 +936,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -953,12 +953,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -966,22 +966,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -997,14 +997,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1015,7 +1015,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1026,7 +1026,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1037,7 +1037,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1045,30 +1045,30 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1104,12 +1104,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1117,12 +1117,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1134,14 +1134,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); acc->Abort(); } @@ -1153,13 +1153,13 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_TRUE(vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -1181,12 +1181,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1194,12 +1194,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1211,14 +1211,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1235,7 +1235,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1246,7 +1246,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1257,7 +1257,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1268,7 +1268,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1280,22 +1280,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1336,16 +1336,16 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1353,12 +1353,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1366,22 +1366,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1397,14 +1397,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1415,7 +1415,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1426,7 +1426,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1437,7 +1437,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1445,30 +1445,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1483,21 +1483,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1505,12 +1505,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1518,24 +1518,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1549,21 +1549,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_TRUE(vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -1605,16 +1605,16 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1622,12 +1622,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1635,22 +1635,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1666,14 +1666,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1684,7 +1684,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1695,7 +1695,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1706,7 +1706,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1714,30 +1714,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1752,21 +1752,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1774,12 +1774,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1787,24 +1787,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1818,21 +1818,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_TRUE(vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -1869,12 +1869,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1882,12 +1882,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1899,14 +1899,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1923,7 +1923,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1934,7 +1934,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1945,7 +1945,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1956,7 +1956,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1968,22 +1968,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1996,7 +1996,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); @@ -2006,7 +2006,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2014,12 +2014,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2027,20 +2027,20 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2052,13 +2052,13 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_TRUE(vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -2100,16 +2100,16 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2117,12 +2117,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2130,22 +2130,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2161,14 +2161,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2179,7 +2179,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2190,7 +2190,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2201,7 +2201,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2209,30 +2209,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2247,21 +2247,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2269,12 +2269,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2282,24 +2282,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); acc->Abort(); } @@ -2315,14 +2315,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2333,7 +2333,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2344,7 +2344,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2355,7 +2355,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2363,30 +2363,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2401,21 +2401,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2423,12 +2423,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2436,24 +2436,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2467,21 +2467,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_TRUE(vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -2523,16 +2523,16 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2540,12 +2540,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2553,22 +2553,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2584,14 +2584,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2602,7 +2602,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2613,7 +2613,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2624,7 +2624,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2632,30 +2632,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2670,21 +2670,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2692,12 +2692,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2705,24 +2705,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); acc->Abort(); } @@ -2738,14 +2738,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2756,7 +2756,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); @@ -2768,7 +2768,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2779,7 +2779,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2787,30 +2787,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2825,21 +2825,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2847,12 +2847,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2860,24 +2860,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2891,21 +2891,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_TRUE(vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -2942,12 +2942,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2955,12 +2955,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2972,14 +2972,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2996,7 +2996,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3007,7 +3007,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3018,7 +3018,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3029,7 +3029,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3041,22 +3041,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3069,7 +3069,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); @@ -3079,7 +3079,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3087,12 +3087,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3100,20 +3100,20 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); acc->Abort(); } @@ -3130,7 +3130,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3141,7 +3141,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3152,7 +3152,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3163,7 +3163,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3175,22 +3175,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3203,7 +3203,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); @@ -3213,7 +3213,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3221,12 +3221,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3234,20 +3234,20 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3259,13 +3259,13 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_TRUE(vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3298,12 +3298,12 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { gid_to = vertex_to.Gid(); // Check edges - ASSERT_EQ(vertex_from.InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from.InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from.InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from.OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3314,7 +3314,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { { auto ret = vertex_to.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to.InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3322,7 +3322,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { ASSERT_EQ(e.FromVertex(), vertex_from); ASSERT_EQ(e.ToVertex(), vertex_to); } - ASSERT_EQ(vertex_to.OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to.OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to.OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3353,14 +3353,14 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { } // Check edges - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); ASSERT_EQ(vertex_from->InDegree(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3374,7 +3374,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3382,11 +3382,11 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3401,13 +3401,13 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { ASSERT_TRUE(vertex_to); // Check edges - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); } } @@ -3465,7 +3465,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex1.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1.InDegree(memgraph::storage::View::NEW), 2); @@ -3485,7 +3485,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex1.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1.OutDegree(memgraph::storage::View::NEW), 2); @@ -3505,7 +3505,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2.InDegree(memgraph::storage::View::NEW), 2); @@ -3525,7 +3525,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2.OutDegree(memgraph::storage::View::NEW), 2); @@ -3577,7 +3577,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::OLD), 2); @@ -3599,7 +3599,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::OLD), 2); @@ -3621,7 +3621,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 2); @@ -3641,7 +3641,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3652,7 +3652,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 2); @@ -3672,7 +3672,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3698,7 +3698,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3709,7 +3709,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3720,7 +3720,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3731,7 +3731,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3768,12 +3768,12 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { gid_to = vertex_to.Gid(); // Check edges - ASSERT_EQ(vertex_from.InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from.InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from.InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from.OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3784,7 +3784,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { { auto ret = vertex_to.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to.InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3792,7 +3792,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_EQ(e.FromVertex(), vertex_from); ASSERT_EQ(e.ToVertex(), vertex_to); } - ASSERT_EQ(vertex_to.OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to.OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to.OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3823,14 +3823,14 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { } // Check edges - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); ASSERT_EQ(vertex_from->InDegree(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3844,7 +3844,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3852,11 +3852,11 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); acc->Abort(); @@ -3873,12 +3873,12 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3889,7 +3889,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3897,7 +3897,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3928,14 +3928,14 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { } // Check edges - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); ASSERT_EQ(vertex_from->InDegree(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3949,7 +3949,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3957,11 +3957,11 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3976,13 +3976,13 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_TRUE(vertex_to); // Check edges - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); } } @@ -4040,7 +4040,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1.InDegree(memgraph::storage::View::NEW), 2); @@ -4060,7 +4060,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1.OutDegree(memgraph::storage::View::NEW), 2); @@ -4080,7 +4080,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2.InDegree(memgraph::storage::View::NEW), 2); @@ -4100,7 +4100,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2.OutDegree(memgraph::storage::View::NEW), 2); @@ -4152,7 +4152,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::OLD), 2); @@ -4174,7 +4174,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::OLD), 2); @@ -4196,7 +4196,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 2); @@ -4216,7 +4216,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4227,7 +4227,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 2); @@ -4247,7 +4247,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4276,7 +4276,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::OLD), 2); @@ -4296,7 +4296,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::NEW), 2); @@ -4316,7 +4316,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::OLD), 2); @@ -4336,7 +4336,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::NEW), 2); @@ -4356,7 +4356,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 2); @@ -4376,7 +4376,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 2); @@ -4396,7 +4396,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 2); @@ -4416,7 +4416,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 2); @@ -4468,7 +4468,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::OLD), 2); @@ -4490,7 +4490,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::OLD), 2); @@ -4512,7 +4512,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 2); @@ -4532,7 +4532,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4543,7 +4543,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 2); @@ -4563,7 +4563,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4589,7 +4589,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -4600,7 +4600,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4611,7 +4611,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -4622,7 +4622,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4685,7 +4685,7 @@ TEST(StorageWithProperties, EdgePropertyCommit) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4714,7 +4714,7 @@ TEST(StorageWithProperties, EdgePropertyCommit) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4746,7 +4746,7 @@ TEST(StorageWithProperties, EdgePropertyCommit) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4788,7 +4788,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4829,7 +4829,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4851,7 +4851,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4892,7 +4892,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4923,7 +4923,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4965,7 +4965,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -4996,7 +4996,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5038,7 +5038,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5080,7 +5080,7 @@ TEST(StorageWithProperties, EdgePropertySerializationError) { { auto vertex = acc1->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property1 = acc1->NameToProperty("property1"); auto property2 = acc1->NameToProperty("property2"); @@ -5114,7 +5114,7 @@ TEST(StorageWithProperties, EdgePropertySerializationError) { { auto vertex = acc2->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property1 = acc2->NameToProperty("property1"); auto property2 = acc2->NameToProperty("property2"); @@ -5142,7 +5142,7 @@ TEST(StorageWithProperties, EdgePropertySerializationError) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property1 = acc->NameToProperty("property1"); auto property2 = acc->NameToProperty("property2"); @@ -5193,7 +5193,7 @@ TEST(StorageWithProperties, EdgePropertyClear) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; ASSERT_EQ(edge.GetProperty(property1, memgraph::storage::View::OLD)->ValueString(), "value"); ASSERT_TRUE(edge.GetProperty(property2, memgraph::storage::View::OLD)->IsNull()); @@ -5226,7 +5226,7 @@ TEST(StorageWithProperties, EdgePropertyClear) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto old_value = edge.SetProperty(property2, memgraph::storage::PropertyValue(42)); ASSERT_TRUE(old_value.HasValue()); @@ -5238,7 +5238,7 @@ TEST(StorageWithProperties, EdgePropertyClear) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; ASSERT_EQ(edge.GetProperty(property1, memgraph::storage::View::OLD)->ValueString(), "value"); ASSERT_EQ(edge.GetProperty(property2, memgraph::storage::View::OLD)->ValueInt(), 42); @@ -5272,7 +5272,7 @@ TEST(StorageWithProperties, EdgePropertyClear) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; ASSERT_TRUE(edge.GetProperty(property1, memgraph::storage::View::NEW)->IsNull()); ASSERT_TRUE(edge.GetProperty(property2, memgraph::storage::View::NEW)->IsNull()); @@ -5302,7 +5302,7 @@ TEST(StorageWithoutProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5333,7 +5333,7 @@ TEST(StorageWithoutProperties, EdgePropertyAbort) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5371,7 +5371,7 @@ TEST(StorageWithoutProperties, EdgePropertyClear) { auto acc = store->Access(); auto vertex = acc->FindVertex(gid, memgraph::storage::View::OLD); ASSERT_TRUE(vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; ASSERT_EQ(edge.ClearProperties().GetError(), memgraph::storage::Error::PROPERTIES_DISABLED); diff --git a/tests/unit/storage_v2_edge_ondisk.cpp b/tests/unit/storage_v2_edge_ondisk.cpp index 4edc099d1..c52a16b63 100644 --- a/tests/unit/storage_v2_edge_ondisk.cpp +++ b/tests/unit/storage_v2_edge_ondisk.cpp @@ -68,16 +68,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -85,12 +85,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -98,28 +98,28 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -140,14 +140,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -158,7 +158,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -169,7 +169,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -180,7 +180,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -188,42 +188,42 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -271,16 +271,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -288,12 +288,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -301,22 +301,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -337,14 +337,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -355,7 +355,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -366,7 +366,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -377,7 +377,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -385,30 +385,30 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -449,12 +449,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -462,12 +462,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -479,14 +479,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -506,7 +506,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -517,7 +517,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -528,7 +528,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -539,7 +539,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -551,18 +551,18 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameCommit) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -610,16 +610,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -627,12 +627,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -640,22 +640,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); acc->Abort(); } @@ -674,21 +674,21 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { acc->PrefetchInEdges(*vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -717,16 +717,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -734,12 +734,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -747,22 +747,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -783,14 +783,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -801,7 +801,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -812,7 +812,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -823,7 +823,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -831,30 +831,30 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -902,16 +902,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -919,12 +919,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -932,22 +932,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); acc->Abort(); } @@ -966,21 +966,21 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { acc->PrefetchInEdges(*vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -1009,16 +1009,16 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1026,12 +1026,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1039,22 +1039,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1075,14 +1075,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1093,7 +1093,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1104,7 +1104,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1115,7 +1115,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1123,30 +1123,30 @@ TEST_P(StorageEdgeTest, EdgeCreateFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1187,12 +1187,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1200,12 +1200,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1217,14 +1217,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); acc->Abort(); } @@ -1239,13 +1239,13 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { acc->PrefetchInEdges(*vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -1270,12 +1270,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1283,12 +1283,12 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1300,14 +1300,14 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1327,7 +1327,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1338,7 +1338,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1349,7 +1349,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1360,7 +1360,7 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1372,22 +1372,22 @@ TEST_P(StorageEdgeTest, EdgeCreateFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1435,16 +1435,16 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1452,12 +1452,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1465,22 +1465,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1501,14 +1501,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1519,7 +1519,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1530,7 +1530,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1541,7 +1541,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1549,30 +1549,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1592,21 +1592,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1614,12 +1614,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1627,24 +1627,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1663,21 +1663,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerCommit) { acc->PrefetchInEdges(*vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -1726,16 +1726,16 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1743,12 +1743,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1756,22 +1756,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1792,14 +1792,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1810,7 +1810,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1821,7 +1821,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1832,7 +1832,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -1840,30 +1840,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1883,21 +1883,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1905,12 +1905,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -1918,24 +1918,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -1954,21 +1954,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerCommit) { acc->PrefetchInEdges(*vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -2010,12 +2010,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2023,12 +2023,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2040,14 +2040,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2067,7 +2067,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2078,7 +2078,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2089,7 +2089,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2100,7 +2100,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2112,22 +2112,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2143,7 +2143,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); @@ -2153,7 +2153,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2161,12 +2161,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2174,20 +2174,20 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2202,13 +2202,13 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameCommit) { acc->PrefetchInEdges(*vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -2257,16 +2257,16 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2274,12 +2274,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2287,22 +2287,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2323,14 +2323,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2341,7 +2341,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2352,7 +2352,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2363,7 +2363,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2371,30 +2371,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2414,21 +2414,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2436,12 +2436,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2449,24 +2449,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); acc->Abort(); } @@ -2487,14 +2487,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2505,7 +2505,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2516,7 +2516,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2527,7 +2527,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2535,30 +2535,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2578,21 +2578,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2600,12 +2600,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2613,24 +2613,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2649,21 +2649,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSmallerAbort) { acc->PrefetchInEdges(*vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -2712,16 +2712,16 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(edge.ToVertex(), *vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2729,12 +2729,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2742,22 +2742,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2778,14 +2778,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2796,7 +2796,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2807,7 +2807,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2818,7 +2818,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2826,30 +2826,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -2869,21 +2869,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2891,12 +2891,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2904,24 +2904,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); acc->Abort(); } @@ -2942,14 +2942,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2960,7 +2960,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); @@ -2972,7 +2972,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -2983,7 +2983,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -2991,30 +2991,30 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3034,21 +3034,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex_from->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); ASSERT_TRUE(res.GetValue()); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3056,12 +3056,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3069,24 +3069,24 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 1); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->size(), 1); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 1); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_from)->edges.size(), 1); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD, {}, &*vertex_to)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3105,21 +3105,21 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromLargerAbort) { acc->PrefetchInEdges(*vertex_to); // Check edges without filters - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3161,12 +3161,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(edge.ToVertex(), *vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3174,12 +3174,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3191,14 +3191,14 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3218,7 +3218,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3229,7 +3229,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3240,7 +3240,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3251,7 +3251,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3263,22 +3263,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3294,7 +3294,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); @@ -3304,7 +3304,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3312,12 +3312,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3325,20 +3325,20 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); acc->Abort(); } @@ -3358,7 +3358,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3369,7 +3369,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3380,7 +3380,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3391,7 +3391,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3403,22 +3403,22 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3434,7 +3434,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { auto et = acc->NameToEdgeType("et5"); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto res = acc->DeleteEdge(&edge); ASSERT_TRUE(res.HasValue()); @@ -3444,7 +3444,7 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { { auto ret = vertex->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3452,12 +3452,12 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3465,20 +3465,20 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { ASSERT_EQ(e.FromVertex(), *vertex); ASSERT_EQ(e.ToVertex(), *vertex); } - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); auto other_et = acc->NameToEdgeType("other"); // Check edges with filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->size(), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->size(), 1); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et})->edges.size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {et, other_et})->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {}, &*vertex)->edges.size(), 1); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD, {other_et}, &*vertex)->edges.size(), 0); ASSERT_FALSE(acc->Commit().HasError()); } @@ -3493,13 +3493,13 @@ TEST_P(StorageEdgeTest, EdgeDeleteFromSameAbort) { acc->PrefetchInEdges(*vertex); // Check edges without filters - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3534,12 +3534,12 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { gid_to = vertex_to.Gid(); // Check edges - ASSERT_EQ(vertex_from.InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from.InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from.InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from.OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3550,7 +3550,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { { auto ret = vertex_to.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to.InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3558,7 +3558,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { ASSERT_EQ(e.FromVertex(), vertex_from); ASSERT_EQ(e.ToVertex(), vertex_to); } - ASSERT_EQ(vertex_to.OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to.OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to.OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3594,14 +3594,14 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { } // Check edges - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); ASSERT_EQ(vertex_from->InDegree(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3615,7 +3615,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3623,11 +3623,11 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -3647,13 +3647,13 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleCommit) { acc->PrefetchInEdges(*vertex_to); // Check edges - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); } disk_test_utils::RemoveRocksDbDirs(testSuite); @@ -3713,7 +3713,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex1.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1.InDegree(memgraph::storage::View::NEW), 2); @@ -3733,7 +3733,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex1.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1.OutDegree(memgraph::storage::View::NEW), 2); @@ -3753,7 +3753,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2.InDegree(memgraph::storage::View::NEW), 2); @@ -3773,7 +3773,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2.OutDegree(memgraph::storage::View::NEW), 2); @@ -3830,7 +3830,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::OLD), 2); @@ -3852,7 +3852,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::OLD), 2); @@ -3874,7 +3874,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 2); @@ -3894,7 +3894,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3905,7 +3905,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 2); @@ -3925,7 +3925,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3954,7 +3954,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3965,7 +3965,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -3976,7 +3976,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -3987,7 +3987,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleCommit) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4026,12 +4026,12 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { gid_to = vertex_to.Gid(); // Check edges - ASSERT_EQ(vertex_from.InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from.InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from.InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from.OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4042,7 +4042,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { { auto ret = vertex_to.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to.InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4050,7 +4050,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_EQ(e.FromVertex(), vertex_from); ASSERT_EQ(e.ToVertex(), vertex_to); } - ASSERT_EQ(vertex_to.OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to.OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to.OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -4086,14 +4086,14 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { } // Check edges - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); ASSERT_EQ(vertex_from->InDegree(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -4107,7 +4107,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -4115,11 +4115,11 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); acc->Abort(); @@ -4141,12 +4141,12 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { auto et = acc->NameToEdgeType("et5"); // Check edges - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::NEW), 0); { auto ret = vertex_from->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4157,7 +4157,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4165,7 +4165,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -4201,14 +4201,14 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { } // Check edges - ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_from->InDegree(memgraph::storage::View::OLD), 0); ASSERT_EQ(vertex_from->InEdges(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); ASSERT_EQ(vertex_from->InDegree(memgraph::storage::View::NEW).GetError(), memgraph::storage::Error::DELETED_OBJECT); { auto ret = vertex_from->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_from->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -4222,7 +4222,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { { auto ret = vertex_to->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -4230,11 +4230,11 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { ASSERT_EQ(e.FromVertex(), *vertex_from); ASSERT_EQ(e.ToVertex(), *vertex_to); } - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); ASSERT_FALSE(acc->Commit().HasError()); @@ -4254,13 +4254,13 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteSingleAbort) { acc->PrefetchInEdges(*vertex_to); // Check edges - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->InEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->InDegree(memgraph::storage::View::NEW), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::OLD)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::OLD), 0); - ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->size(), 0); + ASSERT_EQ(vertex_to->OutEdges(memgraph::storage::View::NEW)->edges.size(), 0); ASSERT_EQ(*vertex_to->OutDegree(memgraph::storage::View::NEW), 0); } disk_test_utils::RemoveRocksDbDirs(testSuite); @@ -4320,7 +4320,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1.InDegree(memgraph::storage::View::NEW), 2); @@ -4340,7 +4340,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1.OutDegree(memgraph::storage::View::NEW), 2); @@ -4360,7 +4360,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2.InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2.InDegree(memgraph::storage::View::NEW), 2); @@ -4380,7 +4380,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2.OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2.OutDegree(memgraph::storage::View::NEW), 2); @@ -4437,7 +4437,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::OLD), 2); @@ -4459,7 +4459,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::OLD), 2); @@ -4481,7 +4481,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 2); @@ -4501,7 +4501,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4512,7 +4512,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 2); @@ -4532,7 +4532,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4566,7 +4566,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::OLD), 2); @@ -4586,7 +4586,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::NEW), 2); @@ -4606,7 +4606,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::OLD), 2); @@ -4626,7 +4626,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::NEW), 2); @@ -4646,7 +4646,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 2); @@ -4666,7 +4666,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 2); @@ -4686,7 +4686,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 2); @@ -4706,7 +4706,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 2); @@ -4763,7 +4763,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->InDegree(memgraph::storage::View::OLD), 2); @@ -4785,7 +4785,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex1->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex1->OutDegree(memgraph::storage::View::OLD), 2); @@ -4807,7 +4807,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 2); @@ -4827,7 +4827,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4838,7 +4838,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; std::sort(edges.begin(), edges.end(), [](const auto &a, const auto &b) { return a.EdgeType() < b.EdgeType(); }); ASSERT_EQ(edges.size(), 2); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 2); @@ -4858,7 +4858,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4887,7 +4887,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -4898,7 +4898,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->InEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->InDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4909,7 +4909,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::OLD), 1); auto e = edges[0]; @@ -4920,7 +4920,7 @@ TEST_P(StorageEdgeTest, VertexDetachDeleteMultipleAbort) { { auto ret = vertex2->OutEdges(memgraph::storage::View::NEW); ASSERT_TRUE(ret.HasValue()); - auto edges = ret.GetValue(); + auto edges = ret.GetValue().edges; ASSERT_EQ(edges.size(), 1); ASSERT_EQ(*vertex2->OutDegree(memgraph::storage::View::NEW), 1); auto e = edges[0]; @@ -4989,7 +4989,7 @@ TEST(StorageWithProperties, EdgePropertyCommit) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5022,7 +5022,7 @@ TEST(StorageWithProperties, EdgePropertyCommit) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5058,7 +5058,7 @@ TEST(StorageWithProperties, EdgePropertyCommit) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5106,7 +5106,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5150,7 +5150,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { // We prefetch edges implicitly when go thorough query Accessor acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5176,7 +5176,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5221,7 +5221,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5256,7 +5256,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5302,7 +5302,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5337,7 +5337,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5383,7 +5383,7 @@ TEST(StorageWithProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5431,7 +5431,7 @@ TEST(StorageWithProperties, EdgePropertySerializationError) { acc1->PrefetchOutEdges(*vertex); acc1->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property1 = acc1->NameToProperty("property1"); auto property2 = acc1->NameToProperty("property2"); @@ -5469,7 +5469,7 @@ TEST(StorageWithProperties, EdgePropertySerializationError) { acc2->PrefetchOutEdges(*vertex); acc2->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property1 = acc2->NameToProperty("property1"); auto property2 = acc2->NameToProperty("property2"); @@ -5505,7 +5505,7 @@ TEST(StorageWithProperties, EdgePropertySerializationError) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property1 = acc->NameToProperty("property1"); auto property2 = acc->NameToProperty("property2"); @@ -5562,7 +5562,7 @@ TEST(StorageWithProperties, EdgePropertyClear) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; ASSERT_EQ(edge.GetProperty(property1, memgraph::storage::View::OLD)->ValueString(), "value"); ASSERT_TRUE(edge.GetProperty(property2, memgraph::storage::View::OLD)->IsNull()); @@ -5599,7 +5599,7 @@ TEST(StorageWithProperties, EdgePropertyClear) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto old_value = edge.SetProperty(property2, memgraph::storage::PropertyValue(42)); ASSERT_TRUE(old_value.HasValue()); @@ -5615,7 +5615,7 @@ TEST(StorageWithProperties, EdgePropertyClear) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; ASSERT_EQ(edge.GetProperty(property1, memgraph::storage::View::OLD)->ValueString(), "value"); ASSERT_EQ(edge.GetProperty(property2, memgraph::storage::View::OLD)->ValueInt(), 42); @@ -5653,7 +5653,7 @@ TEST(StorageWithProperties, EdgePropertyClear) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; ASSERT_TRUE(edge.GetProperty(property1, memgraph::storage::View::NEW)->IsNull()); ASSERT_TRUE(edge.GetProperty(property2, memgraph::storage::View::NEW)->IsNull()); @@ -5689,7 +5689,7 @@ TEST(StorageWithoutProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5724,7 +5724,7 @@ TEST(StorageWithoutProperties, EdgePropertyAbort) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; auto property = acc->NameToProperty("property5"); @@ -5768,7 +5768,7 @@ TEST(StorageWithoutProperties, EdgePropertyClear) { acc->PrefetchOutEdges(*vertex); acc->PrefetchInEdges(*vertex); - auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue()[0]; + auto edge = vertex->OutEdges(memgraph::storage::View::NEW).GetValue().edges[0]; ASSERT_EQ(edge.ClearProperties().GetError(), memgraph::storage::Error::PROPERTIES_DISABLED); diff --git a/tests/unit/storage_v2_gc.cpp b/tests/unit/storage_v2_gc.cpp index 8074e833c..f17ad657b 100644 --- a/tests/unit/storage_v2_gc.cpp +++ b/tests/unit/storage_v2_gc.cpp @@ -134,22 +134,22 @@ TEST(StorageV2Gc, Sanity) { auto vertex = acc->FindVertex(vertices[i], memgraph::storage::View::NEW); EXPECT_EQ(vertex.has_value(), i % 5 != 0 && i % 3 != 0); if (vertex.has_value()) { - auto out_edges = vertex->OutEdges(memgraph::storage::View::NEW); + auto out_edges = vertex->OutEdges(memgraph::storage::View::NEW)->edges; if (i % 5 != 4 && i % 3 != 2) { - EXPECT_EQ(out_edges.GetValue().size(), 1); + EXPECT_EQ(out_edges.size(), 1); EXPECT_EQ(*vertex->OutDegree(memgraph::storage::View::NEW), 1); - EXPECT_EQ(out_edges.GetValue().at(0).EdgeType().AsUint(), i); + EXPECT_EQ(out_edges.at(0).EdgeType().AsUint(), i); } else { - EXPECT_TRUE(out_edges->empty()); + EXPECT_TRUE(out_edges.empty()); } - auto in_edges = vertex->InEdges(memgraph::storage::View::NEW); + auto in_edges = vertex->InEdges(memgraph::storage::View::NEW)->edges; if (i % 5 != 1 && i % 3 != 1) { - EXPECT_EQ(in_edges.GetValue().size(), 1); + EXPECT_EQ(in_edges.size(), 1); EXPECT_EQ(*vertex->InDegree(memgraph::storage::View::NEW), 1); - EXPECT_EQ(in_edges.GetValue().at(0).EdgeType().AsUint(), (i + 999) % 1000); + EXPECT_EQ(in_edges.at(0).EdgeType().AsUint(), (i + 999) % 1000); } else { - EXPECT_TRUE(in_edges->empty()); + EXPECT_TRUE(in_edges.empty()); } } } diff --git a/tests/unit/storage_v2_replication.cpp b/tests/unit/storage_v2_replication.cpp index 0aff395a1..94312bba5 100644 --- a/tests/unit/storage_v2_replication.cpp +++ b/tests/unit/storage_v2_replication.cpp @@ -180,7 +180,7 @@ TEST_F(ReplicationTest, BasicSynchronousReplicationTest) { ASSERT_TRUE(v); const auto out_edges = v->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - const auto edge = find_edge(*out_edges, *edge_gid); + const auto edge = find_edge(out_edges->edges, *edge_gid); ASSERT_EQ(edge->EdgeType(), replica_store->NameToEdgeType(edge_type)); const auto properties = edge->Properties(memgraph::storage::View::OLD); ASSERT_TRUE(properties.HasValue()); @@ -197,7 +197,7 @@ TEST_F(ReplicationTest, BasicSynchronousReplicationTest) { auto v = acc->FindVertex(*vertex_gid, memgraph::storage::View::OLD); ASSERT_TRUE(v); auto out_edges = v->OutEdges(memgraph::storage::View::OLD); - auto edge = find_edge(*out_edges, *edge_gid); + auto edge = find_edge(out_edges->edges, *edge_gid); ASSERT_TRUE(edge); ASSERT_TRUE(acc->DeleteEdge(&*edge).HasValue()); ASSERT_FALSE(acc->Commit().HasError()); @@ -209,7 +209,7 @@ TEST_F(ReplicationTest, BasicSynchronousReplicationTest) { ASSERT_TRUE(v); const auto out_edges = v->OutEdges(memgraph::storage::View::OLD); ASSERT_TRUE(out_edges.HasValue()); - ASSERT_FALSE(find_edge(*out_edges, *edge_gid)); + ASSERT_FALSE(find_edge(out_edges->edges, *edge_gid)); ASSERT_FALSE(acc->Commit().HasError()); }