| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_proto/leveldb_database.h" | 5 #include "components/leveldb_proto/leveldb_database.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/strings/string_split.h" |
| 13 #include "base/threading/thread_checker.h" | 14 #include "base/threading/thread_checker.h" |
| 14 #include "third_party/leveldatabase/src/include/leveldb/db.h" | 15 #include "third_party/leveldatabase/src/include/leveldb/db.h" |
| 15 #include "third_party/leveldatabase/src/include/leveldb/iterator.h" | 16 #include "third_party/leveldatabase/src/include/leveldb/iterator.h" |
| 16 #include "third_party/leveldatabase/src/include/leveldb/options.h" | 17 #include "third_party/leveldatabase/src/include/leveldb/options.h" |
| 17 #include "third_party/leveldatabase/src/include/leveldb/slice.h" | 18 #include "third_party/leveldatabase/src/include/leveldb/slice.h" |
| 18 #include "third_party/leveldatabase/src/include/leveldb/status.h" | 19 #include "third_party/leveldatabase/src/include/leveldb/status.h" |
| 19 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" | 20 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" |
| 20 | 21 |
| 21 namespace leveldb_proto { | 22 namespace leveldb_proto { |
| 22 | 23 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 44 CHECK(db); | 45 CHECK(db); |
| 45 db_.reset(db); | 46 db_.reset(db); |
| 46 return true; | 47 return true; |
| 47 } | 48 } |
| 48 | 49 |
| 49 LOG(WARNING) << "Unable to open " << database_dir.value() << ": " | 50 LOG(WARNING) << "Unable to open " << database_dir.value() << ": " |
| 50 << status.ToString(); | 51 << status.ToString(); |
| 51 return false; | 52 return false; |
| 52 } | 53 } |
| 53 | 54 |
| 54 bool LevelDB::Save( | 55 bool LevelDB::Save(const base::StringPairs& entries_to_save, |
| 55 const std::vector<std::pair<std::string, std::string> >& entries_to_save, | 56 const std::vector<std::string>& keys_to_remove) { |
| 56 const std::vector<std::string>& keys_to_remove) { | |
| 57 DFAKE_SCOPED_LOCK(thread_checker_); | 57 DFAKE_SCOPED_LOCK(thread_checker_); |
| 58 | 58 |
| 59 leveldb::WriteBatch updates; | 59 leveldb::WriteBatch updates; |
| 60 for (std::vector<std::pair<std::string, std::string> >::const_iterator it = | 60 for (base::StringPairs::const_iterator it = entries_to_save.begin(); |
| 61 entries_to_save.begin(); | 61 it != entries_to_save.end(); |
| 62 it != entries_to_save.end(); ++it) { | 62 ++it) { |
| 63 updates.Put(leveldb::Slice(it->first), leveldb::Slice(it->second)); | 63 updates.Put(leveldb::Slice(it->first), leveldb::Slice(it->second)); |
| 64 } | 64 } |
| 65 for (std::vector<std::string>::const_iterator it = keys_to_remove.begin(); | 65 for (std::vector<std::string>::const_iterator it = keys_to_remove.begin(); |
| 66 it != keys_to_remove.end(); ++it) { | 66 it != keys_to_remove.end(); ++it) { |
| 67 updates.Delete(leveldb::Slice(*it)); | 67 updates.Delete(leveldb::Slice(*it)); |
| 68 } | 68 } |
| 69 | 69 |
| 70 leveldb::WriteOptions options; | 70 leveldb::WriteOptions options; |
| 71 options.sync = true; | 71 options.sync = true; |
| 72 leveldb::Status status = db_->Write(options, &updates); | 72 leveldb::Status status = db_->Write(options, &updates); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 84 scoped_ptr<leveldb::Iterator> db_iterator(db_->NewIterator(options)); | 84 scoped_ptr<leveldb::Iterator> db_iterator(db_->NewIterator(options)); |
| 85 for (db_iterator->SeekToFirst(); db_iterator->Valid(); db_iterator->Next()) { | 85 for (db_iterator->SeekToFirst(); db_iterator->Valid(); db_iterator->Next()) { |
| 86 leveldb::Slice value_slice = db_iterator->value(); | 86 leveldb::Slice value_slice = db_iterator->value(); |
| 87 std::string entry(value_slice.data(), value_slice.size()); | 87 std::string entry(value_slice.data(), value_slice.size()); |
| 88 entries->push_back(entry); | 88 entries->push_back(entry); |
| 89 } | 89 } |
| 90 return true; | 90 return true; |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace leveldb_proto | 93 } // namespace leveldb_proto |
| OLD | NEW |