Proof of concept implementation of context based history filtering.

components/history/core/browser/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 "components/history/core/browser/visit_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 18 matching lines @@
   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.
-        "visit_duration INTEGER DEFAULT 0 NOT NULL)"))
+        "visit_duration INTEGER DEFAULT 0 NOT NULL,"
+        "context INTEGER DEFAULT 0 NOT NULL)"))
       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("
@@ skipping 34 matching lines @@
 // 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 = ui::PageTransitionFromInt(statement.ColumnInt(4));
   visit->segment_id = statement.ColumnInt64(5);
   visit->visit_duration =
       base::TimeDelta::FromInternalValue(statement.ColumnInt64(6));
+  visit->context = static_cast<HistoryContext>(statement.ColumnInt(7));
 }
 
 // static
 bool VisitDatabase::FillVisitVector(sql::Statement& statement,
                                     VisitVector* visits) {
   if (!statement.is_valid())
     return false;
 
   while (statement.Step()) {
     VisitRow visit;
@@ skipping 34 matching lines @@
       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 (?,?,?,?,?,?)"));
+      "visit_duration, context) 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.BindInt(6, static_cast<int>(visit->context));
 
   if (!statement.Run()) {
     DVLOG(0) << "Failed to execute visit insert statement:  "
              << "url_id = " << visit->url_id;
     return 0;
   }
-
   visit->visit_id = GetDB().GetLastInsertRowId();
 
   if (source != SOURCE_BROWSED) {
     // Record the source of this visit when it is not browsed.
     sql::Statement statement1(GetDB().GetCachedStatement(SQL_FROM_HERE,
         "INSERT INTO visit_source (id, source) VALUES (?,?)"));
     statement1.BindInt64(0, visit->visit_id);
     statement1.BindInt64(1, source);
 
     if (!statement1.Run()) {
@@ skipping 52 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=?,"
-      "visit_duration=? WHERE id=?"));
+      "visit_duration=?, context=? 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.BindInt(6, visit.context);
+  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 "
@@ skipping 92 matching lines @@
       max_results ? max_results : std::numeric_limits<int64>::max());
 
   return FillVisitVector(statement, visits);
 }
 
 bool VisitDatabase::GetVisibleVisitsInRange(const QueryOptions& options,
                                             VisitVector* visits) {
   visits->clear();
   // The visit_time values can be duplicated in a redirect chain, so we sort
   // by id too, to ensure a consistent ordering just in case.
+  if (static_cast<int>(options.context) < 1 || static_cast<int>(options.context) > 5) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits "
       "WHERE visit_time >= ? AND visit_time < ? "
       "AND (transition & ?) != 0 "  // CHAIN_END
       "AND (transition & ?) NOT IN (?, ?, ?) "  // NO SUBFRAME or
                                                 // KEYWORD_GENERATED
       "ORDER BY visit_time DESC, id DESC"));
-
   statement.BindInt64(0, options.EffectiveBeginTime());
   statement.BindInt64(1, options.EffectiveEndTime());
   statement.BindInt(2, ui::PAGE_TRANSITION_CHAIN_END);
   statement.BindInt(3, ui::PAGE_TRANSITION_CORE_MASK);
   statement.BindInt(4, ui::PAGE_TRANSITION_AUTO_SUBFRAME);
   statement.BindInt(5, ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
   statement.BindInt(6, ui::PAGE_TRANSITION_KEYWORD_GENERATED);
-
   return FillVisitVectorWithOptions(statement, options, visits);
+} else {
+  sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
+      "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits "
+      "WHERE visit_time >= ? AND visit_time < ? AND context == ? "
+      "AND (transition & ?) != 0 "  // CHAIN_END
+      "AND (transition & ?) NOT IN (?, ?, ?) "  // NO SUBFRAME or
+                                                // KEYWORD_GENERATED
+      "ORDER BY visit_time DESC, id DESC"));
+  statement.BindInt64(0, options.EffectiveBeginTime());
+  statement.BindInt64(1, options.EffectiveEndTime());
+  statement.BindInt(2, static_cast<int>(options.context));
+  statement.BindInt(3, ui::PAGE_TRANSITION_CHAIN_END);
+  statement.BindInt(4, ui::PAGE_TRANSITION_CORE_MASK);
+  statement.BindInt(5, ui::PAGE_TRANSITION_AUTO_SUBFRAME);
+  statement.BindInt(6, ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
+  statement.BindInt(7, ui::PAGE_TRANSITION_KEYWORD_GENERATED);
+  return FillVisitVectorWithOptions(statement, options, visits);
+}
 }
 
 void VisitDatabase::GetDirectVisitsDuringTimes(const VisitFilter& time_filter,
                                                 int max_results,
                                                 VisitVector* visits) {
   visits->clear();
   if (max_results)
     visits->reserve(max_results);
   for (VisitFilter::TimeVector::const_iterator it = time_filter.times().begin();
        it != time_filter.times().end(); ++it) {
@@ skipping 212 matching lines @@
     // Old versions don't have the visit_duration column, we modify the table
     // to add that field.
     if (!GetDB().Execute("ALTER TABLE visits "
         "ADD COLUMN visit_duration INTEGER DEFAULT 0 NOT NULL"))
       return false;
   }
   return true;
 }
 
 }  // namespace history