[CF] db_stress for column families

Summary:
I had this diff for a while to test column families implementation. Last night, I ran it sucessfully for 10 hours with the command:

   time ./db_stress --threads=30 --ops_per_thread=200000000 --max_key=5000 --column_families=20 --clear_column_family_one_in=3000000 --verify_before_write=1  --reopen=50 --max_background_compactions=10 --max_background_flushes=10 --db=/tmp/db_stress

It is ready to be committed :)

Test Plan: Ran it for 10 hours

Reviewers: dhruba, haobo

CC: leveldb

Differential Revision: https://reviews.facebook.net/D16797

db/column_family_test.cc

@@ -322,7 +322,6 @@ TEST(ColumnFamilyTest, AddDrop) {
   ASSERT_OK(Put(1, "fodor", "mirko"));
   ASSERT_EQ("mirko", Get(1, "fodor"));
   ASSERT_EQ("NOT_FOUND", Get(3, "fodor"));
-
   Close();
   ASSERT_TRUE(TryOpen({"default"}).IsInvalidArgument());
   Open({"default", "one", "three", "four"});

db/db_impl.cc

@@ -347,43 +347,6 @@ DBImpl::~DBImpl() {
   LogFlush(options_.info_log);
 }
 
-// Do not flush and close database elegantly. Simulate a crash.
-void DBImpl::TEST_Destroy_DBImpl() {
-  // ensure that no new memtable flushes can occur
-  flush_on_destroy_ = false;
-
-  // wait till all background compactions are done.
-  mutex_.Lock();
-  while (bg_compaction_scheduled_ ||
-         bg_flush_scheduled_ ||
-         bg_logstats_scheduled_) {
-    bg_cv_.Wait();
-  }
-
-  // Prevent new compactions from occuring.
-  bg_work_gate_closed_ = true;
-  const int LargeNumber = 10000000;
-  bg_compaction_scheduled_ += LargeNumber;
-
-  mutex_.Unlock();
-  if (default_cf_handle_ != nullptr) {
-    // we need to delete handle outside of lock because it does its own locking
-    delete default_cf_handle_;
-  }
-  LogFlush(options_.info_log);
-
-  // force release the lock file.
-  if (db_lock_ != nullptr) {
-    env_->UnlockFile(db_lock_);
-  }
-
-  log_.reset();
-  mutex_.Lock();
-  versions_.reset();
-  mutex_.Unlock();
-  table_cache_.reset();
-}
-
 uint64_t DBImpl::TEST_Current_Manifest_FileNo() {
   return versions_->ManifestFileNumber();
 }

db/db_impl.h

@@ -162,9 +162,6 @@ class DBImpl : public DB {
   int64_t TEST_MaxNextLevelOverlappingBytes(ColumnFamilyHandle* column_family =
                                                 nullptr);
 
-  // Simulate a db crash, no elegant closing of database.
-  void TEST_Destroy_DBImpl();
-
   // Return the current manifest file no.
   uint64_t TEST_Current_Manifest_FileNo();
 

include/rocksdb/db.h

@@ -43,7 +43,7 @@ struct ColumnFamilyDescriptor {
 };
 
 // Update Makefile if you change these
-static const int kMajorVersion = 2;
+static const int kMajorVersion = 3;
 static const int kMinorVersion = 0;
 
 struct Options;

utilities/ttl/db_ttl.cc

@@ -214,8 +214,4 @@ Iterator* DBWithTTL::NewIterator(const ReadOptions& opts,
   return new TtlIterator(db_->NewIterator(opts, column_family));
 }
 
-void DBWithTTL::TEST_Destroy_DBWithTtl() {
-  ((DBImpl*) db_)->TEST_Destroy_DBImpl();
-}
-
 }  // namespace rocksdb

utilities/ttl/db_ttl.h

@@ -54,9 +54,6 @@ class DBWithTTL : public StackableDB {
   virtual Iterator* NewIterator(const ReadOptions& opts,
                                 ColumnFamilyHandle* column_family) override;
 
-  // Simulate a db crash, no elegant closing of database.
-  void TEST_Destroy_DBWithTtl();
-
   virtual DB* GetBaseDB() {
     return db_;
   }