update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rocksdb / utilities / merge_operators / sortlist.cc

diff --git a/ceph/src/rocksdb/utilities/merge_operators/sortlist.cc b/ceph/src/rocksdb/utilities/merge_operators/sortlist.cc
index 078b83e19747681c5cf7d0a6bb188a638985a07a..67bfc7e5eab908d983fdad15c12326846e6cb3e3 100644 (file)
--- a/ceph/src/rocksdb/utilities/merge_operators/sortlist.cc
+++ b/ceph/src/rocksdb/utilities/merge_operators/sortlist.cc
@@ -3,11 +3,11 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 #include "utilities/merge_operators/sortlist.h"
+
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/slice.h"
 #include "utilities/merge_operators.h"
 
-
 namespace ROCKSDB_NAMESPACE {
 
 bool SortList::FullMergeV2(const MergeOperationInput& merge_in,
@@ -49,8 +49,6 @@ bool SortList::PartialMergeMulti(const Slice& /*key*/,
   return true;
 }
 
-const char* SortList::Name() const { return "MergeSortOperator"; }
-
 void SortList::MakeVector(std::vector<int>& operand, Slice slice) const {
   do {
     const char* begin = slice.data_;