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

idl: deserialized_bytes_proxy do not assume presence of iterator_type

Browse Source 
deserialized_bytes_proxy assumes that the provided input stream has
iterator_type that represents the iterator pointing to the next
fragment of the fragmented underlying buffyer. This makes little sense
if the input stream is a contiguous one (i.e.
simple_memory_input_stream) so let's not make such assumptions.
This commit is contained in:
Paweł Dziepak
2018-08-24 14:05:58 +01:00
parent 3b7579aa0e
commit 4ca991ea65
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
serializer_impl.hh
View File

@@ -342,26 +342,38 @@ struct serializer<bool_class<Tag>> {
}
};
template<typename Iterator>
template<typename Stream>
class deserialized_bytes_proxy {
seastar::memory_input_stream<Iterator> _stream;
Stream _stream;
template<typename OtherStream>
friend class deserialized_bytes_proxy;
public:
explicit deserialized_bytes_proxy(seastar::memory_input_stream<Iterator> stream)
explicit deserialized_bytes_proxy(Stream stream)
: _stream(std::move(stream)) { }
buffer_view<Iterator> view() const {
GCC6_CONCEPT(static_assert(FragmentRange<buffer_view<Iterator>>));
template<typename OtherStream, typename = std::enable_if_t<std::is_convertible_v<OtherStream, Stream>>>
deserialized_bytes_proxy(deserialized_bytes_proxy<OtherStream> proxy)
: _stream(std::move(proxy._stream)) { }
auto view() const {
if constexpr (std::is_same_v<Stream, simple_input_stream>) {
return bytes_view(reinterpret_cast<const int8_t*>(_stream.begin()), _stream.size());
} else {
using iterator_type = typename Stream::iterator_type ;
GCC6_CONCEPT(static_assert(FragmentRange<buffer_view<iterator_type>>));
return seastar::with_serialized_stream(_stream, seastar::make_visitor(
[&] (typename seastar::memory_input_stream<Iterator>::simple stream) {
return buffer_view<Iterator>(bytes_view(reinterpret_cast<const int8_t*>(stream.begin()),
[&] (typename seastar::memory_input_stream<iterator_type >::simple stream) {
return buffer_view<iterator_type>(bytes_view(reinterpret_cast<const int8_t*>(stream.begin()),
stream.size()));
},
[&] (typename seastar::memory_input_stream<Iterator>::fragmented stream) {
return buffer_view<Iterator>(bytes_view(reinterpret_cast<const int8_t*>(stream.first_fragment_data()),
[&] (typename seastar::memory_input_stream<iterator_type >::fragmented stream) {
return buffer_view<iterator_type>(bytes_view(reinterpret_cast<const int8_t*>(stream.first_fragment_data()),
stream.first_fragment_size()),
stream.size(), stream.fragment_iterator());
}
));
}
}
[[gnu::always_inline]]
@@ -389,9 +401,9 @@ public:
template<>
struct serializer<bytes> {
template<typename Input>
static deserialized_bytes_proxy<typename Input::iterator_type> read(Input& in) {
static deserialized_bytes_proxy<Input> read(Input& in) {
auto sz = deserialize(in, boost::type<uint32_t>());
return deserialized_bytes_proxy<typename Input::iterator_type>(in.read_substream(sz));
return deserialized_bytes_proxy<Input>(in.read_substream(sz));
}
template<typename Output>
static void write(Output& out, bytes_view v) {