diff --git a/readers/generating_v2.hh b/readers/generating_v2.hh index 4cf8f2476c..27ba53ff44 100644 --- a/readers/generating_v2.hh +++ b/readers/generating_v2.hh @@ -17,7 +17,7 @@ class mutation_reader; class reader_permit; mutation_reader -make_generating_reader_v2(schema_ptr s, reader_permit permit, noncopyable_function ()> get_next_fragment); +make_generating_reader(schema_ptr s, reader_permit permit, noncopyable_function ()> get_next_fragment); mutation_reader make_generating_reader_v1(schema_ptr s, reader_permit permit, noncopyable_function ()> get_next_fragment); diff --git a/readers/mutation_readers.cc b/readers/mutation_readers.cc index 71dd2e94f6..6adb54f805 100644 --- a/readers/mutation_readers.cc +++ b/readers/mutation_readers.cc @@ -751,7 +751,7 @@ public: } }; -mutation_reader make_generating_reader_v2(schema_ptr s, reader_permit permit, noncopyable_function ()> get_next_fragment) { +mutation_reader make_generating_reader(schema_ptr s, reader_permit permit, noncopyable_function ()> get_next_fragment) { return make_mutation_reader(std::move(s), std::move(permit), std::move(get_next_fragment)); } diff --git a/test/boost/mutation_reader_test.cc b/test/boost/mutation_reader_test.cc index c4bbfef605..d497bb988d 100644 --- a/test/boost/mutation_reader_test.cc +++ b/test/boost/mutation_reader_test.cc @@ -4281,7 +4281,7 @@ SEASTAR_THREAD_TEST_CASE(test_generating_reader_v2) { streamed_mutation::forwarding fwd_sm, mutation_reader::forwarding fwd_mr) { auto underlying = make_mutation_reader_from_mutations(schema, permit, squash_mutations(muts), range, slice); - auto rd = make_next_partition_adaptor(make_generating_reader_v2(schema, permit, closing_holder(std::move(underlying)))); + auto rd = make_next_partition_adaptor(make_generating_reader(schema, permit, closing_holder(std::move(underlying)))); if (fwd_sm == streamed_mutation::forwarding::yes) { return make_forwardable(std::move(rd)); } diff --git a/test/boost/mutation_writer_test.cc b/test/boost/mutation_writer_test.cc index 5a4a5ebea6..80758e7cd2 100644 --- a/test/boost/mutation_writer_test.cc +++ b/test/boost/mutation_writer_test.cc @@ -142,7 +142,7 @@ SEASTAR_TEST_CASE(test_multishard_writer_producer_aborts) { auto& sharder = s->get_sharder(); try { distribute_reader_and_consume_on_shards(s, sharder, - make_generating_reader_v2(s, make_reader_permit(e), std::move(get_next_mutation_fragment)), + make_generating_reader(s, make_reader_permit(e), std::move(get_next_mutation_fragment)), [&sharder, error] (mutation_reader reader) mutable { if (error) { return reader.close().then([] { diff --git a/tools/scylla-sstable.cc b/tools/scylla-sstable.cc index 9aace1eea7..72f45ebb56 100644 --- a/tools/scylla-sstable.cc +++ b/tools/scylla-sstable.cc @@ -2637,7 +2637,7 @@ void write_operation(schema_ptr schema, reader_permit permit, const std::vector< auto ifile = open_file_dma(input_file, open_flags::ro).get(); auto istream = make_file_input_stream(std::move(ifile)); auto parser = json_mutation_stream_parser{schema, permit, std::move(istream)}; - auto reader = make_generating_reader_v2(schema, permit, std::move(parser)); + auto reader = make_generating_reader(schema, permit, std::move(parser)); auto writer_cfg = manager.configure_writer("scylla-sstable"); writer_cfg.validation_level = validation_level; auto local = data_dictionary::make_local_options(output_dir);