diff options
Diffstat (limited to 'chrome/browser/history/visit_database.cc')
| -rw-r--r-- | chrome/browser/history/visit_database.cc | 296 |
1 files changed, 144 insertions, 152 deletions
diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc index 862d574..2f4b591 100644 --- a/chrome/browser/history/visit_database.cc +++ b/chrome/browser/history/visit_database.cc @@ -1,21 +1,21 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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> -#include "chrome/browser/history/visit_database.h" -#include "chrome/browser/history/visit_log.h" - +#include "app/sql/connection.h" +#include "app/sql/statement.h" #include "chrome/browser/history/url_database.h" +#include "chrome/browser/history/visit_log.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" -using base::Time; - // Rows, in order, of the visit table. #define HISTORY_VISIT_ROW_FIELDS \ " id,url,visit_time,from_visit,transition,segment_id,is_indexed " @@ -29,8 +29,8 @@ VisitDatabase::~VisitDatabase() { } bool VisitDatabase::InitVisitTable() { - if (!DoesSqliteTableExist(GetDB(), "visits")) { - if (sqlite3_exec(GetDB(), "CREATE TABLE visits(" + 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," @@ -38,64 +38,56 @@ bool VisitDatabase::InitVisitTable() { "transition INTEGER DEFAULT 0 NOT NULL," "segment_id INTEGER," // True when we have indexed data for this visit. - "is_indexed BOOLEAN)", - NULL, NULL, NULL) != SQLITE_OK) + "is_indexed BOOLEAN)")) return false; - } else if (!DoesSqliteColumnExist(GetDB(), "visits", - "is_indexed", "BOOLEAN")) { + } 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 (sqlite3_exec(GetDB(), - "ALTER TABLE visits ADD COLUMN is_indexed BOOLEAN", - NULL, NULL, NULL) != SQLITE_OK) + if (!GetDB().Execute("ALTER TABLE visits ADD COLUMN is_indexed BOOLEAN")) return false; } // Index over url so we can quickly find visits for a page. This will just // fail if it already exists and we'll ignore it. - sqlite3_exec(GetDB(), "CREATE INDEX visits_url_index ON visits (url)", - NULL, NULL, NULL); + GetDB().Execute("CREATE INDEX visits_url_index ON visits (url)"); // Create an index over from visits so that we can efficiently find // referrers and redirects. Ignore failures because it likely already exists. - sqlite3_exec(GetDB(), "CREATE INDEX visits_from_index ON visits (from_visit)", - NULL, NULL, NULL); + GetDB().Execute("CREATE INDEX visits_from_index ON visits (from_visit)"); // Create an index over time so that we can efficiently find the visits in a // given time range (most history views are time-based). Ignore failures // because it likely already exists. - sqlite3_exec(GetDB(), "CREATE INDEX visits_time_index ON visits (visit_time)", - NULL, NULL, NULL); + GetDB().Execute("CREATE INDEX visits_time_index ON visits (visit_time)"); return true; } bool VisitDatabase::DropVisitTable() { // This will also drop the indices over the table. - return sqlite3_exec(GetDB(), "DROP TABLE visits", NULL, NULL, NULL) == - SQLITE_OK; + return GetDB().Execute("DROP TABLE visits"); } // Must be in sync with HISTORY_VISIT_ROW_FIELDS. // static -void VisitDatabase::FillVisitRow(SQLStatement& statement, VisitRow* visit) { - visit->visit_id = statement.column_int64(0); - visit->url_id = statement.column_int64(1); - visit->visit_time = Time::FromInternalValue(statement.column_int64(2)); - visit->referring_visit = statement.column_int64(3); - visit->transition = PageTransition::FromInt(statement.column_int(4)); - visit->segment_id = statement.column_int64(5); - visit->is_indexed = !!statement.column_int(6); +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 = PageTransition::FromInt(statement.ColumnInt(4)); + visit->segment_id = statement.ColumnInt64(5); + visit->is_indexed = !!statement.ColumnInt(6); } // static -void VisitDatabase::FillVisitVector(SQLStatement& statement, +void VisitDatabase::FillVisitVector(sql::Statement& statement, VisitVector* visits) { - while (statement.step() == SQLITE_ROW) { + while (statement.Step()) { history::VisitRow visit; FillVisitRow(statement, &visit); visits->push_back(visit); @@ -103,62 +95,61 @@ void VisitDatabase::FillVisitVector(SQLStatement& statement, } VisitID VisitDatabase::AddVisit(VisitRow* visit) { - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "INSERT INTO visits " "(url, visit_time, from_visit, transition, segment_id, is_indexed) " - "VALUES (?,?,?,?,?,?)"); - if (!statement.is_valid()) + "VALUES (?,?,?,?,?,?)")); + if (!statement) return 0; - statement->bind_int64(0, visit->url_id); - statement->bind_int64(1, visit->visit_time.ToInternalValue()); - statement->bind_int64(2, visit->referring_visit); - statement->bind_int64(3, visit->transition); - statement->bind_int64(4, visit->segment_id); - statement->bind_int64(5, visit->is_indexed); + 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); AddEventToVisitLog(VisitLog::ADD_VISIT); - if (statement->step() != SQLITE_DONE) + if (!statement.Run()) return 0; - visit->visit_id = sqlite3_last_insert_rowid(GetDB()); + visit->visit_id = GetDB().GetLastInsertRowId(); return visit->visit_id; } void VisitDatabase::DeleteVisit(const VisitRow& visit) { // Patch around this visit. Any visits that this went to will now have their // "source" be the deleted visit's source. - SQLITE_UNIQUE_STATEMENT(update_chain, GetStatementCache(), - "UPDATE visits SET from_visit=? " - "WHERE from_visit=?"); - if (!update_chain.is_valid()) + sql::Statement update_chain(GetDB().GetCachedStatement(SQL_FROM_HERE, + "UPDATE visits SET from_visit=? WHERE from_visit=?")); + if (!update_chain) return; - update_chain->bind_int64(0, visit.referring_visit); - update_chain->bind_int64(1, visit.visit_id); + update_chain.BindInt64(0, visit.referring_visit); + update_chain.BindInt64(1, visit.visit_id); AddEventToVisitLog(VisitLog::UPDATE_VISIT); - update_chain->step(); + update_chain.Run(); // Now delete the actual visit. - SQLITE_UNIQUE_STATEMENT(del, GetStatementCache(), - "DELETE FROM visits WHERE id=?"); - if (!del.is_valid()) + sql::Statement del(GetDB().GetCachedStatement(SQL_FROM_HERE, + "DELETE FROM visits WHERE id=?")); + if (!del) return; - del->bind_int64(0, visit.visit_id); + del.BindInt64(0, visit.visit_id); AddEventToVisitLog(VisitLog::DELETE_VISIT); - del->step(); + del.Run(); } bool VisitDatabase::GetRowForVisit(VisitID visit_id, VisitRow* out_visit) { - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), - "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits WHERE id=?"); - if (!statement.is_valid()) + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, + "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits WHERE id=?")); + if (!statement) return false; - statement->bind_int64(0, visit_id); + statement.BindInt64(0, visit_id); AddEventToVisitLog(VisitLog::SELECT_VISIT); - if (statement->step() != SQLITE_ROW) + if (!statement.Step()) return false; - FillVisitRow(*statement, out_visit); + FillVisitRow(statement, out_visit); // We got a different visit than we asked for, something is wrong. DCHECK_EQ(visit_id, out_visit->visit_id); @@ -174,128 +165,130 @@ bool VisitDatabase::UpdateVisitRow(const VisitRow& visit) { if (visit.visit_id == visit.referring_visit) return false; - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "UPDATE visits SET " "url=?,visit_time=?,from_visit=?,transition=?,segment_id=?,is_indexed=? " - "WHERE id=?"); - if (!statement.is_valid()) + "WHERE id=?")); + if (!statement) return false; - statement->bind_int64(0, visit.url_id); - statement->bind_int64(1, visit.visit_time.ToInternalValue()); - statement->bind_int64(2, visit.referring_visit); - statement->bind_int64(3, visit.transition); - statement->bind_int64(4, visit.segment_id); - statement->bind_int64(5, visit.is_indexed); - statement->bind_int64(6, visit.visit_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_id); AddEventToVisitLog(VisitLog::UPDATE_VISIT); - return statement->step() == SQLITE_DONE; + return statement.Run(); } bool VisitDatabase::GetVisitsForURL(URLID url_id, VisitVector* visits) { visits->clear(); - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits " "WHERE url=? " - "ORDER BY visit_time ASC"); - if (!statement.is_valid()) + "ORDER BY visit_time ASC")); + if (!statement) return false; - statement->bind_int64(0, url_id); + statement.BindInt64(0, url_id); AddEventToVisitLog(VisitLog::SELECT_VISIT); - FillVisitVector(*statement, visits); + FillVisitVector(statement, visits); return true; } -void VisitDatabase::GetAllVisitsInRange(Time begin_time, Time end_time, +void VisitDatabase::GetAllVisitsInRange(base::Time begin_time, + base::Time end_time, int max_results, VisitVector* visits) { visits->clear(); - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits " "WHERE visit_time >= ? AND visit_time < ?" - "ORDER BY visit_time LIMIT ?"); - if (!statement.is_valid()) + "ORDER BY visit_time LIMIT ?")); + if (!statement) return; // See GetVisibleVisitsInRange for more info on how these times are bound. int64 end = end_time.ToInternalValue(); - statement->bind_int64(0, begin_time.ToInternalValue()); - statement->bind_int64(1, end ? end : std::numeric_limits<int64>::max()); - statement->bind_int64(2, + statement.BindInt64(0, begin_time.ToInternalValue()); + statement.BindInt64(1, end ? end : std::numeric_limits<int64>::max()); + statement.BindInt64(2, max_results ? max_results : std::numeric_limits<int64>::max()); AddEventToVisitLog(VisitLog::SELECT_VISIT); - FillVisitVector(*statement, visits); + FillVisitVector(statement, visits); } void VisitDatabase::GetVisitsInRangeForTransition( - Time begin_time, - Time end_time, + base::Time begin_time, + base::Time end_time, int max_results, PageTransition::Type transition, VisitVector* visits) { DCHECK(visits); visits->clear(); - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits " "WHERE visit_time >= ? AND visit_time < ? " "AND (transition & ?) == ?" - "ORDER BY visit_time LIMIT ?"); - if (!statement.is_valid()) + "ORDER BY visit_time LIMIT ?")); + if (!statement) return; // See GetVisibleVisitsInRange for more info on how these times are bound. int64 end = end_time.ToInternalValue(); - statement->bind_int64(0, begin_time.ToInternalValue()); - statement->bind_int64(1, end ? end : std::numeric_limits<int64>::max()); - statement->bind_int(2, PageTransition::CORE_MASK); - statement->bind_int(3, transition); - statement->bind_int64(4, + statement.BindInt64(0, begin_time.ToInternalValue()); + statement.BindInt64(1, end ? end : std::numeric_limits<int64>::max()); + statement.BindInt(2, PageTransition::CORE_MASK); + statement.BindInt(3, transition); + statement.BindInt64(4, max_results ? max_results : std::numeric_limits<int64>::max()); AddEventToVisitLog(VisitLog::SELECT_VISIT); - FillVisitVector(*statement, visits); + FillVisitVector(statement, visits); } -void VisitDatabase::GetVisibleVisitsInRange(Time begin_time, Time end_time, +void VisitDatabase::GetVisibleVisitsInRange(base::Time begin_time, + base::Time end_time, bool most_recent_visit_only, int max_count, 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. - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + 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"); - if (!statement.is_valid()) + "ORDER BY visit_time DESC, id DESC")); + if (!statement) return; // Note that we use min/max values for querying unlimited ranges of time using // the same statement. Since the time has an index, this will be about the // same amount of work as just doing a query for everything with no qualifier. int64 end = end_time.ToInternalValue(); - statement->bind_int64(0, begin_time.ToInternalValue()); - statement->bind_int64(1, end ? end : std::numeric_limits<int64>::max()); - statement->bind_int(2, PageTransition::CHAIN_END); - statement->bind_int(3, PageTransition::CORE_MASK); - statement->bind_int(4, PageTransition::AUTO_SUBFRAME); - statement->bind_int(5, PageTransition::MANUAL_SUBFRAME); - statement->bind_int(6, PageTransition::KEYWORD_GENERATED); + statement.BindInt64(0, begin_time.ToInternalValue()); + statement.BindInt64(1, end ? end : std::numeric_limits<int64>::max()); + statement.BindInt(2, PageTransition::CHAIN_END); + statement.BindInt(3, PageTransition::CORE_MASK); + statement.BindInt(4, PageTransition::AUTO_SUBFRAME); + statement.BindInt(5, PageTransition::MANUAL_SUBFRAME); + statement.BindInt(6, PageTransition::KEYWORD_GENERATED); AddEventToVisitLog(VisitLog::SELECT_VISIT); std::set<URLID> found_urls; - while (statement->step() == SQLITE_ROW) { + while (statement.Step()) { VisitRow visit; - FillVisitRow(*statement, &visit); + FillVisitRow(statement, &visit); if (most_recent_visit_only) { // Make sure the URL this visit corresponds to is unique if required. if (found_urls.find(visit.url_id) != found_urls.end()) @@ -313,24 +306,24 @@ VisitID VisitDatabase::GetMostRecentVisitForURL(URLID url_id, VisitRow* visit_row) { // 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. - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits " "WHERE url=? " "ORDER BY visit_time DESC, id DESC " - "LIMIT 1"); - if (!statement.is_valid()) + "LIMIT 1")); + if (!statement) return 0; - statement->bind_int64(0, url_id); + statement.BindInt64(0, url_id); AddEventToVisitLog(VisitLog::SELECT_VISIT); - if (statement->step() != SQLITE_ROW) + if (!statement.Step()) return 0; // No visits for this URL. if (visit_row) { - FillVisitRow(*statement, visit_row); + FillVisitRow(statement, visit_row); return visit_row->visit_id; } - return statement->column_int64(0); + return statement.ColumnInt64(0); } bool VisitDatabase::GetMostRecentVisitsForURL(URLID url_id, @@ -340,43 +333,43 @@ bool VisitDatabase::GetMostRecentVisitsForURL(URLID url_id, // 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. - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits " "WHERE url=? " "ORDER BY visit_time DESC, id DESC " - "LIMIT ?"); - if (!statement.is_valid()) + "LIMIT ?")); + if (!statement) return false; - statement->bind_int64(0, url_id); - statement->bind_int(1, max_results); + statement.BindInt64(0, url_id); + statement.BindInt(1, max_results); AddEventToVisitLog(VisitLog::SELECT_VISIT); - FillVisitVector(*statement, visits); + FillVisitVector(statement, visits); return true; } bool VisitDatabase::GetRedirectFromVisit(VisitID from_visit, VisitID* to_visit, GURL* to_url) { - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "SELECT v.id,u.url " "FROM visits v JOIN urls u ON v.url = u.id " "WHERE v.from_visit = ? " - "AND (v.transition & ?) != 0"); // IS_REDIRECT_MASK - if (!statement.is_valid()) + "AND (v.transition & ?) != 0")); // IS_REDIRECT_MASK + if (!statement) return false; - statement->bind_int64(0, from_visit); - statement->bind_int(1, PageTransition::IS_REDIRECT_MASK); + statement.BindInt64(0, from_visit); + statement.BindInt(1, PageTransition::IS_REDIRECT_MASK); AddEventToVisitLog(VisitLog::SELECT_VISIT); - if (statement->step() != SQLITE_ROW) + if (!statement.Step()) return false; // No redirect from this visit. if (to_visit) - *to_visit = statement->column_int64(0); + *to_visit = statement.ColumnInt64(0); if (to_url) - *to_url = GURL(statement->column_string(1)); + *to_url = GURL(statement.ColumnString(1)); return true; } @@ -391,24 +384,24 @@ bool VisitDatabase::GetRedirectToVisit(VisitID to_visit, *from_visit = row.referring_visit; if (from_url) { - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "SELECT u.url " "FROM visits v JOIN urls u ON v.url = u.id " - "WHERE v.id = ?"); - statement->bind_int64(0, row.referring_visit); + "WHERE v.id = ?")); + statement.BindInt64(0, row.referring_visit); AddEventToVisitLog(VisitLog::SELECT_VISIT); - if (statement->step() != SQLITE_ROW) + if (!statement.Step()) return false; - *from_url = GURL(statement->column_string(0)); + *from_url = GURL(statement.ColumnString(0)); } return true; } bool VisitDatabase::GetVisitCountToHost(const GURL& url, int* count, - Time* first_visit) { + base::Time* first_visit) { if (!url.SchemeIs(chrome::kHttpScheme) && !url.SchemeIs(chrome::kHttpsScheme)) return false; @@ -428,38 +421,37 @@ bool VisitDatabase::GetVisitCountToHost(const GURL& url, std::string host_query_max = host_query_min; host_query_max[host_query_max.size() - 1] = '0'; - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, "SELECT MIN(v.visit_time), COUNT(*) " "FROM visits v INNER JOIN urls u ON v.url = u.id " - "WHERE (u.url >= ? AND u.url < ?)"); - if (!statement.is_valid()) + "WHERE (u.url >= ? AND u.url < ?)")); + if (!statement) return false; - statement->bind_string(0, host_query_min); - statement->bind_string(1, host_query_max); + statement.BindString(0, host_query_min); + statement.BindString(1, host_query_max); AddEventToVisitLog(VisitLog::SELECT_VISIT); - if (statement->step() != SQLITE_ROW) { + if (!statement.Step()) { // We've never been to this page before. *count = 0; return true; } - *first_visit = Time::FromInternalValue(statement->column_int64(0)); - *count = statement->column_int(1); + *first_visit = base::Time::FromInternalValue(statement.ColumnInt64(0)); + *count = statement.ColumnInt(1); return true; } -bool VisitDatabase::GetStartDate(Time* first_visit) { - SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(), - "SELECT MIN(visit_time) FROM visits WHERE visit_time != 0"); +bool VisitDatabase::GetStartDate(base::Time* first_visit) { + sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE, + "SELECT MIN(visit_time) FROM visits WHERE visit_time != 0")); AddEventToVisitLog(VisitLog::SELECT_VISIT); - if (!statement.is_valid() || statement->step() != SQLITE_ROW || - statement->column_int64(0) == 0) { - *first_visit = Time::Now(); + if (!statement || !statement.Step() || statement.ColumnInt64(0) == 0) { + *first_visit = base::Time::Now(); return false; } - *first_visit = Time::FromInternalValue(statement->column_int64(0)); + *first_visit = base::Time::FromInternalValue(statement.ColumnInt64(0)); return true; } |