From aebbe68239fa66e6b9fcbc25ad33180fbdf775f9 Mon Sep 17 00:00:00 2001 From: "Raphael S. Carvalho" Date: Fri, 3 Dec 2021 10:23:02 -0300 Subject: [PATCH] sstable_set: update make_range_sstable_reader() to flat_mutation_reader_v2 Signed-off-by: Raphael S. Carvalho --- compaction/compaction.cc | 4 ++-- db/view/view_update_generator.cc | 2 +- sstables/sstable_set.cc | 6 +++--- sstables/sstable_set.hh | 2 +- table.cc | 4 ++-- test/boost/sstable_compaction_test.cc | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compaction/compaction.cc b/compaction/compaction.cc index b005453b06..203b2c2a58 100644 --- a/compaction/compaction.cc +++ b/compaction/compaction.cc @@ -1512,14 +1512,14 @@ public: // Use reader that makes sure no non-local mutation will not be filtered out. flat_mutation_reader make_sstable_reader() const override { - return _compacting->make_range_sstable_reader(_schema, + return downgrade_to_v1(_compacting->make_range_sstable_reader(_schema, _permit, query::full_partition_range, _schema->full_slice(), _io_priority, nullptr, ::streamed_mutation::forwarding::no, - ::mutation_reader::forwarding::no); + ::mutation_reader::forwarding::no)); } diff --git a/db/view/view_update_generator.cc b/db/view/view_update_generator.cc index 590883a48e..c086b6888e 100644 --- a/db/view/view_update_generator.cc +++ b/db/view/view_update_generator.cc @@ -85,7 +85,7 @@ future<> view_update_generator::start() { tracing::trace_state_ptr ts, streamed_mutation::forwarding fwd_ms, mutation_reader::forwarding fwd_mr) { - return ssts->make_range_sstable_reader(s, std::move(permit), pr, ps, pc, std::move(ts), fwd_ms, fwd_mr); + return downgrade_to_v1(ssts->make_range_sstable_reader(s, std::move(permit), pr, ps, pc, std::move(ts), fwd_ms, fwd_mr)); }); auto [staging_sstable_reader, staging_sstable_reader_handle] = make_manually_paused_evictable_reader( std::move(ms), diff --git a/sstables/sstable_set.cc b/sstables/sstable_set.cc index ca72001789..c63d22bdd1 100644 --- a/sstables/sstable_set.cc +++ b/sstables/sstable_set.cc @@ -1084,7 +1084,7 @@ sstable_set::create_single_key_sstable_reader( std::move(permit), sstable_histogram, pr, slice, pc, std::move(trace_state), fwd, fwd_mr); } -flat_mutation_reader +flat_mutation_reader_v2 sstable_set::make_range_sstable_reader( schema_ptr s, reader_permit permit, @@ -1100,13 +1100,13 @@ sstable_set::make_range_sstable_reader( (shared_sstable& sst, const dht::partition_range& pr) mutable { return sst->make_reader(s, permit, pr, slice, pc, trace_state, fwd, fwd_mr, monitor_generator(sst)); }; - return make_combined_reader(s, std::move(permit), std::make_unique(s, + return upgrade_to_v2(make_combined_reader(s, std::move(permit), std::make_unique(s, shared_from_this(), pr, std::move(trace_state), std::move(reader_factory_fn)), fwd, - fwd_mr); + fwd_mr)); } flat_mutation_reader_v2 diff --git a/sstables/sstable_set.hh b/sstables/sstable_set.hh index 038bcabece..3762bbfb1a 100644 --- a/sstables/sstable_set.hh +++ b/sstables/sstable_set.hh @@ -123,7 +123,7 @@ public: /// /// The reader is unrestricted, but will account its resource usage on the /// semaphore belonging to the passed-in permit. - flat_mutation_reader make_range_sstable_reader( + flat_mutation_reader_v2 make_range_sstable_reader( schema_ptr, reader_permit, const dht::partition_range&, diff --git a/table.cc b/table.cc index 5f8621eb80..4740d122dc 100644 --- a/table.cc +++ b/table.cc @@ -266,8 +266,8 @@ flat_mutation_reader table::make_streaming_reader(schema_ptr schema, reader_perm auto trace_state = tracing::trace_state_ptr(); const auto fwd = streamed_mutation::forwarding::no; const auto fwd_mr = mutation_reader::forwarding::no; - return sstables->make_range_sstable_reader(std::move(schema), std::move(permit), range, slice, pc, - std::move(trace_state), fwd, fwd_mr); + return downgrade_to_v1(sstables->make_range_sstable_reader(std::move(schema), std::move(permit), range, slice, pc, + std::move(trace_state), fwd, fwd_mr)); } future> table::lock_counter_cells(const mutation& m, db::timeout_clock::time_point timeout) { diff --git a/test/boost/sstable_compaction_test.cc b/test/boost/sstable_compaction_test.cc index 5efa7fdd3d..7e0a9c6b67 100644 --- a/test/boost/sstable_compaction_test.cc +++ b/test/boost/sstable_compaction_test.cc @@ -3342,14 +3342,14 @@ SEASTAR_TEST_CASE(purged_tombstone_consumer_sstable_test) { for (auto&& sst : all) { compacting->insert(std::move(sst)); } - auto reader = compacting->make_range_sstable_reader(s, + auto reader = downgrade_to_v1(compacting->make_range_sstable_reader(s, env.make_reader_permit(), query::full_partition_range, s->full_slice(), service::get_local_compaction_priority(), nullptr, ::streamed_mutation::forwarding::no, - ::mutation_reader::forwarding::no); + ::mutation_reader::forwarding::no)); auto r = std::move(reader); auto close_r = deferred_close(r);