corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1335974 - Add more error codes to URLCLASSIFIER_UPDATE_ERROR. r=francois

Browse Source 
MozReview-Commit-ID: AAd6Yu0AuUO
This commit is contained in:
Dimi Lee
2017-02-22 16:25:04 +08:00
parent 0e47a9fd3c
commit 7545e85763
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
toolkit/components/url-classifier/Classifier.cpp
View File

@@ -1113,7 +1113,7 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
const nsACString& aTable)
{
if (nsUrlClassifierDBService::ShutdownHasStarted()) {
return NS_ERROR_ABORT;
return NS_ERROR_UC_UPDATE_SHUTDOWNING;
}
LOG(("Classifier::UpdateHashStore(%s)", PromiseFlatCString(aTable).get()));
@@ -1133,7 +1133,7 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
LookupCacheV2* lookupCache =
LookupCache::Cast<LookupCacheV2>(GetLookupCacheForUpdate(store.TableName()));
if (!lookupCache) {
return NS_ERROR_FAILURE;
return NS_ERROR_UC_UPDATE_TABLE_NOT_FOUND;
}
// Clear cache when update
@@ -1193,13 +1193,13 @@ Classifier::UpdateHashStore(nsTArray<TableUpdate*>* aUpdates,
// At this point the store is updated and written out to disk, but
// the data is still in memory. Build our quick-lookup table here.
rv = lookupCache->Build(store.AddPrefixes(), store.AddCompletes());
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_UC_UPDATE_BUILD_PREFIX_FAILURE);
#if defined(DEBUG)
lookupCache->DumpCompletions();
#endif
rv = lookupCache->WriteFile();
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_UC_UPDATE_FAIL_TO_WRITE_DISK);
int64_t now = (PR_Now() / PR_USEC_PER_SEC);
LOG(("Successfully updated %s", store.TableName().get()));
@@ -1215,7 +1215,7 @@ Classifier::UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
MOZ_ASSERT(!NS_IsMainThread(),
"UpdateTableV4 must be called on the classifier worker thread.");
if (nsUrlClassifierDBService::ShutdownHasStarted()) {
return NS_ERROR_ABORT;
return NS_ERROR_UC_UPDATE_SHUTDOWNING;
}
LOG(("Classifier::UpdateTableV4(%s)", PromiseFlatCString(aTable).get()));
@@ -1227,7 +1227,7 @@ Classifier::UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
LookupCacheV4* lookupCache =
LookupCache::Cast<LookupCacheV4>(GetLookupCacheForUpdate(aTable));
if (!lookupCache) {
return NS_ERROR_FAILURE;
return NS_ERROR_UC_UPDATE_TABLE_NOT_FOUND;
}
nsresult rv = NS_OK;
@@ -1246,7 +1246,7 @@ Classifier::UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
}
auto updateV4 = TableUpdate::Cast<TableUpdateV4>(update);
NS_ENSURE_TRUE(updateV4, NS_ERROR_FAILURE);
NS_ENSURE_TRUE(updateV4, NS_ERROR_UC_UPDATE_TABLE_NOT_FOUND);
if (updateV4->IsFullUpdate()) {
input->Clear();
@@ -1286,15 +1286,15 @@ Classifier::UpdateTableV4(nsTArray<TableUpdate*>* aUpdates,
}
rv = lookupCache->Build(*output);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_UC_UPDATE_BUILD_PREFIX_FAILURE);
rv = lookupCache->WriteFile();
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_UC_UPDATE_FAIL_TO_WRITE_DISK);
if (lastAppliedUpdate) {
LOG(("Write meta data of the last applied update."));
rv = lookupCache->WriteMetadata(lastAppliedUpdate);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, NS_ERROR_UC_UPDATE_FAIL_TO_WRITE_DISK);
}