test: sstable_move_test: always use uuid sstable generation

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2025-06-16 09:19:16 +03:00
parent 49ca442e7c
commit ecc7272a07

View File

@@ -38,7 +38,7 @@ SEASTAR_THREAD_TEST_CASE(test_sstable_move) {
auto stop_env = defer([&env] { env.stop().get(); });
sstables::sstable_generation_generator gen_generator;
auto [ sst, cur_dir ] = copy_sst_to_tmpdir(tmp.path(), env, uncompressed_schema(), fs::path(uncompressed_dir()), gen_generator());
auto [ sst, cur_dir ] = copy_sst_to_tmpdir(tmp.path(), env, uncompressed_schema(), fs::path(uncompressed_dir()), sstables::generation_type(1));
generation_type gen{0};
for (auto i = 0; i < 2; i++) {
@@ -62,9 +62,8 @@ SEASTAR_THREAD_TEST_CASE(test_sstable_move_idempotent) {
auto scf = make_sstable_compressor_factory_for_tests_in_thread();
auto env = test_env({}, *scf);
auto stop_env = defer([&env] { env.stop().get(); });
sstables::sstable_generation_generator gen_generator;
auto [ sst, cur_dir ] = copy_sst_to_tmpdir(tmp.path(), env, uncompressed_schema(), fs::path(uncompressed_dir()), gen_generator());
auto [ sst, cur_dir ] = copy_sst_to_tmpdir(tmp.path(), env, uncompressed_schema(), fs::path(uncompressed_dir()), sstables::generation_type(1));
sstring old_path = sst->get_storage().prefix();
touch_directory(format("{}/{}", old_path, sstables::staging_dir)).get();
sst->change_state(sstables::sstable_state::staging).get();
@@ -109,7 +108,7 @@ SEASTAR_THREAD_TEST_CASE(test_sstable_move_replay) {
auto stop_env = defer([&env] { env.stop().get(); });
sstables::sstable_generation_generator gen_generator;
auto [ sst, cur_dir ] = copy_sst_to_tmpdir(tmp.path(), env, uncompressed_schema(), fs::path(uncompressed_dir()), gen_generator());
auto [ sst, cur_dir ] = copy_sst_to_tmpdir(tmp.path(), env, uncompressed_schema(), fs::path(uncompressed_dir()), sstables::generation_type(1));
bool done;
int count = 0;