diff options
| author | jorlow@chromium.org <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529> | 2011-03-22 23:24:02 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529> | 2011-03-22 23:24:02 +0000 |
| commit | 8303bb1b33a4db1d688d32f9be10976b0b54f209 (patch) | |
| tree | 01802e7d30e43809b4a8c62a073c11c6037eb8f6 /db/version_set.h | |
| parent | 6d243ebf79640525a94fab280efeb5a46c994af6 (diff) | |
| download | leveldb-8303bb1b33a4db1d688d32f9be10976b0b54f209.tar.gz | |
Pull from upstream.
git-svn-id: https://leveldb.googlecode.com/svn/trunk@14 62dab493-f737-651d-591e-8d6aee1b9529
Diffstat (limited to 'db/version_set.h')
| -rw-r--r-- | db/version_set.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/db/version_set.h b/db/version_set.h index 0ea763d..a4199be 100644 --- a/db/version_set.h +++ b/db/version_set.h @@ -141,7 +141,7 @@ class VersionSet { // Return the maximum overlapping data (in bytes) at next level for any // file at a level >= 1. - int64 MaxNextLevelOverlappingBytes(); + int64_t MaxNextLevelOverlappingBytes(); // Create an iterator that reads over the compaction inputs for "*c". // The caller should delete the iterator when no longer needed. @@ -298,8 +298,10 @@ class Compaction { // State used to check for number of of overlapping grandparent files // (parent == level_ + 1, grandparent == level_ + 2) std::vector<FileMetaData*> grandparents_; - int grandparent_index_; // Index in grandparent_starts_ - int output_start_; // Index in grandparent_starts_ where output started + int grandparent_index_; // Index in grandparent_starts_ + bool seen_key_; // Some output key has been seen + int64_t overlapped_bytes_; // Bytes of overlap between current output + // and grandparent files // State for implementing IsBaseLevelForKey |