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

Fix unit tests

Browse Source
This commit is contained in:
János Benjamin Antal 2023-01-15 18:52:36 +01:00
parent b30137ab7a
commit c139856b2a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/query/v2/plan/operator.cpp
View File

@ -1,4 +1,4 @@
// Copyright 2022 Memgraph Ltd. // Copyright 2023 Memgraph Ltd.
// //
// Use of this software is governed by the Business Source License // Use of this software is governed by the Business Source License
// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@ -192,7 +192,7 @@ class DistributedCreateNodeCursor : public Cursor {
void PullMultiple(MultiFrame &multi_frame, ExecutionContext &context) override { void PullMultiple(MultiFrame &multi_frame, ExecutionContext &context) override {
SCOPED_PROFILE_OP("CreateNodeMF"); SCOPED_PROFILE_OP("CreateNodeMF");
input_cursor_->PullMultiple(multi_frame, context); input_cursor_->PullMultiple(multi_frame, context);
auto &request_router = context.request_router; auto *request_router = context.request_router;
{ {
SCOPED_REQUEST_WAIT_PROFILE; SCOPED_REQUEST_WAIT_PROFILE;
request_router->CreateVertices(NodeCreationInfoToRequests(context, multi_frame)); request_router->CreateVertices(NodeCreationInfoToRequests(context, multi_frame));
@ -259,10 +259,10 @@ class DistributedCreateNodeCursor : public Cursor {
} }
void PlaceNodesOnTheMultiFrame(MultiFrame &multi_frame, ExecutionContext &context) { void PlaceNodesOnTheMultiFrame(MultiFrame &multi_frame, ExecutionContext &context) {
auto multi_frame_reader = multi_frame.GetValidFramesConsumer(); auto multi_frame_modifier = multi_frame.GetValidFramesModifier();
size_t i = 0; size_t i = 0;
MG_ASSERT(std::distance(multi_frame_reader.begin(), multi_frame_reader.end())); MG_ASSERT(std::distance(multi_frame_modifier.begin(), multi_frame_modifier.end()));
for (auto &frame : multi_frame_reader) { for (auto &frame : multi_frame_modifier) {
const auto primary_label = msgs::Label{.id = nodes_info_[0]->labels[0]}; const auto primary_label = msgs::Label{.id = nodes_info_[0]->labels[0]};
msgs::Vertex v{.id = std::make_pair(primary_label, primary_keys_[i])}; msgs::Vertex v{.id = std::make_pair(primary_label, primary_keys_[i])};
frame[nodes_info_.front()->symbol] = TypedValue( frame[nodes_info_.front()->symbol] = TypedValue(
@ -272,8 +272,8 @@ class DistributedCreateNodeCursor : public Cursor {
std::vector<msgs::NewVertex> NodeCreationInfoToRequests(ExecutionContext &context, MultiFrame &multi_frame) { std::vector<msgs::NewVertex> NodeCreationInfoToRequests(ExecutionContext &context, MultiFrame &multi_frame) {
std::vector<msgs::NewVertex> requests; std::vector<msgs::NewVertex> requests;
auto multi_frame_reader = multi_frame.GetValidFramesConsumer(); auto multi_frame_modifier = multi_frame.GetValidFramesModifier();
for (auto &frame : multi_frame_reader) { for (auto &frame : multi_frame_modifier) {
msgs::PrimaryKey pk; msgs::PrimaryKey pk;
for (const auto &node_info : nodes_info_) { for (const auto &node_info : nodes_info_) {
msgs::NewVertex rqst; msgs::NewVertex rqst;

18
tests/unit/query_v2_create_node_multiframe.cpp
View File

@ -9,6 +9,7 @@
// by the Apache License, Version 2.0, included in the file // by the Apache License, Version 2.0, included in the file
// licenses/APL.txt. // licenses/APL.txt.
#include "gmock/gmock.h"
#include "mock_helpers.hpp" #include "mock_helpers.hpp"
#include "query/v2/bindings/frame.hpp" #include "query/v2/bindings/frame.hpp"
@ -26,17 +27,13 @@ namespace memgraph::query::v2 {
MultiFrame CreateMultiFrame(const size_t max_pos) { MultiFrame CreateMultiFrame(const size_t max_pos) {
static constexpr size_t frame_size = 100; static constexpr size_t frame_size = 100;
MultiFrame multi_frame(max_pos, frame_size, utils::NewDeleteResource()); MultiFrame multi_frame(max_pos, frame_size, utils::NewDeleteResource());
auto frames_populator = multi_frame.GetInvalidFramesPopulator();
for (auto &frame : frames_populator) {
frame.MakeValid();
}
return multi_frame; return multi_frame;
} }
TEST(CreateNodeTest, CreateNodeCursor) { TEST(CreateNodeTest, CreateNodeCursor) {
using testing::_; using testing::_;
using testing::ElementsAre; using testing::IsEmpty;
using testing::Return; using testing::Return;
AstStorage ast; AstStorage ast;
@ -46,11 +43,12 @@ TEST(CreateNodeTest, CreateNodeCursor) {
auto id_alloc = IdAllocator(0, 100); auto id_alloc = IdAllocator(0, 100);
node.symbol = symbol_table.CreateSymbol("n", true); node.symbol = symbol_table.CreateSymbol("n", true);
node.labels.push_back(msgs::LabelId::FromUint(2)); const auto primary_label_id = msgs::LabelId::FromUint(2);
node.labels.push_back(primary_label_id);
auto literal = PrimitiveLiteral(); auto literal = PrimitiveLiteral();
literal.value_ = TypedValue(static_cast<int64_t>(200)); literal.value_ = TypedValue(static_cast<int64_t>(200));
auto p = plan::PropertiesMapList{}; auto p = plan::PropertiesMapList{};
p.push_back(std::make_pair(msgs::PropertyId::FromUint(2), &literal)); p.push_back(std::make_pair(msgs::PropertyId::FromUint(3), &literal));
node.properties.emplace<0>(std::move(p)); node.properties.emplace<0>(std::move(p));
auto once_op = std::make_shared<plan::Once>(); auto once_op = std::make_shared<plan::Once>();
@ -70,9 +68,11 @@ TEST(CreateNodeTest, CreateNodeCursor) {
auto number_of_valid_frames = 0; auto number_of_valid_frames = 0;
for (auto &frame : frames) { for (auto &frame : frames) {
++number_of_valid_frames; ++number_of_valid_frames;
EXPECT_EQ(frame[node.symbol].IsEdge(), true); EXPECT_EQ(frame[node.symbol].IsVertex(), true);
const auto &n = frame[node.symbol].ValueVertex(); const auto &n = frame[node.symbol].ValueVertex();
EXPECT_THAT(n.Labels(), ElementsAre(msgs::Label{msgs::LabelId::FromUint(2)})); EXPECT_THAT(n.Labels(), IsEmpty());
EXPECT_EQ(n.PrimaryLabel(), primary_label_id);
// TODO(antaljanosbenjamin): Check primary key
} }
EXPECT_EQ(number_of_valid_frames, 1); EXPECT_EQ(number_of_valid_frames, 1);