summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDavid Grogan <dgrogan@chromium.org>2013-05-14 16:52:56 -0700
committerDavid Grogan <dgrogan@chromium.org>2013-05-14 17:03:07 -0700
commit28dad918f2ffb80fd70110ed5cd47744339649f2 (patch)
treec2ce59adbce3e461e9f3e6d7d984f93f07d7eb33 /db
parent514c943a8e9ce1b06c55ae5e47008f6b0854b36c (diff)
downloadleveldb-28dad918f2ffb80fd70110ed5cd47744339649f2.tar.gz
Release leveldb 1.10v1.10
Fixes issues 147 - thanks feniksgordonfreeman 153 156 166 Additionally, * Remove calls to exit(1). * Fix unused-variable warnings from clang. * Fix possible overflow error related to num_restart value >= (2^32/4). * Add leveldbutil to .gitignore. * Add better log messages when Write is stalled on a compaction.
Diffstat (limited to 'db')
-rw-r--r--db/db_impl.cc3
-rw-r--r--db/dbformat.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/db/db_impl.cc b/db/db_impl.cc
index 058d56d..5c30d6f 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -1276,10 +1276,11 @@ Status DBImpl::MakeRoomForWrite(bool force) {
} else if (imm_ != NULL) {
// We have filled up the current memtable, but the previous
// one is still being compacted, so we wait.
+ Log(options_.info_log, "Current memtable full; waiting...\n");
bg_cv_.Wait();
} else if (versions_->NumLevelFiles(0) >= config::kL0_StopWritesTrigger) {
// There are too many level-0 files.
- Log(options_.info_log, "waiting...\n");
+ Log(options_.info_log, "Too many L0 files; waiting...\n");
bg_cv_.Wait();
} else {
// Attempt to switch to a new memtable and trigger compaction of old
diff --git a/db/dbformat.cc b/db/dbformat.cc
index 28e11b3..20a7ca4 100644
--- a/db/dbformat.cc
+++ b/db/dbformat.cc
@@ -26,7 +26,7 @@ std::string ParsedInternalKey::DebugString() const {
(unsigned long long) sequence,
int(type));
std::string result = "'";
- result += user_key.ToString();
+ result += EscapeString(user_key.ToString());
result += buf;
return result;
}