summaryrefslogtreecommitdiffstats
path: root/chrome/browser/webdata/autocomplete_syncable_service.cc
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-27 20:32:10 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-27 20:32:10 +0000
commitefbd89cd06131ca00c1b7ea08755f287ec485625 (patch)
tree0813f95bc91799213b930b5d84c02ce8551b12a6 /chrome/browser/webdata/autocomplete_syncable_service.cc
parenteb0a2a8b81c49e8ad663f77fac2d32fbdfc4990e (diff)
downloadchromium_src-efbd89cd06131ca00c1b7ea08755f287ec485625.zip
chromium_src-efbd89cd06131ca00c1b7ea08755f287ec485625.tar.gz
chromium_src-efbd89cd06131ca00c1b7ea08755f287ec485625.tar.bz2
Revert 129097 - Cull autofill entries older than 60 days.
Tested with 20K Autocomplete entries selected 100000 times. 500 of them are in range. ---Start MergeDataAndStartSyncing for autofill Read from db - 7s Sift through them selecting only those needed for update - ~0.5s Process 476 changes - <1s ---End MergeDataAndStartSyncing for autofill - total ~8.5 s Callback back after deleting extra entries - 17s BUG=28990 TEST=unit-test Review URL: http://codereview.chromium.org/9585020 TBR=georgey@chromium.org Review URL: https://chromiumcodereview.appspot.com/9865036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata/autocomplete_syncable_service.cc')
-rw-r--r--chrome/browser/webdata/autocomplete_syncable_service.cc157
1 files changed, 35 insertions, 122 deletions
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc
index 6ec7048..3b3ecb1 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.cc
+++ b/chrome/browser/webdata/autocomplete_syncable_service.cc
@@ -29,54 +29,30 @@ const char kAutofillEntryNamespaceTag[] = "autofill_entry|";
// Merges timestamps from the |autofill| entry and |timestamps|. Returns
// true if they were different, false if they were the same.
// All of the timestamp vectors are assummed to be sorted, resulting vector is
-// sorted as well. Only two timestamps - the earliest and the latest are stored.
+// sorted as well.
bool MergeTimestamps(const sync_pb::AutofillSpecifics& autofill,
const std::vector<base::Time>& timestamps,
std::vector<base::Time>* new_timestamps) {
DCHECK(new_timestamps);
+ std::set<base::Time> timestamp_union(timestamps.begin(),
+ timestamps.end());
- new_timestamps->clear();
size_t timestamps_count = autofill.usage_timestamp_size();
- if (timestamps_count == 0 && timestamps.empty()) {
- return false;
- } else if (timestamps_count == 0) {
- new_timestamps->insert(new_timestamps->begin(),
- timestamps.begin(),
- timestamps.end());
- return true;
- } else if (timestamps.empty()) {
- new_timestamps->reserve(2);
- new_timestamps->push_back(base::Time::FromInternalValue(
- autofill.usage_timestamp(0)));
- if (timestamps_count > 1) {
- new_timestamps->push_back(base::Time::FromInternalValue(
- autofill.usage_timestamp(timestamps_count - 1)));
- }
- return true;
- } else {
- base::Time sync_time_begin = base::Time::FromInternalValue(
- autofill.usage_timestamp(0));
- base::Time sync_time_end = base::Time::FromInternalValue(
- autofill.usage_timestamp(timestamps_count - 1));
- if (timestamps.front() != sync_time_begin ||
- timestamps.back() != sync_time_end) {
- new_timestamps->push_back(
- timestamps.front() < sync_time_begin ? timestamps.front() :
- sync_time_begin);
- if (new_timestamps->back() != timestamps.back() ||
- new_timestamps->back() != sync_time_end) {
- new_timestamps->push_back(
- timestamps.back() > sync_time_end ? timestamps.back() :
- sync_time_end);
- }
- return true;
- } else {
- new_timestamps->insert(new_timestamps->begin(),
- timestamps.begin(),
- timestamps.end());
- return false;
+
+ bool different = timestamps.size() != timestamps_count;
+ for (size_t i = 0; i < timestamps_count; ++i) {
+ if (timestamp_union.insert(base::Time::FromInternalValue(
+ autofill.usage_timestamp(i))).second) {
+ different = true;
}
}
+
+ if (different) {
+ new_timestamps->insert(new_timestamps->begin(),
+ timestamp_union.begin(),
+ timestamp_union.end());
+ }
+ return different;
}
} // namespace
@@ -125,58 +101,24 @@ SyncError AutocompleteSyncableService::MergeDataAndStartSyncing(
sync_processor_ = sync_processor.Pass();
std::vector<AutofillEntry> new_synced_entries;
- std::vector<AutofillEntry> synced_expired_entries;
// Go through and check for all the entries that sync already knows about.
// CreateOrUpdateEntry() will remove entries that are same with the synced
// ones from |new_db_entries|.
for (SyncDataList::const_iterator sync_iter = initial_sync_data.begin();
sync_iter != initial_sync_data.end(); ++sync_iter) {
- CreateOrUpdateEntry(*sync_iter, &new_db_entries,
- &new_synced_entries, &synced_expired_entries);
+ CreateOrUpdateEntry(*sync_iter, &new_db_entries, &new_synced_entries);
}
- // Check if newly received items need culling.
- bool need_to_cull_data = !synced_expired_entries.empty();
-
if (!SaveChangesToWebData(new_synced_entries))
return SyncError(FROM_HERE, "Failed to update webdata.", model_type());
WebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
- keys_to_ignore_.clear();
SyncChangeList new_changes;
for (AutocompleteEntryMap::iterator i = new_db_entries.begin();
i != new_db_entries.end(); ++i) {
- // Sync back only the data that appeared after
- // |AutofillEntry::ExpirationTime()|.
- if (!i->second.second->IsExpired()) {
- new_changes.push_back(
- SyncChange(i->second.first, CreateSyncData(*(i->second.second))));
- } else {
- need_to_cull_data = true;
- // Key is not on the server and is too old, it will not ever be synced -
- // delete it locally.
- if (i->second.first == SyncChange::ACTION_ADD)
- keys_to_ignore_.insert(i->first);
- }
- }
-
- // Delete only the changes never synced to the db as they are too old.
- for (size_t i = 0; i < synced_expired_entries.size(); ++i) {
- // Key is on the server and not local and is too old, we need to notify
- // sync that it has expired.
- if (keys_to_ignore_.find(synced_expired_entries[i].key()) ==
- keys_to_ignore_.end()) {
- new_changes.push_back(SyncChange(SyncChange::ACTION_DELETE,
- CreateSyncData(synced_expired_entries[i])));
- }
- }
-
- if (need_to_cull_data) {
- // This will schedule deletion operation later on DB thread and we will
- // be notified on the results of the deletion and deletes will be synced to
- // the sync.
- web_data_service_->RemoveExpiredFormElements();
+ new_changes.push_back(
+ SyncChange(i->second.first, CreateSyncData(*(i->second.second))));
}
SyncError error = sync_processor_->ProcessSyncChanges(FROM_HERE, new_changes);
@@ -227,7 +169,6 @@ SyncError AutocompleteSyncableService::ProcessSyncChanges(
std::vector<AutofillEntry> entries;
scoped_ptr<AutocompleteEntryMap> db_entries;
std::vector<AutofillEntry> new_entries;
- std::vector<AutofillEntry> ignored_entries;
SyncError list_processing_error;
@@ -251,8 +192,7 @@ SyncError AutocompleteSyncableService::ProcessSyncChanges(
std::make_pair(SyncChange::ACTION_ADD, it);
}
}
- CreateOrUpdateEntry(i->sync_data(), db_entries.get(),
- &new_entries, &ignored_entries);
+ CreateOrUpdateEntry(i->sync_data(), db_entries.get(), &new_entries);
break;
case SyncChange::ACTION_DELETE: {
DCHECK(i->sync_data().GetSpecifics().has_autofill())
@@ -277,17 +217,6 @@ SyncError AutocompleteSyncableService::ProcessSyncChanges(
if (!SaveChangesToWebData(new_entries))
return SyncError(FROM_HERE, "Failed to update webdata.", model_type());
- // Remove already expired data.
- for (size_t i = 0; i < ignored_entries.size(); ++i) {
- if (db_entries.get() &&
- db_entries->find(ignored_entries[i].key()) != db_entries->end()) {
- bool success = web_data_service_->GetDatabase()->GetAutofillTable()->
- RemoveFormElement(ignored_entries[i].key().name(),
- ignored_entries[i].key().value());
- DCHECK(success);
- }
- }
-
WebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
return list_processing_error;
@@ -335,8 +264,7 @@ bool AutocompleteSyncableService::SaveChangesToWebData(
void AutocompleteSyncableService::CreateOrUpdateEntry(
const SyncData& data,
AutocompleteEntryMap* loaded_data,
- std::vector<AutofillEntry>* new_entries,
- std::vector<AutofillEntry>* ignored_entries) {
+ std::vector<AutofillEntry>* new_entries) {
const sync_pb::EntitySpecifics& specifics = data.GetSpecifics();
const sync_pb::AutofillSpecifics& autofill_specifics(
specifics.autofill());
@@ -354,20 +282,12 @@ void AutocompleteSyncableService::CreateOrUpdateEntry(
// New entry.
std::vector<base::Time> timestamps;
size_t timestamps_count = autofill_specifics.usage_timestamp_size();
- timestamps.reserve(2);
- if (timestamps_count) {
- timestamps.push_back(base::Time::FromInternalValue(
- autofill_specifics.usage_timestamp(0)));
+ timestamps.resize(timestamps_count);
+ for (size_t ts = 0; ts < timestamps_count; ++ts) {
+ timestamps[ts] = base::Time::FromInternalValue(
+ autofill_specifics.usage_timestamp(ts));
}
- if (timestamps_count > 1) {
- timestamps.push_back(base::Time::FromInternalValue(
- autofill_specifics.usage_timestamp(timestamps_count - 1)));
- }
- AutofillEntry new_entry(key, timestamps);
- if (new_entry.IsExpired())
- ignored_entries->push_back(new_entry);
- else
- new_entries->push_back(new_entry);
+ new_entries->push_back(AutofillEntry(key, timestamps));
} else {
// Entry already present - merge if necessary.
std::vector<base::Time> timestamps;
@@ -375,14 +295,11 @@ void AutocompleteSyncableService::CreateOrUpdateEntry(
autofill_specifics, it->second.second->timestamps(), &timestamps);
if (different) {
AutofillEntry new_entry(it->second.second->key(), timestamps);
- if (new_entry.IsExpired()) {
- ignored_entries->push_back(new_entry);
- } else {
- new_entries->push_back(new_entry);
- // Update the sync db if the list of timestamps have changed.
- *(it->second.second) = new_entry;
- it->second.first = SyncChange::ACTION_UPDATE;
- }
+ new_entries->push_back(new_entry);
+
+ // Update the sync db if the list of timestamps have changed.
+ *(it->second.second) = new_entry;
+ it->second.first = SyncChange::ACTION_UPDATE;
} else {
loaded_data->erase(it);
}
@@ -441,12 +358,10 @@ void AutocompleteSyncableService::ActOnChanges(
break;
}
case AutofillChange::REMOVE: {
- if (keys_to_ignore_.find(change->key()) == keys_to_ignore_.end()) {
- std::vector<base::Time> timestamps;
- AutofillEntry entry(change->key(), timestamps);
- new_changes.push_back(SyncChange(SyncChange::ACTION_DELETE,
- CreateSyncData(entry)));
- }
+ std::vector<base::Time> timestamps;
+ AutofillEntry entry(change->key(), timestamps);
+ new_changes.push_back(SyncChange(SyncChange::ACTION_DELETE,
+ CreateSyncData(entry)));
break;
}
default:
@@ -460,8 +375,6 @@ void AutocompleteSyncableService::ActOnChanges(
<< " Failed processing change:"
<< " Error:" << error.message();
}
- // |keys_to_ignore_| are only needed for the very first notification.
- keys_to_ignore_.clear();
}
SyncData AutocompleteSyncableService::CreateSyncData(
generated by cgit v1.1 at 2025-04-02 18:20:52 +0000