Revert 212459 "Remove TextDatabase from the history service."

trunk/src/chrome/browser/history/visit_database.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/history/visit_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 16 matching lines @@
 
 bool VisitDatabase::InitVisitTable() {
   if (!GetDB().DoesTableExist("visits")) {
     if (!GetDB().Execute("CREATE TABLE visits("
         "id INTEGER PRIMARY KEY,"
         "url INTEGER NOT NULL," // key of the URL this corresponds to
         "visit_time INTEGER NOT NULL,"
         "from_visit INTEGER,"
         "transition INTEGER DEFAULT 0 NOT NULL,"
         "segment_id INTEGER,"
-        // Some old DBs may have an "is_indexed" field here, but this is no
-        // longer used and should NOT be read or written from any longer.
+        // True when we have indexed data for this visit.
+        "is_indexed BOOLEAN,"
         "visit_duration INTEGER DEFAULT 0 NOT NULL)"))
       return false;
+  } else if (!GetDB().DoesColumnExist("visits", "is_indexed")) {
+    // Old versions don't have the is_indexed column, we can just add that and
+    // not worry about different database revisions, since old ones will
+    // continue to work.
+    //
+    // TODO(brettw) this should be removed once we think everybody has been
+    // updated (added early Mar 2008).
+    if (!GetDB().Execute("ALTER TABLE visits ADD COLUMN is_indexed BOOLEAN"))
+      return false;
   }
 
   // Visit source table contains the source information for all the visits. To
   // save space, we do not record those user browsed visits which would be the
   // majority in this table. Only other sources are recorded.
   // Due to the tight relationship between visit_source and visits table, they
   // should be created and dropped at the same time.
   if (!GetDB().DoesTableExist("visit_source")) {
     if (!GetDB().Execute("CREATE TABLE visit_source("
                          "id INTEGER PRIMARY KEY,source INTEGER NOT NULL)"))
@@ skipping 31 matching lines @@
 
 // Must be in sync with HISTORY_VISIT_ROW_FIELDS.
 // static
 void VisitDatabase::FillVisitRow(sql::Statement& statement, VisitRow* visit) {
   visit->visit_id = statement.ColumnInt64(0);
   visit->url_id = statement.ColumnInt64(1);
   visit->visit_time = base::Time::FromInternalValue(statement.ColumnInt64(2));
   visit->referring_visit = statement.ColumnInt64(3);
   visit->transition = content::PageTransitionFromInt(statement.ColumnInt(4));
   visit->segment_id = statement.ColumnInt64(5);
+  visit->is_indexed = !!statement.ColumnInt(6);
   visit->visit_duration =
-      base::TimeDelta::FromInternalValue(statement.ColumnInt64(6));
+      base::TimeDelta::FromInternalValue(statement.ColumnInt64(7));
 }
 
 // static
 bool VisitDatabase::FillVisitVector(sql::Statement& statement,
                                     VisitVector* visits) {
   if (!statement.is_valid())
     return false;
 
   while (statement.Step()) {
     history::VisitRow visit;
@@ skipping 33 matching lines @@
     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 "
-      "(url, visit_time, from_visit, transition, segment_id, "
-      "visit_duration) VALUES (?,?,?,?,?,?)"));
+      "(url, visit_time, from_visit, transition, segment_id, is_indexed, "
+      "visit_duration) VALUES (?,?,?,?,?,?,?)"));
   statement.BindInt64(0, visit->url_id);
   statement.BindInt64(1, visit->visit_time.ToInternalValue());
   statement.BindInt64(2, visit->referring_visit);
   statement.BindInt64(3, visit->transition);
   statement.BindInt64(4, visit->segment_id);
-  statement.BindInt64(5, visit->visit_duration.ToInternalValue());
+  statement.BindInt64(5, visit->is_indexed);
+  statement.BindInt64(6, visit->visit_duration.ToInternalValue());
 
   if (!statement.Run()) {
     VLOG(0) << "Failed to execute visit insert statement:  "
             << "url_id = " << visit->url_id;
     return 0;
   }
 
   visit->visit_id = GetDB().GetLastInsertRowId();
 
   if (source != SOURCE_BROWSED) {
@@ skipping 58 matching lines @@
 }
 
 bool VisitDatabase::UpdateVisitRow(const VisitRow& visit) {
   // Don't store inconsistent data to the database.
   DCHECK_NE(visit.visit_id, visit.referring_visit);
   if (visit.visit_id == visit.referring_visit)
     return false;
 
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "UPDATE visits SET "
-      "url=?,visit_time=?,from_visit=?,transition=?,segment_id=?,"
+      "url=?,visit_time=?,from_visit=?,transition=?,segment_id=?,is_indexed=?,"
       "visit_duration=? WHERE id=?"));
   statement.BindInt64(0, visit.url_id);
   statement.BindInt64(1, visit.visit_time.ToInternalValue());
   statement.BindInt64(2, visit.referring_visit);
   statement.BindInt64(3, visit.transition);
   statement.BindInt64(4, visit.segment_id);
-  statement.BindInt64(5, visit.visit_duration.ToInternalValue());
-  statement.BindInt64(6, visit.visit_id);
+  statement.BindInt64(5, visit.is_indexed);
+  statement.BindInt64(6, visit.visit_duration.ToInternalValue());
+  statement.BindInt64(7, visit.visit_id);
 
   return statement.Run();
 }
 
 bool VisitDatabase::GetVisitsForURL(URLID url_id, VisitVector* visits) {
   visits->clear();
 
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" HISTORY_VISIT_ROW_FIELDS
       "FROM visits "
       "WHERE url=? "
       "ORDER BY visit_time ASC"));
   statement.BindInt64(0, url_id);
   return FillVisitVector(statement, visits);
 }
 
+bool VisitDatabase::GetIndexedVisitsForURL(URLID url_id, VisitVector* visits) {
+  visits->clear();
+
+  sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
+      "SELECT" HISTORY_VISIT_ROW_FIELDS
+      "FROM visits "
+      "WHERE url=? AND is_indexed=1"));
+  statement.BindInt64(0, url_id);
+  return FillVisitVector(statement, visits);
+}
+
 bool VisitDatabase::GetVisitsForURLWithOptions(URLID url_id,
                                                const QueryOptions& options,
                                                VisitVector* visits) {
   visits->clear();
 
   if (options.REMOVE_ALL_DUPLICATES) {
     VisitRow visit_row;
     VisitID visit_id = GetMostRecentVisitForURL(url_id, &visit_row);
     if (visit_id && options.EffectiveMaxCount() != 0) {
       visits->push_back(visit_row);
@@ skipping 348 matching lines @@
   while (statement.Step()) {
     BriefVisitInfo info;
     info.url_id = statement.ColumnInt64(0);
     info.time = base::Time::FromInternalValue(statement.ColumnInt64(1));
     info.transition = content::PageTransitionFromInt(statement.ColumnInt(2));
     result_vector->push_back(info);
   }
 }
 
 }  // namespace history