Merge 'Treewide use-after-move bug fixes' from Raphael "Raph" Carvalho
That's courtersy of 153813d3b8, which annotates Seastar smart pointer classes with Clang's consumed attributes, to help Clang to statically spot use-after-move bugs.
Closes #13386
* github.com:scylladb/scylladb:
replica: Fix use-after-move in table::make_streaming_reader
index/built_indexes_virtual_reader.hh: Fix use-after-move
db/view/build_progress_virtual_reader: Fix use-after-move
sstables: Fix use-after-move when making reader in reverse mode
This commit is contained in:
@@ -197,7 +197,7 @@ public:
|
||||
streamed_mutation::forwarding fwd,
|
||||
mutation_reader::forwarding fwd_mr) {
|
||||
return flat_mutation_reader_v2(std::make_unique<build_progress_reader>(
|
||||
std::move(s),
|
||||
s,
|
||||
std::move(permit),
|
||||
_db.find_column_family(s->ks_name(), system_keyspace::v3::SCYLLA_VIEWS_BUILDS_IN_PROGRESS),
|
||||
range,
|
||||
|
||||
@@ -223,7 +223,7 @@ public:
|
||||
mutation_reader::forwarding fwd_mr) {
|
||||
return make_flat_mutation_reader_v2<built_indexes_reader>(
|
||||
_db,
|
||||
std::move(s),
|
||||
s,
|
||||
std::move(permit),
|
||||
_db.find_column_family(s->ks_name(), system_keyspace::v3::BUILT_VIEWS),
|
||||
range,
|
||||
|
||||
@@ -705,7 +705,7 @@ public:
|
||||
mutation_reader::forwarding fwd_mr = mutation_reader::forwarding::no) const;
|
||||
|
||||
flat_mutation_reader_v2 make_streaming_reader(schema_ptr schema, reader_permit permit, const dht::partition_range& range) {
|
||||
return make_streaming_reader(std::move(schema), std::move(permit), range, schema->full_slice());
|
||||
return make_streaming_reader(schema, std::move(permit), range, schema->full_slice());
|
||||
}
|
||||
|
||||
// Stream reader from the given sstables
|
||||
|
||||
@@ -1701,7 +1701,7 @@ static flat_mutation_reader_v2 make_reader(
|
||||
// in 'native-reversed' format (if ever).
|
||||
if (slice.get().is_reversed()) {
|
||||
return make_flat_mutation_reader_v2<mx_sstable_mutation_reader>(
|
||||
std::move(sstable), std::move(schema), std::move(permit), range,
|
||||
std::move(sstable), schema, std::move(permit), range,
|
||||
legacy_reverse_slice_to_native_reverse_slice(*schema, slice.get()), pc, std::move(trace_state), fwd, fwd_mr, monitor);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user