Rename ItOnNonConstInvalidFrames->InvalidFramesPopulator

src/query/v2/multiframe.cpp

@@ -82,7 +82,7 @@ ValidFramesReader MultiFrame::GetValidFramesReader() { return ValidFramesReader(
 
 ValidFramesInvalidator MultiFrame::GetValidFramesInvalidator() { return ValidFramesInvalidator(*this); }
 
-ItOnNonConstInvalidFrames MultiFrame::GetItOnNonConstInvalidFrames() { return ItOnNonConstInvalidFrames(*this); }
+InvalidFramesPopulator MultiFrame::GetInvalidFramesPopulator() { return InvalidFramesPopulator(*this); }
 
 ValidFramesReader::ValidFramesReader(MultiFrame &multiframe) : multiframe_(multiframe) {}
 
@@ -107,11 +107,11 @@ ValidFramesInvalidator::Iterator ValidFramesInvalidator::end() {
   return Iterator(&multiframe_.frames_[multiframe_.frames_.size()], *this);
 }
 
-ItOnNonConstInvalidFrames::ItOnNonConstInvalidFrames(MultiFrame &multiframe) : multiframe_(multiframe) {}
+InvalidFramesPopulator::InvalidFramesPopulator(MultiFrame &multiframe) : multiframe_(multiframe) {}
 
-ItOnNonConstInvalidFrames::~ItOnNonConstInvalidFrames() = default;
+InvalidFramesPopulator::~InvalidFramesPopulator() = default;
 
-ItOnNonConstInvalidFrames::Iterator ItOnNonConstInvalidFrames::begin() {
+InvalidFramesPopulator::Iterator InvalidFramesPopulator::begin() {
   for (auto idx = 0UL; idx < multiframe_.frames_.size(); ++idx) {
     if (!multiframe_.frames_[idx].IsValid()) {
       return Iterator(&multiframe_.frames_[idx]);
@@ -121,7 +121,7 @@ ItOnNonConstInvalidFrames::Iterator ItOnNonConstInvalidFrames::begin() {
   return end();
 }
 
-ItOnNonConstInvalidFrames::Iterator ItOnNonConstInvalidFrames::end() {
+InvalidFramesPopulator::Iterator InvalidFramesPopulator::end() {
   return Iterator(&multiframe_.frames_[multiframe_.frames_.size()]);
 }
 

src/query/v2/multiframe.hpp

@@ -20,13 +20,13 @@ constexpr unsigned long kNumberOfFramesInMultiframe = 1000;  // #NoCommit have i
 
 class ValidFramesReader;
 class ValidFramesInvalidator;
-class ItOnNonConstInvalidFrames;
+class InvalidFramesPopulator;
 
 class MultiFrame {
  public:
   friend class ValidFramesReader;
   friend class ValidFramesInvalidator;
-  friend class ItOnNonConstInvalidFrames;
+  friend class InvalidFramesPopulator;
 
   MultiFrame(FrameWithValidity default_frame, size_t number_of_frames, utils::MemoryResource *execution_memory);
   ~MultiFrame();
@@ -59,7 +59,7 @@ class MultiFrame {
   Iteration goes in a deterministic order.
   One can modify the validity of the frame with this implementation.
   */
-  ItOnNonConstInvalidFrames GetItOnNonConstInvalidFrames();
+  InvalidFramesPopulator GetInvalidFramesPopulator();
 
   void ResetAllFramesInvalid() noexcept;
 
@@ -170,15 +170,15 @@ class ValidFramesInvalidator {
   MultiFrame &multiframe_;
 };
 
-class ItOnNonConstInvalidFrames {
+class InvalidFramesPopulator {
  public:
-  ItOnNonConstInvalidFrames(MultiFrame &multiframe);
-  ~ItOnNonConstInvalidFrames();
+  InvalidFramesPopulator(MultiFrame &multiframe);
+  ~InvalidFramesPopulator();
 
-  ItOnNonConstInvalidFrames(const ItOnNonConstInvalidFrames &other) = delete;                 // copy constructor
-  ItOnNonConstInvalidFrames(ItOnNonConstInvalidFrames &&other) noexcept = delete;             // move constructor
-  ItOnNonConstInvalidFrames &operator=(const ItOnNonConstInvalidFrames &other) = delete;      // copy assignment
-  ItOnNonConstInvalidFrames &operator=(ItOnNonConstInvalidFrames &&other) noexcept = delete;  // move assignment
+  InvalidFramesPopulator(const InvalidFramesPopulator &other) = delete;                 // copy constructor
+  InvalidFramesPopulator(InvalidFramesPopulator &&other) noexcept = delete;             // move constructor
+  InvalidFramesPopulator &operator=(const InvalidFramesPopulator &other) = delete;      // copy assignment
+  InvalidFramesPopulator &operator=(InvalidFramesPopulator &&other) noexcept = delete;  // move assignment
 
   struct Iterator {
     using iterator_category = std::forward_iterator_tag;

src/query/v2/plan/operator.cpp

@@ -268,7 +268,7 @@ bool Once::OnceCursor::Pull(Frame &, ExecutionContext &context) {
 void Once::OnceCursor::PullMultiple(MultiFrame &multi_frame, ExecutionContext &context) {
   SCOPED_PROFILE_OP("OnceMF");
 
-  auto iterator_for_valid_frame_only = multi_frame.GetItOnNonConstInvalidFrames();
+  auto iterator_for_valid_frame_only = multi_frame.GetValidFramesInvalidator();
   auto first_it = iterator_for_valid_frame_only.begin();
   MG_ASSERT(first_it != iterator_for_valid_frame_only.end());
   if (pull_count_ < 1) {