github-repos/leveldb
1
0
Fork 0
mirror of https://github.com/google/leveldb.git synced 2025-03-12 09:40:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #386 from ivanabc:master

Browse Source 
PiperOrigin-RevId: 250702492
This commit is contained in:
Chris Mumford 2019-05-30 09:56:33 -07:00
commit 4cb80b7ddc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
db/db_impl.cc
View File

@ -229,12 +229,19 @@ void DBImpl::DeleteObsoleteFiles() {
return; return;
} }
const uint64_t log_number = versions_->LogNumber();
const uint64_t prev_log_number = versions_->PrevLogNumber();
const uint64_t manifest_file_number = versions_->ManifestFileNumber();
// Make a set of all of the live files // Make a set of all of the live files
std::set<uint64_t> live = pending_outputs_; std::set<uint64_t> live = pending_outputs_;
versions_->AddLiveFiles(&live); versions_->AddLiveFiles(&live);
std::vector<std::string> filenames; std::vector<std::string> filenames;
env_->GetChildren(dbname_, &filenames); // Ignoring errors on purpose env_->GetChildren(dbname_, &filenames); // Ignoring errors on purpose
// Unlock while deleting obsolete files
mutex_.Unlock();
uint64_t number; uint64_t number;
FileType type; FileType type;
for (size_t i = 0; i < filenames.size(); i++) { for (size_t i = 0; i < filenames.size(); i++) {
@ -242,13 +249,12 @@ void DBImpl::DeleteObsoleteFiles() {
bool keep = true; bool keep = true;
switch (type) { switch (type) {
case kLogFile: case kLogFile:
keep = ((number >= versions_->LogNumber()) || keep = ((number >= log_number) || (number == prev_log_number));
(number == versions_->PrevLogNumber()));
break; break;
case kDescriptorFile: case kDescriptorFile:
// Keep my manifest file, and any newer incarnations' // Keep my manifest file, and any newer incarnations'
// (in case there is a race that allows other incarnations) // (in case there is a race that allows other incarnations)
keep = (number >= versions_->ManifestFileNumber()); keep = (number >= manifest_file_number);
break; break;
case kTableFile: case kTableFile:
keep = (live.find(number) != live.end()); keep = (live.find(number) != live.end());
@ -275,6 +281,7 @@ void DBImpl::DeleteObsoleteFiles() {
} }
} }
} }
mutex_.Lock();
} }
Status DBImpl::Recover(VersionEdit* edit, bool* save_manifest) { Status DBImpl::Recover(VersionEdit* edit, bool* save_manifest) {