Address missed GH comments && fix broken merge

src/functions/awesome_memgraph_functions.hpp

@@ -45,19 +45,13 @@ struct FunctionContext {
 struct StorageEngineTag {};
 struct QueryEngineTag {};
 
-namespace impl {
-struct SinkCallable {
-  void operator()() {}
-};
-}  // namespace impl
-
 /// Return the function implementation with the given name.
 ///
 /// Note, returned function signature uses C-style access to an array to allow
 /// having an array stored anywhere the caller likes, as long as it is
 /// contiguous in memory. Since most functions don't take many arguments, it's
 /// convenient to have them stored in the calling stack frame.
-template <typename TypedValueT, typename FunctionContextT, typename Tag, typename Conv = impl::SinkCallable>
+template <typename TypedValueT, typename FunctionContextT, typename Tag, typename Conv>
 std::function<TypedValueT(const TypedValueT *arguments, int64_t num_arguments, const FunctionContextT &context)>
 NameToFunction(const std::string &function_name);
 

src/storage/v3/edge_accessor.cpp

@@ -180,6 +180,6 @@ Result<std::map<PropertyId, PropertyValue>> EdgeAccessor::Properties(View view)
 }
 
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-size_t EdgeAccessor::CypherId() const { return 10; }
+size_t EdgeAccessor::CypherId() const { return Gid().AsUint(); }
 
 }  // namespace memgraph::storage::v3

src/storage/v3/vertex_accessor.cpp

@@ -733,7 +733,4 @@ Result<size_t> VertexAccessor::OutDegree(View view) const {
   return degree;
 }
 
-// NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-size_t VertexAccessor::CypherId() const { return 10; }
-
 }  // namespace memgraph::storage::v3

src/storage/v3/vertex_accessor.hpp

@@ -118,9 +118,6 @@ class VertexAccessor final {
   }
   bool operator!=(const VertexAccessor &other) const noexcept { return !(*this == other); }
 
-  // Dummy function
-  size_t CypherId() const;
-
  private:
   /// Add a label and return `true` if insertion took place.
   /// `false` is returned if the label already existed.

tests/unit/query_v2_expression_evaluator.cpp

@@ -32,7 +32,7 @@
 #include "query/v2/shard_request_manager.hpp"
 #include "query_v2_query_common.hpp"
 #include "storage/v3/property_value.hpp"
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 #include "utils/exceptions.hpp"
 #include "utils/string.hpp"