From 55008a2927bcfe2e596783f9bf17a079c5ab9093 Mon Sep 17 00:00:00 2001 From: jeremy Date: Wed, 30 Nov 2022 14:17:01 +0100 Subject: [PATCH] Rename func ResetAllFramesInvalid->MakeAllFramesInvalid --- src/query/v2/interpreter.cpp | 4 ++-- src/query/v2/multiframe.cpp | 2 +- src/query/v2/multiframe.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/query/v2/interpreter.cpp b/src/query/v2/interpreter.cpp index bfa7dfe0e..bf28ef875 100644 --- a/src/query/v2/interpreter.cpp +++ b/src/query/v2/interpreter.cpp @@ -761,7 +761,7 @@ std::optional PullPlan::PullMultiple(AnyStrea stream_values(frame); ++i; } - multi_frame_.ResetAllFramesInvalid(); + multi_frame_.MakeAllFramesInvalid(); } for (; !n || i < n;) { @@ -776,7 +776,7 @@ std::optional PullPlan::PullMultiple(AnyStrea ++i; } } - multi_frame_.ResetAllFramesInvalid(); + multi_frame_.MakeAllFramesInvalid(); } // If we finished because we streamed the requested n results, diff --git a/src/query/v2/multiframe.cpp b/src/query/v2/multiframe.cpp index 4573beaea..3a180ab89 100644 --- a/src/query/v2/multiframe.cpp +++ b/src/query/v2/multiframe.cpp @@ -44,7 +44,7 @@ MultiFrame::MultiFrame(const MultiFrame &other) : default_frame_(other.default_f MultiFrame::MultiFrame(MultiFrame &&other) noexcept : default_frame_(std::move(other.default_frame_)), frames_(std::move(other.frames_)) {} -void MultiFrame::ResetAllFramesInvalid() noexcept { +void MultiFrame::MakeAllFramesInvalid() noexcept { std::for_each(frames_.begin(), frames_.end(), [](auto &frame) { frame.MakeInvalid(); }); } diff --git a/src/query/v2/multiframe.hpp b/src/query/v2/multiframe.hpp index 5ea8d1c65..27d010fd4 100644 --- a/src/query/v2/multiframe.hpp +++ b/src/query/v2/multiframe.hpp @@ -71,7 +71,7 @@ class MultiFrame { */ InvalidFramesPopulator GetInvalidFramesPopulator(); - void ResetAllFramesInvalid() noexcept; + void MakeAllFramesInvalid() noexcept; bool HasValidFrame() const noexcept;