mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-05 12:05:22 +00:00
Bug 492797 - hasHistoryEntries should cache the value instead of hitting the db every time (r=marco)
This commit is contained in:
parent
88f8ea266e
commit
38c09e9028
@ -398,6 +398,7 @@ nsNavHistory::nsNavHistory()
|
|||||||
, mDatabaseStatus(DATABASE_STATUS_OK)
|
, mDatabaseStatus(DATABASE_STATUS_OK)
|
||||||
, mCanNotify(true)
|
, mCanNotify(true)
|
||||||
, mCacheObservers("history-observers")
|
, mCacheObservers("history-observers")
|
||||||
|
, mHasHistoryEntries(-1)
|
||||||
{
|
{
|
||||||
#ifdef LAZY_ADD
|
#ifdef LAZY_ADD
|
||||||
mLazyTimerSet = PR_TRUE;
|
mLazyTimerSet = PR_TRUE;
|
||||||
@ -2470,6 +2471,12 @@ nsNavHistory::GetHasHistoryEntries(PRBool* aHasEntries)
|
|||||||
NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
|
NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
|
||||||
NS_ENSURE_ARG_POINTER(aHasEntries);
|
NS_ENSURE_ARG_POINTER(aHasEntries);
|
||||||
|
|
||||||
|
// Use cached value if it's been set
|
||||||
|
if (mHasHistoryEntries != -1) {
|
||||||
|
*aHasEntries = (mHasHistoryEntries == 1);
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
|
||||||
nsCOMPtr<mozIStorageStatement> dbSelectStatement;
|
nsCOMPtr<mozIStorageStatement> dbSelectStatement;
|
||||||
nsresult rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
|
nsresult rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
|
||||||
"SELECT 1 "
|
"SELECT 1 "
|
||||||
@ -2477,7 +2484,11 @@ nsNavHistory::GetHasHistoryEntries(PRBool* aHasEntries)
|
|||||||
"OR EXISTS (SELECT id FROM moz_historyvisits LIMIT 1)"),
|
"OR EXISTS (SELECT id FROM moz_historyvisits LIMIT 1)"),
|
||||||
getter_AddRefs(dbSelectStatement));
|
getter_AddRefs(dbSelectStatement));
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
return dbSelectStatement->ExecuteStep(aHasEntries);
|
rv = dbSelectStatement->ExecuteStep(aHasEntries);
|
||||||
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
|
mHasHistoryEntries = *aHasEntries ? 1 : 0;
|
||||||
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
@ -4370,7 +4381,7 @@ nsNavHistory::GetCount(PRUint32 *aCount)
|
|||||||
nsresult
|
nsresult
|
||||||
nsNavHistory::RemovePagesInternal(const nsCString& aPlaceIdsQueryString)
|
nsNavHistory::RemovePagesInternal(const nsCString& aPlaceIdsQueryString)
|
||||||
{
|
{
|
||||||
// early return if there is nothing to delete
|
// Return early if there is nothing to delete.
|
||||||
if (aPlaceIdsQueryString.IsEmpty())
|
if (aPlaceIdsQueryString.IsEmpty())
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
||||||
@ -4379,7 +4390,7 @@ nsNavHistory::RemovePagesInternal(const nsCString& aPlaceIdsQueryString)
|
|||||||
nsresult rv = PreparePlacesForVisitsDelete(aPlaceIdsQueryString);
|
nsresult rv = PreparePlacesForVisitsDelete(aPlaceIdsQueryString);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
// delete all visits
|
// Delete all visits for the specified place ids.
|
||||||
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
|
rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
|
||||||
"DELETE FROM moz_historyvisits_view WHERE place_id IN (") +
|
"DELETE FROM moz_historyvisits_view WHERE place_id IN (") +
|
||||||
aPlaceIdsQueryString +
|
aPlaceIdsQueryString +
|
||||||
@ -4389,6 +4400,9 @@ nsNavHistory::RemovePagesInternal(const nsCString& aPlaceIdsQueryString)
|
|||||||
rv = CleanupPlacesOnVisitsDelete(aPlaceIdsQueryString);
|
rv = CleanupPlacesOnVisitsDelete(aPlaceIdsQueryString);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
|
// Invalidate the cached value for whether there's history or not.
|
||||||
|
mHasHistoryEntries = -1;
|
||||||
|
|
||||||
return transaction.Commit();
|
return transaction.Commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4828,6 +4842,9 @@ nsNavHistory::RemoveVisitsByTimeframe(PRTime aBeginTime, PRTime aEndTime)
|
|||||||
rv = transaction.Commit();
|
rv = transaction.Commit();
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
|
// Invalidate the cached value for whether there's history or not.
|
||||||
|
mHasHistoryEntries = -1;
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4879,6 +4896,9 @@ nsNavHistory::RemoveAllPages()
|
|||||||
rv = transaction.Commit();
|
rv = transaction.Commit();
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
|
// Invalidate the cached value for whether there's history or not.
|
||||||
|
mHasHistoryEntries = -1;
|
||||||
|
|
||||||
// Expiration will take care of orphans.
|
// Expiration will take care of orphans.
|
||||||
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
|
||||||
nsINavHistoryObserver, OnClearHistory());
|
nsINavHistoryObserver, OnClearHistory());
|
||||||
@ -5510,6 +5530,9 @@ nsNavHistory::NotifyOnPageExpired(nsIURI *aURI, PRTime aVisitTime,
|
|||||||
nsINavHistoryObserver, OnDeleteVisits(aURI, aVisitTime));
|
nsINavHistoryObserver, OnDeleteVisits(aURI, aVisitTime));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Invalidate the cached value for whether there's history or not.
|
||||||
|
mHasHistoryEntries = -1;
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -687,6 +687,8 @@ protected:
|
|||||||
|
|
||||||
PRUint16 mDatabaseStatus;
|
PRUint16 mDatabaseStatus;
|
||||||
|
|
||||||
|
PRInt8 mHasHistoryEntries;
|
||||||
|
|
||||||
// Used to enable and disable the observer notifications
|
// Used to enable and disable the observer notifications
|
||||||
bool mCanNotify;
|
bool mCanNotify;
|
||||||
nsCategoryCache<nsINavHistoryObserver> mCacheObservers;
|
nsCategoryCache<nsINavHistoryObserver> mCacheObservers;
|
||||||
|
Loading…
Reference in New Issue
Block a user