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

sstable_conforms_to_mutation_source_test: Open-code the make_sstable()

Browse Source 
helper

This test case is pretty special in the sense that it uses custom path
for tempdir to create, write and load sstable to/from. It's better to
open-code the make_sstable() helper into the test case rather than
encourage callers to use custom tempdirs. "Good" test cases can use
make_sstable_easy() for the same purposes (in fact they alredy do).

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2023-11-02 17:46:06 +03:00
parent 7f6423bc35
commit cc89acff67
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/boost/sstable_conforms_to_mutation_source_test.cc
View File

@@ -28,7 +28,12 @@ using namespace std::chrono_literals;
static
mutation_source make_sstable_mutation_source(sstables::test_env& env, schema_ptr s, sstring dir, std::vector<mutation> mutations,
sstable_writer_config cfg, sstables::sstable::version_types version, gc_clock::time_point query_time = gc_clock::now()) {
return make_sstable(env, s, dir, std::move(mutations), cfg, version, query_time)->as_mutation_source();
auto sst = env.make_sstable(s, dir, env.new_generation(), version, sstable_format_types::big, default_sstable_buffer_size, query_time);
auto mt = make_memtable(s, mutations);
auto mr = mt->make_flat_reader(s, env.make_reader_permit());
sst->write_components(std::move(mr), mutations.size(), s, cfg, mt->get_encoding_stats()).get();
sst->load(s->get_sharder()).get();
return sst->as_mutation_source();
}
static void consume_all(flat_mutation_reader_v2& rd) {

11
test/lib/sstable_utils.cc
View File

@@ -85,17 +85,6 @@ sstables::shared_sstable make_sstable_containing(sstables::shared_sstable sst, s
return sst;
}
shared_sstable make_sstable(sstables::test_env& env, schema_ptr s, sstring dir, std::vector<mutation> mutations,
sstable_writer_config cfg, sstables::sstable::version_types version, gc_clock::time_point query_time) {
fs::path dir_path(dir);
auto mt = make_memtable(s, mutations);
auto sst = env.make_sstable(s, dir_path.string(), env.new_generation(), version, sstable_format_types::big, default_sstable_buffer_size, query_time);
auto mr = mt->make_flat_reader(s, env.make_reader_permit());
sst->write_components(std::move(mr), mutations.size(), s, cfg, mt->get_encoding_stats()).get();
sst->load(s->get_sharder()).get();
return sst;
}
shared_sstable make_sstable_easy(test_env& env, flat_mutation_reader_v2 rd, sstable_writer_config cfg,
sstables::generation_type gen, const sstables::sstable::version_types version, int expected_partition, gc_clock::time_point query_time) {
auto s = rd.schema();

3
test/lib/sstable_utils.hh
View File

@@ -38,9 +38,6 @@ inline future<> write_memtable_to_sstable_for_test(replica::memtable& mt, sstabl
return write_memtable_to_sstable(mt, sst, sst->manager().configure_writer("memtable"));
}
shared_sstable make_sstable(sstables::test_env& env, schema_ptr s, sstring dir, std::vector<mutation> mutations,
sstable_writer_config cfg, sstables::sstable::version_types version, gc_clock::time_point query_time = gc_clock::now());
namespace sstables {
using sstable_ptr = shared_sstable;