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

Fix refering freed memory in earlier commit.

Browse Source 
Summary: Fix refering freed memory in earlier commit by https://reviews.facebook.net/D11181

Test Plan: make check

Reviewers: haobo, sheki

Reviewed By: haobo

CC: leveldb

Differential Revision: https://reviews.facebook.net/D11193
This commit is contained in:
Dhruba Borthakur 2013-06-10 13:28:58 -07:00
parent 4a8554d5bb
commit 1b69f1e584
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/dbformat.cc
View File

@ -44,8 +44,7 @@ std::string InternalKey::DebugString(bool hex) const {
} }
const char* InternalKeyComparator::Name() const { const char* InternalKeyComparator::Name() const {
return ("leveldb.InternalKeyComparator:" + return name_.c_str();
std::string(user_comparator_->Name())).c_str();
} }
int InternalKeyComparator::Compare(const Slice& akey, const Slice& bkey) const { int InternalKeyComparator::Compare(const Slice& akey, const Slice& bkey) const {

7
db/dbformat.h
View File

@ -86,8 +86,13 @@ inline ValueType ExtractValueType(const Slice& internal_key) {
class InternalKeyComparator : public Comparator { class InternalKeyComparator : public Comparator {
private: private:
const Comparator* user_comparator_; const Comparator* user_comparator_;
std::string name_;
public: public:
explicit InternalKeyComparator(const Comparator* c) : user_comparator_(c) { } explicit InternalKeyComparator(const Comparator* c) : user_comparator_(c),
name_("leveldb.InternalKeyComparator:" +
std::string(user_comparator_->Name())) {
}
virtual const char* Name() const; virtual const char* Name() const;
virtual int Compare(const Slice& a, const Slice& b) const; virtual int Compare(const Slice& a, const Slice& b) const;
virtual void FindShortestSeparator( virtual void FindShortestSeparator(