From fdd89e0e81be9d6f22804482b1fa48ae5f4540d2 Mon Sep 17 00:00:00 2001
From: gvolfing <gabor.volfinger@memgraph.io>
Date: Mon, 16 Jan 2023 11:27:41 +0100
Subject: [PATCH] Replace ScanVertices with GetProperties request, in the case
 of ScanAllByPrimaryKey operator

---
 src/query/v2/plan/operator.cpp  | 36 ++++++++++++++++++++++++++++++++-
 src/query/v2/request_router.hpp |  3 +--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/query/v2/plan/operator.cpp b/src/query/v2/plan/operator.cpp
index a5ca9d061..a7a3efe3b 100644
--- a/src/query/v2/plan/operator.cpp
+++ b/src/query/v2/plan/operator.cpp
@@ -516,7 +516,41 @@ class DistributedScanAllByPrimaryKeyCursor : public Cursor {
         pk.push_back(TypedValueToValue(primary_key->Accept(evaluator)));
       }
 
-      current_batch_ = request_router.ScanVertices(request_label, pk);
+      // Original
+      // current_batch_ = request_router.ScanVertices(request_label, pk);
+
+      // VertexAccessor(Vertex v, std::vector<std::pair<PropertyId, Value>> props,
+      //                const RequestRouterInterface *request_router);
+
+      // VertexAccessor(Vertex v, std::map<PropertyId, Value> &&props, const RequestRouterInterface *request_router);
+      // VertexAccessor(Vertex v, const std::map<PropertyId, Value> &props, const RequestRouterInterface
+      // *request_router);
+
+      // struct Vertex {
+      //   VertexId id;
+      //   std::vector<Label> labels;
+      //   friend bool operator==(const Vertex &lhs, const Vertex &rhs) { return lhs.id == rhs.id; }
+      // };
+
+      msgs::Label label = {.id = msgs::LabelId::FromUint(label_->AsUint())};
+
+      msgs::GetPropertiesRequest req = {.vertex_ids = {std::make_pair(label, pk)}};
+      auto get_prop_result = request_router.GetProperties(req);
+      MG_ASSERT(get_prop_result.size() == 1);
+
+      // std::vector<std::pair<PropertyId, Value>> props
+      std::map<msgs::PropertyId, msgs::Value> transformed_properties;
+      auto properties = get_prop_result[0].props;
+      std::transform(properties.begin(), properties.end(),
+                     std::inserter(transformed_properties, transformed_properties.end()), [](const auto &prop) {
+                       return std::make_pair(msgs::PropertyId::FromUint(prop.first.AsUint()), prop.second);
+                     });
+
+      msgs::Vertex vertex = {.id = get_prop_result[0].vertex, .labels = {label}};
+      // auto va = VertexAccessor(vertex, std::move(transformed_properties), &request_router);
+      auto va = VertexAccessor(vertex, properties, &request_router);
+
+      current_batch_ = {va};
     }
     current_vertex_it_ = current_batch_.begin();
     request_state_ = State::COMPLETED;
diff --git a/src/query/v2/request_router.hpp b/src/query/v2/request_router.hpp
index 6004c0b88..d4223e880 100644
--- a/src/query/v2/request_router.hpp
+++ b/src/query/v2/request_router.hpp
@@ -115,8 +115,7 @@ class RequestRouterInterface {
   virtual std::optional<storage::v3::LabelId> MaybeNameToLabel(const std::string &name) const = 0;
   virtual bool IsPrimaryLabel(storage::v3::LabelId label) const = 0;
   virtual bool IsPrimaryKey(storage::v3::LabelId primary_label, storage::v3::PropertyId property) const = 0;
-  // TODO - (gvolfing) Implement this function in the mocked class.
-  virtual std::vector<coordinator::SchemaProperty> GetSchemaForLabel(storage::v3::LabelId /*label*/) const = 0;
+  virtual std::vector<coordinator::SchemaProperty> GetSchemaForLabel(storage::v3::LabelId label) const = 0;
 };
 
 // TODO(kostasrim)rename this class template