From 072bc58b1eac7462ee9de6b53c287253d2c51a3c Mon Sep 17 00:00:00 2001
From: jeremy <jeremy.bailleux@memgraph.io>
Date: Wed, 30 Nov 2022 14:50:28 +0100
Subject: [PATCH] Reverse condition in while() + comment
---
src/query/v2/multiframe.cpp | 10 ++++++++++
src/query/v2/multiframe.hpp | 6 +++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/query/v2/multiframe.cpp b/src/query/v2/multiframe.cpp
index 3a180ab89..7873969ac 100644
--- a/src/query/v2/multiframe.cpp
+++ b/src/query/v2/multiframe.cpp
@@ -16,6 +16,16 @@
namespace memgraph::query::v2 {
+// #NoCommit uncomment https://github.com/memgraph/memgraph/pull/676#discussion_r1035704661
+// static_assert(std::forward_iterator<ValidFramesReader::Iterator> &&
+// std::equality_comparable<ValidFramesReader::Iterator>);
+// static_assert(std::forward_iterator<ValidFramesModifier::Iterator> &&
+// std::equality_comparable<ValidFramesModifier::Iterator>);
+// static_assert(std::forward_iterator<ValidFramesConsumer::Iterator> &&
+// std::equality_comparable<ValidFramesConsumer::Iterator>);
+// static_assert(std::forward_iterator<InvalidFramesPopulator::Iterator> &&
+// std::equality_comparable<InvalidFramesPopulator::Iterator>);
+
MultiFrame::MultiFrame(FrameWithValidity default_frame, size_t number_of_frames,
utils::MemoryResource *execution_memory)
: default_frame_(default_frame),
diff --git a/src/query/v2/multiframe.hpp b/src/query/v2/multiframe.hpp
index fb6cbe9e6..9186d739c 100644
--- a/src/query/v2/multiframe.hpp
+++ b/src/query/v2/multiframe.hpp
@@ -113,7 +113,7 @@ class ValidFramesReader {
Iterator &operator++() {
do {
ptr_++;
- } while (!this->ptr_->IsValid() && *this != iterator_wrapper_.end());
+ } while (*this != iterator_wrapper_.end() && !this->ptr_->IsValid());
return *this;
}
@@ -160,7 +160,7 @@ class ValidFramesModifier {
Iterator &operator++() {
do {
ptr_++;
- } while (!this->ptr_->IsValid() && *this != iterator_wrapper_.end());
+ } while (*this != iterator_wrapper_.end() && !this->ptr_->IsValid());
return *this;
}
@@ -207,7 +207,7 @@ class ValidFramesConsumer {
Iterator &operator++() {
do {
ptr_++;
- } while (!this->ptr_->IsValid() && *this != iterator_wrapper_.end());
+ } while (*this != iterator_wrapper_.end() && !this->ptr_->IsValid());
return *this;
}