[sql] WARN_UNUSED_RESULT on Execute().

chrome/browser/history/thumbnail_database.cc

 // Copyright (c) 2011 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/thumbnail_database.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 67 matching lines @@
 #if defined(OS_MACOSX)
   // Exclude the thumbnails file from backups.
   base::mac::SetFileBackupExclusion(db_name);
 #endif
 
   // Create the tables.
   if (!meta_table_.Init(&db_, kCurrentVersionNumber,
                         kCompatibleVersionNumber) ||
       !InitThumbnailTable() ||
       !InitFaviconsTable(&db_, false) ||
-      !InitIconMappingTable(&db_, false)) {
+      !InitFaviconsIndex() ||
+      !InitIconMappingTable(&db_, false) ||
+      !InitIconMappingIndex()) {
     db_.Close();
     return sql::INIT_FAILURE;
   }
-  InitFaviconsIndex();
-  InitIconMappingIndex();
 
   // Version check. We should not encounter a database too old for us to handle
   // in the wild, so we try to continue in that case.
   if (meta_table_.GetCompatibleVersionNumber() > kCurrentVersionNumber) {
     LOG(WARNING) << "Thumbnail database is too new.";
     return sql::INIT_TOO_NEW;
   }
 
   int cur_version = meta_table_.GetVersionNumber();
   if (cur_version == 2) {
@@ skipping 108 matching lines @@
                // Set the default icon_type as FAVICON to be consistent with
                // table upgrade in UpgradeToVersion4().
                "icon_type INTEGER DEFAULT 1,"
                "sizes LONGVARCHAR)");
     if (!db->Execute(sql.c_str()))
       return false;
   }
   return true;
 }
 
-void ThumbnailDatabase::InitFaviconsIndex() {
-  // Add an index on the url column. We ignore errors. Since this is always
-  // called during startup, the index will normally already exist.
-  db_.Execute("CREATE INDEX favicons_url ON favicons(url)");
+bool ThumbnailDatabase::InitFaviconsIndex() {
+  // Add an index on the url column.
+  return
+      db_.Execute("CREATE INDEX IF NOT EXISTS favicons_url ON favicons(url)");
 }
 
 void ThumbnailDatabase::BeginTransaction() {
   db_.BeginTransaction();
 }
 
 void ThumbnailDatabase::CommitTransaction() {
   db_.CommitTransaction();
 }
 
 void ThumbnailDatabase::Vacuum() {
   DCHECK(db_.transaction_nesting() == 0) <<
       "Can not have a transaction when vacuuming.";
-  db_.Execute("VACUUM");
+  ignore_result(db_.Execute("VACUUM"));
 }
 
 void ThumbnailDatabase::SetPageThumbnail(
     const GURL& url,
     URLID id,
     const gfx::Image* thumbnail,
     const ThumbnailScore& score,
     base::Time time) {
   if (use_top_sites_) {
     LOG(WARNING) << "Use TopSites instead.";
@@ skipping 348 matching lines @@
 bool ThumbnailDatabase::CommitTemporaryIconMappingTable() {
   // Delete the old icon_mapping table.
   if (!db_.Execute("DROP TABLE icon_mapping"))
     return false;
 
   // Rename the temporary one.
   if (!db_.Execute("ALTER TABLE temp_icon_mapping RENAME TO icon_mapping"))
     return false;
 
   // The renamed table needs the index (the temporary table doesn't have one).
-  InitIconMappingIndex();
-
-  return true;
+  return InitIconMappingIndex();
 }
 
 FaviconID ThumbnailDatabase::CopyToTemporaryFaviconTable(FaviconID source) {
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO temp_favicons (url, last_updated, image_data, icon_type)"
       "SELECT url, last_updated, image_data, icon_type "
       "FROM favicons WHERE id = ?"));
   if (!statement)
     return 0;
   statement.BindInt64(0, source);
   if (!statement.Run())
     return 0;
 
   // We return the ID of the newly inserted favicon.
   return db_.GetLastInsertRowId();
 }
 
 bool ThumbnailDatabase::CommitTemporaryFaviconTable() {
   // Delete the old favicons table.
   if (!db_.Execute("DROP TABLE favicons"))
     return false;
 
   // Rename the temporary one.
   if (!db_.Execute("ALTER TABLE temp_favicons RENAME TO favicons"))
     return false;
 
   // The renamed table needs the index (the temporary table doesn't have one).
-  InitFaviconsIndex();
-  return true;
+  return InitFaviconsIndex();
 }
 
 bool ThumbnailDatabase::NeedsMigrationToTopSites() {
   return !use_top_sites_;
 }
 
 bool ThumbnailDatabase::RenameAndDropThumbnails(const FilePath& old_db_file,
                                                 const FilePath& new_db_file) {
   // Init favicons table - same schema as the thumbnails.
   sql::Connection favicons;
@@ skipping 56 matching lines @@
   // Reset the DB to point to new file.
   if (OpenDatabase(&db_, new_db_file) != sql::INIT_OK)
     return false;
 
   file_util::Delete(old_db_file, false);
 
   meta_table_.Reset();
   if (!meta_table_.Init(&db_, kCurrentVersionNumber, kCompatibleVersionNumber))
     return false;
 
-  InitFaviconsIndex();
+  if (!InitFaviconsIndex())
+    return false;
 
   // Reopen the transaction.
   BeginTransaction();
   use_top_sites_ = true;
   return true;
 }
 
 bool ThumbnailDatabase::InitIconMappingTable(sql::Connection* db,
                                              bool is_temporary) {
   const char* name = is_temporary ? "temp_icon_mapping" : "icon_mapping";
   if (!db->DoesTableExist(name)) {
     std::string sql;
     sql.append("CREATE TABLE ");
     sql.append(name);
     sql.append("("
                "id INTEGER PRIMARY KEY,"
                "page_url LONGVARCHAR NOT NULL,"
                "icon_id INTEGER)");
     if (!db->Execute(sql.c_str()))
       return false;
   }
   return true;
 }
 
-void ThumbnailDatabase::InitIconMappingIndex() {
-  // Add an index on the url column. We ignore errors. Since this is always
-  // called during startup, the index will normally already exist.
-  db_.Execute("CREATE INDEX icon_mapping_page_url_idx"
-              " ON icon_mapping(page_url)");
-  db_.Execute("CREATE INDEX icon_mapping_icon_id_idx ON icon_mapping(icon_id)");
+bool ThumbnailDatabase::InitIconMappingIndex() {
+  // Add an index on the url column.
+  return
+      db_.Execute("CREATE INDEX IF NOT EXISTS icon_mapping_page_url_idx"
+                  " ON icon_mapping(page_url)") &&
+      db_.Execute("CREATE INDEX IF NOT EXISTS icon_mapping_icon_id_idx"
+                  " ON icon_mapping(icon_id)");
 }
 
 IconMappingID ThumbnailDatabase::AddIconMapping(const GURL& page_url,
                                                 FaviconID icon_id,
                                                 bool is_temporary) {
   const char* name = is_temporary ? "temp_icon_mapping" : "icon_mapping";
   const char* statement_name =
       is_temporary ? "add_temp_icon_mapping" : "add_icon_mapping";
 
   std::string sql;
@@ skipping 35 matching lines @@
   if (!db_.Execute("ALTER TABLE favicons ADD sizes LONGVARCHAR")) {
     NOTREACHED();
     return false;
   }
   meta_table_.SetVersionNumber(5);
   meta_table_.SetCompatibleVersionNumber(std::min(5, kCompatibleVersionNumber));
   return true;
 }
 
 }  // namespace history