Skip to content

GitLab

T
tangled
Commit 95af34ec authored by Kristi Park's avatar Kristi Park Committed by Commit Bot
Browse files
Options

Remove thumbnail data from TopSitesDatabase 

NTP thumbnails have been deprecated as of M69.

Remove forced URLs and thumbnail data from TopSitesDatabase. This
includes renaming the "thumbnails" table to "top_sites"; removing all
columns except url, url_rank, title, and redirects; and all rows for
forced sites.

Forced sites were only used to store thumbnails for Most Likely sites.

Bug: 893362
Change-Id: I0fe5662869db014d62002575fdaaebf29ece9359
Reviewed-on: https://chromium-review.googlesource.com/c/1383139
Commit-Queue: Kristi Park <kristipark@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618360}
parent e31b72de
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 79 deletions
components/history/core/browser/BUILD.gn
View file @ 95af34ec
......@@ -168,6 +168,7 @@ bundle_data("unit_tests_bundle_data") {
"//components/test/data/history/TopSites.v1.sql",
"//components/test/data/history/TopSites.v2.sql",
"//components/test/data/history/TopSites.v3.sql",
"//components/test/data/history/TopSites.v4.sql",
"//components/test/data/history/history.22.sql",
"//components/test/data/history/history.26.sql",
"//components/test/data/history/history.27.sql",
......
components/history/core/browser/top_sites_database.cc
View file @ 95af34ec
......@@ -14,6 +14,7 @@
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "components/history/core/browser/history_types.h"
#include "components/history/core/browser/top_sites.h"
#include "sql/database.h"
......@@ -25,24 +26,13 @@ namespace history {
// Description of database table:
//
// thumbnails
// url URL of the sites for which we have a thumbnail.
// url_rank Index of the URL in that thumbnail, 0-based. The thumbnail
// with the highest rank will be the next one evicted. Forced
// thumbnails have a rank of -1.
// title The title to display under that thumbnail.
// top_sites
// url URL of the top site.
// url_rank Index of the site, 0-based. The site with the highest rank
// will be the next one evicted.
// title The title to display under that site.
// redirects A space separated list of URLs that are known to redirect
// to this url.
// boring_score How "boring" that thumbnail is. See ThumbnailScore.
// good_clipping True if the thumbnail was clipped from the bottom, keeping
// the entire width of the window. See ThumbnailScore.
// at_top True if the thumbnail was captured at the top of the
// website.
// last_updated The time at which this thumbnail was last updated.
// load_completed True if the thumbnail was captured after the page load was
// completed.
// last_forced If this is a forced thumbnail, records the last time it
// was forced. If it's not a forced thumbnail, 0.
namespace {
......@@ -54,33 +44,28 @@ namespace {
// fatal (in fact, very old data may be expired immediately at startup
// anyhow).
// TODO(kristipark): Add revision/date details after v4 lands.
// Version 4: kristipark@chromium.org
// Version 3: b6d6a783/r231648 by beaudoin@chromium.org on 2013-10-29
// Version 2: eb0b24e6/r87284 by satorux@chromium.org on 2011-05-31 (deprecated)
// Version 1: 809cc4d8/r64072 by sky@chromium.org on 2010-10-27 (deprecated)
// NOTE(shess): When changing the version, add a new golden file for
// the new version and a test to verify that Init() works with it.
static const int kVersionNumber = 3;
static const int kVersionNumber = 4;
static const int kDeprecatedVersionNumber = 2; // and earlier.
// Rank used to indicate that this is a newly added URL.
static const int kRankOfNewURL = -1;
bool InitTables(sql::Database* db) {
static const char kThumbnailsSql[] =
"CREATE TABLE IF NOT EXISTS thumbnails ("
static const char kTopSitesSql[] =
"CREATE TABLE IF NOT EXISTS top_sites ("
"url LONGVARCHAR PRIMARY KEY,"
"url_rank INTEGER,"
"title LONGVARCHAR,"
"thumbnail BLOB,"
"redirects LONGVARCHAR,"
"boring_score DOUBLE DEFAULT 1.0,"
"good_clipping INTEGER DEFAULT 0,"
"at_top INTEGER DEFAULT 0,"
"last_updated INTEGER DEFAULT 0,"
"load_completed INTEGER DEFAULT 0,"
"last_forced INTEGER DEFAULT 0)";
return db->Execute(kThumbnailsSql);
"redirects LONGVARCHAR)";
return db->Execute(kTopSitesSql);
}
// Encodes redirects into a string.
......@@ -130,7 +115,7 @@ enum RecoveryEventType {
OBSOLETE_RECOVERY_EVENT_FAILED_AUTORECOVER_THUMBNAILS,
RECOVERY_EVENT_FAILED_COMMIT,
// Track invariants resolved by FixThumbnailsTable().
// Track invariants resolved by FixTopSitesTable().
RECOVERY_EVENT_INVARIANT_RANK,
RECOVERY_EVENT_INVARIANT_REDIRECT,
RECOVERY_EVENT_INVARIANT_CONTIGUOUS,
......@@ -152,21 +137,28 @@ void RecordRecoveryEvent(RecoveryEventType recovery_event) {
// depending on the operation broken. This table has large rows, which will use
// overflow pages, so it is possible (though unlikely) that a chain could fit
// together and yield a row with errors.
void FixThumbnailsTable(sql::Database* db) {
// Enforce invariant separating forced and non-forced thumbnails.
static const char kFixRankSql[] =
"DELETE FROM thumbnails "
"WHERE (url_rank = -1 AND last_forced = 0) "
"OR (url_rank <> -1 AND last_forced <> 0)";
ignore_result(db->Execute(kFixRankSql));
if (db->GetLastChangeCount() > 0)
RecordRecoveryEvent(RECOVERY_EVENT_INVARIANT_RANK);
void FixTopSitesTable(sql::Database* db, int version) {
// Forced sites are only present in version 3.
if (version == 3) {
// Enforce invariant separating forced and non-forced thumbnails.
static const char kFixRankSql[] =
"DELETE FROM thumbnails "
"WHERE (url_rank = -1 AND last_forced = 0) "
"OR (url_rank <> -1 AND last_forced <> 0)";
ignore_result(db->Execute(kFixRankSql));
if (db->GetLastChangeCount() > 0)
RecordRecoveryEvent(RECOVERY_EVENT_INVARIANT_RANK);
}
// The table was renamed to "top_sites" in version 4.
const char* kTableName = (version == 3 ? "thumbnails" : "top_sites");
// Enforce invariant that url is in its own redirects.
static const char kFixRedirectsSql[] =
"DELETE FROM thumbnails "
"DELETE FROM %s "
"WHERE url <> substr(redirects, -length(url), length(url))";
ignore_result(db->Execute(kFixRedirectsSql));
ignore_result(
db->Execute(base::StringPrintf(kFixRedirectsSql, kTableName).c_str()));
if (db->GetLastChangeCount() > 0)
RecordRecoveryEvent(RECOVERY_EVENT_INVARIANT_REDIRECT);
......@@ -176,13 +168,15 @@ void FixThumbnailsTable(sql::Database* db) {
// manually is easier to follow. Another option would be to somehow integrate
// the renumbering into the table recovery code.
static const char kByRankSql[] =
"SELECT url_rank, rowid FROM thumbnails WHERE url_rank <> -1 "
"SELECT url_rank, rowid FROM %s WHERE url_rank <> -1 "
"ORDER BY url_rank";
sql::Statement select_statement(db->GetUniqueStatement(kByRankSql));
sql::Statement select_statement(db->GetUniqueStatement(
base::StringPrintf(kByRankSql, kTableName).c_str()));
static const char kAdjustRankSql[] =
"UPDATE thumbnails SET url_rank = ? WHERE rowid = ?";
sql::Statement update_statement(db->GetUniqueStatement(kAdjustRankSql));
"UPDATE %s SET url_rank = ? WHERE rowid = ?";
sql::Statement update_statement(db->GetUniqueStatement(
base::StringPrintf(kAdjustRankSql, kTableName).c_str()));
// Update any rows where |next_rank| doesn't match |url_rank|.
int next_rank = 0;
......@@ -206,7 +200,7 @@ void FixThumbnailsTable(sql::Database* db) {
// constraints.
void RecoverAndFixup(sql::Database* db, const base::FilePath& db_path) {
// NOTE(shess): If the version changes, review this code.
DCHECK_EQ(3, kVersionNumber);
DCHECK_EQ(4, kVersionNumber);
std::unique_ptr<sql::Recovery> recovery =
sql::Recovery::BeginRecoverDatabase(db, db_path);
......@@ -245,7 +239,7 @@ void RecoverAndFixup(sql::Database* db, const base::FilePath& db_path) {
}
// TODO(shess): Inline this?
FixThumbnailsTable(recovery->db());
FixTopSitesTable(recovery->db(), version);
if (!sql::Recovery::Recovered(std::move(recovery))) {
// TODO(shess): Very unclear what this failure would actually mean, and what
......@@ -368,6 +362,13 @@ bool TopSitesDatabase::InitImpl(const base::FilePath& db_name) {
}
}
if (meta_table_.GetVersionNumber() == 3) {
if (!UpgradeToVersion4()) {
LOG(WARNING) << "Unable to upgrade top sites database to version 4.";
return false;
}
}
// Version check.
if (meta_table_.GetVersionNumber() != kVersionNumber)
return false;
......@@ -408,12 +409,30 @@ bool TopSitesDatabase::UpgradeToVersion3() {
return true;
}
bool TopSitesDatabase::UpgradeToVersion4() {
// Rename table to "top_sites" and retain only the url, url_rank, title, and
// redirects columns. Also, remove any remaining forced sites.
const char* statement =
// The top_sites table is created before the version upgrade.
"INSERT INTO top_sites SELECT "
"url,url_rank,title,redirects FROM thumbnails;"
"DROP TABLE thumbnails;"
// Remove any forced sites.
"DELETE FROM top_sites WHERE (url_rank = -1);";
if (!db_->Execute(statement)) {
NOTREACHED();
return false;
}
meta_table_.SetVersionNumber(4);
return true;
}
void TopSitesDatabase::GetSites(MostVisitedURLList* urls) {
sql::Statement statement(
db_->GetCachedStatement(SQL_FROM_HERE,
"SELECT url, url_rank, title, redirects "
"FROM thumbnails WHERE url_rank <> -1 "
"ORDER BY url_rank"));
"FROM top_sites ORDER BY url_rank"));
if (!statement.is_valid()) {
LOG(WARNING) << db_->GetErrorMessage();
......@@ -448,7 +467,7 @@ void TopSitesDatabase::SetSiteNoTransaction(const MostVisitedURL& url,
void TopSitesDatabase::AddSite(const MostVisitedURL& url, int new_rank) {
sql::Statement statement(
db_->GetCachedStatement(SQL_FROM_HERE,
"INSERT OR REPLACE INTO thumbnails "
"INSERT OR REPLACE INTO top_sites "
"(url, url_rank, title, redirects) "
"VALUES (?, ?, ?, ?)"));
statement.BindString(0, url.url.spec());
......@@ -464,9 +483,9 @@ void TopSitesDatabase::AddSite(const MostVisitedURL& url, int new_rank) {
bool TopSitesDatabase::UpdateSite(const MostVisitedURL& url) {
sql::Statement statement(db_->GetCachedStatement(SQL_FROM_HERE,
"UPDATE thumbnails SET "
"UPDATE top_sites SET "
"title = ?, redirects = ?"
"WHERE url = ? "));
"WHERE url = ?"));
statement.BindString16(0, url.title);
statement.BindString(1, GetRedirects(url));
......@@ -477,7 +496,7 @@ int TopSitesDatabase::GetURLRank(const MostVisitedURL& url) {
sql::Statement select_statement(
db_->GetCachedStatement(SQL_FROM_HERE,
"SELECT url_rank "
"FROM thumbnails WHERE url=?"));
"FROM top_sites WHERE url = ?"));
select_statement.BindString(0, url.url.spec());
if (select_statement.Step())
return select_statement.ColumnInt(0);
......@@ -502,9 +521,9 @@ void TopSitesDatabase::UpdateSiteRankNoTransaction(const MostVisitedURL& url,
// [-1 -> 2], 0, 1, [2 -> 3], [3 -> 4], [4 -> 5]
sql::Statement shift_statement(
db_->GetCachedStatement(SQL_FROM_HERE,
"UPDATE thumbnails "
"UPDATE top_sites "
"SET url_rank = url_rank + 1 "
"WHERE url_rank >= ? AND url_rank <> -1"));
"WHERE url_rank >= ?"));
shift_statement.BindInt(0, new_rank);
shift_statement.Run();
} else if (prev_rank > new_rank) {
......@@ -513,10 +532,9 @@ void TopSitesDatabase::UpdateSiteRankNoTransaction(const MostVisitedURL& url,
// 0, [1 -> 2], [2 -> 3], [3 -> 1], 4
sql::Statement shift_statement(
db_->GetCachedStatement(SQL_FROM_HERE,
"UPDATE thumbnails "
"UPDATE top_sites "
"SET url_rank = url_rank + 1 "
"WHERE url_rank >= ? AND url_rank < ? "
"AND url_rank <> -1"));
"WHERE url_rank >= ? AND url_rank < ?"));
shift_statement.BindInt(0, new_rank);
shift_statement.BindInt(1, prev_rank);
shift_statement.Run();
......@@ -526,10 +544,9 @@ void TopSitesDatabase::UpdateSiteRankNoTransaction(const MostVisitedURL& url,
// 0, [1 -> 3], [2 -> 1], [3 -> 2], 4
sql::Statement shift_statement(
db_->GetCachedStatement(SQL_FROM_HERE,
"UPDATE thumbnails "
"UPDATE top_sites "
"SET url_rank = url_rank - 1 "
"WHERE url_rank > ? AND url_rank <= ? "
"AND url_rank <> -1"));
"WHERE url_rank > ? AND url_rank <= ?"));
shift_statement.BindInt(0, prev_rank);
shift_statement.BindInt(1, new_rank);
shift_statement.Run();
......@@ -537,7 +554,7 @@ void TopSitesDatabase::UpdateSiteRankNoTransaction(const MostVisitedURL& url,
// Set the url's new_rank.
sql::Statement set_statement(db_->GetCachedStatement(SQL_FROM_HERE,
"UPDATE thumbnails "
"UPDATE top_sites "
"SET url_rank = ? "
"WHERE url == ?"));
set_statement.BindInt(0, new_rank);
......@@ -553,16 +570,16 @@ bool TopSitesDatabase::RemoveURLNoTransaction(const MostVisitedURL& url) {
// Decrement all following ranks.
sql::Statement shift_statement(
db_->GetCachedStatement(SQL_FROM_HERE,
"UPDATE thumbnails "
"UPDATE top_sites "
"SET url_rank = url_rank - 1 "
"WHERE url_rank > ? AND url_rank <> -1"));
"WHERE url_rank > ?"));
shift_statement.BindInt(0, old_rank);
if (!shift_statement.Run())
return false;
sql::Statement delete_statement(db_->GetCachedStatement(
SQL_FROM_HERE, "DELETE FROM thumbnails WHERE url = ?"));
SQL_FROM_HERE, "DELETE FROM top_sites WHERE url = ?"));
delete_statement.BindString(0, url.url.spec());
return delete_statement.Run();
......
components/history/core/browser/top_sites_database.h
View file @ 95af34ec
......@@ -44,9 +44,11 @@ class TopSitesDatabase {
FRIEND_TEST_ALL_PREFIXES(TopSitesDatabaseTest, Version1);
FRIEND_TEST_ALL_PREFIXES(TopSitesDatabaseTest, Version2);
FRIEND_TEST_ALL_PREFIXES(TopSitesDatabaseTest, Version3);
FRIEND_TEST_ALL_PREFIXES(TopSitesDatabaseTest, Version4);
FRIEND_TEST_ALL_PREFIXES(TopSitesDatabaseTest, Recovery1);
FRIEND_TEST_ALL_PREFIXES(TopSitesDatabaseTest, Recovery2);
FRIEND_TEST_ALL_PREFIXES(TopSitesDatabaseTest, Recovery3);
FRIEND_TEST_ALL_PREFIXES(TopSitesDatabaseTest, Recovery4);
// Rank used to indicate that a URL is not stored in the database.
static const int kRankOfNonExistingURL;
......@@ -55,6 +57,10 @@ class TopSitesDatabase {
// upgrade was successful.
bool UpgradeToVersion3();
// Upgrades the top_sites table to version 4, returning true if the upgrade
// was successful.
bool UpgradeToVersion4();
// Sets a top site for the URL. |new_rank| is the position of the URL in the
// list of top sites, zero-based.
// If the URL is not in the table, adds it. If it is, updates its rank and
......
components/history/core/browser/top_sites_database_unittest.cc
View file @ 95af34ec
......@@ -38,24 +38,22 @@ const GURL kUrl2 = GURL("https://chrome.google.com/webstore?hl=en");
// present. Any extraneous items have the potential to interact
// negatively with future schema changes.
void VerifyTablesAndColumns(sql::Database* db) {
// [meta] and [thumbnails].
// [meta] and [top_sites].
EXPECT_EQ(2u, sql::test::CountSQLTables(db));
// Implicit index on [meta], index on [thumbnails].
// Implicit index on [meta], index on [top_sites].
EXPECT_EQ(2u, sql::test::CountSQLIndices(db));
// [key] and [value].
EXPECT_EQ(2u, sql::test::CountTableColumns(db, "meta"));
// [url], [url_rank], [title], [thumbnail], [redirects],
// [boring_score], [good_clipping], [at_top], [last_updated], and
// [load_completed], [last_forced]
EXPECT_EQ(11u, sql::test::CountTableColumns(db, "thumbnails"));
// [url], [url_rank], [title], [redirects]
EXPECT_EQ(4u, sql::test::CountTableColumns(db, "top_sites"));
}
void VerifyDatabaseEmpty(sql::Database* db) {
size_t rows = 0;
EXPECT_TRUE(sql::test::CountTableRows(db, "thumbnails", &rows));
EXPECT_TRUE(sql::test::CountTableRows(db, "top_sites", &rows));
EXPECT_EQ(0u, rows);
}
......@@ -127,8 +125,31 @@ TEST_F(TopSitesDatabaseTest, Version3) {
ASSERT_EQ(2u, urls.size());
}
// Version 1 is deprecated, the resulting schema should be current,
// with no data.
TEST_F(TopSitesDatabaseTest, Version4) {
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v4.sql"));
TopSitesDatabase db;
ASSERT_TRUE(db.Init(file_name_));
VerifyTablesAndColumns(db.db_.get());
// Basic operational check.
MostVisitedURLList urls;
db.GetSites(&urls);
ASSERT_EQ(3u, urls.size());
EXPECT_EQ(kUrl0, urls[0].url); // [0] because of url_rank.
sql::Transaction transaction(db.db_.get());
transaction.Begin();
ASSERT_TRUE(db.RemoveURLNoTransaction(urls[1]));
transaction.Commit();
db.GetSites(&urls);
ASSERT_EQ(2u, urls.size());
}
// Version 1 is deprecated, the resulting schema should be current, with no
// data.
TEST_F(TopSitesDatabaseTest, Recovery1) {
// Create an example database.
EXPECT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v1.sql"));
......@@ -160,6 +181,8 @@ TEST_F(TopSitesDatabaseTest, Recovery1) {
}
}
// Version 2 is deprecated, the resulting schema should be current, with no
// data.
TEST_F(TopSitesDatabaseTest, Recovery2) {
// Create an example database.
EXPECT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v2.sql"));
......@@ -233,11 +256,114 @@ TEST_F(TopSitesDatabaseTest, Recovery3) {
// Corrupt the thumnails.url auto-index by deleting an element from the table
// but leaving it in the index.
static const char kIndexName[] = "sqlite_autoindex_thumbnails_1";
static const char kIndexName[] = "sqlite_autoindex_top_sites_1";
// TODO(shess): Refactor CorruptTableOrIndex() to make parameterized
// statements easy.
static const char kDeleteSql[] =
"DELETE FROM thumbnails WHERE url = "
"DELETE FROM top_sites WHERE url = "
"'http://www.google.com/chrome/intl/en/welcome.html'";
EXPECT_TRUE(
sql::test::CorruptTableOrIndex(file_name_, kIndexName, kDeleteSql));
// SQLite can operate on the database, but notices the corruption in integrity
// check.
{
sql::Database raw_db;
EXPECT_TRUE(raw_db.Open(file_name_));
ASSERT_NE("ok", sql::test::IntegrityCheck(&raw_db));
}
// Open the database and access the corrupt index.
{
TopSitesDatabase db;
ASSERT_TRUE(db.Init(file_name_));
{
sql::test::ScopedErrorExpecter expecter;
expecter.ExpectError(SQLITE_CORRUPT);
// Data for kUrl1 was deleted, but the index entry remains, this will
// throw SQLITE_CORRUPT. The corruption handler will recover the database
// and poison the handle, so the outer call fails.
EXPECT_EQ(TopSitesDatabase::kRankOfNonExistingURL,
db.GetURLRank(MostVisitedURL(kUrl1, base::string16())));
ASSERT_TRUE(expecter.SawExpectedErrors());
}
}
// Check that the database is recovered at the SQLite level.
{
sql::Database raw_db;
EXPECT_TRUE(raw_db.Open(file_name_));
ASSERT_EQ("ok", sql::test::IntegrityCheck(&raw_db));
}
// After recovery, the database accesses won't throw errors. The top-ranked
// item is removed, but the ranking was revised in post-processing.
{
TopSitesDatabase db;
ASSERT_TRUE(db.Init(file_name_));
VerifyTablesAndColumns(db.db_.get());
EXPECT_EQ(TopSitesDatabase::kRankOfNonExistingURL,
db.GetURLRank(MostVisitedURL(kUrl1, base::string16())));
MostVisitedURLList urls;
db.GetSites(&urls);
ASSERT_EQ(2u, urls.size());
EXPECT_EQ(kUrl0, urls[0].url); // [0] because of url_rank.
EXPECT_EQ(kUrl2, urls[1].url); // [1] because of url_rank.
}
}
TEST_F(TopSitesDatabaseTest, Recovery4) {
// Create an example database.
EXPECT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v4.sql"));
// Corrupt the database by adjusting the header.
EXPECT_TRUE(sql::test::CorruptSizeInHeader(file_name_));
// Database is unusable at the SQLite level.
{
sql::test::ScopedErrorExpecter expecter;
expecter.ExpectError(SQLITE_CORRUPT);
sql::Database raw_db;
EXPECT_TRUE(raw_db.Open(file_name_));
EXPECT_FALSE(raw_db.IsSQLValid("PRAGMA integrity_check"));
ASSERT_TRUE(expecter.SawExpectedErrors());
}
// Corruption should be detected and recovered during Init().
{
sql::test::ScopedErrorExpecter expecter;
expecter.ExpectError(SQLITE_CORRUPT);
TopSitesDatabase db;
ASSERT_TRUE(db.Init(file_name_));
MostVisitedURLList urls;
db.GetSites(&urls);
ASSERT_EQ(3u, urls.size());
EXPECT_EQ(kUrl0, urls[0].url); // [0] because of url_rank.
ASSERT_TRUE(expecter.SawExpectedErrors());
}
// Double-check database integrity.
{
sql::Database raw_db;
EXPECT_TRUE(raw_db.Open(file_name_));
ASSERT_EQ("ok", sql::test::IntegrityCheck(&raw_db));
}
// Corrupt the tops_sites.url auto-index by deleting an element from the table
// but leaving it in the index.
static const char kIndexName[] = "sqlite_autoindex_top_sites_1";
// TODO(shess): Refactor CorruptTableOrIndex() to make parameterized
// statements easy.
static const char kDeleteSql[] =
"DELETE FROM top_sites WHERE url = "
"'http://www.google.com/chrome/intl/en/welcome.html'";
EXPECT_TRUE(
sql::test::CorruptTableOrIndex(file_name_, kIndexName, kDeleteSql));
......@@ -295,7 +421,7 @@ TEST_F(TopSitesDatabaseTest, Recovery3) {
}
TEST_F(TopSitesDatabaseTest, ApplyDelta_Delete) {
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v3.sql"));
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v4.sql"));
TopSitesDatabase db;
ASSERT_TRUE(db.Init(file_name_));
......@@ -315,7 +441,7 @@ TEST_F(TopSitesDatabaseTest, ApplyDelta_Delete) {
}
TEST_F(TopSitesDatabaseTest, ApplyDelta_Add) {
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v3.sql"));
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v4.sql"));
TopSitesDatabase db;
ASSERT_TRUE(db.Init(file_name_));
......@@ -339,7 +465,7 @@ TEST_F(TopSitesDatabaseTest, ApplyDelta_Add) {
}
TEST_F(TopSitesDatabaseTest, ApplyDelta_Move) {
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v3.sql"));
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v4.sql"));
TopSitesDatabase db;
ASSERT_TRUE(db.Init(file_name_));
......@@ -361,7 +487,7 @@ TEST_F(TopSitesDatabaseTest, ApplyDelta_Move) {
}
TEST_F(TopSitesDatabaseTest, ApplyDelta_All) {
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v3.sql"));
ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, "TopSites.v4.sql"));
TopSitesDatabase db;
ASSERT_TRUE(db.Init(file_name_));
......
components/test/data/history/TopSites.v4.sql 0 → 100644
View file @ 95af34ec
-- components_unittests --gtest_filter=TopSitesDatabaseTest.Version4
--
-- .dump of a version 4 "Top Sites" database.
BEGIN TRANSACTION;
CREATE TABLE meta(key LONGVARCHAR NOT NULL UNIQUE PRIMARY KEY, value LONGVARCHAR);
INSERT INTO "meta" VALUES('version','4');
INSERT INTO "meta" VALUES('last_compatible_version','4');
CREATE TABLE top_sites (url LONGVARCHAR PRIMARY KEY,url_rank INTEGER ,title LONGVARCHAR,redirects LONGVARCHAR);
INSERT INTO "top_sites" VALUES('http://www.google.com/chrome/intl/en/welcome.html',1,'Welcome to Chromium','http://www.google.com/chrome/intl/en/welcome.html');
INSERT INTO "top_sites" VALUES('https://chrome.google.com/webstore?hl=en',2,'Chrome Web Store','https://chrome.google.com/webstore?hl=en');
INSERT INTO "top_sites" VALUES('http://www.google.com/',0,'Google','https://www.google.com/ http://www.google.com/');
COMMIT;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment