Replace FTS in the history_service with a brute force text search.

chrome/browser/history/visit_database.cc

Index: chrome/browser/history/visit_database.cc
diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc
index 4ef7f21ca8e6b7a99379723cb57575e942f908fc..d87e12738ea2e493076a082d116dc89b68b01b7f 100644
--- a/chrome/browser/history/visit_database.cc
+++ b/chrome/browser/history/visit_database.cc
@@ -118,6 +118,39 @@ bool VisitDatabase::FillVisitVector(sql::Statement& statement,
   return statement.Succeeded();
 }
 
+// static
+bool VisitDatabase::FillVisitVectorWithOptions(sql::Statement& statement,
+                                               const QueryOptions& options,
+                                               VisitVector* visits) {
+  std::set<URLID> found_urls;

[brettw, 2013/06/18 23:26:28]

You just copied this code from GetVisibleVisitsInRange but in your new code you
query by ASC instead of DESC, and the duplicate management behavior will be
different in these two cases.

When you fix the REMOVE_ALL_DUPLICATES below, this function should probably be
defined to always take a DESC query (and it should specify this ordering in the
header) so the results are consistent.

[rmcilroy, 2013/06/19 10:30:14]

Good point.  I've updated the comment to state this should be a DESC query. Not
sure if you wanted any kind of check here in the function?

+
+  // Keeps track of the day that |found_urls| is holding the URLs for, in order
+  // to handle removing per-day duplicates.
+  base::Time found_urls_midnight;
+
+  while (statement.Step()) {
+    VisitRow visit;
+    FillVisitRow(statement, &visit);
+
+    if (options.duplicate_policy != QueryOptions::KEEP_ALL_DUPLICATES) {
+      if (options.duplicate_policy == QueryOptions::REMOVE_DUPLICATES_PER_DAY &&
+          found_urls_midnight != visit.visit_time.LocalMidnight()) {
+        found_urls.clear();
+        found_urls_midnight = visit.visit_time.LocalMidnight();
+      }
+      // Make sure the URL this visit corresponds to is unique.
+      if (found_urls.find(visit.url_id) != found_urls.end())
+        continue;
+      found_urls.insert(visit.url_id);
+    }
+
+    if (static_cast<int>(visits->size()) >= options.EffectiveMaxCount())
+      return true;
+    visits->push_back(visit);
+  }
+  return false;
+}
+
 VisitID VisitDatabase::AddVisit(VisitRow* visit, VisitSource source) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO visits "
@@ -245,6 +278,22 @@ bool VisitDatabase::GetIndexedVisitsForURL(URLID url_id, VisitVector* visits) {
   return FillVisitVector(statement, visits);
 }
 
+bool VisitDatabase::GetVisitsForURLWithOptions(URLID url_id,
+                                               const QueryOptions& options,
+                                               VisitVector* visits) {
+  visits->clear();
+
+  sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
+      "SELECT" HISTORY_VISIT_ROW_FIELDS
+      "FROM visits "
+      "WHERE url=? AND visit_time >= ? AND visit_time < ? "
+      "ORDER BY visit_time ASC"));
+  statement.BindInt64(0, url_id);
+  statement.BindInt64(1, options.EffectiveBeginTime());
+  statement.BindInt64(2, options.EffectiveEndTime());
+
+  return FillVisitVectorWithOptions(statement, options, visits);

[brettw, 2013/06/18 23:26:28]

This is a bit weird for the case where we set REMOVE_ALL_DUPLICATES. It makes a
query for all visits and then steps through them, eliminating all but the first
one as duplicates. Do we need a separate branch for REMOVE_ALL_DUPLICATES?

[rmcilroy, 2013/06/19 10:30:14]

Done.

+}
 
 bool VisitDatabase::GetVisitsForTimes(const std::vector<base::Time>& times,
                                       VisitVector* visits) {
@@ -333,33 +382,7 @@ bool VisitDatabase::GetVisibleVisitsInRange(const QueryOptions& options,
   statement.BindInt(5, content::PAGE_TRANSITION_MANUAL_SUBFRAME);
   statement.BindInt(6, content::PAGE_TRANSITION_KEYWORD_GENERATED);
 
-  std::set<URLID> found_urls;
-
-  // Keeps track of the day that |found_urls| is holding the URLs for, in order
-  // to handle removing per-day duplicates.
-  base::Time found_urls_midnight;
-
-  while (statement.Step()) {
-    VisitRow visit;
-    FillVisitRow(statement, &visit);
-
-    if (options.duplicate_policy != QueryOptions::KEEP_ALL_DUPLICATES) {
-      if (options.duplicate_policy == QueryOptions::REMOVE_DUPLICATES_PER_DAY &&
-          found_urls_midnight != visit.visit_time.LocalMidnight()) {
-        found_urls.clear();
-        found_urls_midnight = visit.visit_time.LocalMidnight();
-      }
-      // Make sure the URL this visit corresponds to is unique.
-      if (found_urls.find(visit.url_id) != found_urls.end())
-        continue;
-      found_urls.insert(visit.url_id);
-    }
-
-    if (static_cast<int>(visits->size()) >= options.EffectiveMaxCount())
-      return true;
-    visits->push_back(visit);
-  }
-  return false;
+  return FillVisitVectorWithOptions(statement, options, visits);
 }
 
 void VisitDatabase::GetDirectVisitsDuringTimes(const VisitFilter& time_filter,