bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

sstable_set: update make_range_sstable_reader() to flat_mutation_reader_v2

Browse Source 
Signed-off-by: Raphael S. Carvalho <raphaelsc@scylladb.com>
This commit is contained in:
Raphael S. Carvalho
2021-12-03 10:23:02 -03:00
parent c3c070a5ca
commit aebbe68239
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compaction/compaction.cc
View File

@@ -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));
}

2
db/view/view_update_generator.cc
View File

@@ -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),

6
sstables/sstable_set.cc
View File

@@ -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<incremental_reader_selector>(s,
return upgrade_to_v2(make_combined_reader(s, std::move(permit), std::make_unique<incremental_reader_selector>(s,
shared_from_this(),
pr,
std::move(trace_state),
std::move(reader_factory_fn)),
fwd,
fwd_mr);
fwd_mr));
}
flat_mutation_reader_v2

2
sstables/sstable_set.hh
View File

@@ -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&,

4
table.cc
View File

@@ -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<std::vector<locked_cell>> table::lock_counter_cells(const mutation& m, db::timeout_clock::time_point timeout) {

4
test/boost/sstable_compaction_test.cc
View File

@@ -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);