Ver código fonte

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)
main
Hans Wennborg 13 anos atrás
pai
commit
36a5f8ed7f
102 arquivos alterados com 258 adições e 146 exclusões
  1. +1
    -1
      db/builder.cc
  2. +1
    -1
      db/builder.h
  3. +1
    -1
      db/corruption_test.cc
  4. +2
    -2
      db/db_bench.cc
  5. +2
    -2
      db/db_impl.cc
  6. +1
    -1
      db/db_impl.h
  7. +1
    -1
      db/db_iter.cc
  8. +1
    -1
      db/db_iter.h
  9. +100
    -2
      db/db_test.cc
  10. +1
    -1
      db/dbformat.cc
  11. +2
    -2
      db/dbformat.h
  12. +1
    -1
      db/dbformat_test.cc
  13. +1
    -1
      db/filename.cc
  14. +1
    -1
      db/filename.h
  15. +1
    -1
      db/filename_test.cc
  16. +2
    -2
      db/log_format.h
  17. +2
    -2
      db/log_reader.cc
  18. +2
    -2
      db/log_reader.h
  19. +2
    -2
      db/log_test.cc
  20. +2
    -2
      db/log_writer.cc
  21. +2
    -2
      db/log_writer.h
  22. +1
    -1
      db/memtable.cc
  23. +1
    -1
      db/memtable.h
  24. +2
    -2
      db/repair.cc
  25. +1
    -1
      db/skiplist.h
  26. +1
    -1
      db/skiplist_test.cc
  27. +1
    -1
      db/snapshot.h
  28. +1
    -1
      db/table_cache.cc
  29. +1
    -1
      db/table_cache.h
  30. +1
    -1
      db/version_edit.cc
  31. +1
    -1
      db/version_edit.h
  32. +1
    -1
      db/version_edit_test.cc
  33. +25
    -11
      db/version_set.cc
  34. +1
    -1
      db/version_set.h
  35. +1
    -1
      db/version_set_test.cc
  36. +2
    -2
      db/write_batch.cc
  37. +1
    -1
      db/write_batch_internal.h
  38. +1
    -1
      db/write_batch_test.cc
  39. +2
    -2
      doc/bench/db_bench_sqlite3.cc
  40. +2
    -2
      doc/bench/db_bench_tree_db.cc
  41. +2
    -2
      helpers/memenv/memenv.cc
  42. +1
    -1
      helpers/memenv/memenv.h
  43. +1
    -1
      helpers/memenv/memenv_test.cc
  44. +1
    -1
      include/leveldb/cache.h
  45. +1
    -1
      include/leveldb/comparator.h
  46. +1
    -1
      include/leveldb/db.h
  47. +1
    -1
      include/leveldb/env.h
  48. +1
    -1
      include/leveldb/iterator.h
  49. +1
    -1
      include/leveldb/options.h
  50. +1
    -1
      include/leveldb/slice.h
  51. +1
    -1
      include/leveldb/status.h
  52. +1
    -1
      include/leveldb/table.h
  53. +1
    -1
      include/leveldb/table_builder.h
  54. +1
    -1
      include/leveldb/write_batch.h
  55. +2
    -2
      port/atomic_pointer.h
  56. +2
    -2
      port/port_android.cc
  57. +2
    -2
      port/port_android.h
  58. +2
    -2
      port/port_example.h
  59. +2
    -2
      port/port_posix.cc
  60. +1
    -1
      table/block.cc
  61. +1
    -1
      table/block.h
  62. +1
    -1
      table/block_builder.cc
  63. +1
    -1
      table/block_builder.h
  64. +1
    -1
      table/format.cc
  65. +1
    -1
      table/format.h
  66. +2
    -2
      table/iterator.cc
  67. +2
    -2
      table/merger.cc
  68. +1
    -1
      table/merger.h
  69. +1
    -1
      table/table.cc
  70. +1
    -1
      table/table_builder.cc
  71. +3
    -3
      table/table_test.cc
  72. +2
    -2
      table/two_level_iterator.cc
  73. +1
    -1
      table/two_level_iterator.h
  74. +1
    -1
      util/arena.cc
  75. +1
    -1
      util/arena.h
  76. +1
    -1
      util/arena_test.cc
  77. +1
    -1
      util/cache.cc
  78. +1
    -1
      util/cache_test.cc
  79. +1
    -1
      util/coding.cc
  80. +1
    -1
      util/coding.h
  81. +1
    -1
      util/coding_test.cc
  82. +2
    -2
      util/comparator.cc
  83. +2
    -2
      util/crc32c.cc
  84. +2
    -2
      util/crc32c.h
  85. +2
    -2
      util/crc32c_test.cc
  86. +1
    -1
      util/env.cc
  87. +2
    -2
      util/env_posix.cc
  88. +1
    -1
      util/env_test.cc
  89. +1
    -1
      util/hash.cc
  90. +1
    -1
      util/histogram.cc
  91. +1
    -1
      util/histogram.h
  92. +1
    -1
      util/logging.cc
  93. +1
    -1
      util/logging.h
  94. +1
    -1
      util/mutexlock.h
  95. +1
    -1
      util/options.cc
  96. +1
    -1
      util/posix_logger.h
  97. +1
    -1
      util/random.h
  98. +1
    -1
      util/status.cc
  99. +2
    -2
      util/testharness.cc
  100. +2
    -2
      util/testharness.h

+ 1
- 1
db/builder.cc Ver arquivo

@ -85,4 +85,4 @@ Status BuildTable(const std::string& dbname,
return s;
}
}
} // namespace leveldb

+ 1
- 1
db/builder.h Ver arquivo

@ -29,6 +29,6 @@ extern Status BuildTable(const std::string& dbname,
Iterator* iter,
FileMetaData* meta);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_BUILDER_H_

+ 1
- 1
db/corruption_test.cc Ver arquivo

@ -352,7 +352,7 @@ TEST(CorruptionTest, UnrelatedKeys) {
ASSERT_EQ(Value(1000, &tmp2).ToString(), v);
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 2
- 2
db/db_bench.cc Ver arquivo

@ -288,7 +288,7 @@ struct ThreadState {
}
};
}
} // namespace
class Benchmark {
private:
@ -829,7 +829,7 @@ class Benchmark {
}
};
}
} // namespace leveldb
int main(int argc, char** argv) {
FLAGS_write_buffer_size = leveldb::Options().write_buffer_size;

+ 2
- 2
db/db_impl.cc Ver arquivo

@ -985,7 +985,7 @@ static void CleanupIteratorState(void* arg1, void* arg2) {
state->mu->Unlock();
delete state;
}
}
} // namespace
Iterator* DBImpl::NewInternalIterator(const ReadOptions& options,
SequenceNumber* latest_snapshot) {
@ -1378,4 +1378,4 @@ Status DestroyDB(const std::string& dbname, const Options& options) {
return result;
}
}
} // namespace leveldb

+ 1
- 1
db/db_impl.h Ver arquivo

@ -187,6 +187,6 @@ extern Options SanitizeOptions(const std::string& db,
const InternalKeyComparator* icmp,
const Options& src);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_DB_IMPL_H_

+ 1
- 1
db/db_iter.cc Ver arquivo

@ -296,4 +296,4 @@ Iterator* NewDBIterator(
return new DBIter(dbname, env, user_key_comparator, internal_iter, sequence);
}
}
} // namespace leveldb

+ 1
- 1
db/db_iter.h Ver arquivo

@ -21,6 +21,6 @@ extern Iterator* NewDBIterator(
Iterator* internal_iter,
const SequenceNumber& sequence);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_DB_ITER_H_

+ 100
- 2
db/db_test.cc Ver arquivo

@ -136,6 +136,33 @@ class DBTest {
return result;
}
// Return a string that contains all key,value pairs in order,
// formatted like "(k1->v1)(k2->v2)".
std::string Contents() {
std::vector<std::string> forward;
std::string result;
Iterator* iter = db_->NewIterator(ReadOptions());
for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
std::string s = IterStatus(iter);
result.push_back('(');
result.append(s);
result.push_back(')');
forward.push_back(s);
}
// Check reverse iteration results are the reverse of forward results
int matched = 0;
for (iter->SeekToLast(); iter->Valid(); iter->Prev()) {
ASSERT_LT(matched, forward.size());
ASSERT_EQ(IterStatus(iter), forward[forward.size() - matched - 1]);
matched++;
}
ASSERT_EQ(matched, forward.size());
delete iter;
return result;
}
std::string AllEntriesFor(const Slice& user_key) {
Iterator* iter = dbfull()->TEST_NewInternalIterator();
InternalKey target(user_key, kMaxSequenceNumber, kTypeValue);
@ -1048,6 +1075,49 @@ TEST(DBTest, OverlapInLevel0) {
ASSERT_EQ("NOT_FOUND", Get("600"));
}
TEST(DBTest, L0_CompactionBug_Issue44_a) {
Reopen();
ASSERT_OK(Put("b", "v"));
Reopen();
ASSERT_OK(Delete("b"));
ASSERT_OK(Delete("a"));
Reopen();
ASSERT_OK(Delete("a"));
Reopen();
ASSERT_OK(Put("a", "v"));
Reopen();
Reopen();
ASSERT_EQ("(a->v)", Contents());
env_->SleepForMicroseconds(1000000); // Wait for compaction to finish
ASSERT_EQ("(a->v)", Contents());
}
TEST(DBTest, L0_CompactionBug_Issue44_b) {
Reopen();
Put("","");
Reopen();
Delete("e");
Put("","");
Reopen();
Put("c", "cv");
Reopen();
Put("","");
Reopen();
Put("","");
env_->SleepForMicroseconds(1000000); // Wait for compaction to finish
Reopen();
Put("d","dv");
Reopen();
Put("","");
Reopen();
Delete("d");
Delete("b");
Reopen();
ASSERT_EQ("(->)(c->cv)", Contents());
env_->SleepForMicroseconds(1000000); // Wait for compaction to finish
ASSERT_EQ("(->)(c->cv)", Contents());
}
TEST(DBTest, ComparatorCheck) {
class NewComparator : public Comparator {
public:
@ -1071,6 +1141,34 @@ TEST(DBTest, ComparatorCheck) {
<< s.ToString();
}
TEST(DBTest, CustomComparator) {
class NumberComparator : public Comparator {
public:
virtual const char* Name() const { return "test.NumberComparator"; }
virtual int Compare(const Slice& a, const Slice& b) const {
return (strtol(a.ToString().c_str(), NULL, 0) -
strtol(b.ToString().c_str(), NULL, 0));
}
virtual void FindShortestSeparator(std::string* s, const Slice& l) const {}
virtual void FindShortSuccessor(std::string* key) const {}
};
NumberComparator cmp;
Options new_options;
new_options.create_if_missing = true;
new_options.comparator = &cmp;
DestroyAndReopen(&new_options);
ASSERT_OK(Put("10", "ten"));
ASSERT_OK(Put("0x14", "twenty"));
for (int i = 0; i < 2; i++) {
ASSERT_EQ("ten", Get("10"));
ASSERT_EQ("ten", Get("0xa"));
ASSERT_EQ("twenty", Get("20"));
ASSERT_EQ("twenty", Get("0x14"));
Compact("0", "9999");
fprintf(stderr, "ss\n%s\n", DumpSSTableList().c_str());
}
}
TEST(DBTest, ManualCompaction) {
ASSERT_EQ(config::kMaxMemCompactLevel, 2)
<< "Need to update this test to match kMaxMemCompactLevel";
@ -1207,7 +1305,7 @@ static void MTThreadBody(void* arg) {
fprintf(stderr, "... stopping thread %d after %d ops\n", t->id, int(counter));
}
}
} // namespace
TEST(DBTest, MultiThreaded) {
// Initialize state
@ -1525,7 +1623,7 @@ void BM_LogAndApply(int iters, int num_base_files) {
buf, iters, us, ((float)us) / iters);
}
}
} // namespace leveldb
int main(int argc, char** argv) {
if (argc > 1 && std::string(argv[1]) == "--benchmark") {

+ 1
- 1
db/dbformat.cc Ver arquivo

@ -115,4 +115,4 @@ LookupKey::LookupKey(const Slice& user_key, SequenceNumber s) {
end_ = dst;
}
}
} // namespace leveldb

+ 2
- 2
db/dbformat.h Ver arquivo

@ -37,7 +37,7 @@ static const int kL0_StopWritesTrigger = 12;
// space if the same key space is being repeatedly overwritten.
static const int kMaxMemCompactLevel = 2;
}
} // namespace config
class InternalKey;
@ -210,6 +210,6 @@ inline LookupKey::~LookupKey() {
if (start_ != space_) delete[] start_;
}
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_FORMAT_H_

+ 1
- 1
db/dbformat_test.cc Ver arquivo

@ -105,7 +105,7 @@ TEST(FormatTest, InternalKeyShortestSuccessor) {
ShortSuccessor(IKey("\xff\xff", 100, kTypeValue)));
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 1
- 1
db/filename.cc Ver arquivo

@ -132,4 +132,4 @@ Status SetCurrentFile(Env* env, const std::string& dbname,
return s;
}
}
} // namespace leveldb

+ 1
- 1
db/filename.h Ver arquivo

@ -75,6 +75,6 @@ extern Status SetCurrentFile(Env* env, const std::string& dbname,
uint64_t descriptor_number);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_FILENAME_H_

+ 1
- 1
db/filename_test.cc Ver arquivo

@ -115,7 +115,7 @@ TEST(FileNameTest, Construction) {
ASSERT_EQ(kTempFile, type);
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 2
- 2
db/log_format.h Ver arquivo

@ -29,7 +29,7 @@ static const int kBlockSize = 32768;
// Header is checksum (4 bytes), type (1 byte), length (2 bytes).
static const int kHeaderSize = 4 + 1 + 2;
}
}
} // namespace log
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_LOG_FORMAT_H_

+ 2
- 2
db/log_reader.cc Ver arquivo

@ -255,5 +255,5 @@ unsigned int Reader::ReadPhysicalRecord(Slice* result) {
}
}
}
}
} // namespace log
} // namespace leveldb

+ 2
- 2
db/log_reader.h Ver arquivo

@ -102,7 +102,7 @@ class Reader {
void operator=(const Reader&);
};
}
}
} // namespace log
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_LOG_READER_H_

+ 2
- 2
db/log_test.cc Ver arquivo

@ -492,8 +492,8 @@ TEST(LogTest, ReadPastEnd) {
CheckOffsetPastEndReturnsNoRecords(5);
}
}
}
} // namespace log
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 2
- 2
db/log_writer.cc Ver arquivo

@ -99,5 +99,5 @@ Status Writer::EmitPhysicalRecord(RecordType t, const char* ptr, size_t n) {
return s;
}
}
}
} // namespace log
} // namespace leveldb

+ 2
- 2
db/log_writer.h Ver arquivo

@ -42,7 +42,7 @@ class Writer {
void operator=(const Writer&);
};
}
}
} // namespace log
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_LOG_WRITER_H_

+ 1
- 1
db/memtable.cc Ver arquivo

@ -142,4 +142,4 @@ bool MemTable::Get(const LookupKey& key, std::string* value, Status* s) {
return false;
}
}
} // namespace leveldb

+ 1
- 1
db/memtable.h Ver arquivo

@ -86,6 +86,6 @@ class MemTable {
void operator=(const MemTable&);
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_MEMTABLE_H_

+ 2
- 2
db/repair.cc Ver arquivo

@ -377,11 +377,11 @@ class Repairer {
fname.c_str(), s.ToString().c_str());
}
};
}
} // namespace
Status RepairDB(const std::string& dbname, const Options& options) {
Repairer repairer(dbname, options);
return repairer.Run();
}
}
} // namespace leveldb

+ 1
- 1
db/skiplist.h Ver arquivo

@ -375,4 +375,4 @@ bool SkipList::Contains(const Key& key) const {
}
}
}
} // namespace leveldb

+ 1
- 1
db/skiplist_test.cc Ver arquivo

@ -371,7 +371,7 @@ TEST(SkipTest, Concurrent3) { RunConcurrent(3); }
TEST(SkipTest, Concurrent4) { RunConcurrent(4); }
TEST(SkipTest, Concurrent5) { RunConcurrent(5); }
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 1
- 1
db/snapshot.h Ver arquivo

@ -61,6 +61,6 @@ class SnapshotList {
SnapshotImpl list_;
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_SNAPSHOT_H_

+ 1
- 1
db/table_cache.cc Ver arquivo

@ -92,4 +92,4 @@ void TableCache::Evict(uint64_t file_number) {
cache_->Erase(Slice(buf, sizeof(buf)));
}
}
} // namespace leveldb

+ 1
- 1
db/table_cache.h Ver arquivo

@ -45,6 +45,6 @@ class TableCache {
Cache* cache_;
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_TABLE_CACHE_H_

+ 1
- 1
db/version_edit.cc Ver arquivo

@ -263,4 +263,4 @@ std::string VersionEdit::DebugString() const {
return r;
}
}
} // namespace leveldb

+ 1
- 1
db/version_edit.h Ver arquivo

@ -102,6 +102,6 @@ class VersionEdit {
std::vector< std::pair<int, FileMetaData> > new_files_;
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_VERSION_EDIT_H_

+ 1
- 1
db/version_edit_test.cc Ver arquivo

@ -39,7 +39,7 @@ TEST(VersionEditTest, EncodeDecode) {
TestEncodeDecode(edit);
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 25
- 11
db/version_set.cc Ver arquivo

@ -61,7 +61,7 @@ std::string IntSetToString(const std::set& s) {
result += "}";
return result;
}
}
} // namespace
Version::~Version() {
assert(refs_ == 0);
@ -253,7 +253,8 @@ void Version::AddIterators(const ReadOptions& options,
// If "*iter" points at a value or deletion for user_key, store
// either the value, or a NotFound error and return true.
// Else return false.
static bool GetValue(Iterator* iter, const Slice& user_key,
static bool GetValue(const Comparator* cmp,
Iterator* iter, const Slice& user_key,
std::string* value,
Status* s) {
if (!iter->Valid()) {
@ -264,7 +265,7 @@ static bool GetValue(Iterator* iter, const Slice& user_key,
*s = Status::Corruption("corrupted key for ", user_key);
return true;
}
if (parsed_key.user_key != user_key) {
if (cmp->Compare(parsed_key.user_key, user_key) != 0) {
return false;
}
switch (parsed_key.type) {
@ -360,7 +361,7 @@ Status Version::Get(const ReadOptions& options,
f->number,
f->file_size);
iter->Seek(ikey);
const bool done = GetValue(iter, user_key, value, &s);
const bool done = GetValue(ucmp, iter, user_key, value, &s);
if (!iter->status().ok()) {
s = iter->status();
delete iter;
@ -450,16 +451,29 @@ void Version::GetOverlappingInputs(
user_end = end->user_key();
}
const Comparator* user_cmp = vset_->icmp_.user_comparator();
for (size_t i = 0; i < files_[level].size(); i++) {
FileMetaData* f = files_[level][i];
if (begin != NULL &&
user_cmp->Compare(f->largest.user_key(), user_begin) < 0) {
for (size_t i = 0; i < files_[level].size(); ) {
FileMetaData* f = files_[level][i++];
const Slice file_start = f->smallest.user_key();
const Slice file_limit = f->largest.user_key();
if (begin != NULL && user_cmp->Compare(file_limit, user_begin) < 0) {
// "f" is completely before specified range; skip it
} else if (end != NULL &&
user_cmp->Compare(f->smallest.user_key(), user_end) > 0) {
} else if (end != NULL && user_cmp->Compare(file_start, user_end) > 0) {
// "f" is completely after specified range; skip it
} else {
inputs->push_back(f);
if (level == 0) {
// Level-0 files may overlap each other. So check if the newly
// added file has expanded the range. If so, restart search.
if (begin != NULL && user_cmp->Compare(file_start, user_begin) < 0) {
user_begin = file_start;
inputs->clear();
i = 0;
} else if (end != NULL && user_cmp->Compare(file_limit, user_end) > 0) {
user_end = file_limit;
inputs->clear();
i = 0;
}
}
}
}
}
@ -1369,4 +1383,4 @@ void Compaction::ReleaseInputs() {
}
}
}
} // namespace leveldb

+ 1
- 1
db/version_set.h Ver arquivo

@ -365,6 +365,6 @@ class Compaction {
size_t level_ptrs_[config::kNumLevels];
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_VERSION_SET_H_

+ 1
- 1
db/version_set_test.cc Ver arquivo

@ -172,7 +172,7 @@ TEST(FindFileTest, OverlappingFiles) {
ASSERT_TRUE(Overlaps("600", "700"));
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 2
- 2
db/write_batch.cc Ver arquivo

@ -120,7 +120,7 @@ class MemTableInserter : public WriteBatch::Handler {
sequence_++;
}
};
}
} // namespace
Status WriteBatchInternal::InsertInto(const WriteBatch* b,
MemTable* memtable) {
@ -135,4 +135,4 @@ void WriteBatchInternal::SetContents(WriteBatch* b, const Slice& contents) {
b->rep_.assign(contents.data(), contents.size());
}
}
} // namespace leveldb

+ 1
- 1
db/write_batch_internal.h Ver arquivo

@ -41,7 +41,7 @@ class WriteBatchInternal {
static Status InsertInto(const WriteBatch* batch, MemTable* memtable);
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_

+ 1
- 1
db/write_batch_test.cc Ver arquivo

@ -82,7 +82,7 @@ TEST(WriteBatchTest, Corruption) {
PrintContents(&batch));
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 2
- 2
doc/bench/db_bench_sqlite3.cc Ver arquivo

@ -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++) {

+ 2
- 2
doc/bench/db_bench_tree_db.cc Ver arquivo

@ -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++) {

+ 2
- 2
helpers/memenv/memenv.cc Ver arquivo

@ -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

+ 1
- 1
helpers/memenv/memenv.h Ver arquivo

@ -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_

+ 1
- 1
helpers/memenv/memenv_test.cc Ver arquivo

@ -225,7 +225,7 @@ TEST(MemEnvTest, DBTest) {
delete db;
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 1
- 1
include/leveldb/cache.h Ver arquivo

@ -94,6 +94,6 @@ class Cache {
void operator=(const Cache&);
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_CACHE_H_

+ 1
- 1
include/leveldb/comparator.h Ver arquivo

@ -58,6 +58,6 @@ class Comparator {
// must not be deleted.
extern const Comparator* BytewiseComparator();
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_COMPARATOR_H_

+ 1
- 1
include/leveldb/db.h Ver arquivo

@ -155,6 +155,6 @@ Status DestroyDB(const std::string& name, const Options& options);
// on a database that contains important information.
Status RepairDB(const std::string& dbname, const Options& options);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_DB_H_

+ 1
- 1
include/leveldb/env.h Ver arquivo

@ -318,6 +318,6 @@ class EnvWrapper : public Env {
Env* target_;
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_ENV_H_

+ 1
- 1
include/leveldb/iterator.h Ver arquivo

@ -95,6 +95,6 @@ extern Iterator* NewEmptyIterator();
// Return an empty iterator with the specified status.
extern Iterator* NewErrorIterator(const Status& status);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_ITERATOR_H_

+ 1
- 1
include/leveldb/options.h Ver arquivo

@ -182,6 +182,6 @@ struct WriteOptions {
}
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_OPTIONS_H_

+ 1
- 1
include/leveldb/slice.h Ver arquivo

@ -103,7 +103,7 @@ inline int Slice::compare(const Slice& b) const {
return r;
}
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_SLICE_H_

+ 1
- 1
include/leveldb/status.h Ver arquivo

@ -95,6 +95,6 @@ inline void Status::operator=(const Status& s) {
}
}
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_STATUS_H_

+ 1
- 1
include/leveldb/table.h Ver arquivo

@ -65,6 +65,6 @@ class Table {
void operator=(const Table&);
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_TABLE_H_

+ 1
- 1
include/leveldb/table_builder.h Ver arquivo

@ -86,6 +86,6 @@ class TableBuilder {
void operator=(const TableBuilder&);
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_TABLE_BUILDER_H_

+ 1
- 1
include/leveldb/write_batch.h Ver arquivo

@ -59,6 +59,6 @@ class WriteBatch {
// Intentionally copyable
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_INCLUDE_WRITE_BATCH_H_

+ 2
- 2
port/atomic_pointer.h Ver arquivo

@ -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_

+ 2
- 2
port/port_android.cc Ver arquivo

@ -60,5 +60,5 @@ void CondVar::SignalAll() {
PthreadCall("broadcast", pthread_cond_broadcast(&cv_));
}
}
}
} // namespace port
} // namespace leveldb

+ 2
- 2
port/port_android.h Ver arquivo

@ -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_

+ 2
- 2
port/port_example.h Ver arquivo

@ -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_

+ 2
- 2
port/port_posix.cc Ver arquivo

@ -46,5 +46,5 @@ void CondVar::SignalAll() {
PthreadCall("broadcast", pthread_cond_broadcast(&cv_));
}
}
}
} // namespace port
} // namespace leveldb

+ 1
- 1
table/block.cc Ver arquivo

@ -260,4 +260,4 @@ Iterator* Block::NewIterator(const Comparator* cmp) {
}
}
}
} // namespace leveldb

+ 1
- 1
table/block.h Ver arquivo

@ -38,6 +38,6 @@ class Block {
class Iter;
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_TABLE_BLOCK_H_

+ 1
- 1
table/block_builder.cc Ver arquivo

@ -106,4 +106,4 @@ void BlockBuilder::Add(const Slice& key, const Slice& value) {
counter_++;
}
}
} // namespace leveldb

+ 1
- 1
table/block_builder.h Ver arquivo

@ -52,6 +52,6 @@ class BlockBuilder {
void operator=(const BlockBuilder&);
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_TABLE_BLOCK_BUILDER_H_

+ 1
- 1
table/format.cc Ver arquivo

@ -132,4 +132,4 @@ Status ReadBlock(RandomAccessFile* file,
return Status::OK();
}
}
} // namespace leveldb

+ 1
- 1
table/format.h Ver arquivo

@ -98,6 +98,6 @@ inline BlockHandle::BlockHandle()
size_(~static_cast<uint64_t>(0)) {
}
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_TABLE_FORMAT_H_

+ 2
- 2
table/iterator.cc Ver arquivo

@ -54,7 +54,7 @@ class EmptyIterator : public Iterator {
private:
Status status_;
};
}
} // namespace
Iterator* NewEmptyIterator() {
return new EmptyIterator(Status::OK());
@ -64,4 +64,4 @@ Iterator* NewErrorIterator(const Status& status) {
return new EmptyIterator(status);
}
}
} // namespace leveldb

+ 2
- 2
table/merger.cc Ver arquivo

@ -181,7 +181,7 @@ void MergingIterator::FindLargest() {
}
current_ = largest;
}
}
} // namespace
Iterator* NewMergingIterator(const Comparator* cmp, Iterator** list, int n) {
assert(n >= 0);
@ -194,4 +194,4 @@ Iterator* NewMergingIterator(const Comparator* cmp, Iterator** list, int n) {
}
}
}
} // namespace leveldb

+ 1
- 1
table/merger.h Ver arquivo

@ -21,6 +21,6 @@ class Iterator;
extern Iterator* NewMergingIterator(
const Comparator* comparator, Iterator** children, int n);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_TABLE_MERGER_H_

+ 1
- 1
table/table.cc Ver arquivo

@ -172,4 +172,4 @@ uint64_t Table::ApproximateOffsetOf(const Slice& key) const {
return result;
}
}
} // namespace leveldb

+ 1
- 1
table/table_builder.cc Ver arquivo

@ -224,4 +224,4 @@ uint64_t TableBuilder::FileSize() const {
return rep_->offset;
}
}
} // namespace leveldb

+ 3
- 3
table/table_test.cc Ver arquivo

@ -60,7 +60,7 @@ class ReverseKeyComparator : public Comparator {
*key = Reverse(s);
}
};
}
} // namespace
static ReverseKeyComparator reverse_key_comparator;
static void Increment(const Comparator* cmp, std::string* key) {
@ -85,7 +85,7 @@ struct STLLessThan {
return cmp->Compare(Slice(a), Slice(b)) < 0;
}
};
}
} // namespace
class StringSink: public WritableFile {
public:
@ -847,7 +847,7 @@ TEST(TableTest, ApproximateOffsetOfCompressed) {
ASSERT_TRUE(Between(c.ApproximateOffsetOf("xyz"), 4000, 6000));
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 2
- 2
table/two_level_iterator.cc Ver arquivo

@ -169,7 +169,7 @@ void TwoLevelIterator::InitDataBlock() {
}
}
}
} // namespace
Iterator* NewTwoLevelIterator(
Iterator* index_iter,
@ -179,4 +179,4 @@ Iterator* NewTwoLevelIterator(
return new TwoLevelIterator(index_iter, block_function, arg, options);
}
}
} // namespace leveldb

+ 1
- 1
table/two_level_iterator.h Ver arquivo

@ -29,6 +29,6 @@ extern Iterator* NewTwoLevelIterator(
void* arg,
const ReadOptions& options);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_

+ 1
- 1
util/arena.cc Ver arquivo

@ -65,4 +65,4 @@ char* Arena::AllocateNewBlock(size_t block_bytes) {
return result;
}
}
} // namespace leveldb

+ 1
- 1
util/arena.h Ver arquivo

@ -63,6 +63,6 @@ inline char* Arena::Allocate(size_t bytes) {
return AllocateFallback(bytes);
}
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_ARENA_H_

+ 1
- 1
util/arena_test.cc Ver arquivo

@ -61,7 +61,7 @@ TEST(ArenaTest, Simple) {
}
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 1
- 1
util/cache.cc Ver arquivo

@ -325,4 +325,4 @@ Cache* NewLRUCache(size_t capacity) {
return new ShardedLRUCache(capacity);
}
}
} // namespace leveldb

+ 1
- 1
util/cache_test.cc Ver arquivo

@ -179,7 +179,7 @@ TEST(CacheTest, NewId) {
ASSERT_NE(a, b);
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 1
- 1
util/coding.cc Ver arquivo

@ -191,4 +191,4 @@ bool GetLengthPrefixedSlice(Slice* input, Slice* result) {
}
}
}
} // namespace leveldb

+ 1
- 1
util/coding.h Ver arquivo

@ -99,6 +99,6 @@ inline const char* GetVarint32Ptr(const char* p,
return GetVarint32PtrFallback(p, limit, value);
}
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_CODING_H_

+ 1
- 1
util/coding_test.cc Ver arquivo

@ -166,7 +166,7 @@ TEST(Coding, Strings) {
ASSERT_EQ("", input.ToString());
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 2
- 2
util/comparator.cc Ver arquivo

@ -63,11 +63,11 @@ class BytewiseComparatorImpl : public Comparator {
// *key is a run of 0xffs. Leave it alone.
}
};
}
} // namespace
static const BytewiseComparatorImpl bytewise;
const Comparator* BytewiseComparator() {
return &bytewise;
}
}
} // namespace leveldb

+ 2
- 2
util/crc32c.cc Ver arquivo

@ -328,5 +328,5 @@ uint32_t Extend(uint32_t crc, const char* buf, size_t size) {
return l ^ 0xffffffffu;
}
}
}
} // namespace crc32c
} // namespace leveldb

+ 2
- 2
util/crc32c.h Ver arquivo

@ -39,7 +39,7 @@ inline uint32_t Unmask(uint32_t masked_crc) {
return ((rot >> 17) | (rot << 15));
}
}
}
} // namespace crc32c
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_CRC32C_H_

+ 2
- 2
util/crc32c_test.cc Ver arquivo

@ -64,8 +64,8 @@ TEST(CRC, Mask) {
ASSERT_EQ(crc, Unmask(Unmask(Mask(Mask(crc)))));
}
}
}
} // namespace crc32c
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 1
- 1
util/env.cc Ver arquivo

@ -79,4 +79,4 @@ Status ReadFileToString(Env* env, const std::string& fname, std::string* data) {
EnvWrapper::~EnvWrapper() {
}
}
} // namespace leveldb

+ 2
- 2
util/env_posix.cc Ver arquivo

@ -553,7 +553,7 @@ void PosixEnv::StartThread(void (*function)(void* arg), void* arg) {
pthread_create(&t, NULL, &StartThreadWrapper, state));
}
}
} // namespace
static pthread_once_t once = PTHREAD_ONCE_INIT;
static Env* default_env;
@ -564,4 +564,4 @@ Env* Env::Default() {
return default_env;
}
}
} // namespace leveldb

+ 1
- 1
util/env_test.cc Ver arquivo

@ -95,7 +95,7 @@ TEST(EnvPosixTest, StartThread) {
ASSERT_EQ(state.val, 3);
}
}
} // namespace leveldb
int main(int argc, char** argv) {
return leveldb::test::RunAllTests();

+ 1
- 1
util/hash.cc Ver arquivo

@ -42,4 +42,4 @@ uint32_t Hash(const char* data, size_t n, uint32_t seed) {
}
}
} // namespace leveldb

+ 1
- 1
util/histogram.cc Ver arquivo

@ -136,4 +136,4 @@ std::string Histogram::ToString() const {
return r;
}
}
} // namespace leveldb

+ 1
- 1
util/histogram.h Ver arquivo

@ -37,6 +37,6 @@ class Histogram {
double StandardDeviation() const;
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_HISTOGRAM_H_

+ 1
- 1
util/logging.cc Ver arquivo

@ -78,4 +78,4 @@ bool ConsumeDecimalNumber(Slice* in, uint64_t* val) {
return (digits > 0);
}
}
} // namespace leveldb

+ 1
- 1
util/logging.h Ver arquivo

@ -42,6 +42,6 @@ extern bool ConsumeChar(Slice* in, char c);
// unspecified state.
extern bool ConsumeDecimalNumber(Slice* in, uint64_t* val);
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_LOGGING_H_

+ 1
- 1
util/mutexlock.h Ver arquivo

@ -33,7 +33,7 @@ class MutexLock {
void operator=(const MutexLock&);
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_MUTEXLOCK_H_

+ 1
- 1
util/options.cc Ver arquivo

@ -25,4 +25,4 @@ Options::Options()
}
}
} // namespace leveldb

+ 1
- 1
util/posix_logger.h Ver arquivo

@ -93,6 +93,6 @@ class PosixLogger : public Logger {
}
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_POSIX_LOGGER_H_

+ 1
- 1
util/random.h Ver arquivo

@ -54,6 +54,6 @@ class Random {
}
};
}
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_RANDOM_H_

+ 1
- 1
util/status.cc Ver arquivo

@ -72,4 +72,4 @@ std::string Status::ToString() const {
}
}
}
} // namespace leveldb

+ 2
- 2
util/testharness.cc Ver arquivo

@ -73,5 +73,5 @@ int RandomSeed() {
return result;
}
}
}
} // namespace test
} // namespace leveldb

+ 2
- 2
util/testharness.h Ver arquivo

@ -132,7 +132,7 @@ void TCONCAT(_Test_,name)::_Run()
extern bool RegisterTest(const char* base, const char* name, void (*func)());
}
}
} // namespace test
} // namespace leveldb
#endif // STORAGE_LEVELDB_UTIL_TESTHARNESS_H_

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff

Carregando…
Cancelar
Salvar