tqcq/leveldb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #411 from proller:assert1

Browse Source 
PiperOrigin-RevId: 247424040
This commit is contained in:
Chris Mumford 2019-05-09 08:37:48 -07:00
commit 1aae5c9f29
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/dbformat.h
View File

@ -139,7 +139,11 @@ class InternalKey {
AppendInternalKey(&rep_, ParsedInternalKey(user_key, s, t)); AppendInternalKey(&rep_, ParsedInternalKey(user_key, s, t));
} }
void DecodeFrom(const Slice& s) { rep_.assign(s.data(), s.size()); } bool DecodeFrom(const Slice& s) {
rep_.assign(s.data(), s.size());
return !rep_.empty();
}
Slice Encode() const { Slice Encode() const {
assert(!rep_.empty()); assert(!rep_.empty());
return rep_; return rep_;

3
db/version_edit.cc
View File

@ -86,8 +86,7 @@ void VersionEdit::EncodeTo(std::string* dst) const {
static bool GetInternalKey(Slice* input, InternalKey* dst) { static bool GetInternalKey(Slice* input, InternalKey* dst) {
Slice str; Slice str;
if (GetLengthPrefixedSlice(input, &str)) { if (GetLengthPrefixedSlice(input, &str)) {
dst->DecodeFrom(str); return dst->DecodeFrom(str);
return true;
} else { } else {
return false; return false;
} }