diff options
| author | sanjay@google.com <sanjay@google.com@62dab493-f737-651d-591e-8d6aee1b9529> | 2012-02-03 16:16:14 +0000 |
|---|---|---|
| committer | sanjay@google.com <sanjay@google.com@62dab493-f737-651d-591e-8d6aee1b9529> | 2012-02-03 16:16:14 +0000 |
| commit | 56addd362f70667d374aaa686f90eeae5c23d486 (patch) | |
| tree | 51d772a165b9e65f0e3060a6db1123944c64afc6 | |
| parent | e05bd5cade19e5de0f763f4f122eef9f35de3d9c (diff) | |
| download | src-56addd362f70667d374aaa686f90eeae5c23d486.tar.gz | |
avoid very large compactions; fix build on Linux
git-svn-id: http://leveldb.googlecode.com/svn/trunk@58 62dab493-f737-651d-591e-8d6aee1b9529
| -rw-r--r-- | build_detect_platform | 2 | ||||
| -rw-r--r-- | db/version_set.cc | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/build_detect_platform b/build_detect_platform index 5ab15ef..d8d9ba1 100644 --- a/build_detect_platform +++ b/build_detect_platform @@ -27,7 +27,7 @@ case `uname -s` in Linux) PLATFORM=OS_LINUX echo "PLATFORM_CFLAGS=-pthread -DOS_LINUX" >> build_config.mk - echo "PLATFORM_LDFLAGS=-lpthread" >> build_config.mk + echo "PLATFORM_LDFLAGS=-pthread" >> build_config.mk ;; SunOS) PLATFORM=OS_SOLARIS diff --git a/db/version_set.cc b/db/version_set.cc index 7cf5197..1310aeb 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -26,6 +26,11 @@ static const int kTargetFileSize = 2 * 1048576; // stop building a single file in a level->level+1 compaction. static const int64_t kMaxGrandParentOverlapBytes = 10 * kTargetFileSize; +// Maximum number of bytes in all compacted files. We avoid expanding +// the lower level file set of a compaction if it would make the +// total compaction cover more than this many bytes. +static const int64_t kExpandedCompactionByteSizeLimit = 25 * kTargetFileSize; + static double MaxBytesForLevel(int level) { // Note: the result for level zero is not really used since we set // the level-0 compaction threshold based on number of files. @@ -1223,7 +1228,11 @@ void VersionSet::SetupOtherInputs(Compaction* c) { if (!c->inputs_[1].empty()) { std::vector<FileMetaData*> expanded0; current_->GetOverlappingInputs(level, &all_start, &all_limit, &expanded0); - if (expanded0.size() > c->inputs_[0].size()) { + const int64_t inputs0_size = TotalFileSize(c->inputs_[0]); + const int64_t inputs1_size = TotalFileSize(c->inputs_[1]); + const int64_t expanded0_size = TotalFileSize(expanded0); + if (expanded0.size() > c->inputs_[0].size() && + inputs1_size + expanded0_size < kExpandedCompactionByteSizeLimit) { InternalKey new_start, new_limit; GetRange(expanded0, &new_start, &new_limit); std::vector<FileMetaData*> expanded1; @@ -1231,12 +1240,14 @@ void VersionSet::SetupOtherInputs(Compaction* c) { &expanded1); if (expanded1.size() == c->inputs_[1].size()) { Log(options_->info_log, - "Expanding@%d %d+%d to %d+%d\n", + "Expanding@%d %d+%d (%ld+%ld bytes) to %d+%d (%ld+%ld bytes)\n", level, int(c->inputs_[0].size()), int(c->inputs_[1].size()), + long(inputs0_size), long(inputs1_size), int(expanded0.size()), - int(expanded1.size())); + int(expanded1.size()), + long(expanded0_size), long(inputs1_size)); smallest = new_start; largest = new_limit; c->inputs_[0] = expanded0; |