From a96f4897566afde491e9f3b7d7d99af0fb921205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Benjamin=20Antal?= <benjamin.antal@memgraph.io>
Date: Wed, 2 Nov 2022 14:02:19 +0100
Subject: [PATCH 1/4] Count the number of requests per operator
---
src/query/v2/plan/profile.hpp | 1 +
src/query/v2/plan/scoped_profile.hpp | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/query/v2/plan/profile.hpp b/src/query/v2/plan/profile.hpp
index da25be33c..bf7687018 100644
--- a/src/query/v2/plan/profile.hpp
+++ b/src/query/v2/plan/profile.hpp
@@ -29,6 +29,7 @@ struct ProfilingStats {
static constexpr std::string_view kNumCycles{"num_cycles"};
static constexpr std::string_view kRelativeTime{"relative_time"};
static constexpr std::string_view kAbsoluteTime{"absolute_time"};
+ static constexpr std::string_view kActualHits{"actual_hits"};
int64_t actual_hits{0};
uint64_t num_cycles{0};
diff --git a/src/query/v2/plan/scoped_profile.hpp b/src/query/v2/plan/scoped_profile.hpp
index 3aa4bc569..a9d4c1296 100644
--- a/src/query/v2/plan/scoped_profile.hpp
+++ b/src/query/v2/plan/scoped_profile.hpp
@@ -42,13 +42,18 @@ class ScopedCustomProfile {
custom_data = nlohmann::json::object();
}
const auto elapsed = utils::ReadTSC() - start_time_;
- auto &num_cycles_json = custom_data[ProfilingStats::kNumCycles];
- const auto num_cycles = num_cycles_json.is_null() ? 0 : num_cycles_json.get<uint64_t>();
- num_cycles_json = num_cycles + elapsed;
+ IncreaseCustomData(custom_data, ProfilingStats::kNumCycles, elapsed);
+ IncreaseCustomData(custom_data, ProfilingStats::kActualHits, 1);
}
}
private:
+ static void IncreaseCustomData(nlohmann::json &custom_data, const std::string_view key, uint64_t increment) {
+ auto &json_data = custom_data[key];
+ const auto numerical_data = json_data.is_null() ? 0 : json_data.get<uint64_t>();
+ json_data = numerical_data + increment;
+ }
+
std::string_view custom_data_name_;
uint64_t start_time_;
ExecutionContext *context_;
From bb3b0533757302f04c641ddf30fe563d77cc533d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Benjamin=20Antal?= <benjamin.antal@memgraph.io>
Date: Wed, 2 Nov 2022 14:04:10 +0100
Subject: [PATCH 2/4] Create edge in the correct direction
---
src/query/v2/plan/operator.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/query/v2/plan/operator.cpp b/src/query/v2/plan/operator.cpp
index 0ab550ed1..0f35a4bbf 100644
--- a/src/query/v2/plan/operator.cpp
+++ b/src/query/v2/plan/operator.cpp
@@ -2458,13 +2458,13 @@ class DistributedCreateExpandCursor : public Cursor {
std::invoke([&]() {
switch (edge_info.direction) {
case EdgeAtom::Direction::IN: {
- set_vertex(v1, request.src_vertex);
- set_vertex(v2, request.dest_vertex);
+ set_vertex(v2, request.src_vertex);
+ set_vertex(v1, request.dest_vertex);
break;
}
case EdgeAtom::Direction::OUT: {
- set_vertex(v1, request.dest_vertex);
- set_vertex(v2, request.src_vertex);
+ set_vertex(v1, request.src_vertex);
+ set_vertex(v2, request.dest_vertex);
break;
}
case EdgeAtom::Direction::BOTH:
From 57e71692036bd921a349460e4c45f2285712c85d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Benjamin=20Antal?= <benjamin.antal@memgraph.io>
Date: Wed, 2 Nov 2022 14:06:08 +0100
Subject: [PATCH 3/4] Eliminate dangling reference from lambda
---
src/query/v2/plan/operator.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/query/v2/plan/operator.cpp b/src/query/v2/plan/operator.cpp
index 0f35a4bbf..068ca9192 100644
--- a/src/query/v2/plan/operator.cpp
+++ b/src/query/v2/plan/operator.cpp
@@ -2513,7 +2513,8 @@ class DistributedExpandCursor : public Cursor {
}
MG_ASSERT(direction != EdgeAtom::Direction::BOTH);
const auto &edge = frame[self_.common_.edge_symbol].ValueEdge();
- static auto get_dst_vertex = [&edge](const EdgeAtom::Direction direction) {
+ static constexpr auto get_dst_vertex = [](const EdgeAccessor &edge,
+ const EdgeAtom::Direction direction) -> msgs::VertexId {
switch (direction) {
case EdgeAtom::Direction::IN:
return edge.From().Id();
@@ -2526,7 +2527,7 @@ class DistributedExpandCursor : public Cursor {
msgs::ExpandOneRequest request;
// to not fetch any properties of the edges
request.edge_properties.emplace();
- request.src_vertices.push_back(get_dst_vertex(direction));
+ request.src_vertices.push_back(get_dst_vertex(edge, direction));
request.direction = (direction == EdgeAtom::Direction::IN) ? msgs::EdgeDirection::OUT : msgs::EdgeDirection::IN;
msgs::ExecutionState<msgs::ExpandOneRequest> request_state;
auto result_rows = context.shard_request_manager->Request(request_state, std::move(request));
From 589dd36bf2ca9816576f0aac83e0f0f8ddf10694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20Benjamin=20Antal?= <benjamin.antal@memgraph.io>
Date: Wed, 2 Nov 2022 14:44:54 +0100
Subject: [PATCH 4/4] Make function parameter constant
---
src/query/v2/plan/scoped_profile.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/query/v2/plan/scoped_profile.hpp b/src/query/v2/plan/scoped_profile.hpp
index a9d4c1296..73484c4bc 100644
--- a/src/query/v2/plan/scoped_profile.hpp
+++ b/src/query/v2/plan/scoped_profile.hpp
@@ -48,7 +48,7 @@ class ScopedCustomProfile {
}
private:
- static void IncreaseCustomData(nlohmann::json &custom_data, const std::string_view key, uint64_t increment) {
+ static void IncreaseCustomData(nlohmann::json &custom_data, const std::string_view key, const uint64_t increment) {
auto &json_data = custom_data[key];
const auto numerical_data = json_data.is_null() ? 0 : json_data.get<uint64_t>();
json_data = numerical_data + increment;