bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

readers/multishard: shard_reader: extract buffer-fill into its own method

Browse Source 
It is about to get a bit more complicated, so worth to extract into a
method so it can be shared by the two call-sites.
This commit is contained in:
Botond Dénes
2024-09-25 03:38:11 -04:00
parent ee92784098
commit ee7ecb9155
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
readers/multishard.cc
View File

@@ -707,6 +707,7 @@ private:
foreign_ptr<std::unique_ptr<evictable_reader_v2>> _reader;
private:
future<remote_fill_buffer_result_v2> fill_reader_buffer(evictable_reader_v2& reader);
future<> do_fill_buffer();
public:
@@ -791,6 +792,14 @@ future<> shard_reader_v2::close() noexcept {
}
}
future<remote_fill_buffer_result_v2> shard_reader_v2::fill_reader_buffer(evictable_reader_v2& reader) {
reader_permit::need_cpu_guard ncpu_guard{reader.permit()};
co_await reader.fill_buffer();
co_return remote_fill_buffer_result_v2(reader.detach_buffer(), reader.is_end_of_stream());
}
future<> shard_reader_v2::do_fill_buffer() {
struct reader_and_buffer_fill_result {
foreign_ptr<std::unique_ptr<evictable_reader_v2>> reader;
@@ -842,9 +851,7 @@ future<> shard_reader_v2::do_fill_buffer() {
try {
tracing::trace(_trace_state, "Creating shard reader on shard: {}", this_shard_id());
reader_permit::need_cpu_guard ncpu_guard{rreader->permit()};
co_await rreader->fill_buffer();
auto res = remote_fill_buffer_result_v2(rreader->detach_buffer(), rreader->is_end_of_stream());
auto res = co_await fill_reader_buffer(*rreader);
co_return reader_and_buffer_fill_result{std::move(rreader), std::move(res)};
} catch (...) {
ex = std::current_exception();
@@ -856,9 +863,7 @@ future<> shard_reader_v2::do_fill_buffer() {
co_return std::move(res.result);
} else {
co_return co_await smp::submit_to(_shard, coroutine::lambda([this] () -> future<remote_fill_buffer_result_v2> {
reader_permit::need_cpu_guard ncpu_guard{_reader->permit()};
co_await _reader->fill_buffer();
co_return remote_fill_buffer_result_v2(_reader->detach_buffer(), _reader->is_end_of_stream());
return fill_reader_buffer(*_reader);
}));
}
});