Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 415757 ? RemovePagesFromHost could delete wrong items/annotation (r=dietrich, a=schrep)

Browse Source
This commit is contained in:
dietrich@mozilla.com 2008-02-08 14:13:29 -08:00
parent 588f30c270
commit 6eb4098d75
4 changed files with 224 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/components/places/public/nsIBrowserHistory.idl
View File

@ -90,6 +90,8 @@ interface nsIBrowserHistory : nsIGlobalHistory2
* Remove all pages from the given host.
* If aEntireDomain is true, will assume aHost is a domain,
* and remove all pages from the entire domain.
* Notice that this does not call observers for single deleted uris,
* instead it will send Begin/EndUpdateBatch
*/
void removePagesFromHost(in AUTF8String aHost, in boolean aEntireDomain);

213
toolkit/components/places/src/nsNavHistory.cpp
View File

@ -3098,42 +3098,26 @@ nsNavHistory::GetCount(PRUint32 *aCount)
}
// nsNavHistory::RemovePages
// nsNavHistory::RemovePagesInternal
//
// Removes a bunch of uris from history.
// Has better performance than RemovePage when deleting a lot of history.
// Notice that this function does not call the onDeleteURI observers,
// instead, if aDoBatchNotify is true, we call OnBegin/EndUpdateBatch.
// We don't do duplicates removal, URIs array should be cleaned-up before.
// Deletes a list of placeIds from history.
// This is an internal method used by RemovePages and RemovePagesFromHost.
// Takes a comma separated list of place ids.
// This method does not do any observer notification.
NS_IMETHODIMP
nsNavHistory::RemovePages(nsIURI **aURIs, PRUint32 aLength, PRBool aDoBatchNotify)
nsresult
nsNavHistory::RemovePagesInternal(const nsCString& aPlaceIdsQueryString)
{
// build a list of place ids to delete
nsCString deletePlaceIdsQueryString;
nsresult rv;
for (PRInt32 i = 0; i < aLength; i++) {
PRInt64 placeId;
rv = GetUrlIdFor(aURIs[i], &placeId, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
if (placeId != 0) {
if (!deletePlaceIdsQueryString.IsEmpty())
deletePlaceIdsQueryString.AppendLiteral(",");
deletePlaceIdsQueryString.AppendInt(placeId);
}
}
// early return if there is nothing to delete
if (deletePlaceIdsQueryString.IsEmpty())
if (aPlaceIdsQueryString.IsEmpty())
return NS_OK;
mozStorageTransaction transaction(mDBConn, PR_FALSE);
nsCOMPtr<mozIStorageStatement> statement;
// delete all visits
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
nsresult rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"DELETE FROM moz_historyvisits WHERE place_id IN (") +
deletePlaceIdsQueryString +
aPlaceIdsQueryString +
NS_LITERAL_CSTRING(")"));
NS_ENSURE_SUCCESS(rv, rv);
@ -3148,7 +3132,7 @@ nsNavHistory::RemovePages(nsIURI **aURIs, PRUint32 aLength, PRBool aDoBatchNotif
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"DELETE FROM moz_places WHERE id IN ("
"SELECT h.id FROM moz_places h WHERE h.id IN (") +
deletePlaceIdsQueryString +
aPlaceIdsQueryString +
NS_LITERAL_CSTRING(") AND "
"NOT EXISTS (SELECT b.id FROM moz_bookmarks b WHERE b.fk = h.id) AND "
"NOT EXISTS (SELECT a.id FROM moz_annos a WHERE a.place_id = h.id))"));
@ -3161,22 +3145,51 @@ nsNavHistory::RemovePages(nsIURI **aURIs, PRUint32 aLength, PRBool aDoBatchNotif
// query to figure out which places to recalculate frecency first.
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"UPDATE moz_places SET frecency = -1 WHERE id IN(") +
deletePlaceIdsQueryString +
aPlaceIdsQueryString +
NS_LITERAL_CSTRING(")"));
NS_ENSURE_SUCCESS(rv, rv);
// placeId could have a livemark item, so setting the frecency to -1
// would cause it to show up in the url bar autocomplete
// call FixInvalidFrecenciesForExcludedPlaces() to handle that scenario
// XXX this might be dog slow, further degrading delete perf.
rv = FixInvalidFrecenciesForExcludedPlaces();
NS_ENSURE_SUCCESS(rv, rv);
// XXX todo
// forcibly call the "on idle" timer here to do a little work
// but the rest will happen on idle.
rv = transaction.Commit();
// but the rest will happen on idle.
return transaction.Commit();
}
// nsNavHistory::RemovePages
//
// Removes a bunch of uris from history.
// Has better performance than RemovePage when deleting a lot of history.
// Notice that this function does not call the onDeleteURI observers,
// instead, if aDoBatchNotify is true, we call OnBegin/EndUpdateBatch.
// We don't do duplicates removal, URIs array should be cleaned-up before.
NS_IMETHODIMP
nsNavHistory::RemovePages(nsIURI **aURIs, PRUint32 aLength, PRBool aDoBatchNotify)
{
nsresult rv;
// build a list of place ids to delete
nsCString deletePlaceIdsQueryString;
for (PRInt32 i = 0; i < aLength; i++) {
PRInt64 placeId;
rv = GetUrlIdFor(aURIs[i], &placeId, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
if (placeId != 0) {
if (!deletePlaceIdsQueryString.IsEmpty())
deletePlaceIdsQueryString.AppendLiteral(",");
deletePlaceIdsQueryString.AppendInt(placeId);
}
}
rv = RemovePagesInternal(deletePlaceIdsQueryString);
NS_ENSURE_SUCCESS(rv, rv);
// force a full refresh calling onEndUpdateBatch (will call Refresh())
@ -3215,16 +3228,12 @@ nsNavHistory::RemovePage(nsIURI *aURI)
//
// Silently fails if we have no knowledge of the host.
//
// This function is actually pretty simple, it just boils down to a DELETE
// statement, but is made complex due to the observers and the two types of
// similar delete operations that we need to support.
// This sends onBeginUpdateBatch/onEndUpdateBatch to observers
NS_IMETHODIMP
nsNavHistory::RemovePagesFromHost(const nsACString& aHost, PRBool aEntireDomain)
{
nsresult rv;
mozStorageTransaction transaction(mDBConn, PR_FALSE);
// Local files don't have any host name. We don't want to delete all files in
// history when we get passed an empty string, so force to exact match
if (aHost.IsEmpty())
@ -3252,37 +3261,19 @@ nsNavHistory::RemovePagesFromHost(const nsACString& aHost, PRBool aEntireDomain)
revHostSlash.Truncate(revHostSlash.Length() - 1);
revHostSlash.Append(NS_LITERAL_STRING("/"));
// how we are selecting host names
// build condition string based on host selection type
nsCAutoString conditionString;
if (aEntireDomain)
conditionString.AssignLiteral("h.rev_host >= ?1 AND h.rev_host < ?2 ");
else
conditionString.AssignLiteral("h.rev_host = ?1 ");
// Tell the observers about the non-hidden items we are about to delete.
// Since this is a two-step process, if we get an error, we may tell them we
// will delete something but then not actually delete it. Too bad.
//
// Note also that we *include* bookmarked items here. We generally want to
// send out delete notifications for bookmarked items since in general,
// deleting the visits (like we always do) will cause the item to disappear
// from history views. This will also cause all visit dates to be deleted,
// which affects many bookmark views
// is bookmarked?
conditionString.AppendLiteral("AND (b.type = ?3 OR b.id IS NULL) ");
// has EXPIRES_NEVER annotations?
conditionString.AppendLiteral("AND (a.expiration = ?4 OR a.id IS NULL) ");
nsCOMPtr<mozIStorageStatement> statement;
// create statement depending on delete type
nsCAutoString getURIsForDeletion = NS_LITERAL_CSTRING(
"SELECT h.id, h.url, b.id, a.id FROM moz_places h "
"LEFT OUTER JOIN moz_bookmarks b ON h.id = b.fk "
"LEFT OUTER JOIN moz_annos a ON h.id = a.place_id WHERE ") +
conditionString;
nsCOMPtr<mozIStorageStatement> statement;
rv = mDBConn->CreateStatement(getURIsForDeletion, getter_AddRefs(statement));
rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
"SELECT h.id FROM moz_places h WHERE ") +
conditionString, getter_AddRefs(statement));
NS_ENSURE_SUCCESS(rv, rv);
rv = statement->BindStringParameter(0, revHostDot);
NS_ENSURE_SUCCESS(rv, rv);
@ -3290,110 +3281,24 @@ nsNavHistory::RemovePagesFromHost(const nsACString& aHost, PRBool aEntireDomain)
rv = statement->BindStringParameter(1, revHostSlash);
NS_ENSURE_SUCCESS(rv, rv);
}
rv = statement->BindInt32Parameter(2, nsNavBookmarks::TYPE_BOOKMARK);
NS_ENSURE_SUCCESS(rv, rv);
rv = statement->BindInt32Parameter(3, nsIAnnotationService::EXPIRE_NEVER);
NS_ENSURE_SUCCESS(rv, rv);
nsCAutoString deletedPlaceIds;
nsCAutoString deletedPlaceIdsBookmarked;
nsCAutoString deletedPlaceIdsWithAnno;
nsCStringArray deletedURIs;
nsCString hostPlaceIds;
PRBool hasMore = PR_FALSE;
while ((statement->ExecuteStep(&hasMore) == NS_OK) && hasMore) {
nsCAutoString thisURIString;
if (NS_FAILED(statement->GetUTF8String(1, thisURIString)) ||
thisURIString.IsEmpty())
continue; // no URI
if (!deletedURIs.AppendCString(thisURIString))
return NS_ERROR_OUT_OF_MEMORY;
if (!deletedPlaceIds.IsEmpty())
deletedPlaceIds.AppendLiteral(", ");
if (!hostPlaceIds.IsEmpty())
hostPlaceIds.AppendLiteral(",");
PRInt64 placeId;
rv = statement->GetInt64(0, &placeId);
NS_ENSURE_SUCCESS(rv, rv);
deletedPlaceIds.AppendInt(placeId);
if (statement->AsInt64(2)) {
if (!deletedPlaceIdsBookmarked.IsEmpty())
deletedPlaceIdsBookmarked.AppendLiteral(", ");
deletedPlaceIdsBookmarked.AppendInt(placeId);
}
if (statement->AsInt64(3)) {
if (!deletedPlaceIdsWithAnno.IsEmpty())
deletedPlaceIdsWithAnno.AppendLiteral(", ");
deletedPlaceIdsWithAnno.AppendInt(placeId);
}
hostPlaceIds.AppendInt(placeId);
}
// first, delete all the visits
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"DELETE FROM moz_historyvisits WHERE place_id IN (") +
deletedPlaceIds + NS_LITERAL_CSTRING(")"));
rv = RemovePagesInternal(hostPlaceIds);
NS_ENSURE_SUCCESS(rv, rv);
// delete annotations (except EXPIRE_NEVER)
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"DELETE FROM moz_annos WHERE place_id NOT IN (") +
deletedPlaceIdsWithAnno + NS_LITERAL_CSTRING(")"));
NS_ENSURE_SUCCESS(rv, rv);
// force a full refresh calling onEndUpdateBatch (will call Refresh())
UpdateBatchScoper batch(*this); // sends Begin/EndUpdateBatch to observers
// finally, delete the actual moz_places records that are
// - not bookmarked
// - do not have EXPIRE_NEVER annotations
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"DELETE FROM moz_places WHERE id IN (") + deletedPlaceIds +
NS_LITERAL_CSTRING(") AND id NOT IN (") + deletedPlaceIdsBookmarked +
NS_LITERAL_CSTRING(") AND id NOT IN (") + deletedPlaceIdsWithAnno +
NS_LITERAL_CSTRING(")"));
NS_ENSURE_SUCCESS(rv, rv);
// reset the frecency for the places we did not delete. Note, we don't
// reset the visit_count, as we use that in our "on idle"
// query to figure out which places to recalcuate frecency first.
if (!deletedPlaceIdsBookmarked.IsEmpty() ||
!deletedPlaceIdsWithAnno.IsEmpty()) {
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
"UPDATE moz_places SET frecency = -1 WHERE id IN (") +
deletedPlaceIdsBookmarked +
NS_LITERAL_CSTRING(") OR id IN (") + deletedPlaceIdsWithAnno +
NS_LITERAL_CSTRING(")"));
NS_ENSURE_SUCCESS(rv, rv);
// the places could be livemark items, so setting the frecency to -1
// would cause them show up in the url bar autocomplete
// call FixInvalidFrecenciesForExcludedPlaces() to handle that scenario
rv = FixInvalidFrecenciesForExcludedPlaces();
NS_ENSURE_SUCCESS(rv, rv);
// XXX todo
// forcibly call the "on idle" timer here to do a little work
// but the rest will happen on idle.
}
transaction.Commit();
// notify observers
UpdateBatchScoper batch(*this); // sends Begin/EndUpdateBatch to obsrvrs.
if (deletedURIs.Count()) {
nsCOMPtr<nsIURI> thisURI;
for (PRUint32 observerIndex = 0; observerIndex < mObservers.Length();
observerIndex ++) {
const nsCOMPtr<nsINavHistoryObserver> &obs = mObservers.ElementAt(observerIndex);
if (! obs)
continue;
// send it all the URIs
for (PRInt32 i = 0; i < deletedURIs.Count(); i ++) {
if (NS_FAILED(NS_NewURI(getter_AddRefs(thisURI), *deletedURIs[i],
nsnull, nsnull)))
continue; // bad URI
obs->OnDeleteURI(thisURI);
}
}
}
return NS_OK;
}

2
toolkit/components/places/src/nsNavHistory.h
View File

@ -468,6 +468,8 @@ protected:
nsresult InitMemDB();
#endif
nsresult RemovePagesInternal(const nsCString& aPlaceIdsQueryString);
nsresult AddURIInternal(nsIURI* aURI, PRTime aTime, PRBool aRedirect,
PRBool aToplevel, nsIURI* aReferrer);

161
toolkit/components/places/tests/unit/test_415757.js Normal file
View File

@ -0,0 +1,161 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et: */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Google Inc.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Marco Bonardo <mak77@supereva.it>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
// Get global history service
try {
var bhist = Cc["@mozilla.org/browser/global-history;2"]
.getService(Ci.nsIBrowserHistory);
} catch(ex) {
do_throw("Could not get history service\n");
}
// Get history service
try {
var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"]
.getService(Ci.nsINavHistoryService);
} catch(ex) {
do_throw("Could not get history service\n");
}
// Get annotation service
try {
var annosvc = Cc["@mozilla.org/browser/annotation-service;1"]
.getService(Ci.nsIAnnotationService);
} catch(ex) {
do_throw("Could not get annotation service\n");
}
/**
* Checks to see that a URI is in the database.
*
* @param aURI
* The URI to check.
* @returns true if the URI is in the DB, false otherwise.
*/
function uri_in_db(aURI) {
var options = histsvc.getNewQueryOptions();
options.maxResults = 1;
options.resultType = options.RESULTS_AS_URI
var query = histsvc.getNewQuery();
query.uri = aURI;
var result = histsvc.executeQuery(query, options);
var root = result.root;
root.containerOpen = true;
return (root.childCount == 1);
}
const TOTAL_SITES = 20;
// main
function run_test() {
// add pages to global history
try {
for (var i = 0; i < TOTAL_SITES; i++) {
let site = "http://www.test-" + i + ".com/";
let testURI = uri(site);
let when = Date.now() * 1000 + (i * TOTAL_SITES);
histsvc.addVisit(testURI, when, null, histsvc.TRANSITION_TYPED, false, 0);
}
for (var i = 0; i < TOTAL_SITES; i++) {
let site = "http://www.test.com/" + i + "/";
let testURI = uri(site);
let when = Date.now() * 1000 + (i * TOTAL_SITES);
histsvc.addVisit(testURI, when, null, histsvc.TRANSITION_TYPED, false, 0);
}
} catch(ex) {
do_throw("addPageWithDetails failed");
}
// set a page annotation on one of the urls that will be removed
var testAnnoDeletedURI = uri("http://www.test.com/1/");
var testAnnoDeletedName = "foo";
var testAnnoDeletedValue = "bar";
try {
annosvc.setPageAnnotation(testAnnoDeletedURI, testAnnoDeletedName,
testAnnoDeletedValue, 0,
annosvc.EXPIRE_WITH_HISTORY);
} catch(ex) {
do_throw("setPageAnnotation failed");
}
// set a page annotation on one of the urls that will NOT be removed
var testAnnoRetainedURI = uri("http://www.test-1.com/");
var testAnnoRetainedName = "foo";
var testAnnoRetainedValue = "bar";
try {
annosvc.setPageAnnotation(testAnnoRetainedURI, testAnnoRetainedName,
testAnnoRetainedValue, 0,
annosvc.EXPIRE_WITH_HISTORY);
} catch(ex) {
do_throw("setPageAnnotation failed");
}
// remove pages from www.test.com
bhist.removePagesFromHost("www.test.com", false);
// check that all pages in www.test.com have been removed
for (var i = 0; i < TOTAL_SITES; i++) {
let site = "http://www.test.com/" + i + "/";
let testURI = uri(site);
do_check_false(uri_in_db(testURI));
}
// check that all pages in www.test-X.com have NOT been removed
for (var i = 0; i < TOTAL_SITES; i++) {
let site = "http://www.test-" + i + ".com/";
let testURI = uri(site);
do_check_true(uri_in_db(testURI));
}
// check that annotation on the removed item does not exists
try {
annosvc.getPageAnnotation(testAnnoDeletedURI, testAnnoName);
do_throw("fetching page-annotation that doesn't exist, should've thrown");
} catch(ex) {}
// check that annotation on the NOT removed item still exists
try {
var annoVal = annosvc.getPageAnnotation(testAnnoRetainedURI,
testAnnoRetainedName);
} catch(ex) {
do_throw("The annotation has been removed erroneously");
}
do_check_eq(annoVal, testAnnoRetainedValue);
}