[sync] Add typed url sync metadata to the history db

components/history/core/browser/history_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/history_database.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/history/core/browser/url_utils.h"
+#include "sql/meta_table.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mac_util.h"
 #endif
 
 namespace history {
 
 namespace {
 
 // Current version number. We write databases at the "current" version number,
 // but any previous version that can read the "compatible" one can make do with
 // our database without *too* many bad effects.
-const int kCurrentVersionNumber = 34;
+const int kCurrentVersionNumber = 35;
 const int kCompatibleVersionNumber = 16;
 const char kEarlyExpirationThresholdKey[] = "early_expiration_threshold";
 const int kMaxHostsInMemory = 10000;
 
 }  // namespace
 
 HistoryDatabase::HistoryDatabase(
     DownloadInterruptReason download_interrupt_reason_none,
     DownloadInterruptReason download_interrupt_reason_crash)
     : DownloadDatabase(download_interrupt_reason_none,
@@ skipping 35 matching lines @@
   // Exclude the history file from backups.
   base::mac::SetFileBackupExclusion(history_name);
 #endif
 
   // Prime the cache.
   db_.Preload();
 
   // Create the tables and indices.
   // NOTE: If you add something here, also add it to
   //       RecreateAllButStarAndURLTables.
-  if (!meta_table_.Init(&db_, GetCurrentVersion(), kCompatibleVersionNumber))
+  if (!GetMetaTable()->Init(&db_, GetCurrentVersion(),
+                            kCompatibleVersionNumber))
     return sql::INIT_FAILURE;
   if (!CreateURLTable(false) || !InitVisitTable() ||
       !InitKeywordSearchTermsTable() || !InitDownloadTable() ||
-      !InitSegmentTables())
+      !InitSegmentTables() || !InitSyncTable())
     return sql::INIT_FAILURE;
   CreateMainURLIndex();
   CreateKeywordSearchTermsIndices();
 
   // TODO(benjhayden) Remove at some point.
-  meta_table_.DeleteKey("next_download_id");
+  GetMetaTable()->DeleteKey("next_download_id");
 
   // Version check.
   sql::InitStatus version_status = EnsureCurrentVersion();
   if (version_status != sql::INIT_OK)
     return version_status;
 
   return committer.Commit() ? sql::INIT_OK : sql::INIT_FAILURE;
 }
 
 void HistoryDatabase::ComputeDatabaseMetrics(
@@ skipping 221 matching lines @@
       return s.ColumnInt64(0);
   }
   return 0;
 }
 
 base::Time HistoryDatabase::GetEarlyExpirationThreshold() {
   if (!cached_early_expiration_threshold_.is_null())
     return cached_early_expiration_threshold_;
 
   int64_t threshold;
-  if (!meta_table_.GetValue(kEarlyExpirationThresholdKey, &threshold)) {
+  if (!GetMetaTable()->GetValue(kEarlyExpirationThresholdKey, &threshold)) {
     // Set to a very early non-zero time, so it's before all history, but not
     // zero to avoid re-retrieval.
     threshold = 1L;
   }
 
   cached_early_expiration_threshold_ = base::Time::FromInternalValue(threshold);
   return cached_early_expiration_threshold_;
 }
 
 void HistoryDatabase::UpdateEarlyExpirationThreshold(base::Time threshold) {
-  meta_table_.SetValue(kEarlyExpirationThresholdKey,
-                       threshold.ToInternalValue());
+  GetMetaTable()->SetValue(kEarlyExpirationThresholdKey,
+                           threshold.ToInternalValue());
   cached_early_expiration_threshold_ = threshold;
 }
 
 sql::Connection& HistoryDatabase::GetDB() {
   return db_;
 }
 
 // Migration -------------------------------------------------------------------
 
 sql::InitStatus HistoryDatabase::EnsureCurrentVersion() {
   // We can't read databases newer than we were designed for.
-  if (meta_table_.GetCompatibleVersionNumber() > kCurrentVersionNumber) {
+  if (GetMetaTable()->GetCompatibleVersionNumber() > kCurrentVersionNumber) {
     LOG(WARNING) << "History database is too new.";
     return sql::INIT_TOO_NEW;
   }
 
-  int cur_version = meta_table_.GetVersionNumber();
+  int cur_version = GetMetaTable()->GetVersionNumber();
 
   // Put migration code here
 
   if (cur_version == 15) {
     if (!db_.Execute("DROP TABLE starred") || !DropStarredIDFromURLs()) {
       LOG(WARNING) << "Unable to update history database to version 16.";
       return sql::INIT_FAILURE;
     }
     ++cur_version;
-    meta_table_.SetVersionNumber(cur_version);
-    meta_table_.SetCompatibleVersionNumber(
+    GetMetaTable()->SetVersionNumber(cur_version);
+    GetMetaTable()->SetCompatibleVersionNumber(
         std::min(cur_version, kCompatibleVersionNumber));
   }
 
   if (cur_version == 16) {
 #if !defined(OS_WIN)
     // In this version we bring the time format on Mac & Linux in sync with the
     // Windows version so that profiles can be moved between computers.
     MigrateTimeEpoch();
 #endif
     // On all platforms we bump the version number, so on Windows this
     // migration is a NOP. We keep the compatible version at 16 since things
     // will basically still work, just history will be in the future if an
     // old version reads it.
     ++cur_version;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 17) {
     // Version 17 was for thumbnails to top sites migration. We ended up
     // disabling it though, so 17->18 does nothing.
     ++cur_version;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 18) {
     // This is the version prior to adding url_source column. We need to
     // migrate the database.
     cur_version = 19;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 19) {
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
     // This was the thumbnail migration.  Obsolete.
   }
 
   if (cur_version == 20) {
     // This is the version prior to adding the visit_duration field in visits
     // database. We need to migrate the database.
     if (!MigrateVisitsWithoutDuration()) {
       LOG(WARNING) << "Unable to update history database to version 21.";
       return sql::INIT_FAILURE;
     }
     ++cur_version;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 21) {
     // The android_urls table's data schemal was changed in version 21.
 #if defined(OS_ANDROID)
     if (!MigrateToVersion22()) {
       LOG(WARNING) << "Unable to migrate the android_urls table to version 22";
     }
 #endif
     ++cur_version;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 22) {
     if (!MigrateDownloadsState()) {
       LOG(WARNING) << "Unable to fix invalid downloads state values";
       // Invalid state values may cause crashes.
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 23) {
     if (!MigrateDownloadsReasonPathsAndDangerType()) {
       LOG(WARNING) << "Unable to upgrade download interrupt reason and paths";
       // Invalid state values may cause crashes.
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 24) {
     if (!MigratePresentationIndex()) {
       LOG(WARNING) << "Unable to migrate history to version 25";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 25) {
     if (!MigrateReferrer()) {
       LOG(WARNING) << "Unable to migrate history to version 26";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 26) {
     if (!MigrateDownloadedByExtension()) {
       LOG(WARNING) << "Unable to migrate history to version 27";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 27) {
     if (!MigrateDownloadValidators()) {
       LOG(WARNING) << "Unable to migrate history to version 28";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 28) {
     if (!MigrateMimeType()) {
       LOG(WARNING) << "Unable to migrate history to version 29";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 29) {
     if (!MigrateHashHttpMethodAndGenerateGuids()) {
       LOG(WARNING) << "Unable to migrate history to version 30";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 30) {
     if (!MigrateDownloadTabUrl()) {
       LOG(WARNING) << "Unable to migrate history to version 31";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 31) {
     if (!MigrateDownloadSiteInstanceUrl()) {
       LOG(WARNING) << "Unable to migrate history to version 32";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 32) {
     // New download slices table is introduced, no migration needed.
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   if (cur_version == 33) {
     if (!MigrateDownloadLastAccessTime()) {
       LOG(WARNING) << "Unable to migrate to version 34";
       return sql::INIT_FAILURE;
     }
     cur_version++;
-    meta_table_.SetVersionNumber(cur_version);
+    GetMetaTable()->SetVersionNumber(cur_version);
+  }
+
+  if (cur_version == 34) {
+    // AUTOINCREMENT is added to urls table PRIMARY KEY(id), need to recreate a
+    // new table and copy all contents over. favicon_id is removed from urls
+    // table since we never use it. Also typed_url_sync_metadata and
+    // autofill_model_type_state tables are introduced, no migration needed for
+    // those two tables.
+    if (!RecreateURLTableWithAllContents()) {
+      LOG(WARNING) << "Unable to update history database to version 35.";
+      return sql::INIT_FAILURE;
+    }
+    cur_version++;
+    GetMetaTable()->SetVersionNumber(cur_version);
   }
 
   // When the version is too old, we just try to continue anyway, there should
   // not be a released product that makes a database too old for us to handle.
   LOG_IF(WARNING, cur_version < GetCurrentVersion()) <<
          "History database version " << cur_version << " is too old to handle.";
 
   return sql::INIT_OK;
 }
 
 #if !defined(OS_WIN)
 void HistoryDatabase::MigrateTimeEpoch() {
   // Update all the times in the URLs and visits table in the main database.
   ignore_result(db_.Execute(
       "UPDATE urls "
       "SET last_visit_time = last_visit_time + 11644473600000000 "
       "WHERE id IN (SELECT id FROM urls WHERE last_visit_time > 0);"));
   ignore_result(db_.Execute(
       "UPDATE visits "
       "SET visit_time = visit_time + 11644473600000000 "
       "WHERE id IN (SELECT id FROM visits WHERE visit_time > 0);"));
   ignore_result(db_.Execute(
       "UPDATE segment_usage "
       "SET time_slot = time_slot + 11644473600000000 "
       "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);"));
 }
 #endif
 
 }  // namespace history