Fix: Spurious SQL error message is logged in priming SQLite database cache....

chrome/browser/history/history_database.cc

 // Copyright (c) 2006-2008 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/history_database.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/string_util.h"
@@ skipping 39 matching lines @@
   // TODO(brettw) scale this value to the amount of available memory.
   sqlite3_exec(db_, "PRAGMA cache_size=6000", NULL, NULL, NULL);
 
   // Wrap the rest of init in a tranaction. This will prevent the database from
   // getting corrupted if we crash in the middle of initialization or migration.
   TransactionScoper transaction(this);
 
   // Make sure the statement cache is properly initialized.
   statement_cache_->set_db(db_);
 
-  // Prime the cache. See the header file's documentation for this function.
-  PrimeCache();
+  // Prime the cache.
+  MetaTableHelper::PrimeCache(std::string(), db_);
 
   // Create the tables and indices.
   // NOTE: If you add something here, also add it to
   //       RecreateAllButStarAndURLTables.
   if (!meta_table_.Init(std::string(), kCurrentVersionNumber,
                         kCompatibleVersionNumber, db_))
     return INIT_FAILURE;
   if (!CreateURLTable(false) || !InitVisitTable() ||
       !InitKeywordSearchTermsTable() || !InitDownloadTable() ||
       !InitSegmentTables())
     return INIT_FAILURE;
   CreateMainURLIndex();
   CreateSupplimentaryURLIndices();
 
   // Version check.
   InitStatus version_status = EnsureCurrentVersion(bookmarks_path);
   if (version_status != INIT_OK)
     return version_status;
 
   // Succeeded: keep the DB open by detaching the auto-closer.
   scoper.Detach();
   db_closer_.Attach(&db_, &statement_cache_);
   return INIT_OK;
 }
 
 void HistoryDatabase::BeginExclusiveMode() {
   sqlite3_exec(db_, "PRAGMA locking_mode=EXCLUSIVE", NULL, NULL, NULL);
 }
 
-void HistoryDatabase::PrimeCache() {
-  // A statement must be open for the preload command to work. If the meta
-  // table can't be read, it probably means this is a new database and there
-  // is nothing to preload (so it's OK we do nothing).
-  SQLStatement dummy;
-  if (dummy.prepare(db_, "SELECT * from meta") != SQLITE_OK)
-    return;
-  if (dummy.step() != SQLITE_ROW)
-    return;
-
-  sqlite3Preload(db_);
-}
-
 // static
 int HistoryDatabase::GetCurrentVersion() {
   return kCurrentVersionNumber;
 }
 
 void HistoryDatabase::BeginTransaction() {
   DCHECK(db_);
   if (transaction_nesting_ == 0) {
     int rv = sqlite3_exec(db_, "BEGIN TRANSACTION", NULL, NULL, NULL);
     DCHECK(rv == SQLITE_OK) << "Failed to begin transaction";
@@ skipping 112 matching lines @@
 
   // 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 < kCurrentVersionNumber) <<
       "History database version " << cur_version << " is too old to handle.";
 
   return INIT_OK;
 }
 
 }  // namespace history