Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1839)

Unified Diff: chrome/browser/history/visit_database.cc

Issue 16951015: Remove TextDatabase from the history service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@replace_fts
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/history/visit_database.cc
diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc
index d87e12738ea2e493076a082d116dc89b68b01b7f..8785f402555f413c8b0a6dd758d49773e307565b 100644
--- a/chrome/browser/history/visit_database.cc
+++ b/chrome/browser/history/visit_database.cc
@@ -34,7 +34,7 @@ bool VisitDatabase::InitVisitTable() {
"from_visit INTEGER,"
"transition INTEGER DEFAULT 0 NOT NULL,"
"segment_id INTEGER,"
- // True when we have indexed data for this visit.
+ // TODO(rmcilroy): remove unused is_indexed field.
Scott Hess - ex-Googler 2013/06/14 19:39:56 Removing involves copying the entire table over.
rmcilroy 2013/06/17 14:11:49 Ack.
"is_indexed BOOLEAN,"
"visit_duration INTEGER DEFAULT 0 NOT NULL)"))
return false;
@@ -98,7 +98,6 @@ void VisitDatabase::FillVisitRow(sql::Statement& statement, VisitRow* visit) {
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(7));
}
@@ -154,15 +153,14 @@ bool VisitDatabase::FillVisitVectorWithOptions(sql::Statement& statement,
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, is_indexed, "
- "visit_duration) VALUES (?,?,?,?,?,?,?)"));
+ "(url, visit_time, from_visit, transition, segment_id, "
+ "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->is_indexed);
- statement.BindInt64(6, visit->visit_duration.ToInternalValue());
+ statement.BindInt64(5, visit->visit_duration.ToInternalValue());
if (!statement.Run()) {
VLOG(0) << "Failed to execute visit insert statement: "
@@ -241,16 +239,15 @@ bool VisitDatabase::UpdateVisitRow(const VisitRow& visit) {
sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
"UPDATE visits SET "
- "url=?,visit_time=?,from_visit=?,transition=?,segment_id=?,is_indexed=?,"
+ "url=?,visit_time=?,from_visit=?,transition=?,segment_id=?,"
"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.is_indexed);
- statement.BindInt64(6, visit.visit_duration.ToInternalValue());
- statement.BindInt64(7, visit.visit_id);
+ statement.BindInt64(5, visit.visit_duration.ToInternalValue());
+ statement.BindInt64(6, visit.visit_id);
return statement.Run();
}
@@ -267,17 +264,6 @@ bool VisitDatabase::GetVisitsForURL(URLID url_id, VisitVector* visits) {
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) {

Powered by Google App Engine
This is Rietveld 408576698