diff --git a/src/query/v2/parameters.hpp b/src/query/v2/parameters.hpp index 1e2f0744f..7f4ac0b31 100644 --- a/src/query/v2/parameters.hpp +++ b/src/query/v2/parameters.hpp @@ -12,8 +12,8 @@ #pragma once #include +#include #include -#include #include "storage/v3/property_value.hpp" #include "utils/logging.hpp" @@ -32,7 +32,7 @@ struct Parameters { * @param position Token position in query of value. * @param value */ - void Add(int position, const storage::v3::PropertyValue &value) { storage_.emplace_back(position, value); } + void Add(int position, const storage::v3::PropertyValue &value) { storage_.emplace(position, value); } /** * Returns the value found for the given token position. @@ -41,23 +41,11 @@ struct Parameters { * @return Value for the given token position. */ const storage::v3::PropertyValue &AtTokenPosition(int position) const { - auto found = std::find_if(storage_.begin(), storage_.end(), [&](const auto &a) { return a.first == position; }); + auto found = storage_.find(position); MG_ASSERT(found != storage_.end(), "Token position must be present in container"); return found->second; } - /** - * Returns the position-th stripped value. Asserts that this - * container has at least (position + 1) elements. - * - * @param position Which stripped param is sought. - * @return Token position and value for sought param. - */ - const std::pair &At(int position) const { - MG_ASSERT(position < static_cast(storage_.size()), "Invalid position"); - return storage_[position]; - } - /** Returns the number of arguments in this container */ auto size() const { return storage_.size(); } @@ -65,7 +53,7 @@ struct Parameters { auto end() const { return storage_.end(); } private: - std::vector> storage_; + std::unordered_map storage_; }; } // namespace memgraph::query::v2 diff --git a/src/query/v2/plan/operator.cpp b/src/query/v2/plan/operator.cpp index 0ab550ed1..068ca9192 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: @@ -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 request_state; auto result_rows = context.shard_request_manager->Request(request_state, std::move(request)); 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..73484c4bc 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(); - 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, const uint64_t increment) { + auto &json_data = custom_data[key]; + const auto numerical_data = json_data.is_null() ? 0 : json_data.get(); + json_data = numerical_data + increment; + } + std::string_view custom_data_name_; uint64_t start_time_; ExecutionContext *context_; diff --git a/src/storage/v3/bindings/eval.hpp b/src/storage/v3/bindings/eval.hpp index 38b5aae87..7f93bb79c 100644 --- a/src/storage/v3/bindings/eval.hpp +++ b/src/storage/v3/bindings/eval.hpp @@ -42,7 +42,7 @@ struct Parameters { * @param position Token position in query of value. * @param value */ - void Add(int position, const storage::v3::PropertyValue &value) { storage_.emplace_back(position, value); } + void Add(int position, const storage::v3::PropertyValue &value) { storage_.emplace(position, value); } /** * Returns the value found for the given token position. @@ -51,23 +51,11 @@ struct Parameters { * @return Value for the given token position. */ const storage::v3::PropertyValue &AtTokenPosition(int position) const { - auto found = std::find_if(storage_.begin(), storage_.end(), [&](const auto &a) { return a.first == position; }); + auto found = storage_.find(position); MG_ASSERT(found != storage_.end(), "Token position must be present in container"); return found->second; } - /** - * Returns the position-th stripped value. Asserts that this - * container has at least (position + 1) elements. - * - * @param position Which stripped param is sought. - * @return Token position and value for sought param. - */ - const std::pair &At(int position) const { - MG_ASSERT(position < static_cast(storage_.size()), "Invalid position"); - return storage_[position]; - } - /** Returns the number of arguments in this container */ auto size() const { return storage_.size(); } @@ -75,7 +63,7 @@ struct Parameters { auto end() const { return storage_.end(); } private: - std::vector> storage_; + std::unordered_map storage_; }; struct EvaluationContext {