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

Fix TEST_Destroy_DBImpl() to work with column families

Browse Source
This commit is contained in:
Igor Canadi 2014-03-05 12:27:39 -08:00
parent 0738ae6dc9
commit a329dd1b25
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/db_impl.cc
View File

@ -361,6 +361,10 @@ void DBImpl::TEST_Destroy_DBImpl() {
bg_compaction_scheduled_ += LargeNumber; bg_compaction_scheduled_ += LargeNumber;
mutex_.Unlock(); mutex_.Unlock();
if (default_cf_handle_ != nullptr) {
// we need to delete handle outside of lock because it does its own locking
delete default_cf_handle_;
}
LogFlush(options_.info_log); LogFlush(options_.info_log);
// force release the lock file. // force release the lock file.
@ -369,7 +373,9 @@ void DBImpl::TEST_Destroy_DBImpl() {
} }
log_.reset(); log_.reset();
mutex_.Lock();
versions_.reset(); versions_.reset();
mutex_.Unlock();
table_cache_.reset(); table_cache_.reset();
} }