andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixup 33087a2 "fix swallowed error for file deletion consistency check (#6809)"

Browse Source 
I forgot to amend changes to the above backport commit before pushing
it.
This commit is contained in:
Andrew Kryczka 2020-05-05 14:52:18 -07:00
parent 33087a2881
commit 26979ce6f7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/version_builder_test.cc
View File

@ -801,21 +801,18 @@ TEST_F(VersionBuilderTest, CheckConsistencyForFileDeletedTwice) {
EnvOptions env_options; EnvOptions env_options;
constexpr TableCache* table_cache = nullptr; constexpr TableCache* table_cache = nullptr;
constexpr VersionSet* version_set = nullptr;
VersionBuilder version_builder(env_options, &ioptions_, table_cache, VersionBuilder version_builder(env_options, table_cache, &vstorage_);
&vstorage_, version_set);
VersionStorageInfo new_vstorage(&icmp_, ucmp_, options_.num_levels, VersionStorageInfo new_vstorage(&icmp_, ucmp_, options_.num_levels,
kCompactionStyleLevel, nullptr, kCompactionStyleLevel, nullptr,
true /* force_consistency_checks */); true /* force_consistency_checks */);
ASSERT_OK(version_builder.Apply(&version_edit)); ASSERT_OK(version_builder.Apply(&version_edit));
ASSERT_OK(version_builder.SaveTo(&new_vstorage)); ASSERT_OK(version_builder.SaveTo(&new_vstorage));
VersionBuilder version_builder2(env_options, &ioptions_, table_cache, VersionBuilder version_builder2(env_options, table_cache, &new_vstorage);
&new_vstorage, version_set);
VersionStorageInfo new_vstorage2(&icmp_, ucmp_, options_.num_levels, VersionStorageInfo new_vstorage2(&icmp_, ucmp_, options_.num_levels,
kCompactionStyleLevel, nullptr, kCompactionStyleLevel, nullptr,
true /* force_consistency_checks */); true /* force_consistency_checks */);
ASSERT_NOK(version_builder2.Apply(&version_edit)); ASSERT_NOK(version_builder2.Apply(&version_edit));
UnrefFilesInVersion(&new_vstorage); UnrefFilesInVersion(&new_vstorage);