summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorHans Wennborg <hans@chromium.org>2011-10-31 17:22:06 +0000
committerHans Wennborg <hans@chromium.org>2011-10-31 17:22:06 +0000
commit36a5f8ed7f9fb3373236d5eace4f5fea369856ee (patch)
tree59dd30362b5471d422313b52d561c88b124a2c7a /helpers
parent299ccedfeca1fb3497978c288e76008a5c08e899 (diff)
downloadleveldb-36a5f8ed7f9fb3373236d5eace4f5fea369856ee.tar.gz
A number of fixes:
- Replace raw slice comparison with a call to user comparator. Added test for custom comparators. - Fix end of namespace comments. - Fixed bug in picking inputs for a level-0 compaction. When finding overlapping files, the covered range may expand as files are added to the input set. We now correctly expand the range when this happens instead of continuing to use the old range. For example, suppose L0 contains files with the following ranges: F1: a .. d F2: c .. g F3: f .. j and the initial compaction target is F3. We used to search for range f..j which yielded {F2,F3}. However we now expand the range as soon as another file is added. In this case, when F2 is added, we expand the range to c..j and restart the search. That picks up file F1 as well. This change fixes a bug related to deleted keys showing up incorrectly after a compaction as described in Issue 44. (Sync with upstream @25072954)
Diffstat (limited to 'helpers')
-rw-r--r--helpers/memenv/memenv.cc4
-rw-r--r--helpers/memenv/memenv.h2
-rw-r--r--helpers/memenv/memenv_test.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/helpers/memenv/memenv.cc b/helpers/memenv/memenv.cc
index dab80fe..2082083 100644
--- a/helpers/memenv/memenv.cc
+++ b/helpers/memenv/memenv.cc
@@ -365,10 +365,10 @@ class InMemoryEnv : public EnvWrapper {
FileSystem file_map_; // Protected by mutex_.
};
-}
+} // namespace
Env* NewMemEnv(Env* base_env) {
return new InMemoryEnv(base_env);
}
-}
+} // namespace leveldb
diff --git a/helpers/memenv/memenv.h b/helpers/memenv/memenv.h
index 835b944..03b88de 100644
--- a/helpers/memenv/memenv.h
+++ b/helpers/memenv/memenv.h
@@ -15,6 +15,6 @@ class Env;
// *base_env must remain live while the result is in use.
Env* NewMemEnv(Env* base_env);
-}
+} // namespace leveldb
#endif // STORAGE_LEVELDB_HELPERS_MEMENV_MEMENV_H_
diff --git a/helpers/memenv/memenv_test.cc b/helpers/memenv/memenv_test.cc
index 3791dc3..a44310f 100644
--- a/helpers/memenv/memenv_test.cc
+++ b/helpers/memenv/memenv_test.cc
@@ -225,7 +225,7 @@ TEST(MemEnvTest, DBTest) {
delete db;
}
-}
+} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();