tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typos

Browse Source
This commit is contained in:
jbajic 2022-11-09 15:55:34 +01:00
parent 691f6af36d
commit 8636788ab2
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/storage/v3/shard_rsm.cpp
View File

@ -57,11 +57,11 @@ using conversions::ToPropertyValue;
namespace { namespace {
namespace msgs = msgs; namespace msgs = msgs;
using AllEdgePropertyDataSructure = std::map<PropertyId, msgs::Value>; using AllEdgePropertyDataStructure = std::map<PropertyId, msgs::Value>;
using SpecificEdgePropertyDataSructure = std::vector<msgs::Value>; using SpecificEdgePropertyDataStructure = std::vector<msgs::Value>;
using AllEdgeProperties = std::tuple<msgs::VertexId, msgs::Gid, AllEdgePropertyDataSructure>; using AllEdgeProperties = std::tuple<msgs::VertexId, msgs::Gid, AllEdgePropertyDataStructure>;
using SpecificEdgeProperties = std::tuple<msgs::VertexId, msgs::Gid, SpecificEdgePropertyDataSructure>; using SpecificEdgeProperties = std::tuple<msgs::VertexId, msgs::Gid, SpecificEdgePropertyDataStructure>;
using SpecificEdgePropertiesVector = std::vector<SpecificEdgeProperties>; using SpecificEdgePropertiesVector = std::vector<SpecificEdgeProperties>;
using AllEdgePropertiesVector = std::vector<AllEdgeProperties>; using AllEdgePropertiesVector = std::vector<AllEdgeProperties>;
@ -69,7 +69,7 @@ using AllEdgePropertiesVector = std::vector<AllEdgeProperties>;
using EdgeAccessors = std::vector<storage::v3::EdgeAccessor>; using EdgeAccessors = std::vector<storage::v3::EdgeAccessor>;
using EdgeFiller = std::function<bool(const EdgeAccessor &edge, bool is_in_edge, msgs::ExpandOneResultRow &result_row)>; using EdgeFiller = std::function<bool(const EdgeAccessor &edge, bool is_in_edge, msgs::ExpandOneResultRow &result_row)>;
using EdgeUniqunessFunction = std::function<EdgeAccessors(EdgeAccessors &&, msgs::EdgeDirection)>; using EdgeUniquenessFunction = std::function<EdgeAccessors(EdgeAccessors &&, msgs::EdgeDirection)>;
struct VertexIdCmpr { struct VertexIdCmpr {
bool operator()(const storage::v3::VertexId *lhs, const storage::v3::VertexId *rhs) const { return *lhs < *rhs; } bool operator()(const storage::v3::VertexId *lhs, const storage::v3::VertexId *rhs) const { return *lhs < *rhs; }
@ -180,8 +180,6 @@ std::vector<TypedValue> EvaluateVertexExpressions(DbAccessor &dba, const VertexA
return evaluated_expressions; return evaluated_expressions;
} }
struct LocalError {};
std::optional<std::vector<msgs::Label>> FillUpSourceVertexSecondaryLabels(const std::optional<VertexAccessor> &v_acc, std::optional<std::vector<msgs::Label>> FillUpSourceVertexSecondaryLabels(const std::optional<VertexAccessor> &v_acc,
const msgs::ExpandOneRequest &req) { const msgs::ExpandOneRequest &req) {
auto secondary_labels = v_acc->Labels(View::NEW); auto secondary_labels = v_acc->Labels(View::NEW);
@ -242,7 +240,7 @@ std::optional<std::map<PropertyId, Value>> FillUpSourceVertexProperties(const st
std::optional<std::array<std::vector<EdgeAccessor>, 2>> FillUpConnectingEdges( std::optional<std::array<std::vector<EdgeAccessor>, 2>> FillUpConnectingEdges(
const std::optional<VertexAccessor> &v_acc, const msgs::ExpandOneRequest &req, const std::optional<VertexAccessor> &v_acc, const msgs::ExpandOneRequest &req,
const EdgeUniqunessFunction &maybe_filter_based_on_edge_uniquness) { const EdgeUniquenessFunction &maybe_filter_based_on_edge_uniquness) {
std::vector<EdgeTypeId> edge_types{}; std::vector<EdgeTypeId> edge_types{};
edge_types.reserve(req.edge_types.size()); edge_types.reserve(req.edge_types.size());
std::transform(req.edge_types.begin(), req.edge_types.end(), std::back_inserter(edge_types), std::transform(req.edge_types.begin(), req.edge_types.end(), std::back_inserter(edge_types),
@ -296,11 +294,11 @@ std::optional<std::array<std::vector<EdgeAccessor>, 2>> FillUpConnectingEdges(
return std::array<std::vector<EdgeAccessor>, 2>{in_edges, out_edges}; return std::array<std::vector<EdgeAccessor>, 2>{in_edges, out_edges};
} }
using AllEdgePropertyDataSructure = std::map<PropertyId, msgs::Value>; using AllEdgePropertyDataStructure = std::map<PropertyId, msgs::Value>;
using SpecificEdgePropertyDataSructure = std::vector<msgs::Value>; using SpecificEdgePropertyDataStructure = std::vector<msgs::Value>;
using AllEdgeProperties = std::tuple<msgs::VertexId, msgs::Gid, AllEdgePropertyDataSructure>; using AllEdgeProperties = std::tuple<msgs::VertexId, msgs::Gid, AllEdgePropertyDataStructure>;
using SpecificEdgeProperties = std::tuple<msgs::VertexId, msgs::Gid, SpecificEdgePropertyDataSructure>; using SpecificEdgeProperties = std::tuple<msgs::VertexId, msgs::Gid, SpecificEdgePropertyDataStructure>;
using SpecificEdgePropertiesVector = std::vector<SpecificEdgeProperties>; using SpecificEdgePropertiesVector = std::vector<SpecificEdgeProperties>;
using AllEdgePropertiesVector = std::vector<AllEdgeProperties>; using AllEdgePropertiesVector = std::vector<AllEdgeProperties>;
@ -354,7 +352,7 @@ void LogError(const ResultErrorType &error, const std::string_view action) {
std::optional<msgs::ExpandOneResultRow> GetExpandOneResult( std::optional<msgs::ExpandOneResultRow> GetExpandOneResult(
Shard::Accessor &acc, msgs::VertexId src_vertex, const msgs::ExpandOneRequest &req, Shard::Accessor &acc, msgs::VertexId src_vertex, const msgs::ExpandOneRequest &req,
const EdgeUniqunessFunction &maybe_filter_based_on_edge_uniquness, const EdgeFiller &edge_filler, const EdgeUniquenessFunction &maybe_filter_based_on_edge_uniquness, const EdgeFiller &edge_filler,
const Schemas::Schema *schema) { const Schemas::Schema *schema) {
/// Fill up source vertex /// Fill up source vertex
const auto primary_key = ConvertPropertyVector(src_vertex.second); const auto primary_key = ConvertPropertyVector(src_vertex.second);
@ -397,9 +395,9 @@ std::optional<msgs::ExpandOneResultRow> GetExpandOneResult(
return result_row; return result_row;
} }
EdgeUniqunessFunction InitializeEdgeUniqunessFunction(bool only_unique_neighbor_rows) { EdgeUniquenessFunction InitializeEdgeUniquenessFunction(bool only_unique_neighbor_rows) {
// Functions to select connecting edges based on uniquness // Functions to select connecting edges based on uniquness
EdgeUniqunessFunction maybe_filter_based_on_edge_uniquness; EdgeUniquenessFunction maybe_filter_based_on_edge_uniquness;
if (only_unique_neighbor_rows) { if (only_unique_neighbor_rows) {
maybe_filter_based_on_edge_uniquness = [](EdgeAccessors &&edges, maybe_filter_based_on_edge_uniquness = [](EdgeAccessors &&edges,
@ -871,7 +869,7 @@ msgs::ReadResponses ShardRsm::HandleRead(msgs::ExpandOneRequest &&req) {
std::vector<msgs::ExpandOneResultRow> results; std::vector<msgs::ExpandOneResultRow> results;
auto maybe_filter_based_on_edge_uniquness = InitializeEdgeUniqunessFunction(req.only_unique_neighbor_rows); auto maybe_filter_based_on_edge_uniquness = InitializeEdgeUniquenessFunction(req.only_unique_neighbor_rows);
auto edge_filler = InitializeEdgeFillerFunction(req); auto edge_filler = InitializeEdgeFillerFunction(req);
for (auto &src_vertex : req.src_vertices) { for (auto &src_vertex : req.src_vertices) {

2
tests/simulation/shard_rsm.cpp
View File

@ -906,7 +906,7 @@ void TestCreateAndUpdateVertices(ShardClient &client) {
auto unique_prop_val = GetUniqueInteger(); auto unique_prop_val = GetUniqueInteger();
MG_ASSERT(AttemptToCreateVertex(client, unique_prop_val)); MG_ASSERT(AttemptToCreateVertex(client, unique_prop_val));
MG_ASSERT(AttemptToUpdateVertex(client, unique_prop_val, {LabelId::FromInt(3)})); MG_ASSERT(AttemptToUpdateVertex(client, unique_prop_val, {LabelId::FromInt(3)}, {}));
MG_ASSERT(AttemptToUpdateVertex(client, unique_prop_val, {}, {LabelId::FromInt(3)})); MG_ASSERT(AttemptToUpdateVertex(client, unique_prop_val, {}, {LabelId::FromInt(3)}));
MG_ASSERT(AttemptToRemoveVertexProperty(client, unique_prop_val)); MG_ASSERT(AttemptToRemoveVertexProperty(client, unique_prop_val));
} }