diff options
author | Hans Wennborg <hans@chromium.org> | 2011-10-31 17:22:06 +0000 |
---|---|---|
committer | Hans Wennborg <hans@chromium.org> | 2011-10-31 17:22:06 +0000 |
commit | 36a5f8ed7f9fb3373236d5eace4f5fea369856ee (patch) | |
tree | 59dd30362b5471d422313b52d561c88b124a2c7a /doc | |
parent | 299ccedfeca1fb3497978c288e76008a5c08e899 (diff) |
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 'doc')
-rw-r--r-- | doc/bench/db_bench_sqlite3.cc | 4 | ||||
-rw-r--r-- | doc/bench/db_bench_tree_db.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/bench/db_bench_sqlite3.cc b/doc/bench/db_bench_sqlite3.cc index e11db52c4..6951a1430 100644 --- a/doc/bench/db_bench_sqlite3.cc +++ b/doc/bench/db_bench_sqlite3.cc @@ -155,7 +155,7 @@ static Slice TrimSpace(Slice s) { return Slice(s.data() + start, limit - start); } -} +} // namespace class Benchmark { private: @@ -652,7 +652,7 @@ class Benchmark { }; -} +} // namespace leveldb int main(int argc, char** argv) { for (int i = 1; i < argc; i++) { diff --git a/doc/bench/db_bench_tree_db.cc b/doc/bench/db_bench_tree_db.cc index d42e3060d..214d9b7a3 100644 --- a/doc/bench/db_bench_tree_db.cc +++ b/doc/bench/db_bench_tree_db.cc @@ -124,7 +124,7 @@ static Slice TrimSpace(Slice s) { return Slice(s.data() + start, limit - start); } -} +} // namespace class Benchmark { private: @@ -467,7 +467,7 @@ class Benchmark { } }; -} +} // namespace leveldb int main(int argc, char** argv) { for (int i = 1; i < argc; i++) { |