Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix missing Handle release in TableCache::GetRangeTombstoneIterator #8589

Closed
wants to merge 5 commits into from
Closed

Fix missing Handle release in TableCache::GetRangeTombstoneIterator #8589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84fb07a
Fix missing Handle release in TableCache::GetRangeTombstoneIterator
pdillinger Jul 27, 2021
4c9d221
make format
pdillinger Jul 27, 2021
c105cd6
Fix ASC bug in unit test
pdillinger Jul 27, 2021
748da12
Simplify & fix unit test
pdillinger Jul 27, 2021
01e4ae7
Fix ASC (again)
pdillinger Jul 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions db/db_range_del_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,16 @@ TEST_F(DBRangeDelTest, TableEvictedDuringScan) {
ASSERT_EQ(kNum, expected);
delete iter;
db_->ReleaseSnapshot(snapshot);

// Also test proper cache handling in GetRangeTombstoneIterator,
// via TablesRangeTombstoneSummary. (This once triggered memory leak
// report with ASAN.)
opts.max_open_files = 1;
Reopen(opts);

std::string str;
ASSERT_OK(dbfull()->TablesRangeTombstoneSummary(db_->DefaultColumnFamily(),
100, &str));
}

TEST_F(DBRangeDelTest, GetCoveredKeyFromMutableMemtable) {
Expand Down
10 changes: 9 additions & 1 deletion db/table_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ Status TableCache::GetRangeTombstoneIterator(
const InternalKeyComparator& internal_comparator,
const FileMetaData& file_meta,
std::unique_ptr<FragmentedRangeTombstoneIterator>* out_iter) {
assert(out_iter);
const FileDescriptor& fd = file_meta.fd;
Status s;
TableReader* t = fd.table_reader;
Expand All @@ -308,8 +309,15 @@ Status TableCache::GetRangeTombstoneIterator(
}
}
if (s.ok()) {
// Note: NewRangeTombstoneIterator could return nullptr
out_iter->reset(t->NewRangeTombstoneIterator(options));
assert(out_iter);
}
if (handle) {
if (*out_iter) {
(*out_iter)->RegisterCleanup(&UnrefEntry, cache_, handle);
} else {
ReleaseHandle(handle);
}
}
return s;
}
Expand Down