andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix valgrind failure caused by recent checked-in.

Browse Source 
Summary: Initialize un-initialized parameters

Test Plan: run the failed test (c_test)

Reviewers: yhchiang, ljin

Reviewed By: ljin

Subscribers: leveldb

Differential Revision: https://reviews.facebook.net/D21249
This commit is contained in:
sdong 2014-08-06 17:37:35 -07:00
parent 1242bfcad7
commit 7abe9655d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
db/db_impl.cc
View File

@ -4353,8 +4353,8 @@ const Options& DBImpl::GetOptions(ColumnFamilyHandle* column_family) const {
bool DBImpl::GetProperty(ColumnFamilyHandle* column_family, bool DBImpl::GetProperty(ColumnFamilyHandle* column_family,
const Slice& property, std::string* value) { const Slice& property, std::string* value) {
bool is_int_property; bool is_int_property = false;
bool need_out_of_mutex; bool need_out_of_mutex = false;
DBPropertyType property_type = DBPropertyType property_type =
GetPropertyType(property, &is_int_property, &need_out_of_mutex); GetPropertyType(property, &is_int_property, &need_out_of_mutex);
@ -4378,8 +4378,8 @@ bool DBImpl::GetProperty(ColumnFamilyHandle* column_family,
bool DBImpl::GetIntProperty(ColumnFamilyHandle* column_family, bool DBImpl::GetIntProperty(ColumnFamilyHandle* column_family,
const Slice& property, uint64_t* value) { const Slice& property, uint64_t* value) {
bool is_int_property; bool is_int_property = false;
bool need_out_of_mutex; bool need_out_of_mutex = false;
DBPropertyType property_type = DBPropertyType property_type =
GetPropertyType(property, &is_int_property, &need_out_of_mutex); GetPropertyType(property, &is_int_property, &need_out_of_mutex);
if (!is_int_property) { if (!is_int_property) {

2
db/internal_stats.cc
View File

@ -93,10 +93,10 @@ DBPropertyType GetPropertyType(const Slice& property, bool* is_int_property,
Slice in = property; Slice in = property;
Slice prefix("rocksdb."); Slice prefix("rocksdb.");
*need_out_of_mutex = false; *need_out_of_mutex = false;
*is_int_property = false;
if (!in.starts_with(prefix)) return kUnknown; if (!in.starts_with(prefix)) return kUnknown;
in.remove_prefix(prefix.size()); in.remove_prefix(prefix.size());
*is_int_property = false;
if (in.starts_with("num-files-at-level")) { if (in.starts_with("num-files-at-level")) {
return kNumFilesAtLevel; return kNumFilesAtLevel;
} else if (in == "levelstats") { } else if (in == "levelstats") {