blob: f28a7dc3bd3ec7c33569b6be5aa30340545aab60 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
// Copyright (c) 2009 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.
#include "chrome/browser/sync/sessions/session_state.h"
#include <set>
#include <vector>
using std::set;
using std::vector;
namespace browser_sync {
namespace sessions {
IdToConflictSetMap::const_iterator ConflictProgress::IdToConflictSetFind(
const syncable::Id& the_id) const {
return id_to_conflict_set_.find(the_id);
}
IdToConflictSetMap::const_iterator
ConflictProgress::IdToConflictSetBegin() const {
return id_to_conflict_set_.begin();
}
IdToConflictSetMap::const_iterator
ConflictProgress::IdToConflictSetEnd() const {
return id_to_conflict_set_.end();
}
IdToConflictSetMap::size_type ConflictProgress::IdToConflictSetSize() const {
return id_to_conflict_set_.size();
}
const ConflictSet* ConflictProgress::IdToConflictSetGet(
const syncable::Id& the_id) {
return id_to_conflict_set_[the_id];
}
std::set<ConflictSet*>::const_iterator
ConflictProgress::ConflictSetsBegin() const {
return conflict_sets_.begin();
}
std::set<ConflictSet*>::const_iterator
ConflictProgress::ConflictSetsEnd() const {
return conflict_sets_.end();
}
std::set<ConflictSet*>::size_type
ConflictProgress::ConflictSetsSize() const {
return conflict_sets_.size();
}
std::set<syncable::Id>::iterator
ConflictProgress::ConflictingItemsBegin() {
return conflicting_item_ids_.begin();
}
std::set<syncable::Id>::const_iterator
ConflictProgress::ConflictingItemsBeginConst() const {
return conflicting_item_ids_.begin();
}
std::set<syncable::Id>::const_iterator
ConflictProgress::ConflictingItemsEnd() const {
return conflicting_item_ids_.end();
}
void ConflictProgress::AddConflictingItemById(const syncable::Id& the_id) {
std::pair<std::set<syncable::Id>::iterator, bool> ret =
conflicting_item_ids_.insert(the_id);
if (ret.second)
*dirty_ = true;
}
void ConflictProgress::EraseConflictingItemById(const syncable::Id& the_id) {
int items_erased = conflicting_item_ids_.erase(the_id);
if (items_erased != 0)
*dirty_ = true;
}
void ConflictProgress::MergeSets(const syncable::Id& id1,
const syncable::Id& id2) {
// There are no single item sets, we just leave those entries == 0
vector<syncable::Id>* set1 = id_to_conflict_set_[id1];
vector<syncable::Id>* set2 = id_to_conflict_set_[id2];
vector<syncable::Id>* rv = 0;
if (0 == set1 && 0 == set2) {
// Neither item currently has a set so we build one.
rv = new vector<syncable::Id>();
rv->push_back(id1);
if (id1 != id2) {
rv->push_back(id2);
} else {
LOG(WARNING) << "[BUG] Attempting to merge two identical conflict ids.";
}
conflict_sets_.insert(rv);
} else if (0 == set1) {
// Add the item to the existing set.
rv = set2;
rv->push_back(id1);
} else if (0 == set2) {
// Add the item to the existing set.
rv = set1;
rv->push_back(id2);
} else if (set1 == set2) {
// It's the same set already.
return;
} else {
// Merge the two sets.
rv = set1;
// Point all the second sets id's back to the first.
vector<syncable::Id>::iterator i;
for (i = set2->begin() ; i != set2->end() ; ++i) {
id_to_conflict_set_[*i] = rv;
}
// Copy the second set to the first.
rv->insert(rv->end(), set2->begin(), set2->end());
conflict_sets_.erase(set2);
delete set2;
}
id_to_conflict_set_[id1] = id_to_conflict_set_[id2] = rv;
}
void ConflictProgress::CleanupSets() {
// Clean up all the sets.
set<ConflictSet*>::iterator i;
for (i = conflict_sets_.begin(); i != conflict_sets_.end(); i++) {
delete *i;
}
conflict_sets_.clear();
id_to_conflict_set_.clear();
}
void UpdateProgress::AddVerifyResult(const VerifyResult& verify_result,
const sync_pb::SyncEntity& entity) {
verified_updates_.push_back(std::make_pair(verify_result, entity));
}
void UpdateProgress::AddAppliedUpdate(const UpdateAttemptResponse& response,
const syncable::Id& id) {
applied_updates_.push_back(std::make_pair(response, id));
}
std::vector<AppliedUpdate>::iterator UpdateProgress::AppliedUpdatesBegin() {
return applied_updates_.begin();
}
std::vector<VerifiedUpdate>::const_iterator
UpdateProgress::VerifiedUpdatesBegin() const {
return verified_updates_.begin();
}
std::vector<AppliedUpdate>::const_iterator
UpdateProgress::AppliedUpdatesEnd() const {
return applied_updates_.end();
}
std::vector<VerifiedUpdate>::const_iterator
UpdateProgress::VerifiedUpdatesEnd() const {
return verified_updates_.end();
}
int UpdateProgress::SuccessfullyAppliedUpdateCount() const {
int count = 0;
for (std::vector<AppliedUpdate>::const_iterator it =
applied_updates_.begin();
it != applied_updates_.end();
++it) {
if (it->first == SUCCESS)
count++;
}
return count;
}
// Returns true if at least one update application failed due to a conflict
// during this sync cycle.
bool UpdateProgress::HasConflictingUpdates() const {
std::vector<AppliedUpdate>::const_iterator it;
for (it = applied_updates_.begin(); it != applied_updates_.end(); ++it) {
if (it->first == CONFLICT) {
return true;
}
}
return false;
}
} // namespace sessions
} // namespace browser_sync
|
