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

Side by Side Diff: chrome/browser/chromeos/contacts/contact_database.cc

Issue 10836043: contacts: Add UpdateMetadata protocol buffer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add a comment Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/contacts/contact_database.h" 5 #include "chrome/browser/chromeos/contacts/contact_database.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/sequenced_task_runner.h" 10 #include "base/sequenced_task_runner.h"
11 #include "base/threading/sequenced_worker_pool.h" 11 #include "base/threading/sequenced_worker_pool.h"
12 #include "chrome/browser/chromeos/contacts/contact.pb.h" 12 #include "chrome/browser/chromeos/contacts/contact.pb.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "leveldb/db.h" 14 #include "leveldb/db.h"
15 #include "leveldb/iterator.h" 15 #include "leveldb/iterator.h"
16 #include "leveldb/options.h" 16 #include "leveldb/options.h"
17 #include "leveldb/slice.h" 17 #include "leveldb/slice.h"
18 #include "leveldb/status.h" 18 #include "leveldb/status.h"
19 #include "leveldb/write_batch.h" 19 #include "leveldb/write_batch.h"
20 20
21 using content::BrowserThread; 21 using content::BrowserThread;
22 22
23 namespace contacts { 23 namespace contacts {
24 24
25 namespace {
26
27 // LevelDB key used for storing UpdateMetadata messages.
28 const char kUpdateMetadataKey[] = "__chrome_update_metadata__";
29
30 } // namespace
31
25 ContactDatabase::ContactDatabase() : weak_ptr_factory_(this) { 32 ContactDatabase::ContactDatabase() : weak_ptr_factory_(this) {
26 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 33 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
27 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); 34 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
28 task_runner_ = pool->GetSequencedTaskRunner(pool->GetSequenceToken()); 35 task_runner_ = pool->GetSequencedTaskRunner(pool->GetSequenceToken());
29 } 36 }
30 37
31 void ContactDatabase::DestroyOnUIThread() { 38 void ContactDatabase::DestroyOnUIThread() {
32 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 39 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
33 weak_ptr_factory_.InvalidateWeakPtrs(); 40 weak_ptr_factory_.InvalidateWeakPtrs();
34 task_runner_->PostNonNestableTask( 41 task_runner_->PostNonNestableTask(
(...skipping 12 matching lines...) Expand all
47 base::Unretained(this), 54 base::Unretained(this),
48 database_dir, 55 database_dir,
49 success), 56 success),
50 base::Bind(&ContactDatabase::RunInitCallback, 57 base::Bind(&ContactDatabase::RunInitCallback,
51 weak_ptr_factory_.GetWeakPtr(), 58 weak_ptr_factory_.GetWeakPtr(),
52 callback, 59 callback,
53 base::Owned(success))); 60 base::Owned(success)));
54 } 61 }
55 62
56 void ContactDatabase::SaveContacts(scoped_ptr<ContactPointers> contacts, 63 void ContactDatabase::SaveContacts(scoped_ptr<ContactPointers> contacts,
64 scoped_ptr<UpdateMetadata> metadata,
57 bool is_full_update, 65 bool is_full_update,
58 SaveCallback callback) { 66 SaveCallback callback) {
59 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 67 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
60 bool* success = new bool(false); 68 bool* success = new bool(false);
61 task_runner_->PostTaskAndReply( 69 task_runner_->PostTaskAndReply(
62 FROM_HERE, 70 FROM_HERE,
63 base::Bind(&ContactDatabase::SaveContactsFromTaskRunner, 71 base::Bind(&ContactDatabase::SaveContactsFromTaskRunner,
64 base::Unretained(this), 72 base::Unretained(this),
65 base::Passed(contacts.Pass()), 73 base::Passed(contacts.Pass()),
74 base::Passed(metadata.Pass()),
66 is_full_update, 75 is_full_update,
67 success), 76 success),
68 base::Bind(&ContactDatabase::RunSaveCallback, 77 base::Bind(&ContactDatabase::RunSaveCallback,
69 weak_ptr_factory_.GetWeakPtr(), 78 weak_ptr_factory_.GetWeakPtr(),
70 callback, 79 callback,
71 base::Owned(success))); 80 base::Owned(success)));
72 } 81 }
73 82
74 void ContactDatabase::LoadContacts(LoadCallback callback) { 83 void ContactDatabase::LoadContacts(LoadCallback callback) {
75 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 84 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
85
76 bool* success = new bool(false); 86 bool* success = new bool(false);
77 scoped_ptr<ScopedVector<Contact> > contacts(new ScopedVector<Contact>); 87 scoped_ptr<ScopedVector<Contact> > contacts(new ScopedVector<Contact>);
88 scoped_ptr<UpdateMetadata> metadata(new UpdateMetadata);
89
90 // Extract pointers before we calling Pass() so we can use them below.
78 ScopedVector<Contact>* contacts_ptr = contacts.get(); 91 ScopedVector<Contact>* contacts_ptr = contacts.get();
92 UpdateMetadata* metadata_ptr = metadata.get();
93
79 task_runner_->PostTaskAndReply( 94 task_runner_->PostTaskAndReply(
80 FROM_HERE, 95 FROM_HERE,
81 base::Bind(&ContactDatabase::LoadContactsFromTaskRunner, 96 base::Bind(&ContactDatabase::LoadContactsFromTaskRunner,
82 base::Unretained(this), 97 base::Unretained(this),
83 success, 98 success,
84 contacts_ptr), 99 contacts_ptr,
100 metadata_ptr),
85 base::Bind(&ContactDatabase::RunLoadCallback, 101 base::Bind(&ContactDatabase::RunLoadCallback,
86 weak_ptr_factory_.GetWeakPtr(), 102 weak_ptr_factory_.GetWeakPtr(),
87 callback, 103 callback,
88 base::Owned(success), 104 base::Owned(success),
89 base::Passed(contacts.Pass()))); 105 base::Passed(contacts.Pass()),
106 base::Passed(metadata.Pass())));
90 } 107 }
91 108
92 ContactDatabase::~ContactDatabase() { 109 ContactDatabase::~ContactDatabase() {
93 DCHECK(IsRunByTaskRunner()); 110 DCHECK(IsRunByTaskRunner());
94 } 111 }
95 112
96 bool ContactDatabase::IsRunByTaskRunner() const { 113 bool ContactDatabase::IsRunByTaskRunner() const {
97 return BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread(); 114 return BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread();
98 } 115 }
99 116
(...skipping 10 matching lines...) Expand all
110 127
111 void ContactDatabase::RunSaveCallback(SaveCallback callback, 128 void ContactDatabase::RunSaveCallback(SaveCallback callback,
112 const bool* success) { 129 const bool* success) {
113 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 130 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
114 callback.Run(*success); 131 callback.Run(*success);
115 } 132 }
116 133
117 void ContactDatabase::RunLoadCallback( 134 void ContactDatabase::RunLoadCallback(
118 LoadCallback callback, 135 LoadCallback callback,
119 const bool* success, 136 const bool* success,
120 scoped_ptr<ScopedVector<Contact> > contacts) { 137 scoped_ptr<ScopedVector<Contact> > contacts,
138 scoped_ptr<UpdateMetadata> metadata) {
121 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 139 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
122 callback.Run(*success, contacts.Pass()); 140 callback.Run(*success, contacts.Pass(), metadata.Pass());
123 } 141 }
124 142
125 void ContactDatabase::InitFromTaskRunner(const FilePath& database_dir, 143 void ContactDatabase::InitFromTaskRunner(const FilePath& database_dir,
126 bool* success) { 144 bool* success) {
127 DCHECK(IsRunByTaskRunner()); 145 DCHECK(IsRunByTaskRunner());
128 DCHECK(success); 146 DCHECK(success);
129 VLOG(1) << "Opening " << database_dir.value(); 147 VLOG(1) << "Opening " << database_dir.value();
130 148
131 *success = false; 149 *success = false;
132 150
(...skipping 21 matching lines...) Expand all
154 file_util::Delete(database_dir, true); 172 file_util::Delete(database_dir, true);
155 delete_and_retry_on_corruption = false; 173 delete_and_retry_on_corruption = false;
156 } else { 174 } else {
157 break; 175 break;
158 } 176 }
159 } 177 }
160 } 178 }
161 179
162 void ContactDatabase::SaveContactsFromTaskRunner( 180 void ContactDatabase::SaveContactsFromTaskRunner(
163 scoped_ptr<ContactPointers> contacts, 181 scoped_ptr<ContactPointers> contacts,
182 scoped_ptr<UpdateMetadata> metadata,
164 bool is_full_update, 183 bool is_full_update,
165 bool* success) { 184 bool* success) {
166 DCHECK(IsRunByTaskRunner()); 185 DCHECK(IsRunByTaskRunner());
167 DCHECK(success); 186 DCHECK(success);
168 VLOG(1) << "Saving " << contacts->size() << " contact(s) to database as " 187 VLOG(1) << "Saving " << contacts->size() << " contact(s) to database as "
169 << (is_full_update ? "full" : "partial") << " update"; 188 << (is_full_update ? "full" : "partial") << " update";
170 189
171 *success = false; 190 *success = false;
172 191
173 // If we're doing a full update, find all of the existing keys first so we can 192 // If we're doing a full update, find all of the existing keys first so we can
174 // delete ones that aren't present in the new set of contacts. 193 // delete ones that aren't present in the new set of contacts.
175 std::set<std::string> keys_to_delete; 194 std::set<std::string> keys_to_delete;
176 if (is_full_update) { 195 if (is_full_update) {
177 leveldb::ReadOptions options; 196 leveldb::ReadOptions options;
178 scoped_ptr<leveldb::Iterator> db_iterator(db_->NewIterator(options)); 197 scoped_ptr<leveldb::Iterator> db_iterator(db_->NewIterator(options));
179 db_iterator->SeekToFirst(); 198 db_iterator->SeekToFirst();
180 while (db_iterator->Valid()) { 199 while (db_iterator->Valid()) {
181 keys_to_delete.insert(db_iterator->key().ToString()); 200 std::string key = db_iterator->key().ToString();
201 if (key != kUpdateMetadataKey)
202 keys_to_delete.insert(key);
182 db_iterator->Next(); 203 db_iterator->Next();
183 } 204 }
184 } 205 }
185 206
186 // TODO(derat): Serializing all of the contacts and so we can write them in a 207 // TODO(derat): Serializing all of the contacts and so we can write them in a
187 // single batch may be expensive, memory-wise. Consider writing them in 208 // single batch may be expensive, memory-wise. Consider writing them in
188 // several batches instead. (To avoid using partial writes in the event of a 209 // several batches instead. (To avoid using partial writes in the event of a
189 // crash, maybe add a dummy "write completed" contact that's removed in the 210 // crash, maybe add a dummy "write completed" contact that's removed in the
190 // first batch and added in the last.) 211 // first batch and added in the last.)
191 leveldb::WriteBatch updates; 212 leveldb::WriteBatch updates;
192 for (ContactPointers::const_iterator it = contacts->begin(); 213 for (ContactPointers::const_iterator it = contacts->begin();
193 it != contacts->end(); ++it) { 214 it != contacts->end(); ++it) {
194 const contacts::Contact& contact = **it; 215 const contacts::Contact& contact = **it;
216 if (contact.provider_id() == kUpdateMetadataKey) {
217 LOG(WARNING) << "Skipping contact with reserved ID "
218 << contact.provider_id();
219 continue;
220 }
195 updates.Put(leveldb::Slice(contact.provider_id()), 221 updates.Put(leveldb::Slice(contact.provider_id()),
196 leveldb::Slice(contact.SerializeAsString())); 222 leveldb::Slice(contact.SerializeAsString()));
197 keys_to_delete.erase(contact.provider_id()); 223 if (is_full_update)
224 keys_to_delete.erase(contact.provider_id());
198 } 225 }
199 226
200 for (std::set<std::string>::const_iterator it = keys_to_delete.begin(); 227 for (std::set<std::string>::const_iterator it = keys_to_delete.begin();
201 it != keys_to_delete.end(); ++it) { 228 it != keys_to_delete.end(); ++it) {
202 updates.Delete(leveldb::Slice(*it)); 229 updates.Delete(leveldb::Slice(*it));
203 } 230 }
204 231
232 updates.Put(leveldb::Slice(kUpdateMetadataKey),
233 leveldb::Slice(metadata->SerializeAsString()));
234
205 leveldb::WriteOptions options; 235 leveldb::WriteOptions options;
206 options.sync = true; 236 options.sync = true;
207 leveldb::Status status = db_->Write(options, &updates); 237 leveldb::Status status = db_->Write(options, &updates);
208 if (status.ok()) 238 if (status.ok())
209 *success = true; 239 *success = true;
210 else 240 else
211 LOG(WARNING) << "Failed writing contacts: " << status.ToString(); 241 LOG(WARNING) << "Failed writing contacts: " << status.ToString();
212 } 242 }
213 243
214 void ContactDatabase::LoadContactsFromTaskRunner( 244 void ContactDatabase::LoadContactsFromTaskRunner(
215 bool* success, 245 bool* success,
216 ScopedVector<Contact>* contacts_out) { 246 ScopedVector<Contact>* contacts,
247 UpdateMetadata* metadata) {
217 DCHECK(IsRunByTaskRunner()); 248 DCHECK(IsRunByTaskRunner());
218 DCHECK(success); 249 DCHECK(success);
219 DCHECK(contacts_out); 250 DCHECK(contacts);
251 DCHECK(metadata);
220 252
221 *success = false; 253 *success = false;
222 contacts_out->clear(); 254 contacts->clear();
255 metadata->Clear();
223 256
224 leveldb::ReadOptions options; 257 leveldb::ReadOptions options;
225 scoped_ptr<leveldb::Iterator> db_iterator(db_->NewIterator(options)); 258 scoped_ptr<leveldb::Iterator> db_iterator(db_->NewIterator(options));
226 db_iterator->SeekToFirst(); 259 db_iterator->SeekToFirst();
227 while (db_iterator->Valid()) { 260 while (db_iterator->Valid()) {
228 scoped_ptr<Contact> contact(new Contact);
229 leveldb::Slice value_slice = db_iterator->value(); 261 leveldb::Slice value_slice = db_iterator->value();
230 if (!contact->ParseFromArray(value_slice.data(), value_slice.size())) { 262
231 LOG(WARNING) << "Unable to parse contact " 263 if (db_iterator->key().ToString() == kUpdateMetadataKey) {
232 << db_iterator->key().ToString(); 264 if (!metadata->ParseFromArray(value_slice.data(), value_slice.size())) {
233 return; 265 LOG(WARNING) << "Unable to parse metadata";
266 return;
267 }
268 } else {
269 scoped_ptr<Contact> contact(new Contact);
270 if (!contact->ParseFromArray(value_slice.data(), value_slice.size())) {
271 LOG(WARNING) << "Unable to parse contact "
272 << db_iterator->key().ToString();
273 return;
274 }
275 contacts->push_back(contact.release());
234 } 276 }
235 contacts_out->push_back(contact.release());
236 db_iterator->Next(); 277 db_iterator->Next();
237 } 278 }
238 279
239 *success = true; 280 *success = true;
240 } 281 }
241 282
242 } // namespace contacts 283 } // namespace contacts
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/contacts/contact_database.h ('k') | chrome/browser/chromeos/contacts/contact_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698