DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge commit '84d6d69fc69662b2709fffbeaf3c3b4f53c535b1'

Browse Source
This commit is contained in:
Pieter Wuille
2013-08-18 00:58:04 +02:00
parent 317f57ec87 84d6d69fc6
commit 4a9a8f3f48
6 changed files with 107 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/leveldb/db/db_impl.cc
View File

@@ -322,7 +322,7 @@ Status DBImpl::Recover(VersionEdit* edit) {
if (ParseFileName(filenames[i], &number, &type)) {
expected.erase(number);
if (type == kLogFile && ((number >= min_log) || (number == prev_log)))
logs.push_back(number);
logs.push_back(number);
}
}
if (!expected.empty()) {
@@ -822,9 +822,6 @@ Status DBImpl::FinishCompactionOutputFile(CompactionState* compact,
(unsigned long long) output_number,
(unsigned long long) current_entries,
(unsigned long long) current_bytes);
// rate-limit compaction file creation with a 100ms pause
env_->SleepForMicroseconds(100000);
}
}
return s;