import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / db / merge_helper.h

diff --git a/ceph/src/rocksdb/db/merge_helper.h b/ceph/src/rocksdb/db/merge_helper.h
index c0534f08ba4eec20db5e239a664caea2597f822f..30759effa77969d18ed6302a42513797978e8533 100644 (file)
--- a/ceph/src/rocksdb/db/merge_helper.h
+++ b/ceph/src/rocksdb/db/merge_helper.h
@@ -66,6 +66,8 @@ class MergeHelper {
   //                   0 means no restriction
   // at_bottom:   (IN) true if the iterator covers the bottem level, which means
   //                   we could reach the start of the history of this user key.
+  // allow_data_in_errors: (IN) if true, data details will be displayed in
+  //                   error/log messages.
   //
   // Returns one of the following statuses:
   // - OK: Entries were successfully merged.
@@ -80,7 +82,8 @@ class MergeHelper {
   Status MergeUntil(InternalIterator* iter,
                     CompactionRangeDelAggregator* range_del_agg = nullptr,
                     const SequenceNumber stop_before = 0,
-                    const bool at_bottom = false);
+                    const bool at_bottom = false,
+                    const bool allow_data_in_errors = false);
 
   // Filters a merge operand using the compaction filter specified
   // in the constructor. Returns the decision that the filter made.