diff --git a/mutation_reader.cc b/mutation_reader.cc index b8ac8a2394..fbd82fcc95 100644 --- a/mutation_reader.cc +++ b/mutation_reader.cc @@ -552,30 +552,6 @@ flat_mutation_reader make_combined_reader(schema_ptr schema, return make_combined_reader(std::move(schema), std::move(v), fwd_sm, fwd_mr); } -class reader_returning final : public mutation_reader::impl { - streamed_mutation _m; - bool _done = false; -public: - reader_returning(streamed_mutation m) : _m(std::move(m)) { - } - virtual future operator()() override { - if (_done) { - return make_ready_future(); - } else { - _done = true; - return make_ready_future(std::move(_m)); - } - } -}; - -mutation_reader make_reader_returning(mutation m, streamed_mutation::forwarding fwd) { - return make_mutation_reader(streamed_mutation_from_mutation(std::move(m), std::move(fwd))); -} - -mutation_reader make_reader_returning(streamed_mutation m) { - return make_mutation_reader(std::move(m)); -} - // A file that tracks the memory usage of buffers resulting from read // operations. class tracking_file_impl : public file_impl { diff --git a/mutation_reader.hh b/mutation_reader.hh index d000d49c60..704cf5f089 100644 --- a/mutation_reader.hh +++ b/mutation_reader.hh @@ -140,9 +140,6 @@ flat_mutation_reader make_combined_reader(schema_ptr schema, flat_mutation_reader&& b, streamed_mutation::forwarding fwd_sm = streamed_mutation::forwarding::no, mutation_reader::forwarding fwd_mr = mutation_reader::forwarding::yes); -// reads from the input readers, in order -mutation_reader make_reader_returning(mutation, streamed_mutation::forwarding fwd = streamed_mutation::forwarding::no); -mutation_reader make_reader_returning(streamed_mutation); template GCC6_CONCEPT(