Merge commit '92b8c7961b433d12d9d77da5d61c26a920bbd370' into updated-rocksdb

This commit is contained in:
Torrie Fischer
2014-10-02 10:47:26 -07:00
227 changed files with 13758 additions and 6538 deletions

View File

@@ -26,7 +26,7 @@ class PlainTableKeyEncoder {
fixed_user_key_len_(user_key_len),
prefix_extractor_(prefix_extractor),
index_sparseness_((index_sparseness > 1) ? index_sparseness : 1),
key_count_for_prefix(0) {}
key_count_for_prefix_(0) {}
// key: the key to write out, in the format of internal key.
// file: the output file to write out
// offset: offset in the file. Needs to be updated after appending bytes
@@ -45,7 +45,7 @@ class PlainTableKeyEncoder {
uint32_t fixed_user_key_len_;
const SliceTransform* prefix_extractor_;
const size_t index_sparseness_;
size_t key_count_for_prefix;
size_t key_count_for_prefix_;
IterKey pre_prefix_;
};