update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / utilities / merge_operators.h

diff --git a/ceph/src/rocksdb/utilities/merge_operators.h b/ceph/src/rocksdb/utilities/merge_operators.h
index 4c720b822fe1d453f88b30200930410d13a88d37..018d097b1f8a44f46eb5b9c58a3f8907fd4e0590 100644 (file)
--- a/ceph/src/rocksdb/utilities/merge_operators.h
+++ b/ceph/src/rocksdb/utilities/merge_operators.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <string>
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class MergeOperators {
  public:
@@ -23,6 +23,7 @@ class MergeOperators {
   static std::shared_ptr<MergeOperator> CreateStringAppendTESTOperator();
   static std::shared_ptr<MergeOperator> CreateMaxOperator();
   static std::shared_ptr<MergeOperator> CreateBytesXOROperator();
+  static std::shared_ptr<MergeOperator> CreateSortOperator();
 
   // Will return a different merge operator depending on the string.
   // TODO: Hook the "name" up to the actual Name() of the MergeOperators?
@@ -42,6 +43,8 @@ class MergeOperators {
       return CreateMaxOperator();
     } else if (name == "bytesxor") {
       return CreateBytesXOROperator();
+    } else if (name == "sortlist") {
+      return CreateSortOperator();
     } else {
       // Empty or unknown, just return nullptr
       return nullptr;
@@ -49,4 +52,4 @@ class MergeOperators {
   }
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE