WaitForCompact with empty WaitForCompactOptions

Author: jaykorean

db/c.cc

@@ -119,6 +119,7 @@ using ROCKSDB_NAMESPACE::TransactionDB;
 using ROCKSDB_NAMESPACE::TransactionDBOptions;
 using ROCKSDB_NAMESPACE::TransactionLogIterator;
 using ROCKSDB_NAMESPACE::TransactionOptions;
+using ROCKSDB_NAMESPACE::WaitForCompactOptions;
 using ROCKSDB_NAMESPACE::WALRecoveryMode;
 using ROCKSDB_NAMESPACE::WritableFile;
 using ROCKSDB_NAMESPACE::WriteBatch;
@@ -274,6 +275,9 @@ struct rocksdb_optimistictransactiondb_t {
 struct rocksdb_optimistictransaction_options_t {
   OptimisticTransactionOptions rep;
 };
+struct rocksdb_wait_for_compact_options_t {
+  WaitForCompactOptions rep;
+};
 
 struct rocksdb_compactionfiltercontext_t {
   CompactionFilter::Context rep;
@@ -6555,5 +6559,10 @@ void rocksdb_disable_manual_compaction(rocksdb_t* db) {
 void rocksdb_enable_manual_compaction(rocksdb_t* db) {
   db->rep->EnableManualCompaction();
 }
+void rocksdb_wait_for_compact(
+    rocksdb_t* db,
+    rocksdb_wait_for_compact_options_t* wait_for_compact_options) {
+  db->rep->WaitForCompact(wait_for_compact_options->rep);
+}
 
 }  // end extern "C"

db/db_impl/db_impl.h

@@ -1061,7 +1061,7 @@ class DBImpl : public DB {
   // with options to flush before waiting for compaction to finish and close db
   // upon the completion of compaction
   Status WaitForCompact(
-      const WaitForCompactionsOptions& wait_for_compaction_options);
+      const WaitForCompactOptions& wait_for_compact_options) override;
 
 #ifndef NDEBUG
   // Compact any files in the named level that overlap [*begin, *end]
@@ -1108,7 +1108,7 @@ class DBImpl : public DB {
   // with options to flush before waiting for compaction to finish and close db
   // upon the completion of compaction
   Status TEST_WaitForCompact(
-      const WaitForCompactionsOptions& wait_for_compaction_options);
+      const WaitForCompactOptions& wait_for_compact_options);
 
   // Wait for any background purge
   Status TEST_WaitForPurge();

db/db_impl/db_impl_compaction_flush.cc

@@ -3970,14 +3970,8 @@ Status DBImpl::WaitForCompact(bool wait_unscheduled) {
 }
 
 Status DBImpl::WaitForCompact(
-    const WaitForCompactionsOptions& wait_for_compaction_options) {
-  if (wait_for_compaction_options.flush) {
-    MaybeScheduleFlushOrCompaction();
-  }
-  InstrumentedMutexLock l(&mutex_);
-  if (wait_for_compaction_options.close_db) {
-  }
-  return error_handler_.GetBGError();
+    const WaitForCompactOptions& /*wait_for_compact_options*/) {
+  return DBImpl::WaitForCompact();
 }
 
 }  // namespace ROCKSDB_NAMESPACE

db/db_impl/db_impl_debug.cc

@@ -183,6 +183,13 @@ Status DBImpl::TEST_WaitForCompact(bool wait_unscheduled) {
   return WaitForCompact(wait_unscheduled);
 }
 
+Status DBImpl::TEST_WaitForCompact(
+    const WaitForCompactOptions& wait_for_compact_options) {
+  // Wait until the compaction completes with options to flush before compaction
+  // and close db after compaction
+  return WaitForCompact(wait_for_compact_options);
+}
+
 Status DBImpl::TEST_WaitForPurge() {
   InstrumentedMutexLock l(&mutex_);
   while (bg_purge_scheduled_ && error_handler_.GetBGError().ok()) {

include/rocksdb/db.h

@@ -53,7 +53,7 @@ struct Options;
 struct ReadOptions;
 struct TableProperties;
 struct WriteOptions;
-struct WaitForCompactionsOptions;
+struct WaitForCompactOptions;
 class Env;
 class EventListener;
 class FileSystem;
@@ -1448,6 +1448,12 @@ class DB {
   // DisableManualCompaction() has been called.
   virtual void EnableManualCompaction() = 0;
 
+  // Wait for Compaction to finish
+  virtual Status WaitForCompact(
+      const WaitForCompactOptions& /* wait_for_compact_options */) {
+    return Status::NotSupported("WaitForCompact Not implemented");
+  }
+
   // Number of levels used for this DB.
   virtual int NumberLevels(ColumnFamilyHandle* column_family) = 0;
   virtual int NumberLevels() { return NumberLevels(DefaultColumnFamily()); }

include/rocksdb/options.h

@@ -2080,14 +2080,6 @@ struct LiveFilesStorageInfoOptions {
   uint64_t wal_size_for_flush = 0;
 };
 
-struct WaitForCompactionsOptions {
-  // If true, flush before waiting for compactions to finish.
-  // Must be set to true to ensure no immediate compactions after closing and
-  // re-opening the DB
-  bool flush = false;
-
-  // If true, will close the DB upon compactions finishing
-  bool close_db = false;
-};
+struct WaitForCompactOptions {};
 
 }  // namespace ROCKSDB_NAMESPACE