diff --git a/src/query/v2/interpreter.cpp b/src/query/v2/interpreter.cpp index bf28ef875..b5f916e9f 100644 --- a/src/query/v2/interpreter.cpp +++ b/src/query/v2/interpreter.cpp @@ -688,7 +688,7 @@ PullPlan::PullPlan(const std::shared_ptr plan, const Parameters &par : plan_(plan), cursor_(plan->plan().MakeCursor(execution_memory)), frame_(plan->symbol_table().max_position(), execution_memory), - multi_frame_(frame_, kNumberOfFramesInMultiframe, execution_memory), + multi_frame_(plan->symbol_table().max_position(), kNumberOfFramesInMultiframe, execution_memory), memory_limit_(memory_limit) { ctx_.db_accessor = dba; ctx_.symbol_table = plan->symbol_table(); diff --git a/src/query/v2/multiframe.cpp b/src/query/v2/multiframe.cpp index 7873969ac..640e63510 100644 --- a/src/query/v2/multiframe.cpp +++ b/src/query/v2/multiframe.cpp @@ -26,12 +26,11 @@ namespace memgraph::query::v2 { // static_assert(std::forward_iterator && // std::equality_comparable); -MultiFrame::MultiFrame(FrameWithValidity default_frame, size_t number_of_frames, - utils::MemoryResource *execution_memory) - : default_frame_(default_frame), - frames_(utils::pmr::vector(number_of_frames, default_frame, execution_memory)) { +MultiFrame::MultiFrame(size_t size_of_frame, size_t number_of_frames, utils::MemoryResource *execution_memory) + : default_frame_(FrameWithValidity(size_of_frame, execution_memory)), + frames_(utils::pmr::vector(number_of_frames, default_frame_, execution_memory)) { MG_ASSERT(number_of_frames > 0); - MG_ASSERT(!default_frame.IsValid()); + MG_ASSERT(!default_frame_.IsValid()); } MultiFrame::MultiFrame(const MultiFrame &other) : default_frame_(other.default_frame_) { diff --git a/src/query/v2/multiframe.hpp b/src/query/v2/multiframe.hpp index 9186d739c..8f6109ab4 100644 --- a/src/query/v2/multiframe.hpp +++ b/src/query/v2/multiframe.hpp @@ -30,7 +30,7 @@ class MultiFrame { friend class ValidFramesReader; friend class InvalidFramesPopulator; - MultiFrame(FrameWithValidity default_frame, size_t number_of_frames, utils::MemoryResource *execution_memory); + MultiFrame(size_t size_of_frame, size_t number_of_frames, utils::MemoryResource *execution_memory); ~MultiFrame() = default; MultiFrame(const MultiFrame &other); // copy constructor