From 6778690b51ac90f3ad2c67b9cf0a6d822ba6b220 Mon Sep 17 00:00:00 2001
From: Andrew Kryczka <andrewkr@fb.com>
Date: Wed, 1 Nov 2017 22:52:17 -0700
Subject: [PATCH] fix duplicate definition of GetEntryType()

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

Differential Revision: D6219140

Pulled By: ajkr

fbshipit-source-id: 0f2b14e41457334a4665c6b7e3f42f1a060a0f35
---
 db/dbformat.h                    |  2 ++
 db/table_properties_collector.cc | 15 ---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/db/dbformat.h b/db/dbformat.h
index d3fa71c7d..fad6de6e6 100644
--- a/db/dbformat.h
+++ b/db/dbformat.h
@@ -106,6 +106,8 @@ extern uint64_t PackSequenceAndType(uint64_t seq, ValueType t);
 // and the ValueType in *t.
 extern void UnPackSequenceAndType(uint64_t packed, uint64_t* seq, ValueType* t);
 
+EntryType GetEntryType(ValueType value_type);
+
 // Append the serialization of "key" to *result.
 extern void AppendInternalKey(std::string* result,
                               const ParsedInternalKey& key);
diff --git a/db/table_properties_collector.cc b/db/table_properties_collector.cc
index a1f4dba97..6247852dc 100644
--- a/db/table_properties_collector.cc
+++ b/db/table_properties_collector.cc
@@ -59,21 +59,6 @@ InternalKeyPropertiesCollector::GetReadableProperties() const {
 
 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,
                            const std::string property_name,
                            bool* property_present) {