diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-08-18 00:58:04 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-08-18 00:58:04 +0200 |
| commit | 4a9a8f3f48f7820cff2964489f09a34160b1671b (patch) | |
| tree | 417244fb281fca8d19efcbbae5fa6d371ff89ba4 /src/leveldb/db | |
| parent | 317f57ec87da566ee2ae648853a9105a4136efef (diff) | |
| parent | 84d6d69fc69662b2709fffbeaf3c3b4f53c535b1 (diff) | |
Merge commit '84d6d69fc69662b2709fffbeaf3c3b4f53c535b1'
Diffstat (limited to 'src/leveldb/db')
| -rw-r--r-- | src/leveldb/db/db_impl.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/leveldb/db/db_impl.cc b/src/leveldb/db/db_impl.cc index af02467b33..395d3172ad 100644 --- a/src/leveldb/db/db_impl.cc +++ b/src/leveldb/db/db_impl.cc @@ -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; |