wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 422491 - Optimize AwesomeBar if it finished searching and found fewer than maxResults. r=dietrich, a1.9=mconnor, a1.9b5=mconnor

Browse Source
This commit is contained in:
edward.lee@engineering.uiuc.edu 2008-03-22 23:33:44 -07:00
parent 0643e29f3c
commit 40e623ce1c
2 changed files with 102 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,6 +651,7 @@ protected:
static const PRInt32 kAutoCompleteIndex_BookmarkTitle;
static const PRInt32 kAutoCompleteIndex_Tags;
nsCOMPtr<mozIStorageStatement> mDBAutoCompleteQuery; // kAutoCompleteIndex_* results
nsCOMPtr<mozIStorageStatement> mDBPreviousQuery; // kAutoCompleteIndex_* results
nsCOMPtr<mozIStorageStatement> mDBAdaptiveQuery; // kAutoCompleteIndex_* results
nsCOMPtr<mozIStorageStatement> mDBFeedbackIncrease;
@ -685,6 +686,7 @@ protected:
nsDataHashtable<nsStringHashKey, PRBool> mLivemarkFeedURIs;
nsresult AutoCompleteFullHistorySearch(PRBool* aHasMoreResults);
nsresult AutoCompletePreviousSearch();
nsresult AutoCompleteAdaptiveSearch();
/**

126
toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
View File

@ -79,6 +79,26 @@
#define NS_AUTOCOMPLETESIMPLERESULT_CONTRACTID \
"@mozilla.org/autocomplete/simple-result;1"
// Helper to get a particular column with a desired name from the bookmark and
// tags table based on if we want to include tags or not
#define SQL_STR_FRAGMENT_GET_BOOK_TAG(name, column, comparison, getMostRecent) \
NS_LITERAL_CSTRING(", (" \
"SELECT " column " " \
"FROM moz_bookmarks b " \
"JOIN moz_bookmarks t ON t.id = b.parent AND t.parent " comparison " ?1 " \
"WHERE b.type = ") + nsPrintfCString("%d", \
nsINavBookmarksService::TYPE_BOOKMARK) + \
NS_LITERAL_CSTRING(" AND b.fk = h.id") + \
(getMostRecent ? NS_LITERAL_CSTRING(" " \
"ORDER BY b.lastModified DESC LIMIT 1") : EmptyCString()) + \
NS_LITERAL_CSTRING(") " name)
// Get three named columns from the bookmarks and tags table
const nsCString &kBookTagSQL =
SQL_STR_FRAGMENT_GET_BOOK_TAG("parent", "b.parent", "!=", PR_TRUE) +
SQL_STR_FRAGMENT_GET_BOOK_TAG("bookmark", "b.title", "!=", PR_TRUE) +
SQL_STR_FRAGMENT_GET_BOOK_TAG("tags", "GROUP_CONCAT(t.title, ',')", "=", PR_FALSE);
////////////////////////////////////////////////////////////////////////////////
//// nsNavHistoryAutoComplete Helper Functions
@ -91,6 +111,25 @@ StartsWithJS(const nsAString &aString)
return StringBeginsWith(aString, NS_LITERAL_STRING("javascript:"));
}
/**
* Callback function for putting URLs from a nsDataHashtable<nsStringHashKey,
* PRBool> into a nsStringArray.
*
* @param aKey
* The hashtable entry's key (the url)
* @param aData
* Unused data
* @param aArg
* The nsStringArray pointer for collecting URLs
*/
PLDHashOperator
HashedURLsToArray(const nsAString &aKey, PRBool aData, void *aArg)
{
// Append the current url to the array of urls
static_cast<nsStringArray *>(aArg)->AppendString(aKey);
return PL_DHASH_NEXT;
}
/**
* Returns true if the unicode character is a word boundary. I.e., anything
* that *isn't* used to build up a word from a string of characters. We are
@ -206,28 +245,8 @@ nsNavHistory::InitAutoComplete()
nsresult
nsNavHistory::CreateAutoCompleteQueries()
{
// Helper to get a particular column from the bookmark/tags table based on if
// we want to include tags or not
#define SQL_STR_FRAGMENT_GET_BOOK_TAG(column, comparison, getMostRecent) \
NS_LITERAL_CSTRING( \
"(SELECT " column " " \
"FROM moz_bookmarks b " \
"JOIN moz_bookmarks t ON t.id = b.parent AND t.parent " comparison " ?1 " \
"WHERE b.type = ") + nsPrintfCString("%d", \
nsINavBookmarksService::TYPE_BOOKMARK) + \
NS_LITERAL_CSTRING(" AND b.fk = h.id") + \
(getMostRecent ? NS_LITERAL_CSTRING(" " \
"ORDER BY b.lastModified DESC LIMIT 1), ") : NS_LITERAL_CSTRING("), "))
// This gets three columns from the bookmarks and tags table followed by ", "
const nsCString &bookTag =
SQL_STR_FRAGMENT_GET_BOOK_TAG("b.parent", "!=", PR_TRUE) +
SQL_STR_FRAGMENT_GET_BOOK_TAG("b.title", "!=", PR_TRUE) +
SQL_STR_FRAGMENT_GET_BOOK_TAG("GROUP_CONCAT(t.title, ' ')", "=", PR_FALSE);
nsCString sql = NS_LITERAL_CSTRING(
"SELECT h.url, h.title, f.url, ") + bookTag +
NS_LITERAL_CSTRING("NULL "
"SELECT h.url, h.title, f.url") + kBookTagSQL + NS_LITERAL_CSTRING(" "
"FROM moz_places h "
"LEFT OUTER JOIN moz_favicons f ON f.id = h.favicon_id "
"WHERE h.frecency <> 0 ");
@ -244,13 +263,12 @@ nsNavHistory::CreateAutoCompleteQueries()
// which is better than nothing. but this is slow, so not doing it yet.
sql += NS_LITERAL_CSTRING(
"ORDER BY h.frecency DESC LIMIT ?2 OFFSET ?3");
nsresult rv = mDBConn->CreateStatement(sql,
getter_AddRefs(mDBAutoCompleteQuery));
NS_ENSURE_SUCCESS(rv, rv);
sql = NS_LITERAL_CSTRING(
"SELECT h.url, h.title, f.url, ") + bookTag + NS_LITERAL_CSTRING(
"SELECT h.url, h.title, f.url") + kBookTagSQL + NS_LITERAL_CSTRING(", "
"ROUND(MAX(((i.input = ?2) + (SUBSTR(i.input, 1, LENGTH(?2)) = ?2)) * "
"i.use_count), 1) rank "
"FROM moz_inputhistory i "
@ -321,8 +339,14 @@ nsNavHistory::PerformAutoComplete()
}
PRBool moreChunksToSearch = PR_FALSE;
rv = AutoCompleteFullHistorySearch(&moreChunksToSearch);
NS_ENSURE_SUCCESS(rv, rv);
// If we constructed a previous search query, use it instead of full
if (mDBPreviousQuery) {
rv = AutoCompletePreviousSearch();
NS_ENSURE_SUCCESS(rv, rv);
} else {
rv = AutoCompleteFullHistorySearch(&moreChunksToSearch);
NS_ENSURE_SUCCESS(rv, rv);
}
// Only search more chunks if there are more and we need more results
moreChunksToSearch &= !AutoCompleteHasEnoughResults();
@ -424,7 +448,43 @@ nsNavHistory::StartSearch(const nsAString & aSearchString,
DoneSearching(PR_TRUE);
return NS_OK;
} else {
// We must have more than 0 but fewer than the max results, so create an
// optimized query that only looks at these urls
nsCString sql = NS_LITERAL_CSTRING(
"SELECT h.url, h.title, f.url") + kBookTagSQL + NS_LITERAL_CSTRING(" "
"FROM moz_places h "
"LEFT OUTER JOIN moz_favicons f ON f.id = h.favicon_id "
"WHERE h.url IN (");
// Put in bind spots for the urls
for (PRUint32 i = 0; i < prevMatchCount; i++) {
if (i)
sql += NS_LITERAL_CSTRING(",");
// +2 to skip over the ?1 for the tag root parameter
sql += nsPrintfCString("?%d", i + 2);
}
sql += NS_LITERAL_CSTRING(") "
"ORDER BY h.frecency DESC");
rv = mDBConn->CreateStatement(sql, getter_AddRefs(mDBPreviousQuery));
NS_ENSURE_SUCCESS(rv, rv);
// Collect the previous result's URLs that we want to process
nsStringArray urls;
(void)mCurrentResultURLs.EnumerateRead(HashedURLsToArray, &urls);
// Bind the parameters right away. We can only use the query once.
for (PRUint32 i = 0; i < prevMatchCount; i++) {
rv = mDBPreviousQuery->BindStringParameter(i + 1, *urls[i]);
NS_ENSURE_SUCCESS(rv, rv);
}
}
} else {
// Clear out any previous result queries
mDBPreviousQuery = nsnull;
}
mAutoCompleteFinishedSearch = PR_FALSE;
@ -475,7 +535,6 @@ nsNavHistory::StopSearch()
if (mAutoCompleteTimer)
mAutoCompleteTimer->Cancel();
mCurrentSearchString.Truncate();
DoneSearching(PR_FALSE);
return NS_OK;
@ -529,6 +588,21 @@ nsNavHistory::AutoCompleteAdaptiveSearch()
return NS_OK;
}
nsresult
nsNavHistory::AutoCompletePreviousSearch()
{
nsresult rv = mDBPreviousQuery->BindInt32Parameter(0, GetTagsFolder());
NS_ENSURE_SUCCESS(rv, rv);
rv = AutoCompleteProcessSearch(mDBPreviousQuery, QUERY_FULL);
NS_ENSURE_SUCCESS(rv, rv);
// Don't use this query more than once
mDBPreviousQuery = nsnull;
return NS_OK;
}
// nsNavHistory::AutoCompleteFullHistorySearch
//
// Search for places that have a title, url,