leveldb: Deleted leveldb_proto::Options.

leveldb_proto::Options is a small subset (mostly) of leveldb::Options.
It had two leveldb::Options members (shared_cache and write_buffer_size),
and a (possibly empty) database_name. This change deletes
leveldb_proto::Options in lieu of using leveldb::Options. This simplifies
the code as well as adds support for the remaining options specified
in leveldb::Options.

Bug: 762587
Change-Id: Ia7872ecb09b2b181354c820ac3296ea6304a80b0
Reviewed-on: https://chromium-review.googlesource.com/655697Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: John Mellor <johnme@chromium.org>
Commit-Queue: Chris Mumford <cmumford@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501330}

chrome/browser/budget_service/budget_database.cc

@@ -57,11 +57,9 @@ BudgetDatabase::BudgetDatabase(Profile* profile,
                base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}))),
       clock_(base::WrapUnique(new base::DefaultClock)),
       weak_ptr_factory_(this) {
-  db_->InitWithOptions(
-      kDatabaseUMAName,
-      leveldb_proto::Options(database_dir, SharedReadCache::Default),
-      base::BindOnce(&BudgetDatabase::OnDatabaseInit,
-                     weak_ptr_factory_.GetWeakPtr()));
+  db_->InitWithOptions(kDatabaseUMAName, database_dir, leveldb_env::Options(),
+                       base::BindOnce(&BudgetDatabase::OnDatabaseInit,
+                                      weak_ptr_factory_.GetWeakPtr()));
 }
 
 BudgetDatabase::~BudgetDatabase() {}

components/download/internal/download_store.cc

@@ -42,8 +42,7 @@ bool DownloadStore::IsInitialized() {
 void DownloadStore::Initialize(InitCallback callback) {
   DCHECK(!IsInitialized());
   db_->InitWithOptions(
-      kDatabaseClientName,
-      leveldb_proto::Options(database_dir_, SharedReadCache::Default),
+      kDatabaseClientName, database_dir_, leveldb_env::Options(),
       base::BindOnce(&DownloadStore::OnDatabaseInited,
                      weak_factory_.GetWeakPtr(), std::move(callback)));
 }
@@ -85,8 +84,7 @@ void DownloadStore::OnDatabaseDestroyed(StoreCallback callback, bool success) {
   }
 
   db_->InitWithOptions(
-      kDatabaseClientName,
-      leveldb_proto::Options(database_dir_, SharedReadCache::Default),
+      kDatabaseClientName, database_dir_, leveldb_env::Options(),
       base::BindOnce(&DownloadStore::OnDatabaseInitedAfterDestroy,
                      weak_factory_.GetWeakPtr(), std::move(callback)));
 }

components/leveldb_proto/BUILD.gn

@@ -6,7 +6,6 @@ static_library("leveldb_proto") {
   sources = [
     "leveldb_database.cc",
     "leveldb_database.h",
-    "options.h",
     "proto_database.h",
     "proto_database_impl.h",
   ]

components/leveldb_proto/leveldb_database.cc

@@ -67,27 +67,18 @@ bool LevelDB::InitWithOptions(const base::FilePath& database_dir,
   return false;
 }
 
-bool LevelDB::Init(const leveldb_proto::Options& options) {
-  leveldb_env::Options leveldb_options;
-  leveldb_options.create_if_missing = true;
-  leveldb_options.max_open_files = 0;  // Use minimum.
-
-  if (options.write_buffer_size != 0)
-    leveldb_options.write_buffer_size = options.write_buffer_size;
-  switch (options.shared_cache) {
-    case leveldb_env::SharedReadCache::Web:
-      leveldb_options.block_cache = leveldb_env::SharedWebBlockCache();
-      break;
-    case leveldb_env::SharedReadCache::Default:
-      // fallthrough
-      break;
-  }
-  if (options.database_dir.empty()) {
+bool LevelDB::Init(const base::FilePath& database_dir,
+                   const leveldb_env::Options& options) {
+  leveldb_env::Options open_options = options;
+  open_options.create_if_missing = true;
+  open_options.max_open_files = 0;  // Use minimum.
+
+  if (database_dir.empty()) {
     env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
-    leveldb_options.env = env_.get();
+    open_options.env = env_.get();
   }
 
-  return InitWithOptions(options.database_dir, leveldb_options);
+  return InitWithOptions(database_dir, open_options);
 }
 
 bool LevelDB::Save(const base::StringPairs& entries_to_save,

components/leveldb_proto/leveldb_database.h

@@ -13,7 +13,6 @@
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/threading/thread_collision_warner.h"
-#include "components/leveldb_proto/options.h"
 #include "third_party/leveldatabase/env_chromium.h"
 
 namespace base {
@@ -42,9 +41,10 @@ class LevelDB {
   explicit LevelDB(const char* client_name);
   virtual ~LevelDB();
 
-  // Initializes a leveldb with the given options. If |options.database_dir| is
+  // Initializes a leveldb with the given options. If |database_dir| is
   // empty, this opens an in-memory db.
-  virtual bool Init(const leveldb_proto::Options& options);
+  virtual bool Init(const base::FilePath& database_dir,
+                    const leveldb_env::Options& options);
 
   virtual bool Save(const base::StringPairs& pairs_to_save,
                     const std::vector<std::string>& keys_to_remove);

components/leveldb_proto/options.h

-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_LEVELDB_PROTO_OPTIONS_H_
-#define COMPONENTS_LEVELDB_PROTO_OPTIONS_H_
-
-#include "base/files/file_path.h"
-#include "third_party/leveldatabase/env_chromium.h"
-
-namespace leveldb_proto {
-
-struct Options {
-  Options(const base::FilePath& database_dir,
-          leveldb_env::SharedReadCache shared_cache,
-          size_t write_buffer_size = 0)
-      : database_dir(database_dir),
-        shared_cache(shared_cache),
-        write_buffer_size(write_buffer_size) {}
-
-  base::FilePath database_dir;
-  leveldb_env::SharedReadCache shared_cache;
-  size_t write_buffer_size;
-};
-
-}  // namespace leveldb_proto
-
-#endif  // COMPONENTS_LEVELDB_PROTO_OPTIONS_H_

components/leveldb_proto/proto_database.h

@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "base/callback.h"
-#include "components/leveldb_proto/options.h"
+#include "third_party/leveldatabase/env_chromium.h"
 
 namespace base {
 class FilePath;
@@ -45,15 +45,14 @@ class ProtoDatabase {
   void Init(const char* client_name,
             const base::FilePath& database_dir,
             InitCallback callback) {
-    InitWithOptions(
-        client_name,
-        Options(database_dir, leveldb_env::SharedReadCache::Default),
-        std::move(callback));
+    InitWithOptions(client_name, database_dir, leveldb_env::Options(),
+                    std::move(callback));
   }
 
   // Similar to Init, but takes additional options.
   virtual void InitWithOptions(const char* client_name,
-                               const Options& options,
+                               const base::FilePath& database_dir,
+                               const leveldb_env::Options& options,
                                InitCallback callback) = 0;
 
   // Asynchronously saves |entries_to_save| and deletes entries from

components/leveldb_proto/proto_database_impl.h

@@ -45,7 +45,8 @@ class ProtoDatabaseImpl : public ProtoDatabase<T> {
   //     part of the constructor
   void InitWithOptions(
       const char* client_name,
-      const Options& options,
+      const base::FilePath& database_dir,
+      const leveldb_env::Options& options,
       typename ProtoDatabase<T>::InitCallback callback) override;
   void UpdateEntries(
       std::unique_ptr<typename ProtoDatabase<T>::KeyEntryVector>
@@ -60,7 +61,8 @@ class ProtoDatabaseImpl : public ProtoDatabase<T> {
 
   // Allow callers to provide their own Database implementation.
   void InitWithDatabase(std::unique_ptr<LevelDB> database,
-                        const Options& options,
+                        const base::FilePath& database_dir,
+                        const leveldb_env::Options& options,
                         typename ProtoDatabase<T>::InitCallback callback);
 
  private:
@@ -118,12 +120,13 @@ void RunDestroyCallback(typename ProtoDatabase<T>::DestroyCallback callback,
 }
 
 inline void InitFromTaskRunner(LevelDB* database,
-                               const Options& options,
+                               const base::FilePath& database_dir,
+                               const leveldb_env::Options& options,
                                bool* success) {
   DCHECK(success);
 
   // TODO(cjhopman): Histogram for database size.
-  *success = database->Init(options);
+  *success = database->Init(database_dir, options);
 }
 
 inline void DestroyFromTaskRunner(const base::FilePath& database_dir,
@@ -220,12 +223,13 @@ ProtoDatabaseImpl<T>::~ProtoDatabaseImpl() {
 template <typename T>
 void ProtoDatabaseImpl<T>::InitWithOptions(
     const char* client_name,
-    const Options& options,
+    const base::FilePath& database_dir,
+    const leveldb_env::Options& options,
     typename ProtoDatabase<T>::InitCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  database_dir_ = options.database_dir;
-  InitWithDatabase(base::WrapUnique(new LevelDB(client_name)), options,
-                   std::move(callback));
+  database_dir_ = database_dir;
+  InitWithDatabase(base::WrapUnique(new LevelDB(client_name)), database_dir,
+                   options, std::move(callback));
 }
 
 template <typename T>
@@ -253,7 +257,8 @@ void ProtoDatabaseImpl<T>::Destroy(
 template <typename T>
 void ProtoDatabaseImpl<T>::InitWithDatabase(
     std::unique_ptr<LevelDB> database,
-    const Options& options,
+    const base::FilePath& database_dir,
+    const leveldb_env::Options& options,
     typename ProtoDatabase<T>::InitCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!db_);
@@ -262,8 +267,8 @@ void ProtoDatabaseImpl<T>::InitWithDatabase(
   bool* success = new bool(false);
   task_runner_->PostTaskAndReply(
       FROM_HERE,
-      base::Bind(InitFromTaskRunner, base::Unretained(db_.get()), options,
-                 success),
+      base::Bind(InitFromTaskRunner, base::Unretained(db_.get()), database_dir,
+                 options, success),
       base::BindOnce(RunInitCallback<T>, std::move(callback),
                      base::Owned(success)));
 }

components/leveldb_proto/testing/fake_db.h

@@ -32,7 +32,8 @@ class FakeDB : public ProtoDatabase<T> {
   // ProtoDatabase implementation.
   void InitWithOptions(
       const char* client_name,
-      const Options& options,
+      const base::FilePath& database_dir,
+      const leveldb_env::Options& options,
       typename ProtoDatabase<T>::InitCallback callback) override;
   void UpdateEntries(
       std::unique_ptr<typename ProtoDatabase<T>::KeyEntryVector>
@@ -96,9 +97,10 @@ FakeDB<T>::~FakeDB() {}
 template <typename T>
 void FakeDB<T>::InitWithOptions(
     const char* client_name,
-    const Options& options,
+    const base::FilePath& database_dir,
+    const leveldb_env::Options& options,
     typename ProtoDatabase<T>::InitCallback callback) {
-  dir_ = options.database_dir;
+  dir_ = database_dir;
   init_callback_ = std::move(callback);
 }
 

components/ntp_snippets/remote/remote_suggestions_database.cc

@@ -45,18 +45,16 @@ RemoteSuggestionsDatabase::RemoteSuggestionsDatabase(
       base::MakeUnique<ProtoDatabaseImpl<SnippetImageProto>>(file_task_runner);
 
   base::FilePath snippet_dir = database_dir.AppendASCII(kSnippetDatabaseFolder);
+  leveldb_env::Options options;
+  options.write_buffer_size = kDatabaseWriteBufferSizeBytes;
   database_->InitWithOptions(
-      kDatabaseUMAClientName,
-      leveldb_proto::Options(snippet_dir, SharedReadCache::Default,
-                             kDatabaseWriteBufferSizeBytes),
+      kDatabaseUMAClientName, snippet_dir, options,
       base::Bind(&RemoteSuggestionsDatabase::OnDatabaseInited,
                  weak_ptr_factory_.GetWeakPtr()));
 
   base::FilePath image_dir = database_dir.AppendASCII(kImageDatabaseFolder);
   image_database_->InitWithOptions(
-      kImageDatabaseUMAClientName,
-      leveldb_proto::Options(image_dir, SharedReadCache::Default,
-                             kDatabaseWriteBufferSizeBytes),
+      kImageDatabaseUMAClientName, image_dir, options,
       base::Bind(&RemoteSuggestionsDatabase::OnImageDatabaseInited,
                  weak_ptr_factory_.GetWeakPtr()));
 }