Merge branch 'master' into columnfamilies

Conflicts:
	db/compaction_picker.cc
	db/db_impl.cc
	db/db_impl.h
	db/tailing_iter.cc
	db/version_set.h
	include/rocksdb/options.h
	util/options.cc

include/rocksdb/env.h

@@ -575,26 +575,6 @@ class Logger {
   InfoLogLevel log_level_;
 };
 
-// A class to buffer info log entries and flush them in the end.
-class LogBuffer {
- public:
-  // log_level: the log level for all the logs
-  // info_log:  logger to write the logs to
-  LogBuffer(const InfoLogLevel log_level, const shared_ptr<Logger>& info_log);
-  ~LogBuffer();
-
-  // Add a log entry to the buffer.
-  void AddLogToBuffer(const char* format, va_list ap);
-
-  // Flush all buffered log to the info log.
-  void FlushBufferToLog() const;
-
- private:
-  struct Rep;
-  Rep* rep_;
-  const InfoLogLevel log_level_;
-  const shared_ptr<Logger>& info_log_;
-};
 
 // Identifies a locked file.
 class FileLock {
@@ -607,10 +587,6 @@ class FileLock {
   void operator=(const FileLock&);
 };
 
-// Add log to the LogBuffer for a delayed info logging. It can be used when
-// we want to add some logs inside a mutex.
-extern void LogToBuffer(LogBuffer* log_buffer, const char* format, ...);
-
 extern void LogFlush(const shared_ptr<Logger>& info_log);
 
 extern void Log(const InfoLogLevel log_level,

include/rocksdb/memtablerep.h

@@ -160,8 +160,8 @@ class MemTableRep {
 class MemTableRepFactory {
  public:
   virtual ~MemTableRepFactory() {}
-  virtual MemTableRep* CreateMemTableRep(MemTableRep::KeyComparator&,
-                                         Arena*) = 0;
+  virtual MemTableRep* CreateMemTableRep(const MemTableRep::KeyComparator&,
+      Arena*, const SliceTransform*) = 0;
   virtual const char* Name() const = 0;
 };
 
@@ -178,8 +178,9 @@ class VectorRepFactory : public MemTableRepFactory {
 
  public:
   explicit VectorRepFactory(size_t count = 0) : count_(count) { }
-  virtual MemTableRep* CreateMemTableRep(MemTableRep::KeyComparator&,
-                                         Arena*) override;
+  virtual MemTableRep* CreateMemTableRep(
+      const MemTableRep::KeyComparator&, Arena*,
+      const SliceTransform*) override;
   virtual const char* Name() const override {
     return "VectorRepFactory";
   }
@@ -188,8 +189,9 @@ class VectorRepFactory : public MemTableRepFactory {
 // This uses a skip list to store keys. It is the default.
 class SkipListFactory : public MemTableRepFactory {
  public:
-  virtual MemTableRep* CreateMemTableRep(MemTableRep::KeyComparator&,
-                                         Arena*) override;
+  virtual MemTableRep* CreateMemTableRep(
+      const MemTableRep::KeyComparator&, Arena*,
+      const SliceTransform*) override;
   virtual const char* Name() const override {
     return "SkipListFactory";
   }
@@ -202,8 +204,8 @@ class SkipListFactory : public MemTableRepFactory {
 // skiplist_branching_factor: probabilistic size ratio between adjacent
 //                            link lists in the skiplist
 extern MemTableRepFactory* NewHashSkipListRepFactory(
-  const SliceTransform* transform, size_t bucket_count = 1000000,
-  int32_t skiplist_height = 4, int32_t skiplist_branching_factor = 4
+    size_t bucket_count = 1000000, int32_t skiplist_height = 4,
+    int32_t skiplist_branching_factor = 4
 );
 
 // The factory is to create memtables with a hashed linked list:
@@ -211,6 +213,6 @@ extern MemTableRepFactory* NewHashSkipListRepFactory(
 // linked list (null if the bucket is empty).
 // bucket_count: number of fixed array buckets
 extern MemTableRepFactory* NewHashLinkListRepFactory(
-    const SliceTransform* transform, size_t bucket_count = 50000);
+    size_t bucket_count = 50000);
 
 }  // namespace rocksdb

include/rocksdb/options.h

@@ -237,7 +237,7 @@ struct ColumnFamilyOptions {
   // 4) prefix(prefix(key)) == prefix(key)
   //
   // Default: nullptr
-  const SliceTransform* prefix_extractor;
+  std::shared_ptr<const SliceTransform> prefix_extractor;
 
   // If true, place whole keys in the filter (not just prefixes).
   // This must generally be true for gets to be efficient.
@@ -385,6 +385,11 @@ struct ColumnFamilyOptions {
   // The compaction style. Default: kCompactionStyleLevel
   CompactionStyle compaction_style;
 
+  // If true, compaction will verify checksum on every read that happens
+  // as part of compaction
+  // Default: true
+  bool verify_checksums_in_compaction;
+
   // The options needed to support Universal Style compactions
   CompactionOptionsUniversal compaction_options_universal;
 

include/rocksdb/statistics.h

@@ -124,6 +124,7 @@ enum Tickers {
   NUMBER_DIRECT_LOAD_TABLE_PROPERTIES,
   NUMBER_SUPERVERSION_ACQUIRES,
   NUMBER_SUPERVERSION_RELEASES,
+  NUMBER_SUPERVERSION_CLEANUPS,
   TICKER_ENUM_MAX
 };
 
@@ -181,6 +182,7 @@ const std::vector<std::pair<Tickers, std::string>> TickersNameMap = {
      "rocksdb.number.direct.load.table.properties"},
     {NUMBER_SUPERVERSION_ACQUIRES, "rocksdb.number.superversion_acquires"},
     {NUMBER_SUPERVERSION_RELEASES, "rocksdb.number.superversion_releases"},
+    {NUMBER_SUPERVERSION_CLEANUPS, "rocksdb.number.superversion_cleanups"},
 };
 
 /**

include/utilities/backupable_db.h

@@ -55,6 +55,8 @@ struct BackupableDBOptions {
   // Default: false
   bool destroy_old_data;
 
+  void Dump(Logger* logger) const;
+
   explicit BackupableDBOptions(const std::string& _backup_dir,
                                Env* _backup_env = nullptr,
                                bool _share_table_files = true,
@@ -62,6 +64,7 @@ struct BackupableDBOptions {
                                bool _destroy_old_data = false)
       : backup_dir(_backup_dir),
         backup_env(_backup_env),
+        share_table_files(_share_table_files),
         info_log(_info_log),
         sync(_sync),
         destroy_old_data(_destroy_old_data) {}