update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / db / table_properties_collector.cc

diff --git a/ceph/src/rocksdb/db/table_properties_collector.cc b/ceph/src/rocksdb/db/table_properties_collector.cc
index c5ec4754a2012353b48726ef7f1ac72a6ca8abbb..084cf139db833460cf736a8decb5e98f96467c23 100644 (file)
--- a/ceph/src/rocksdb/db/table_properties_collector.cc
+++ b/ceph/src/rocksdb/db/table_properties_collector.cc
@@ -1,7 +1,7 @@
 //  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
+//  This source code is licensed under both the GPLv2 (found in the
+//  COPYING file in the root directory) and Apache 2.0 License
+//  (found in the LICENSE.Apache file in the root directory).
 
 #include "db/table_properties_collector.h"
 
@@ -12,8 +12,8 @@
 namespace rocksdb {
 
 Status InternalKeyPropertiesCollector::InternalAdd(const Slice& key,
-                                                   const Slice& value,
-                                                   uint64_t file_size) {
+                                                   const Slice& /*value*/,
+                                                   uint64_t /*file_size*/) {
   ParsedInternalKey ikey;
   if (!ParseInternalKey(key, &ikey)) {
     return Status::InvalidArgument("Invalid internal key");
@@ -59,23 +59,8 @@ 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,
+                           const std::string& property_name,
                            bool* property_present) {
   auto pos = props.find(property_name);
   if (pos == props.end()) {