Skip to content

Commit 6778690

Browse files
ajkrfacebook-github-bot
authored andcommitted
fix duplicate definition of GetEntryType()
Summary: It's also defined in db/dbformat.cc per 7fe3b32 Closes facebook#3111 Differential Revision: D6219140 Pulled By: ajkr fbshipit-source-id: 0f2b14e41457334a4665c6b7e3f42f1a060a0f35
1 parent cd12421 commit 6778690

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

db/dbformat.h

+2
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ extern uint64_t PackSequenceAndType(uint64_t seq, ValueType t);
106106
// and the ValueType in *t.
107107
extern void UnPackSequenceAndType(uint64_t packed, uint64_t* seq, ValueType* t);
108108

109+
EntryType GetEntryType(ValueType value_type);
110+
109111
// Append the serialization of "key" to *result.
110112
extern void AppendInternalKey(std::string* result,
111113
const ParsedInternalKey& key);

db/table_properties_collector.cc

-15
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,6 @@ InternalKeyPropertiesCollector::GetReadableProperties() const {
5959

6060
namespace {
6161

62-
EntryType GetEntryType(ValueType value_type) {
63-
switch (value_type) {
64-
case kTypeValue:
65-
return kEntryPut;
66-
case kTypeDeletion:
67-
return kEntryDelete;
68-
case kTypeSingleDeletion:
69-
return kEntrySingleDelete;
70-
case kTypeMerge:
71-
return kEntryMerge;
72-
default:
73-
return kEntryOther;
74-
}
75-
}
76-
7762
uint64_t GetUint64Property(const UserCollectedProperties& props,
7863
const std::string property_name,
7964
bool* property_present) {

0 commit comments

Comments
 (0)