Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Side by Side Diff: components/leveldb/leveldb_service_impl.cc

Issue 2285623002: [Leveldb] Use std::{string,vector} instead of mojo::{String,Array}. (Closed)
Patch Set: Address comments from Yuzhu Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/leveldb/leveldb_service_impl.h" 5 #include "components/leveldb/leveldb_service_impl.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "components/leveldb/env_mojo.h" 10 #include "components/leveldb/env_mojo.h"
11 #include "components/leveldb/leveldb_database_impl.h" 11 #include "components/leveldb/leveldb_database_impl.h"
12 #include "components/leveldb/public/cpp/util.h" 12 #include "components/leveldb/public/cpp/util.h"
13 #include "third_party/leveldatabase/env_chromium.h" 13 #include "third_party/leveldatabase/env_chromium.h"
14 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h" 14 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
15 #include "third_party/leveldatabase/src/include/leveldb/db.h" 15 #include "third_party/leveldatabase/src/include/leveldb/db.h"
16 #include "third_party/leveldatabase/src/include/leveldb/env.h" 16 #include "third_party/leveldatabase/src/include/leveldb/env.h"
17 #include "third_party/leveldatabase/src/include/leveldb/filter_policy.h" 17 #include "third_party/leveldatabase/src/include/leveldb/filter_policy.h"
18 #include "third_party/leveldatabase/src/include/leveldb/slice.h" 18 #include "third_party/leveldatabase/src/include/leveldb/slice.h"
19 19
20 namespace leveldb { 20 namespace leveldb {
21 21
22 LevelDBServiceImpl::LevelDBServiceImpl( 22 LevelDBServiceImpl::LevelDBServiceImpl(
23 scoped_refptr<base::SingleThreadTaskRunner> task_runner) 23 scoped_refptr<base::SingleThreadTaskRunner> task_runner)
24 : thread_(new LevelDBMojoProxy(std::move(task_runner))) {} 24 : thread_(new LevelDBMojoProxy(std::move(task_runner))) {}
25 25
26 LevelDBServiceImpl::~LevelDBServiceImpl() {} 26 LevelDBServiceImpl::~LevelDBServiceImpl() {}
27 27
28 void LevelDBServiceImpl::Open(filesystem::mojom::DirectoryPtr directory, 28 void LevelDBServiceImpl::Open(filesystem::mojom::DirectoryPtr directory,
29 const mojo::String& dbname, 29 const std::string& dbname,
30 leveldb::mojom::LevelDBDatabaseRequest database, 30 leveldb::mojom::LevelDBDatabaseRequest database,
31 const OpenCallback& callback) { 31 const OpenCallback& callback) {
32 OpenWithOptions(leveldb::mojom::OpenOptions::New(), std::move(directory), 32 OpenWithOptions(leveldb::mojom::OpenOptions::New(), std::move(directory),
33 dbname, std::move(database), callback); 33 dbname, std::move(database), callback);
34 } 34 }
35 35
36 void LevelDBServiceImpl::OpenWithOptions( 36 void LevelDBServiceImpl::OpenWithOptions(
37 leveldb::mojom::OpenOptionsPtr open_options, 37 leveldb::mojom::OpenOptionsPtr open_options,
38 filesystem::mojom::DirectoryPtr directory, 38 filesystem::mojom::DirectoryPtr directory,
39 const mojo::String& dbname, 39 const std::string& dbname,
40 leveldb::mojom::LevelDBDatabaseRequest database, 40 leveldb::mojom::LevelDBDatabaseRequest database,
41 const OpenCallback& callback) { 41 const OpenCallback& callback) {
42 leveldb::Options options; 42 leveldb::Options options;
43 options.create_if_missing = open_options->create_if_missing; 43 options.create_if_missing = open_options->create_if_missing;
44 options.error_if_exists = open_options->error_if_exists; 44 options.error_if_exists = open_options->error_if_exists;
45 options.paranoid_checks = open_options->paranoid_checks; 45 options.paranoid_checks = open_options->paranoid_checks;
46 options.write_buffer_size = open_options->write_buffer_size; 46 options.write_buffer_size = open_options->write_buffer_size;
47 options.max_open_files = open_options->max_open_files; 47 options.max_open_files = open_options->max_open_files;
48 48
49 options.reuse_logs = leveldb_env::kDefaultLogReuseOptionValue; 49 options.reuse_logs = leveldb_env::kDefaultLogReuseOptionValue;
50 options.compression = leveldb::kSnappyCompression; 50 options.compression = leveldb::kSnappyCompression;
51 51
52 // Register our directory with the file thread. 52 // Register our directory with the file thread.
53 LevelDBMojoProxy::OpaqueDir* dir = 53 LevelDBMojoProxy::OpaqueDir* dir =
54 thread_->RegisterDirectory(std::move(directory)); 54 thread_->RegisterDirectory(std::move(directory));
55 55
56 std::unique_ptr<MojoEnv> env_mojo(new MojoEnv(thread_, dir)); 56 std::unique_ptr<MojoEnv> env_mojo(new MojoEnv(thread_, dir));
57 options.env = env_mojo.get(); 57 options.env = env_mojo.get();
58 58
59 leveldb::DB* db = nullptr; 59 leveldb::DB* db = nullptr;
60 leveldb::Status s = leveldb::DB::Open(options, dbname.To<std::string>(), &db); 60 leveldb::Status s = leveldb::DB::Open(options, dbname, &db);
61 61
62 if (s.ok()) { 62 if (s.ok()) {
63 new LevelDBDatabaseImpl(std::move(database), std::move(env_mojo), 63 new LevelDBDatabaseImpl(std::move(database), std::move(env_mojo),
64 base::WrapUnique(db)); 64 base::WrapUnique(db));
65 } 65 }
66 66
67 callback.Run(LeveldbStatusToError(s)); 67 callback.Run(LeveldbStatusToError(s));
68 } 68 }
69 69
70 void LevelDBServiceImpl::OpenInMemory( 70 void LevelDBServiceImpl::OpenInMemory(
(...skipping 12 matching lines...) Expand all
83 83
84 if (s.ok()) { 84 if (s.ok()) {
85 new LevelDBDatabaseImpl(std::move(database), std::move(env), 85 new LevelDBDatabaseImpl(std::move(database), std::move(env),
86 base::WrapUnique(db)); 86 base::WrapUnique(db));
87 } 87 }
88 88
89 callback.Run(LeveldbStatusToError(s)); 89 callback.Run(LeveldbStatusToError(s));
90 } 90 }
91 91
92 } // namespace leveldb 92 } // namespace leveldb
OLDNEW
« no previous file with comments | « components/leveldb/leveldb_service_impl.h ('k') | components/leveldb/leveldb_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698