Fix an issue with unnecessary capture in lambda expressions

Closes https://github.com/facebook/rocksdb/issues/3900

CMakeLists.txt

@@ -657,8 +657,6 @@ set(SOURCES
         utilities/transactions/transaction_util.cc
         utilities/transactions/write_prepared_txn.cc
         utilities/transactions/write_prepared_txn_db.cc
-        utilities/transactions/write_unprepared_txn.cc
-        utilities/transactions/write_unprepared_txn_db.cc
         utilities/ttl/db_ttl_impl.cc
         utilities/write_batch_with_index/write_batch_with_index.cc
         utilities/write_batch_with_index/write_batch_with_index_internal.cc

HISTORY.md

@@ -2,7 +2,6 @@
 ## Unreleased
 ### Public API Change
 * For users of `Statistics` objects created via `CreateDBStatistics()`, the format of the string returned by its `ToString()` method has changed.
-* With LRUCache, when high_pri_pool_ratio > 0, midpoint insertion strategy will be enabled to put low-pri items to the tail of low-pri list (the midpoint) when they first inserted into the cache. This is to make cache entries never get hit age out faster, improving cache efficiency when large background scan presents.
 
 ## 5.14.0 (5/16/2018)
 ### Public API Change

TARGETS

@@ -280,8 +280,6 @@ cpp_library(
         "utilities/transactions/transaction_util.cc",
         "utilities/transactions/write_prepared_txn.cc",
         "utilities/transactions/write_prepared_txn_db.cc",
-        "utilities/transactions/write_unprepared_txn.cc",
-        "utilities/transactions/write_unprepared_txn_db.cc",
         "utilities/ttl/db_ttl_impl.cc",
         "utilities/write_batch_with_index/write_batch_with_index.cc",
         "utilities/write_batch_with_index/write_batch_with_index_internal.cc",

cache/lru_cache.cc

@@ -199,7 +199,7 @@ void LRUCacheShard::LRU_Remove(LRUHandle* e) {
 void LRUCacheShard::LRU_Insert(LRUHandle* e) {
   assert(e->next == nullptr);
   assert(e->prev == nullptr);
-  if (high_pri_pool_ratio_ > 0 && (e->IsHighPri() || e->HasHit())) {
+  if (high_pri_pool_ratio_ > 0 && e->IsHighPri()) {
     // Inset "e" to head of LRU list.
     e->next = &lru_;
     e->prev = lru_.prev;
@@ -246,6 +246,18 @@ void LRUCacheShard::EvictFromLRU(size_t charge,
   }
 }
 
+void* LRUCacheShard::operator new(size_t size) {
+  return port::cacheline_aligned_alloc(size);
+}
+
+void* LRUCacheShard::operator new(size_t /*size*/, void* ptr) { return ptr; }
+
+void LRUCacheShard::operator delete(void *memblock) {
+  port::cacheline_aligned_free(memblock);
+}
+
+void LRUCacheShard::operator delete(void* /*memblock*/, void* /*ptr*/) {}
+
 void LRUCacheShard::SetCapacity(size_t capacity) {
   autovector<LRUHandle*> last_reference_list;
   {
@@ -275,7 +287,6 @@ Cache::Handle* LRUCacheShard::Lookup(const Slice& key, uint32_t hash) {
       LRU_Remove(e);
     }
     e->refs++;
-    e->SetHit();
   }
   return reinterpret_cast<Cache::Handle*>(e);
 }

cache/lru_cache.h

@@ -77,7 +77,6 @@ struct LRUHandle {
   bool InCache() { return flags & 1; }
   bool IsHighPri() { return flags & 2; }
   bool InHighPriPool() { return flags & 4; }
-  bool HasHit() { return flags & 8; }
 
   void SetInCache(bool in_cache) {
     if (in_cache) {
@@ -103,8 +102,6 @@ struct LRUHandle {
     }
   }
 
-  void SetHit() { flags |= 8; }
-
   void Free() {
     assert((refs == 1 && InCache()) || (refs == 0 && !InCache()));
     if (deleter) {
@@ -209,6 +206,18 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard : public CacheShard {
   //  Retrives high pri pool ratio
   double GetHighPriPoolRatio();
 
+  // Overloading to aligned it to cache line size
+  // They are used by tests.
+  void* operator new(size_t);
+
+  // placement new
+  void* operator new(size_t, void*);
+
+  void operator delete(void *);
+
+  // placement delete, does nothing.
+  void operator delete(void*, void*);
+
  private:
   void LRU_Remove(LRUHandle* e);
   void LRU_Insert(LRUHandle* e);

cache/lru_cache_test.cc

@@ -15,22 +15,11 @@ namespace rocksdb {
 class LRUCacheTest : public testing::Test {
  public:
   LRUCacheTest() {}
-  ~LRUCacheTest() { DeleteCache(); }
-
-  void DeleteCache() {
-    if (cache_ != nullptr) {
-      cache_->~LRUCacheShard();
-      port::cacheline_aligned_free(cache_);
-      cache_ = nullptr;
-    }
-  }
+  ~LRUCacheTest() {}
 
   void NewCache(size_t capacity, double high_pri_pool_ratio = 0.0) {
-    DeleteCache();
-    cache_ = reinterpret_cast<LRUCacheShard*>(
-        port::cacheline_aligned_alloc(sizeof(LRUCacheShard)));
-    new (cache_) LRUCacheShard(capacity, false /*strict_capcity_limit*/,
-                               high_pri_pool_ratio);
+    cache_.reset(new LRUCacheShard(capacity, false /*strict_capcity_limit*/,
+                                   high_pri_pool_ratio));
   }
 
   void Insert(const std::string& key,
@@ -86,7 +75,7 @@ class LRUCacheTest : public testing::Test {
   }
 
  private:
-  LRUCacheShard* cache_ = nullptr;
+  std::unique_ptr<LRUCacheShard> cache_;
 };
 
 TEST_F(LRUCacheTest, BasicLRU) {
@@ -115,29 +104,6 @@ TEST_F(LRUCacheTest, BasicLRU) {
   ValidateLRUList({"e", "z", "d", "u", "v"});
 }
 
-TEST_F(LRUCacheTest, MidpointInsertion) {
-  // Allocate 2 cache entries to high-pri pool.
-  NewCache(5, 0.45);
-
-  Insert("a", Cache::Priority::LOW);
-  Insert("b", Cache::Priority::LOW);
-  Insert("c", Cache::Priority::LOW);
-  Insert("x", Cache::Priority::HIGH);
-  Insert("y", Cache::Priority::HIGH);
-  ValidateLRUList({"a", "b", "c", "x", "y"}, 2);
-
-  // Low-pri entries inserted to the tail of low-pri list (the midpoint).
-  // After lookup, it will move to the tail of the full list.
-  Insert("d", Cache::Priority::LOW);
-  ValidateLRUList({"b", "c", "d", "x", "y"}, 2);
-  ASSERT_TRUE(Lookup("d"));
-  ValidateLRUList({"b", "c", "x", "y", "d"}, 2);
-
-  // High-pri entries will be inserted to the tail of full list.
-  Insert("z", Cache::Priority::HIGH);
-  ValidateLRUList({"c", "x", "y", "d", "z"}, 2);
-}
-
 TEST_F(LRUCacheTest, EntriesWithPriority) {
   // Allocate 2 cache entries to high-pri pool.
   NewCache(5, 0.45);
@@ -164,15 +130,15 @@ TEST_F(LRUCacheTest, EntriesWithPriority) {
   Insert("a", Cache::Priority::LOW);
   ValidateLRUList({"v", "X", "a", "Y", "Z"}, 2);
 
-  // Low-pri entries will be inserted to head of high-pri pool after lookup.
+  // Low-pri entries will be inserted to head of low-pri pool after lookup.
   ASSERT_TRUE(Lookup("v"));
-  ValidateLRUList({"X", "a", "Y", "Z", "v"}, 2);
+  ValidateLRUList({"X", "a", "v", "Y", "Z"}, 2);
 
   // High-pri entries will be inserted to the head of the list after lookup.
   ASSERT_TRUE(Lookup("X"));
-  ValidateLRUList({"a", "Y", "Z", "v", "X"}, 2);
+  ValidateLRUList({"a", "v", "Y", "Z", "X"}, 2);
   ASSERT_TRUE(Lookup("Z"));
-  ValidateLRUList({"a", "Y", "v", "X", "Z"}, 2);
+  ValidateLRUList({"a", "v", "Y", "X", "Z"}, 2);
 
   Erase("Y");
   ValidateLRUList({"a", "v", "X", "Z"}, 2);
@@ -185,7 +151,7 @@ TEST_F(LRUCacheTest, EntriesWithPriority) {
   Insert("g", Cache::Priority::LOW);
   ValidateLRUList({"d", "e", "f", "g", "Z"}, 1);
   ASSERT_TRUE(Lookup("d"));
-  ValidateLRUList({"e", "f", "g", "Z", "d"}, 2);
+  ValidateLRUList({"e", "f", "g", "d", "Z"}, 1);
 }
 
 }  // namespace rocksdb

db/c.cc

@@ -90,7 +90,6 @@ using rocksdb::LiveFileMetaData;
 using rocksdb::BackupEngine;
 using rocksdb::BackupableDBOptions;
 using rocksdb::BackupInfo;
-using rocksdb::BackupID;
 using rocksdb::RestoreOptions;
 using rocksdb::CompactRangeOptions;
 using rocksdb::RateLimiter;
@@ -532,18 +531,10 @@ rocksdb_backup_engine_t* rocksdb_backup_engine_open(
 }
 
 void rocksdb_backup_engine_create_new_backup(rocksdb_backup_engine_t* be,
-                                             rocksdb_t* db,
-                                             char** errptr) {
+                                             rocksdb_t* db, char** errptr) {
   SaveError(errptr, be->rep->CreateNewBackup(db->rep));
 }
 
-void rocksdb_backup_engine_create_new_backup_flush(rocksdb_backup_engine_t* be,
-                                                   rocksdb_t* db,
-                                                   unsigned char flush_before_backup,
-                                                   char** errptr) {
-  SaveError(errptr, be->rep->CreateNewBackup(db->rep, flush_before_backup));
-}
-
 void rocksdb_backup_engine_purge_old_backups(rocksdb_backup_engine_t* be,
                                              uint32_t num_backups_to_keep,
                                              char** errptr) {
@@ -563,12 +554,6 @@ void rocksdb_restore_options_set_keep_log_files(rocksdb_restore_options_t* opt,
   opt->rep.keep_log_files = v;
 }
 
-
-void rocksdb_backup_engine_verify_backup(rocksdb_backup_engine_t* be,
-    uint32_t backup_id, char** errptr) {
-  SaveError(errptr, be->rep->VerifyBackup(static_cast<BackupID>(backup_id)));
-}
-
 void rocksdb_backup_engine_restore_db_from_latest_backup(
     rocksdb_backup_engine_t* be, const char* db_dir, const char* wal_dir,
     const rocksdb_restore_options_t* restore_options, char** errptr) {

db/db_block_cache_test.cc

@@ -390,10 +390,7 @@ class MockCache : public LRUCache {
   static uint32_t high_pri_insert_count;
   static uint32_t low_pri_insert_count;
 
-  MockCache()
-      : LRUCache((size_t)1 << 25 /*capacity*/, 0 /*num_shard_bits*/,
-                 false /*strict_capacity_limit*/, 0.0 /*high_pri_pool_ratio*/) {
-  }
+  MockCache() : LRUCache(1 << 25, 0, false, 0.0) {}
 
   virtual Status Insert(const Slice& key, void* value, size_t charge,
                         void (*deleter)(const Slice& key, void* value),

env/env_posix.cc

@@ -241,9 +241,9 @@ class PosixEnv : public Env {
                                                   size, options));
         } else {
           s = IOError("while mmap file for read", fname, errno);
-          close(fd);
         }
       }
+      close(fd);
     } else {
       if (options.use_direct_reads && !options.use_mmap_reads) {
 #ifdef OS_MACOSX

env/env_test.cc

@@ -232,10 +232,10 @@ TEST_F(EnvPosixTest, MemoryMappedFileBuffer) {
 
   ASSERT_OK(status);
   ASSERT_NE(nullptr, mmap_buffer.get());
-  ASSERT_NE(nullptr, mmap_buffer->GetBase());
-  ASSERT_EQ(kFileBytes, mmap_buffer->GetLen());
-  std::string actual_data(reinterpret_cast<const char*>(mmap_buffer->GetBase()),
-                          mmap_buffer->GetLen());
+  ASSERT_NE(nullptr, mmap_buffer->base);
+  ASSERT_EQ(kFileBytes, mmap_buffer->length);
+  std::string actual_data(static_cast<char*>(mmap_buffer->base),
+                          mmap_buffer->length);
   ASSERT_EQ(expected_data, actual_data);
 }
 
@@ -1437,8 +1437,10 @@ TEST_P(EnvPosixTestWithParam, PosixRandomRWFile) {
 
   std::unique_ptr<RandomRWFile> file;
 
+#ifdef OS_LINUX
   // Cannot open non-existing file.
   ASSERT_NOK(env_->NewRandomRWFile(path, &file, EnvOptions()));
+#endif
 
   // Create the file using WriteableFile
   {

env/io_posix.cc

@@ -456,7 +456,6 @@ PosixMmapReadableFile::~PosixMmapReadableFile() {
     fprintf(stdout, "failed to munmap %p length %" ROCKSDB_PRIszt " \n",
             mmapped_region_, length_);
   }
-  close(fd_);
 }
 
 Status PosixMmapReadableFile::Read(uint64_t offset, size_t n, Slice* result,
@@ -1055,7 +1054,7 @@ Status PosixRandomRWFile::Close() {
 
 PosixMemoryMappedFileBuffer::~PosixMemoryMappedFileBuffer() {
   // TODO should have error handling though not much we can do...
-  munmap(this->base_, length_);
+  munmap(this->base, length);
 }
 
 /*

include/rocksdb/c.h

@@ -145,10 +145,6 @@ extern ROCKSDB_LIBRARY_API rocksdb_backup_engine_t* rocksdb_backup_engine_open(
 extern ROCKSDB_LIBRARY_API void rocksdb_backup_engine_create_new_backup(
     rocksdb_backup_engine_t* be, rocksdb_t* db, char** errptr);
 
-extern ROCKSDB_LIBRARY_API void rocksdb_backup_engine_create_new_backup_flush(
-    rocksdb_backup_engine_t* be, rocksdb_t* db, unsigned char flush_before_backup,
-    char** errptr);
-
 extern ROCKSDB_LIBRARY_API void rocksdb_backup_engine_purge_old_backups(
     rocksdb_backup_engine_t* be, uint32_t num_backups_to_keep, char** errptr);
 
@@ -159,10 +155,6 @@ extern ROCKSDB_LIBRARY_API void rocksdb_restore_options_destroy(
 extern ROCKSDB_LIBRARY_API void rocksdb_restore_options_set_keep_log_files(
     rocksdb_restore_options_t* opt, int v);
 
-extern ROCKSDB_LIBRARY_API void
-rocksdb_backup_engine_verify_backup(rocksdb_backup_engine_t* be,
-    uint32_t backup_id, char** errptr);
-
 extern ROCKSDB_LIBRARY_API void
 rocksdb_backup_engine_restore_db_from_latest_backup(
     rocksdb_backup_engine_t* be, const char* db_dir, const char* wal_dir,

include/rocksdb/cache.h

@@ -47,15 +47,6 @@ struct LRUCacheOptions {
   bool strict_capacity_limit = false;
 
   // Percentage of cache reserved for high priority entries.
-  // If greater than zero, the LRU list will be split into a high-pri
-  // list and a low-pri list. High-pri entries will be insert to the
-  // tail of high-pri list, while low-pri entries will be first inserted to
-  // the low-pri list (the midpoint). This is refered to as
-  // midpoint insertion strategy to make entries never get hit in cache
-  // age out faster.
-  //
-  // See also
-  // BlockBasedTableOptions::cache_index_and_filter_blocks_with_high_priority.
   double high_pri_pool_ratio = 0.0;
 
   LRUCacheOptions() {}

include/rocksdb/env.h

@@ -42,7 +42,7 @@ class SequentialFile;
 class Slice;
 class WritableFile;
 class RandomRWFile;
-class MemoryMappedFileBuffer;
+struct MemoryMappedFileBuffer;
 class Directory;
 struct DBOptions;
 struct ImmutableDBOptions;
@@ -822,24 +822,13 @@ class RandomRWFile {
 
 // MemoryMappedFileBuffer object represents a memory-mapped file's raw buffer.
 // Subclasses should release the mapping upon destruction.
-class MemoryMappedFileBuffer {
-public:
+struct MemoryMappedFileBuffer {
   MemoryMappedFileBuffer(void* _base, size_t _length)
-      : base_(_base), length_(_length) {}
-
+      : base(_base), length(_length) {}
   virtual ~MemoryMappedFileBuffer() = 0;
 
-  // We do not want to unmap this twice. We can make this class
-  // movable if desired, however, since
-  MemoryMappedFileBuffer(const MemoryMappedFileBuffer&) = delete;
-  MemoryMappedFileBuffer& operator=(const MemoryMappedFileBuffer&) = delete;
-
-  void*       GetBase() const { return base_;   }
-  size_t      GetLen() const  { return length_; }
-
-protected:
-  void*        base_;
-  const size_t length_;
+  void* const base;
+  const size_t length;
 };
 
 // Directory object represents collection of files and implements

java/rocksjni/transaction_db.cc

@@ -307,6 +307,7 @@ jobject Java_org_rocksdb_TransactionDB_getLockStatusData(JNIEnv* env,
     return nullptr;
   }
 
+<<<<<<< Updated upstream
   const rocksdb::HashMapJni::FnMapKV<const int32_t, const rocksdb::KeyLockInfo>
       fn_map_kv =
           [env, txn_db, &lock_status_data](
@@ -315,6 +316,13 @@ jobject Java_org_rocksdb_TransactionDB_getLockStatusData(JNIEnv* env,
             const jobject jlong_column_family_id =
                 rocksdb::LongJni::valueOf(env, pair.first);
             if (jlong_column_family_id == nullptr) {
+=======
+  const rocksdb::HashMapJni::FnMapKV<const int32_t, const rocksdb::KeyLockInfo> fn_map_kv =
+      [env](const std::pair<const int32_t, const rocksdb::KeyLockInfo>& pair) {
+          const jobject jlong_column_family_id =
+              rocksdb::LongJni::valueOf(env, pair.first);
+          if (jlong_column_family_id == nullptr) {
+>>>>>>> Stashed changes
               // an error occurred
               return std::unique_ptr<std::pair<jobject, jobject>>(nullptr);
             }

port/port_posix.cc

@@ -188,6 +188,8 @@ int GetMaxOpenFiles() {
 void *cacheline_aligned_alloc(size_t size) {
 #if __GNUC__ < 5 && defined(__SANITIZE_ADDRESS__)
   return malloc(size);
+#elif defined(_ISOC11_SOURCE)
+  return aligned_alloc(CACHE_LINE_SIZE, size);
 #elif ( _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__APPLE__))
   void *m;
   errno = posix_memalign(&m, CACHE_LINE_SIZE, size);

port/win/env_win.cc

@@ -112,15 +112,6 @@ Status WinEnvIO::DeleteFile(const std::string& fname) {
   return result;
 }
 
-Status WinEnvIO::Truncate(const std::string& fname, size_t size) {
-  Status s;
-  int result = truncate(fname.c_str(), size);
-  if (result != 0) {
-    s = IOError("Failed to truncate: " + fname, errno);
-  }
-  return s;
-}
-
 Status WinEnvIO::GetCurrentTime(int64_t* unix_time) {
   time_t time = std::time(nullptr);
   if (time == (time_t)(-1)) {
@@ -353,7 +344,7 @@ Status WinEnvIO::NewRandomRWFile(const std::string & fname,
   // Random access is to disable read-ahead as the system reads too much data
   DWORD desired_access = GENERIC_READ | GENERIC_WRITE;
   DWORD shared_mode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
-  DWORD creation_disposition = OPEN_EXISTING; // Fail if file does not exist
+  DWORD creation_disposition = OPEN_ALWAYS; // Create if necessary or open existing
   DWORD file_flags = FILE_FLAG_RANDOM_ACCESS;
 
   if (options.use_direct_reads && options.use_direct_writes) {
@@ -389,84 +380,6 @@ Status WinEnvIO::NewRandomRWFile(const std::string & fname,
   return s;
 }
 
-Status WinEnvIO::NewMemoryMappedFileBuffer(const std::string & fname,
-  std::unique_ptr<MemoryMappedFileBuffer>* result) {
-  Status s;
-  result->reset();
-
-  DWORD fileFlags = FILE_ATTRIBUTE_READONLY;
-
-  HANDLE hFile = INVALID_HANDLE_VALUE;
-  {
-    IOSTATS_TIMER_GUARD(open_nanos);
-    hFile = CreateFileA(
-      fname.c_str(), GENERIC_READ | GENERIC_WRITE,
-      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-      NULL,
-      OPEN_EXISTING,  // Open only if it exists
-      fileFlags,
-      NULL);
-  }
-
-  if (INVALID_HANDLE_VALUE == hFile) {
-    auto lastError = GetLastError();
-    s = IOErrorFromWindowsError("Failed to open NewMemoryMappedFileBuffer: " + fname,
-      lastError);
-    return s;
-  }
-  UniqueCloseHandlePtr fileGuard(hFile, CloseHandleFunc);
-
-  uint64_t fileSize = 0;
-  s = GetFileSize(fname, &fileSize);
-  if (!s.ok()) {
-    return s;
-  }
-  // Will not map empty files
-  if (fileSize == 0) {
-    return Status::NotSupported("NewMemoryMappedFileBuffer can not map zero length files: " + fname);
-  }
-
-  // size_t is 32-bit with 32-bit builds
-  if (fileSize > std::numeric_limits<size_t>::max()) {
-    return Status::NotSupported(
-      "The specified file size does not fit into 32-bit memory addressing: " + fname);
-  }
-
-  HANDLE hMap = CreateFileMappingA(hFile, NULL, PAGE_READWRITE,
-      0,  // Whole file at its present length
-      0,
-      NULL);  // Mapping name
-
-  if (!hMap) {
-    auto lastError = GetLastError();
-    return IOErrorFromWindowsError(
-      "Failed to create file mapping for NewMemoryMappedFileBuffer: " + fname,
-      lastError);
-  }
-  UniqueCloseHandlePtr mapGuard(hMap, CloseHandleFunc);
-
-  void* base = MapViewOfFileEx(hMap, FILE_MAP_WRITE,
-    0,  // High DWORD of access start
-    0,  // Low DWORD
-    fileSize,
-    NULL);  // Let the OS choose the mapping
-
-  if (!base) {
-    auto lastError = GetLastError();
-    return IOErrorFromWindowsError(
-      "Failed to MapViewOfFile for NewMemoryMappedFileBuffer: " + fname,
-      lastError);
-  }
-
-  result->reset(new WinMemoryMappedBuffer(hFile, hMap, 
-    base, static_cast<size_t>(fileSize)));
-
-  mapGuard.release();
-  fileGuard.release();
-
-  return s;
-}
-
 Status WinEnvIO::NewDirectory(const std::string& name,
   std::unique_ptr<Directory>* result) {
   Status s;
@@ -1015,33 +928,27 @@ std::string WinEnvIO::TimeToString(uint64_t secondsSince1970) {
 
 EnvOptions WinEnvIO::OptimizeForLogWrite(const EnvOptions& env_options,
   const DBOptions& db_options) const {
-  EnvOptions optimized(env_options);
-  // These two the same as default optimizations
+  EnvOptions optimized = env_options;
   optimized.bytes_per_sync = db_options.wal_bytes_per_sync;
+  optimized.use_mmap_writes = false;
+  // This is because we flush only whole pages on unbuffered io and
+  // the last records are not guaranteed to be flushed.
+  optimized.use_direct_writes = false;
+  // TODO(icanadi) it's faster if fallocate_with_keep_size is false, but it
+  // breaks TransactionLogIteratorStallAtLastRecord unit test. Fix the unit
+  // test and make this false
+  optimized.fallocate_with_keep_size = true;
   optimized.writable_file_max_buffer_size =
       db_options.writable_file_max_buffer_size;
-
-  // This adversely affects %999 on windows
-  optimized.use_mmap_writes = false;
-  // Direct writes will produce a huge perf impact on
-  // Windows. Pre-allocate space for WAL.
-  optimized.use_direct_writes = false;
   return optimized;
 }
 
 EnvOptions WinEnvIO::OptimizeForManifestWrite(
   const EnvOptions& env_options) const {
-  EnvOptions optimized(env_options);
+  EnvOptions optimized = env_options;
   optimized.use_mmap_writes = false;
-  optimized.use_direct_reads = false;
-  return optimized;
-}
-
-EnvOptions WinEnvIO::OptimizeForManifestRead(
-  const EnvOptions& env_options) const {
-  EnvOptions optimized(env_options);
-  optimized.use_mmap_writes = false;
-  optimized.use_direct_reads = false;
+  optimized.use_direct_writes = false;
+  optimized.fallocate_with_keep_size = true;
   return optimized;
 }
 
@@ -1238,10 +1145,6 @@ Status WinEnv::DeleteFile(const std::string& fname) {
   return winenv_io_.DeleteFile(fname);
 }
 
-Status WinEnv::Truncate(const std::string& fname, size_t size) {
-  return winenv_io_.Truncate(fname, size);
-}
-
 Status WinEnv::GetCurrentTime(int64_t* unix_time) {
   return winenv_io_.GetCurrentTime(unix_time);
 }
@@ -1270,15 +1173,10 @@ Status WinEnv::ReopenWritableFile(const std::string& fname,
 }
 
 Status WinEnv::NewRandomRWFile(const std::string & fname,
-  std::unique_ptr<RandomRWFile>* result, const EnvOptions & options) {
+  unique_ptr<RandomRWFile>* result, const EnvOptions & options) {
   return winenv_io_.NewRandomRWFile(fname, result, options);
 }
 
-Status WinEnv::NewMemoryMappedFileBuffer(const std::string& fname,
-  std::unique_ptr<MemoryMappedFileBuffer>* result) {
-  return winenv_io_.NewMemoryMappedFileBuffer(fname, result);
-}
-
 Status WinEnv::NewDirectory(const std::string& name,
   std::unique_ptr<Directory>* result) {
   return winenv_io_.NewDirectory(name, result);
@@ -1412,11 +1310,6 @@ void  WinEnv::IncBackgroundThreadsIfNeeded(int num, Env::Priority pri) {
   return winenv_threads_.IncBackgroundThreadsIfNeeded(num, pri);
 }
 
-EnvOptions WinEnv::OptimizeForManifestRead(
-  const EnvOptions& env_options) const {
-  return winenv_io_.OptimizeForManifestRead(env_options);
-}
-
 EnvOptions WinEnv::OptimizeForLogWrite(const EnvOptions& env_options,
   const DBOptions& db_options) const {
   return winenv_io_.OptimizeForLogWrite(env_options, db_options);

port/win/env_win.h

@@ -89,8 +89,6 @@ public:
 
   virtual Status DeleteFile(const std::string& fname);
 
-  Status Truncate(const std::string& fname, size_t size);
-
   virtual Status GetCurrentTime(int64_t* unix_time);
 
   virtual Status NewSequentialFile(const std::string& fname,
@@ -112,10 +110,6 @@ public:
     unique_ptr<RandomRWFile>* result,
     const EnvOptions& options);
 
-  virtual Status NewMemoryMappedFileBuffer(
-    const std::string& fname,
-    std::unique_ptr<MemoryMappedFileBuffer>* result);
-
   virtual Status NewDirectory(const std::string& name,
     std::unique_ptr<Directory>* result);
 
@@ -174,9 +168,6 @@ public:
   virtual EnvOptions OptimizeForManifestWrite(
     const EnvOptions& env_options) const;
 
-  virtual EnvOptions OptimizeForManifestRead(
-    const EnvOptions& env_options) const;
-
   size_t GetPageSize() const { return page_size_; }
 
   size_t GetAllocationGranularity() const { return allocation_granularity_; }
@@ -206,8 +197,6 @@ public:
 
   Status DeleteFile(const std::string& fname) override;
 
-  Status Truncate(const std::string& fname, size_t size) override;
-
   Status GetCurrentTime(int64_t* unix_time) override;
 
   Status NewSequentialFile(const std::string& fname,
@@ -235,13 +224,9 @@ public:
 
   // The returned file will only be accessed by one thread at a time.
   Status NewRandomRWFile(const std::string& fname,
-    std::unique_ptr<RandomRWFile>* result,
+    unique_ptr<RandomRWFile>* result,
     const EnvOptions& options) override;
 
-  Status NewMemoryMappedFileBuffer(
-    const std::string& fname,
-    std::unique_ptr<MemoryMappedFileBuffer>* result) override;
-
   Status NewDirectory(const std::string& name,
     std::unique_ptr<Directory>* result) override;
 
@@ -317,16 +302,12 @@ public:
 
   void IncBackgroundThreadsIfNeeded(int num, Env::Priority pri) override;
 
-  EnvOptions OptimizeForManifestRead(
-    const EnvOptions& env_options) const override;
-
   EnvOptions OptimizeForLogWrite(const EnvOptions& env_options,
     const DBOptions& db_options) const override;
 
   EnvOptions OptimizeForManifestWrite(
     const EnvOptions& env_options) const override;
 
-
 private:
 
   WinEnvIO      winenv_io_;

port/win/io_win.cc

@@ -1061,27 +1061,6 @@ Status WinRandomRWFile::Close() {
   return CloseImpl();
 }
 
-//////////////////////////////////////////////////////////////////////////
-/// WinMemoryMappedBufer
-WinMemoryMappedBuffer::~WinMemoryMappedBuffer() {
-  BOOL ret = FALSE;
-  if (base_ != nullptr) {
-    ret = ::UnmapViewOfFile(base_);
-    assert(ret);
-    base_ = nullptr;
-  }
-  if (map_handle_ != NULL && map_handle_ != INVALID_HANDLE_VALUE) {
-    ret = ::CloseHandle(map_handle_);
-    assert(ret);
-    map_handle_ = NULL;
-  }
-  if (file_handle_ != NULL && file_handle_ != INVALID_HANDLE_VALUE) {
-    ret = ::CloseHandle(file_handle_);
-    assert(ret);
-    file_handle_ = NULL;
-  }
-}
-
 //////////////////////////////////////////////////////////////////////////
 /// WinDirectory
 

port/win/io_win.h

@@ -411,18 +411,6 @@ class WinRandomRWFile : private WinFileData,
   virtual Status Close() override;
 };
 
-class WinMemoryMappedBuffer : public MemoryMappedFileBuffer {
-private:
-  HANDLE  file_handle_;
-  HANDLE  map_handle_;
-public:
-  WinMemoryMappedBuffer(HANDLE file_handle, HANDLE map_handle, void* base, size_t size) :
-    MemoryMappedFileBuffer(base, size),
-    file_handle_(file_handle),
-    map_handle_(map_handle) {}
-  ~WinMemoryMappedBuffer() override;
-};
-
 class WinDirectory : public Directory {
   HANDLE handle_;
  public:

src.mk

@@ -208,8 +208,6 @@ LIB_SOURCES =                                                   \
   utilities/transactions/transaction_util.cc                    \
   utilities/transactions/write_prepared_txn.cc                  \
   utilities/transactions/write_prepared_txn_db.cc               \
-  utilities/transactions/write_unprepared_txn.cc                \
-  utilities/transactions/write_unprepared_txn_db.cc             \
   utilities/ttl/db_ttl_impl.cc                                  \
   utilities/write_batch_with_index/write_batch_with_index.cc    \
   utilities/write_batch_with_index/write_batch_with_index_internal.cc    \

tools/db_bench_tool.cc

@@ -100,13 +100,13 @@ DEFINE_string(
     "readreverse,"
     "compact,"
     "compactall,"
+    "readrandom,"
     "multireadrandom,"
     "readseq,"
     "readtocache,"
     "readreverse,"
     "readwhilewriting,"
     "readwhilemerging,"
-    "readwhilescanning,"
     "readrandomwriterandom,"
     "updaterandom,"
     "xorupdaterandom,"
@@ -149,8 +149,6 @@ DEFINE_string(
     "reads\n"
     "\treadwhilemerging      -- 1 merger, N threads doing random "
     "reads\n"
-    "\treadwhilescanning     -- 1 thread doing full table scan, "
-    "N threads doing random reads\n"
     "\treadrandomwriterandom -- N threads doing random-read, "
     "random-write\n"
     "\tupdaterandom  -- N threads doing read-modify-write for random "
@@ -2526,9 +2524,6 @@ void VerifyDBFromDB(std::string& truth_db_name) {
       } else if (name == "readwhilemerging") {
         num_threads++;  // Add extra thread for writing
         method = &Benchmark::ReadWhileMerging;
-      } else if (name == "readwhilescanning") {
-        num_threads++;  // Add extra thread for scaning
-        method = &Benchmark::ReadWhileScanning;
       } else if (name == "readrandomwriterandom") {
         method = &Benchmark::ReadRandomWriteRandom;
       } else if (name == "readrandommergerandom") {
@@ -4512,45 +4507,6 @@ void VerifyDBFromDB(std::string& truth_db_name) {
     thread->stats.AddBytes(bytes);
   }
 
-  void ReadWhileScanning(ThreadState* thread) {
-    if (thread->tid > 0) {
-      ReadRandom(thread);
-    } else {
-      BGScan(thread);
-    }
-  }
-
-  void BGScan(ThreadState* thread) {
-    if (FLAGS_num_multi_db > 0) {
-      fprintf(stderr, "Not supporting multiple DBs.\n");
-      abort();
-    }
-    assert(db_.db != nullptr);
-    ReadOptions read_options;
-    Iterator* iter = db_.db->NewIterator(read_options);
-
-    fprintf(stderr, "num reads to do %lu\n", reads_);
-    Duration duration(FLAGS_duration, reads_);
-    uint64_t num_seek_to_first = 0;
-    uint64_t num_next = 0;
-    while (!duration.Done(1)) {
-      if (!iter->Valid()) {
-        iter->SeekToFirst();
-        num_seek_to_first++;
-      } else if (!iter->status().ok()) {
-        fprintf(stderr, "Iterator error: %s\n",
-                iter->status().ToString().c_str());
-        abort();
-      } else {
-        iter->Next();
-        num_next++;
-      }
-
-      thread->stats.FinishedOps(&db_, db_.db, 1, kSeek);
-    }
-    delete iter;
-  }
-
   // Given a key K and value V, this puts (K+"0", V), (K+"1", V), (K+"2", V)
   // in DB atomically i.e in a single batch. Also refer GetMany.
   Status PutMany(DB* db, const WriteOptions& writeoptions, const Slice& key,

tools/db_stress.cc

@@ -879,9 +879,9 @@ class SharedState {
             FLAGS_expected_values_path, &expected_mmap_buffer_);
       }
       if (status.ok()) {
-        assert(expected_mmap_buffer_->GetLen() == expected_values_size);
+        assert(expected_mmap_buffer_->length == expected_values_size);
         values_ =
-            static_cast<std::atomic<uint32_t>*>(expected_mmap_buffer_->GetBase());
+            static_cast<std::atomic<uint32_t>*>(expected_mmap_buffer_->base);
         assert(values_ != nullptr);
       } else {
         fprintf(stderr, "Failed opening shared file '%s' with error: %s\n",

utilities/transactions/pessimistic_transaction_db.cc

@@ -26,7 +26,6 @@
 #include "utilities/transactions/pessimistic_transaction.h"
 #include "utilities/transactions/transaction_db_mutex_impl.h"
 #include "utilities/transactions/write_prepared_txn_db.h"
-#include "utilities/transactions/write_unprepared_txn_db.h"
 
 namespace rocksdb {
 
@@ -265,9 +264,7 @@ Status TransactionDB::WrapDB(
   std::unique_ptr<PessimisticTransactionDB> txn_db;
   switch (txn_db_options.write_policy) {
     case WRITE_UNPREPARED:
-      txn_db.reset(new WriteUnpreparedTxnDB(
-          db, PessimisticTransactionDB::ValidateTxnDBOptions(txn_db_options)));
-      break;
+      return Status::NotSupported("WRITE_UNPREPARED is not implemented yet");
     case WRITE_PREPARED:
       txn_db.reset(new WritePreparedTxnDB(
           db, PessimisticTransactionDB::ValidateTxnDBOptions(txn_db_options)));
@@ -300,9 +297,7 @@ Status TransactionDB::WrapStackableDB(
 
   switch (txn_db_options.write_policy) {
     case WRITE_UNPREPARED:
-      txn_db.reset(new WriteUnpreparedTxnDB(
-          db, PessimisticTransactionDB::ValidateTxnDBOptions(txn_db_options)));
-      break;
+      return Status::NotSupported("WRITE_UNPREPARED is not implemented yet");
     case WRITE_PREPARED:
       txn_db.reset(new WritePreparedTxnDB(
           db, PessimisticTransactionDB::ValidateTxnDBOptions(txn_db_options)));

utilities/transactions/write_unprepared_txn.cc

@@ -1,19 +0,0 @@
-//  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#ifndef ROCKSDB_LITE
-
-#include "utilities/transactions/write_unprepared_txn.h"
-
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
-namespace rocksdb {
-
-
-}  // namespace rocksdb
-
-#endif  // ROCKSDB_LITE

utilities/transactions/write_unprepared_txn.h

@@ -1,21 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#pragma once
-
-#ifndef ROCKSDB_LITE
-
-#include "utilities/transactions/write_prepared_txn.h"
-
-namespace rocksdb {
-
-class WriteUnpreparedTxn : public WritePreparedTxn {
-  using WritePreparedTxn::WritePreparedTxn;
-
-};
-
-}  // namespace rocksdb
-
-#endif  // ROCKSDB_LITE

utilities/transactions/write_unprepared_txn_db.cc

@@ -1,29 +0,0 @@
-//  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#ifndef ROCKSDB_LITE
-
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
-#include "utilities/transactions/write_unprepared_txn_db.h"
-#include "rocksdb/utilities/transaction_db.h"
-
-namespace rocksdb {
-
-Transaction* WriteUnpreparedTxnDB::BeginTransaction(
-const WriteOptions& write_options, const TransactionOptions& txn_options,
-Transaction* old_txn) {
-  if (old_txn != nullptr) {
-    ReinitializeTransaction(old_txn, write_options, txn_options);
-    return old_txn;
-  } else {
-    return new WriteUnpreparedTxn(this, write_options, txn_options);
-  }
-}
-
-}  //  namespace rocksdb
-#endif  // ROCKSDB_LITE

utilities/transactions/write_unprepared_txn_db.h

@@ -1,27 +0,0 @@
-//  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#pragma once
-#ifndef ROCKSDB_LITE
-
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
-#include "utilities/transactions/write_prepared_txn_db.h"
-
-#include "utilities/transactions/write_unprepared_txn.h"
-
-namespace rocksdb {
-
-class WriteUnpreparedTxnDB : public WritePreparedTxnDB {
-  using WritePreparedTxnDB::WritePreparedTxnDB;
-
-  Transaction* BeginTransaction(const WriteOptions& write_options, const TransactionOptions& txn_options,
-                                Transaction* old_txn) override;
-};
-
-}  //  namespace rocksdb
-#endif  // ROCKSDB_LITE