update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / include / rocksdb / merge_operator.h

diff --git a/ceph/src/rocksdb/include/rocksdb/merge_operator.h b/ceph/src/rocksdb/include/rocksdb/merge_operator.h
index d8ddcc6a0977d61d6951252ad7dcff33d1f76ad5..86f3d726015926850124fd40f8325a8190e3ce86 100644 (file)
--- a/ceph/src/rocksdb/include/rocksdb/merge_operator.h
+++ b/ceph/src/rocksdb/include/rocksdb/merge_operator.h
@@ -12,7 +12,7 @@
 
 #include "rocksdb/slice.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 class Slice;
 class Logger;
@@ -46,6 +46,7 @@ class Logger;
 class MergeOperator {
  public:
   virtual ~MergeOperator() {}
+  static const char* Type() { return "MergeOperator"; }
 
   // Gives the client a way to express the read -> modify -> write semantics
   // key:      (IN)    The key that's associated with this merge operation.
@@ -253,4 +254,4 @@ class AssociativeMergeOperator : public MergeOperator {
                     Logger* logger) const override;
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE