mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-28 10:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

memtable-sstable: migrate to v2 variant of sstable writer API

Browse Source
This commit is contained in:
Botond Dénes
2022-02-03 13:35:05 +02:00
parent 959483a2dc
commit d8fec08468
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
replica/memtable-sstable.hh
View File

@@ -29,7 +29,7 @@ namespace replica {
class memtable;
seastar::future<>
write_memtable_to_sstable(flat_mutation_reader reader,
write_memtable_to_sstable(flat_mutation_reader_v2 reader,
memtable& mt, sstables::shared_sstable sst,
size_t estimated_partitions,
sstables::write_monitor& monitor,

6
replica/table.cc
View File

@@ -660,7 +660,7 @@ table::try_flush_memtable_to_sstable(lw_shared_ptr<memtable> old, sstable_write_
auto monitor = database_sstable_write_monitor(permit, newtab, _compaction_strategy,
old->get_max_timestamp());
co_return co_await write_memtable_to_sstable(downgrade_to_v1(std::move(reader)), *old, newtab, estimated_partitions, monitor, cfg, priority);
co_return co_await write_memtable_to_sstable(std::move(reader), *old, newtab, estimated_partitions, monitor, cfg, priority);
});
auto reader = old->make_flush_reader(
@@ -2042,7 +2042,7 @@ future<> table::apply(const frozen_mutation& m, schema_ptr m_schema, db::rp_hand
template void table::do_apply(db::rp_handle&&, const frozen_mutation&, const schema_ptr&);
future<>
write_memtable_to_sstable(flat_mutation_reader reader,
write_memtable_to_sstable(flat_mutation_reader_v2 reader,
memtable& mt, sstables::shared_sstable sst,
size_t estimated_partitions,
sstables::write_monitor& monitor,
@@ -2060,7 +2060,7 @@ write_memtable_to_sstable(reader_permit permit, memtable& mt, sstables::shared_s
sstables::write_monitor& monitor,
sstables::sstable_writer_config& cfg,
const io_priority_class& pc) {
return write_memtable_to_sstable(downgrade_to_v1(mt.make_flush_reader(mt.schema(), std::move(permit), pc)), mt, std::move(sst), mt.partition_count(), monitor, cfg, pc);
return write_memtable_to_sstable(mt.make_flush_reader(mt.schema(), std::move(permit), pc), mt, std::move(sst), mt.partition_count(), monitor, cfg, pc);
}
future<>