Merge branch 'T1163-MG-add-multiframe-and-some-operators' of github.com:memgraph/memgraph into T1163-MG-add-multiframe-and-some-operators

This commit is contained in:
jeremy 2022-12-01 14:55:45 +01:00
commit d18d4f198e
2 changed files with 8 additions and 7 deletions

View File

@ -62,6 +62,7 @@ void MultiFrame::DefragmentValidFrames() noexcept {
in the range in such a way that the elements that are not to be removed appear in the beginning of the range. in the range in such a way that the elements that are not to be removed appear in the beginning of the range.
Relative order of the elements that remain is preserved and the physical size of the container is unchanged." Relative order of the elements that remain is preserved and the physical size of the container is unchanged."
*/ */
// NOLINTNEXTLINE (bugprone-unused-return-value) // NOLINTNEXTLINE (bugprone-unused-return-value)
std::remove_if(frames_.begin(), frames_.end(), [](auto &frame) { return !frame.IsValid(); }); std::remove_if(frames_.begin(), frames_.end(), [](auto &frame) { return !frame.IsValid(); });
} }

View File

@ -33,8 +33,8 @@ class MultiFrame {
MultiFrame(int64_t size_of_frame, size_t number_of_frames, utils::MemoryResource *execution_memory); MultiFrame(int64_t size_of_frame, size_t number_of_frames, utils::MemoryResource *execution_memory);
~MultiFrame() = default; ~MultiFrame() = default;
MultiFrame(const MultiFrame &other); // copy constructor MultiFrame(const MultiFrame &other);
MultiFrame(MultiFrame &&other) noexcept; // move constructor MultiFrame(MultiFrame &&other) noexcept;
MultiFrame &operator=(const MultiFrame &other) = delete; MultiFrame &operator=(const MultiFrame &other) = delete;
MultiFrame &operator=(MultiFrame &&other) noexcept = delete; MultiFrame &operator=(MultiFrame &&other) noexcept = delete;
@ -96,10 +96,10 @@ class ValidFramesReader {
explicit ValidFramesReader(MultiFrame &multiframe); explicit ValidFramesReader(MultiFrame &multiframe);
~ValidFramesReader() = default; ~ValidFramesReader() = default;
ValidFramesReader(const ValidFramesReader &other) = delete; // copy constructor ValidFramesReader(const ValidFramesReader &other) = delete;
ValidFramesReader(ValidFramesReader &&other) noexcept = delete; // move constructor ValidFramesReader(ValidFramesReader &&other) noexcept = delete;
ValidFramesReader &operator=(const ValidFramesReader &other) = delete; // copy assignment ValidFramesReader &operator=(const ValidFramesReader &other) = delete;
ValidFramesReader &operator=(ValidFramesReader &&other) noexcept = delete; // move assignment ValidFramesReader &operator=(ValidFramesReader &&other) noexcept = delete;
struct Iterator { struct Iterator {
using iterator_category = std::forward_iterator_tag; using iterator_category = std::forward_iterator_tag;
@ -165,7 +165,7 @@ class ValidFramesModifier {
Iterator &operator++() { Iterator &operator++() {
do { do {
ptr_++; ptr_++;
} while (*this != iterator_wrapper_->end() && !this->ptr_->IsValid()); } while (*this != iterator_wrapper_.end() && ptr_->IsValid());
return *this; return *this;
} }