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

Side by Side Diff: sync/test/test_directory_backing_store.cc

Issue 1008103002: Sync: Avoid 3 passes over SyncDarta DB when loading the directory from the disk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed CR feedback. Created 5 years, 9 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
« no previous file with comments | « sync/test/test_directory_backing_store.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "sync/test/test_directory_backing_store.h" 5 #include "sync/test/test_directory_backing_store.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 9
10 namespace syncer { 10 namespace syncer {
11 namespace syncable { 11 namespace syncable {
12 12
13 TestDirectoryBackingStore::TestDirectoryBackingStore( 13 TestDirectoryBackingStore::TestDirectoryBackingStore(
14 const std::string& dir_name, sql::Connection* db) 14 const std::string& dir_name, sql::Connection* db)
15 : DirectoryBackingStore(dir_name, db) { 15 : DirectoryBackingStore(dir_name, db) {
16 } 16 }
17 17
18 TestDirectoryBackingStore::~TestDirectoryBackingStore() { 18 TestDirectoryBackingStore::~TestDirectoryBackingStore() {
19 // This variant of the DirectoryBackingStore does not own its connection, so 19 // This variant of the DirectoryBackingStore does not own its connection, so
20 // we take care to not delete it here. 20 // we take care to not delete it here.
21 ignore_result(db_.release()); 21 ignore_result(db_.release());
22 } 22 }
23 23
24 DirOpenResult TestDirectoryBackingStore::Load( 24 DirOpenResult TestDirectoryBackingStore::Load(
25 Directory::MetahandlesMap* handles_map, 25 Directory::MetahandlesMap* handles_map,
26 JournalIndex* delete_journals, 26 JournalIndex* delete_journals,
27 MetahandleSet* metahandles_to_purge,
27 Directory::KernelLoadInfo* kernel_load_info) { 28 Directory::KernelLoadInfo* kernel_load_info) {
28 DCHECK(db_->is_open()); 29 DCHECK(db_->is_open());
29 30
30 if (!InitializeTables()) 31 if (!InitializeTables())
31 return FAILED_OPEN_DATABASE; 32 return FAILED_OPEN_DATABASE;
32 33
33 if (!DropDeletedEntries()) 34 if (!LoadEntries(handles_map, metahandles_to_purge))
34 return FAILED_DATABASE_CORRUPT;
35 if (!LoadEntries(handles_map))
36 return FAILED_DATABASE_CORRUPT; 35 return FAILED_DATABASE_CORRUPT;
37 if (!LoadDeleteJournals(delete_journals)) 36 if (!LoadDeleteJournals(delete_journals))
38 return FAILED_DATABASE_CORRUPT; 37 return FAILED_DATABASE_CORRUPT;
39 if (!LoadInfo(kernel_load_info)) 38 if (!LoadInfo(kernel_load_info))
40 return FAILED_DATABASE_CORRUPT; 39 return FAILED_DATABASE_CORRUPT;
41 if (!VerifyReferenceIntegrity(handles_map)) 40 if (!VerifyReferenceIntegrity(handles_map))
42 return FAILED_DATABASE_CORRUPT; 41 return FAILED_DATABASE_CORRUPT;
43 42
44 return OPENED; 43 return OPENED;
45 } 44 }
46 45
46 bool TestDirectoryBackingStore::DeleteEntries(const MetahandleSet& handles) {
47 return DirectoryBackingStore::DeleteEntries(
48 DirectoryBackingStore::METAS_TABLE, handles);
49 }
50
47 } // namespace syncable 51 } // namespace syncable
48 } // namespace syncer 52 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/test/test_directory_backing_store.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698