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

fix duplicate definition of GetEntryType()

Browse Source 
Summary:
It's also defined in db/dbformat.cc per 7fe3b32896
Closes https://github.com/facebook/rocksdb/pull/3111

Differential Revision: D6219140

Pulled By: ajkr

fbshipit-source-id: 0f2b14e41457334a4665c6b7e3f42f1a060a0f35
This commit is contained in:
Andrew Kryczka 2017-11-01 22:52:17 -07:00 committed by Facebook Github Bot
parent cd124215df
commit 6778690b51
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/dbformat.h
View File

@ -106,6 +106,8 @@ extern uint64_t PackSequenceAndType(uint64_t seq, ValueType t);
// and the ValueType in *t. // and the ValueType in *t.
extern void UnPackSequenceAndType(uint64_t packed, uint64_t* seq, ValueType* t); extern void UnPackSequenceAndType(uint64_t packed, uint64_t* seq, ValueType* t);
EntryType GetEntryType(ValueType value_type);
// Append the serialization of "key" to *result. // Append the serialization of "key" to *result.
extern void AppendInternalKey(std::string* result, extern void AppendInternalKey(std::string* result,
const ParsedInternalKey& key); const ParsedInternalKey& key);

15
db/table_properties_collector.cc
View File

@ -59,21 +59,6 @@ InternalKeyPropertiesCollector::GetReadableProperties() const {
namespace { namespace {
EntryType GetEntryType(ValueType value_type) {
switch (value_type) {
case kTypeValue:
return kEntryPut;
case kTypeDeletion:
return kEntryDelete;
case kTypeSingleDeletion:
return kEntrySingleDelete;
case kTypeMerge:
return kEntryMerge;
default:
return kEntryOther;
}
}
uint64_t GetUint64Property(const UserCollectedProperties& props, uint64_t GetUint64Property(const UserCollectedProperties& props,
const std::string property_name, const std::string property_name,
bool* property_present) { bool* property_present) {