Merge branch 'master' into columnfamilies

This commit is contained in:
Igor Canadi
2014-01-24 18:34:48 -08:00
15 changed files with 37 additions and 15 deletions

View File

@@ -1925,8 +1925,11 @@ Status VersionSet::ReduceNumberOfLevels(const std::string& dbname,
}
std::vector<FileMetaData*>* old_files_list = current_version->files_;
// we need to allocate an array with the old number of levels size to
// avoid SIGSEGV in WriteSnapshot()
// however, all levels bigger or equal to new_levels will be empty
std::vector<FileMetaData*>* new_files_list =
new std::vector<FileMetaData*>[new_levels];
new std::vector<FileMetaData*>[current_levels];
for (int i = 0; i < new_levels - 1; i++) {
new_files_list[i] = old_files_list[i];
}