From c2b80afd0f0cd0a76fd15d7d1f4510a1e8a57a89 Mon Sep 17 00:00:00 2001 From: antoniofilipovic Date: Fri, 12 Aug 2022 10:59:52 +0200 Subject: [PATCH] add small fixes so build passes --- src/query/db_accessor.cpp | 4 +++- src/query/graph.cpp | 8 ++++---- src/query/graph.hpp | 8 ++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/query/db_accessor.cpp b/src/query/db_accessor.cpp index 5d6b5167e..190eb7322 100644 --- a/src/query/db_accessor.cpp +++ b/src/query/db_accessor.cpp @@ -11,6 +11,8 @@ #pragma once +#include "query/db_accessor.hpp" + #include "query/graph.hpp" namespace memgraph::query { @@ -21,7 +23,7 @@ SubgraphDbAccessor *SubgraphDbAccessor::MakeSubgraphDbAccessor(DbAccessor *db_ac return new SubgraphDbAccessor(db_accessor, graph); } -storage::PropertyId SubgraphDbAccessor::SubgraphDBNameToProperty(const std::string_view name) { +storage::PropertyId SubgraphDbAccessor::NameToProperty(const std::string_view name) { return db_accessor_->NameToProperty(name); } diff --git a/src/query/graph.cpp b/src/query/graph.cpp index c27c053e5..a40ee382d 100644 --- a/src/query/graph.cpp +++ b/src/query/graph.cpp @@ -47,10 +47,10 @@ Graph &Graph::operator=(Graph &&) = default; /** Returns the number of expansions (edges) in this path. */ auto Graph::size() const { return edges_.size(); } -auto &Graph::vertices() { return vertices_; } -auto &Graph::edges() { return edges_; } -const auto &Graph::vertices() const { return vertices_; } -const auto &Graph::edges() const { return edges_; } +utils::pmr::unordered_set &Graph::vertices() { return vertices_; } +utils::pmr::unordered_set &Graph::edges() { return edges_; } +const utils::pmr::unordered_set &Graph::vertices() const { return vertices_; } +const utils::pmr::unordered_set &Graph::edges() const { return edges_; } utils::MemoryResource *Graph::GetMemoryResource() const { return vertices_.get_allocator().GetMemoryResource(); } diff --git a/src/query/graph.hpp b/src/query/graph.hpp index 97afa161e..67b493d33 100644 --- a/src/query/graph.hpp +++ b/src/query/graph.hpp @@ -65,10 +65,10 @@ class Graph final { /** Returns the number of expansions (edges) in this path. */ auto size() const; - auto &vertices(); - auto &edges(); - const auto &vertices() const; - const auto &edges() const; + utils::pmr::unordered_set &vertices(); + utils::pmr::unordered_set &edges(); + const utils::pmr::unordered_set &vertices() const; + const utils::pmr::unordered_set &edges() const; utils::MemoryResource *GetMemoryResource() const;