mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Re-use seastar::util::memory_data_sink

Browse Source 
A data_sink that stores buffers into an in-memory collection had
appeared in seastar recently. In Scylla there's similar thing that uses
memory_data_sink_buffer as a container, so it's possible to drop the
data_sink_impl iself in favor of seastar implementation.

For that to work there should be append_buffers() overload for the
aforementioned container. For its nice implementation the container, in
turn, needs to get push_back() method and value_type trait. The method
already exists, but is called put(), so just rename it. There's one more
user of it this method in S3 client, and it can enjoy the added
append_buffers() helper.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>

Closes scylladb/scylladb#28124
This commit is contained in:
Pavel Emelyanov
2026-01-13 13:35:10 +03:00
committed by Botond Dénes
parent 3fc5a32136
commit e57ee84662
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
utils/memory_data_sink.hh
View File

@@ -8,6 +8,7 @@
#include <seastar/core/iostream.hh>
#include <seastar/core/temporary_buffer.hh>
#include <seastar/util/memory-data-sink.hh>
#include "utils/small_vector.hh"
#include "seastarx.hh"
@@ -21,12 +22,14 @@ class memory_data_sink_buffers {
buffers_type _bufs;
size_t _size = 0;
public:
using value_type = temporary_buffer<char>; // for std::back_inserter to work
size_t size() const { return _size; }
buffers_type& buffers() { return _bufs; }
const buffers_type& buffers() const { return _bufs; }
// Strong exception guarantees
void put(temporary_buffer<char>&& buf) {
void push_back(temporary_buffer<char>&& buf) {
auto size = buf.size();
_bufs.emplace_back(std::move(buf));
_size += size;
@@ -46,23 +49,8 @@ public:
}
};
class memory_data_sink : public data_sink_impl {
memory_data_sink_buffers& _bufs;
public:
memory_data_sink(memory_data_sink_buffers& b) : _bufs(b) {}
virtual future<> put(std::span<temporary_buffer<char>> bufs) override {
for (auto&& buf : bufs) {
_bufs.put(std::move(buf));
}
return make_ready_future<>();
}
virtual future<> flush() override {
return make_ready_future<>();
}
virtual future<> close() override {
return make_ready_future<>();
}
size_t buffer_size() const noexcept override {
return 128*1024;
}
};
inline void append_buffers(memory_data_sink_buffers& c, std::span<temporary_buffer<char>> bufs) {
std::ranges::move(bufs, std::back_inserter(c));
}
using memory_data_sink = seastar::util::basic_memory_data_sink<memory_data_sink_buffers, 128*1024>;

4
utils/s3/client.cc
View File

@@ -1026,9 +1026,7 @@ public:
{}
virtual future<> put(std::span<temporary_buffer<char>> data) override {
for (auto&& buf : data) {
_bufs.put(std::move(buf));
}
append_buffers(_bufs, std::move(data));
return maybe_flush();
}