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 /port | |
parent | 299ccedfeca1fb3497978c288e76008a5c08e899 (diff) | |
download | leveldb-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 'port')
-rw-r--r-- | port/atomic_pointer.h | 4 | ||||
-rw-r--r-- | port/port_android.cc | 4 | ||||
-rw-r--r-- | port/port_android.h | 4 | ||||
-rw-r--r-- | port/port_example.h | 4 | ||||
-rw-r--r-- | port/port_posix.cc | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h index c20b1bd..35ae550 100644 --- a/port/atomic_pointer.h +++ b/port/atomic_pointer.h @@ -138,7 +138,7 @@ class AtomicPointer { #undef ARCH_CPU_X86_FAMILY #undef ARCH_CPU_ARM_FAMILY -} // namespace leveldb::port -} // namespace leveldb +} // namespace port +} // namespace leveldb #endif // PORT_ATOMIC_POINTER_H_ diff --git a/port/port_android.cc b/port/port_android.cc index 240e9ca..815abf2 100644 --- a/port/port_android.cc +++ b/port/port_android.cc @@ -60,5 +60,5 @@ void CondVar::SignalAll() { PthreadCall("broadcast", pthread_cond_broadcast(&cv_)); } -} -} +} // namespace port +} // namespace leveldb diff --git a/port/port_android.h b/port/port_android.h index d68b6c0..64cdcbf 100644 --- a/port/port_android.h +++ b/port/port_android.h @@ -150,7 +150,7 @@ inline bool GetHeapProfile(void (*func)(void*, const char*, int), void* arg) { return false; } -} -} +} // namespace port +} // namespace leveldb #endif // STORAGE_LEVELDB_PORT_PORT_ANDROID_H_ diff --git a/port/port_example.h b/port/port_example.h index 6bd9b49..036c7d1 100644 --- a/port/port_example.h +++ b/port/port_example.h @@ -119,7 +119,7 @@ extern bool Snappy_Uncompress(const char* input_data, size_t input_length, // The concatenation of all "data[0,n-1]" fragments is the heap profile. extern bool GetHeapProfile(void (*func)(void*, const char*, int), void* arg); -} -} +} // namespace port +} // namespace leveldb #endif // STORAGE_LEVELDB_PORT_PORT_EXAMPLE_H_ diff --git a/port/port_posix.cc b/port/port_posix.cc index e75da8b..c44cc99 100644 --- a/port/port_posix.cc +++ b/port/port_posix.cc @@ -46,5 +46,5 @@ void CondVar::SignalAll() { PthreadCall("broadcast", pthread_cond_broadcast(&cv_)); } -} -} +} // namespace port +} // namespace leveldb |