mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flat_mutation_reader:impl: get rid of _consume_done member

Browse Source 
It is only used in consume_pausable, that can easily do
without it.

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2021-01-10 19:49:26 +02:00
parent ed53b3347e
commit 515bed90bb
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
flat_mutation_reader.hh
View File

@@ -84,7 +84,6 @@ public:
private:
tracked_buffer _buffer;
size_t _buffer_size = 0;
bool _consume_done = false;
protected:
size_t max_buffer_size_in_bytes = 8 * 1024;
bool _end_of_stream = false;
@@ -153,16 +152,20 @@ public:
// Stops when consumer returns stop_iteration::yes or end of stream is reached.
// Next call will start from the next mutation_fragment in the stream.
future<> consume_pausable(Consumer consumer, db::timeout_clock::time_point timeout) {
_consume_done = false;
return do_until([this] { return (is_end_of_stream() && is_buffer_empty()) || _consume_done; },
[this, consumer = std::move(consumer), timeout] () mutable {
if (is_buffer_empty()) {
return fill_buffer(timeout);
}
return do_with(std::move(consumer), [this, timeout] (Consumer& consumer) {
return repeat([this, &consumer, timeout] {
if (is_end_of_stream() && is_buffer_empty()) {
return make_ready_future<stop_iteration>(stop_iteration::yes);
}
_consume_done = consumer(pop_mutation_fragment()) == stop_iteration::yes;
if (is_buffer_empty()) {
return fill_buffer(timeout).then([] {
return make_ready_future<stop_iteration>(stop_iteration::no);
});
}
return make_ready_future<>();
return make_ready_future<stop_iteration>(consumer(pop_mutation_fragment()));
});
});
}