Expose PreReleaseCallback in the public API

Author: igorcanadi

db/db_impl.h

@@ -30,7 +30,6 @@
 #include "db/internal_stats.h"
 #include "db/log_writer.h"
 #include "db/logs_with_prep_tracker.h"
-#include "db/pre_release_callback.h"
 #include "db/range_del_aggregator.h"
 #include "db/read_callback.h"
 #include "db/snapshot_checker.h"
@@ -46,6 +45,7 @@
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/memtablerep.h"
+#include "rocksdb/pre_release_callback.h"
 #include "rocksdb/status.h"
 #include "rocksdb/trace_reader_writer.h"
 #include "rocksdb/transaction_log.h"

db/db_impl_write.cc

@@ -72,6 +72,9 @@ Status DBImpl::WriteImpl(const WriteOptions& write_options,
                          bool disable_memtable, uint64_t* seq_used,
                          size_t batch_cnt,
                          PreReleaseCallback* pre_release_callback) {
+  if (!pre_release_callback) {
+    pre_release_callback = write_options.pre_release_callback;
+  }
   assert(!seq_per_batch_ || batch_cnt != 0);
   if (my_batch == nullptr) {
     return Status::Corruption("Batch is nullptr!");

db/write_thread.h

@@ -15,10 +15,10 @@
 #include <vector>
 
 #include "db/dbformat.h"
-#include "db/pre_release_callback.h"
 #include "db/write_callback.h"
 #include "monitoring/instrumented_mutex.h"
 #include "rocksdb/options.h"
+#include "rocksdb/pre_release_callback.h"
 #include "rocksdb/status.h"
 #include "rocksdb/types.h"
 #include "rocksdb/write_batch.h"

include/rocksdb/options.h

@@ -20,6 +20,7 @@
 #include "rocksdb/comparator.h"
 #include "rocksdb/env.h"
 #include "rocksdb/listener.h"
+#include "rocksdb/pre_release_callback.h"
 #include "rocksdb/universal_compaction.h"
 #include "rocksdb/version.h"
 #include "rocksdb/write_buffer_manager.h"
@@ -1220,12 +1221,16 @@ struct WriteOptions {
   // Default: false
   bool low_pri;
 
+  // See comments for PreReleaseCallback
+  PreReleaseCallback* pre_release_callback;
+
   WriteOptions()
       : sync(false),
         disableWAL(false),
         ignore_missing_column_families(false),
         no_slowdown(false),
-        low_pri(false) {}
+        low_pri(false),
+        pre_release_callback(nullptr) {}
 };
 
 // Options that control flush operations

db/pre_release_callback.h renamed to include/rocksdb/pre_release_callback.h

@@ -19,11 +19,11 @@
 #include <vector>
 
 #include "db/db_iter.h"
-#include "db/pre_release_callback.h"
 #include "db/read_callback.h"
 #include "db/snapshot_checker.h"
 #include "rocksdb/db.h"
 #include "rocksdb/options.h"
+#include "rocksdb/pre_release_callback.h"
 #include "rocksdb/utilities/transaction_db.h"
 #include "util/set_comparator.h"
 #include "util/string_util.h"