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

test: Remove sstable_utils' storage_prefix() helper

Browse Source 
It's excessive, test case that needs it can get storage prefix without
this fancy wrapper-helper

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>

Closes #14273
This commit is contained in:
Pavel Emelyanov
2023-06-16 15:20:12 +03:00
committed by Botond Dénes
parent 1a332ef5e2
commit 6bec03f96f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/boost/sstable_move_test.cc
View File

@@ -61,11 +61,11 @@ SEASTAR_THREAD_TEST_CASE(test_sstable_move_idempotent) {
sstables::sstable_generation_generator gen_generator{0};
auto [ sst, cur_dir ] = copy_sst_to_tmpdir(tmp.path(), env, uncompressed_schema(), fs::path(uncompressed_dir()), gen_generator());
sstring old_path = test(sst).storage_prefix();
sstring old_path = sst->get_storage().prefix();
touch_directory(format("{}/{}", old_path, sstables::staging_dir)).get();
sst->change_state(sstables::staging_dir).get();
sst->change_state(sstables::normal_dir).get();
BOOST_REQUIRE(sstable_directory::compare_sstable_storage_prefix(old_path, test(sst).storage_prefix()));
BOOST_REQUIRE(sstable_directory::compare_sstable_storage_prefix(old_path, sst->get_storage().prefix()));
sst->close_files().get();
}

4
test/lib/sstable_utils.hh
View File

@@ -223,10 +223,6 @@ public:
co_await _sst->_storage->move(*_sst, std::move(new_dir), new_generation, nullptr);
_sst->_generation = std::move(new_generation);
}
sstring storage_prefix() const {
return _sst->_storage->prefix();
}
};
inline auto replacer_fn_no_op() {