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 503360 - Better queries for asynchronous location bar

Browse Source 
This creates a better query based on what the asynchronous implementation of
AutoComplete does.  It also limits the amount of work to be done so we don't
filter more results than we have to (even if it is happening on a background thread).
r=sdwilsh
This commit is contained in:
Marco Bonardo 2009-07-13 12:19:16 -07:00
parent c2762f99e9
commit aafac8b5cd
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
toolkit/components/places/src/nsPlacesAutoComplete.js
View File

@ -105,11 +105,6 @@ const kQueryTypeFiltered = 1;
// "comment" back into the title and the tag.
const kTitleTagsSeparator = " \u2013 ";
// The list of columns in the moz_places table that we use in our queries.
const kMozPlacesColumns =
"id, url, title, rev_host, visit_count, hidden, typed, favicon_id, " +
"frecency, last_visit_date"
const kBrowserUrlbarBranch = "browser.urlbar.";
////////////////////////////////////////////////////////////////////////////////
@ -214,23 +209,24 @@ function nsPlacesAutoComplete()
// h.visit_count which is better than nothing. This is slow, so not doing it
// yet...
// Note: h.frecency is only selected because we need it for ordering.
const SQL_BASE =
"SELECT h.url, h.title, f.url, " + kBookTagSQLFragment + ", h.visit_count, " +
"h.typed, h.id, :query_type " +
"FROM ( " +
"SELECT " + kMozPlacesColumns + " FROM moz_places_temp " +
"UNION ALL " +
"SELECT " + kMozPlacesColumns + " FROM moz_places " +
"WHERE +id NOT IN (SELECT id FROM moz_places_temp) " +
"ORDER BY frecency DESC " +
") AS h " +
"LEFT OUTER JOIN moz_favicons f " +
"ON f.id = h.favicon_id " +
"WHERE h.frecency <> 0 " +
"AND AUTOCOMPLETE_MATCH(:searchString, h.url, IFNULL(bookmark, h.title), " +
"tags, h.visit_count, h.typed, parent, " +
":matchBehavior, :searchBehavior) " +
"{ADDITIONAL_CONDITIONS}";
function sql_base_fragment(aTableName) {
return "SELECT h.url, h.title, f.url, " + kBookTagSQLFragment + ", " +
"h.visit_count, h.typed, h.id, :query_type, h.frecency " +
"FROM " + aTableName + " h " +
"LEFT OUTER JOIN moz_favicons f ON f.id = h.favicon_id " +
"WHERE h.frecency <> 0 " +
"AND AUTOCOMPLETE_MATCH(:searchString, h.url, " +
"IFNULL(bookmark, h.title), tags, " +
"h.visit_count, h.typed, parent, " +
":matchBehavior, :searchBehavior) " +
"{ADDITIONAL_CONDITIONS} ";
}
const SQL_BASE = sql_base_fragment("moz_places_temp") +
"UNION ALL " +
sql_base_fragment("moz_places") +
"AND +h.id NOT IN (SELECT id FROM moz_places_temp) " +
"ORDER BY h.frecency DESC " +
"LIMIT :maxResults";
//////////////////////////////////////////////////////////////////////////////
//// Smart Getters
@ -809,6 +805,10 @@ nsPlacesAutoComplete.prototype = {
// We only want to search the tokens that we are left with - not the
// original search string.
params.searchString = aTokens.join(" ");
// Limit the query to the the maximum number of desired results.
// This way we can avoid doing more work than needed.
params.maxResults = this._maxRichResults;
}
return query;