author | Grigory Kruglov <gkruglov@mozilla.com> |
Mon, 11 Jul 2016 09:17:24 -0700 | |
changeset 304912 | b50931952fbb76037bff76715e1f17f7fd80e34c |
parent 304911 | 3e1f197a8ebaad792fa1160831f15b3b70f9a305 |
child 304913 | 3e3b1eb03a908d02dac0bcb25c93eb8b734b5124 |
push id | 30446 |
push user | cbook@mozilla.com |
push date | Thu, 14 Jul 2016 09:44:34 +0000 |
treeherder | mozilla-central@cd9da00ffcc3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ahunt |
bugs | 1278301 |
milestone | 50.0a1 |
backs out | 5e2a5623088f114559c36a769dbea5cab6dc1e6a |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java | file | annotate | diff | comparison | revisions |
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java +++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java @@ -795,28 +795,26 @@ public class BrowserProvider extends Sha " LEFT OUTER JOIN " + " (SELECT position FROM numbers WHERE position NOT IN (SELECT " + Bookmarks.POSITION + " " + pinnedSitesFromClause + ")) AS free_ids" + " ON numbers.position > free_ids.position" + " GROUP BY numbers.position" + " ORDER BY numbers.position ASC" + " LIMIT " + suggestedGridLimit; // Filter out: unvisited pages (history_id == -1) pinned (and other special) sites, deleted sites, - // pages which weren't visited locally, and about: pages. + // and about: pages. final String ignoreForTopSitesWhereClause = "(" + Combined.HISTORY_ID + " IS NOT -1)" + " AND " + Combined.URL + " NOT IN (SELECT " + Bookmarks.URL + " FROM bookmarks WHERE " + DBUtils.qualifyColumn("bookmarks", Bookmarks.PARENT) + " < " + Bookmarks.FIXED_ROOT_ID + " AND " + DBUtils.qualifyColumn("bookmarks", Bookmarks.IS_DELETED) + " == 0)" + " AND " + - "(" + Combined.URL + " NOT LIKE ?)" + - " AND " + - "(" + Combined.LOCAL_VISITS_COUNT + " > 0)"; + "(" + Combined.URL + " NOT LIKE ?)"; final String[] ignoreForTopSitesArgs = new String[] { AboutPages.URL_FILTER }; // Stuff the suggested sites into SQL: this allows us to filter pinned and topsites out of the suggested // sites list as part of the final query (as opposed to walking cursors in java) final SuggestedSites suggestedSites = GeckoProfile.get(getContext(), uri.getQueryParameter(BrowserContract.PARAM_PROFILE)).getDB().getSuggestedSites();