Browse Source

update new implementation

light_ver
ArcueidType 3 weeks ago
parent
commit
28ae1b52c5
3 changed files with 5 additions and 9 deletions
  1. +1
    -1
      db/dbformat.h
  2. +3
    -5
      db/version_set.cc
  3. +1
    -3
      test/ttl_test.cc

+ 1
- 1
db/dbformat.h View File

@ -22,7 +22,7 @@ namespace leveldb {
// Grouping of constants. We may want to make some of these // Grouping of constants. We may want to make some of these
// parameters set via options. // parameters set via options.
namespace config { namespace config {
static const int kNumLevels = 7;
static const int kNumLevels = 3;
// Level-0 compaction is started when we hit this many files. // Level-0 compaction is started when we hit this many files.
static const int kL0_CompactionTrigger = 4; static const int kL0_CompactionTrigger = 4;

+ 3
- 5
db/version_set.cc View File

@ -1104,13 +1104,11 @@ int VersionSet::NumLevelFiles(int level) const {
const char* VersionSet::LevelSummary(LevelSummaryStorage* scratch) const { const char* VersionSet::LevelSummary(LevelSummaryStorage* scratch) const {
// Update code if kNumLevels changes // Update code if kNumLevels changes
static_assert(config::kNumLevels == 7, "");
static_assert(config::kNumLevels == 3, "");
std::snprintf( std::snprintf(
scratch->buffer, sizeof(scratch->buffer), "files[ %d %d %d %d %d %d %d ]",
scratch->buffer, sizeof(scratch->buffer), "files[ %d %d %d ]",
int(current_->files_[0].size()), int(current_->files_[1].size()), int(current_->files_[0].size()), int(current_->files_[1].size()),
int(current_->files_[2].size()), int(current_->files_[3].size()),
int(current_->files_[4].size()), int(current_->files_[5].size()),
int(current_->files_[6].size()));
int(current_->files_[2].size()));
return scratch->buffer; return scratch->buffer;
} }

+ 1
- 3
test/ttl_test.cc View File

@ -104,9 +104,7 @@ TEST(TestTTL, CompactionTTL) {
delete db; delete db;
} }
// Time-consuming when kNumLevels is 7, so run this test when kNumLevels is set to 3,
// the codes on branch light_ver is a version with kNumLevels set to 3.
// In this case level 2 is the last level with files.
// Test handling last level with kNumLevels = 3
TEST(TestTTL, LastLevelCompaction) { TEST(TestTTL, LastLevelCompaction) {
DB *db; DB *db;

Loading…
Cancel
Save