diff options
| -rw-r--r-- | db/memtable.cc | 1 | ||||
| -rw-r--r-- | db/skiplist.h | 2 | ||||
| -rw-r--r-- | db/version_edit.cc | 1 | ||||
| -rw-r--r-- | port/port_example.h | 2 | ||||
| -rw-r--r-- | util/cache.cc | 2 | ||||
| -rw-r--r-- | util/env_test.cc | 2 |
6 files changed, 4 insertions, 6 deletions
diff --git a/db/memtable.cc b/db/memtable.cc index f42774d..4f09340 100644 --- a/db/memtable.cc +++ b/db/memtable.cc @@ -78,6 +78,7 @@ void MemTable::Add(SequenceNumber s, ValueType type, const Slice& key, // Format of an entry is concatenation of: // key_size : varint32 of internal_key.size() // key bytes : char[internal_key.size()] + // tag : uint64((sequence << 8) | type) // value_size : varint32 of value.size() // value bytes : char[value.size()] size_t key_size = key.size(); diff --git a/db/skiplist.h b/db/skiplist.h index f716834..1140e59 100644 --- a/db/skiplist.h +++ b/db/skiplist.h @@ -36,8 +36,6 @@ namespace leveldb { -class Arena; - template <typename Key, class Comparator> class SkipList { private: diff --git a/db/version_edit.cc b/db/version_edit.cc index 3e9012f..356ce88 100644 --- a/db/version_edit.cc +++ b/db/version_edit.cc @@ -34,6 +34,7 @@ void VersionEdit::Clear() { has_prev_log_number_ = false; has_next_file_number_ = false; has_last_sequence_ = false; + compact_pointers_.clear(); deleted_files_.clear(); new_files_.clear(); } diff --git a/port/port_example.h b/port/port_example.h index a665910..704aa24 100644 --- a/port/port_example.h +++ b/port/port_example.h @@ -55,7 +55,7 @@ class CondVar { void Signal(); // Wake up all waiting threads. - void SignallAll(); + void SignalAll(); }; // ------------------ Compression ------------------- diff --git a/util/cache.cc b/util/cache.cc index ad1e9a2..fc3d154 100644 --- a/util/cache.cc +++ b/util/cache.cc @@ -54,7 +54,7 @@ struct LRUHandle { char key_data[1]; // Beginning of key Slice key() const { - // next_ is only equal to this if the LRU handle is the list head of an + // next is only equal to this if the LRU handle is the list head of an // empty list. List heads never have meaningful keys. assert(next != this); diff --git a/util/env_test.cc b/util/env_test.cc index fc69d71..47174f5 100644 --- a/util/env_test.cc +++ b/util/env_test.cc @@ -14,8 +14,6 @@ namespace leveldb { -static const int kDelayMicros = 100000; - class EnvTest : public testing::Test { public: EnvTest() : env_(Env::Default()) {} |