tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct impl of begin iterators

Browse Source
This commit is contained in:
jeremy 2022-12-09 12:10:48 +01:00
parent 0d19d347f8
commit 0353262cc2
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/query/v2/multiframe.cpp
View File

@ -84,12 +84,24 @@ ValidFramesReader::ValidFramesReader(MultiFrame &multiframe) : multiframe_(multi
after_last_valid_frame_ = multiframe_.frames_.data() + std::distance(multiframe.frames_.begin(), it); after_last_valid_frame_ = multiframe_.frames_.data() + std::distance(multiframe.frames_.begin(), it);
} }
ValidFramesReader::Iterator ValidFramesReader::begin() { return Iterator{&multiframe_.frames_[0]}; } ValidFramesReader::Iterator ValidFramesReader::begin() {
if (multiframe_.frames_[0].IsValid()) {
return Iterator{&multiframe_.frames_[0]};
}
return end();
}
ValidFramesReader::Iterator ValidFramesReader::end() { return Iterator{after_last_valid_frame_}; } ValidFramesReader::Iterator ValidFramesReader::end() { return Iterator{after_last_valid_frame_}; }
ValidFramesModifier::ValidFramesModifier(MultiFrame &multiframe) : multiframe_(multiframe) {} ValidFramesModifier::ValidFramesModifier(MultiFrame &multiframe) : multiframe_(multiframe) {}
ValidFramesModifier::Iterator ValidFramesModifier::begin() { return Iterator{&multiframe_.frames_[0], *this}; } ValidFramesModifier::Iterator ValidFramesModifier::begin() {
if (multiframe_.frames_[0].IsValid()) {
return Iterator{&multiframe_.frames_[0], *this};
}
return end();
}
ValidFramesModifier::Iterator ValidFramesModifier::end() { ValidFramesModifier::Iterator ValidFramesModifier::end() {
return Iterator{multiframe_.frames_.data() + multiframe_.frames_.size(), *this}; return Iterator{multiframe_.frames_.data() + multiframe_.frames_.size(), *this};
} }
@ -103,7 +115,12 @@ ValidFramesConsumer::~ValidFramesConsumer() noexcept {
multiframe_.DefragmentValidFrames(); multiframe_.DefragmentValidFrames();
} }
ValidFramesConsumer::Iterator ValidFramesConsumer::begin() { return Iterator{&multiframe_.frames_[0], *this}; } ValidFramesConsumer::Iterator ValidFramesConsumer::begin() {
if (multiframe_.frames_[0].IsValid()) {
return Iterator{&multiframe_.frames_[0], *this};
}
return end();
}
ValidFramesConsumer::Iterator ValidFramesConsumer::end() { ValidFramesConsumer::Iterator ValidFramesConsumer::end() {
return Iterator{multiframe_.frames_.data() + multiframe_.frames_.size(), *this}; return Iterator{multiframe_.frames_.data() + multiframe_.frames_.size(), *this};