Database usage adjustment for .../history

chrome/browser/history/starred_url_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/starred_url_database.h"
 
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 132 matching lines @@
 
 bool StarredURLDatabase::GetAllStarredEntries(
     std::vector<StarredEntry>* entries) {
   DCHECK(entries);
   std::string sql = "SELECT ";
   sql.append(kHistoryStarFields);
   sql.append("FROM starred LEFT JOIN urls ON starred.url_id = urls.id ");
   sql += "ORDER BY parent_id, visual_order";
 
   sql::Statement s(GetDB().GetUniqueStatement(sql.c_str()));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
+  if (!s.is_valid())
     return false;
-  }
 
   history::StarredEntry entry;
   while (s.Step()) {
     FillInStarredEntry(s, &entry);
     // Reset the url for non-url types. This is needed as we're reusing the
     // same entry for the loop.
     if (entry.type != history::StarredEntry::URL)
       entry.url = GURL();
     entries->push_back(entry);
   }
@@ skipping 25 matching lines @@
 
 bool StarredURLDatabase::UpdateStarredEntryRow(StarID star_id,
                                                const string16& title,
                                                UIStarID parent_folder_id,
                                                int visual_order,
                                                base::Time date_modified) {
   DCHECK(star_id && visual_order >= 0);
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "UPDATE starred SET title=?, parent_id=?, visual_order=?, "
       "date_modified=? WHERE id=?"));
-  if (!statement)
-    return 0;
-
   statement.BindString16(0, title);
   statement.BindInt64(1, parent_folder_id);
   statement.BindInt(2, visual_order);
   statement.BindInt64(3, date_modified.ToInternalValue());
   statement.BindInt64(4, star_id);
+
   return statement.Run();
 }
 
 bool StarredURLDatabase::AdjustStarredVisualOrder(UIStarID parent_folder_id,
                                                   int start_visual_order,
                                                   int delta) {
   DCHECK(parent_folder_id && start_visual_order >= 0);
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "UPDATE starred SET visual_order=visual_order+? "
       "WHERE parent_id=? AND visual_order >= ?"));
-  if (!statement)
-    return false;
-
   statement.BindInt(0, delta);
   statement.BindInt64(1, parent_folder_id);
   statement.BindInt(2, start_visual_order);
+
   return statement.Run();
 }
 
 StarID StarredURLDatabase::CreateStarredEntryRow(URLID url_id,
                                                  UIStarID folder_id,
                                                  UIStarID parent_folder_id,
                                                  const string16& title,
                                                  const base::Time& date_added,
                                                  int visual_order,
                                                  StarredEntry::Type type) {
   DCHECK(visual_order >= 0 &&
          (type != history::StarredEntry::URL || url_id));
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO starred "
       "(type, url_id, group_id, title, date_added, visual_order, parent_id, "
       "date_modified) VALUES (?,?,?,?,?,?,?,?)"));
-  if (!statement)
-    return 0;
 
   switch (type) {
     case history::StarredEntry::URL:
       statement.BindInt(0, 0);
       break;
     case history::StarredEntry::BOOKMARK_BAR:
       statement.BindInt(0, 1);
       break;
     case history::StarredEntry::USER_FOLDER:
       statement.BindInt(0, 2);
       break;
     case history::StarredEntry::OTHER:
       statement.BindInt(0, 3);
       break;
     default:
       NOTREACHED();
   }
   statement.BindInt64(1, url_id);
   statement.BindInt64(2, folder_id);
   statement.BindString16(3, title);
   statement.BindInt64(4, date_added.ToInternalValue());
   statement.BindInt(5, visual_order);
   statement.BindInt64(6, parent_folder_id);
   statement.BindInt64(7, base::Time().ToInternalValue());
+
   if (statement.Run())
     return GetDB().GetLastInsertRowId();
   return 0;
 }
 
 bool StarredURLDatabase::DeleteStarredEntryRow(StarID star_id) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "DELETE FROM starred WHERE id=?"));
-  if (!statement)
-    return false;
+  statement.BindInt64(0, star_id);
 
-  statement.BindInt64(0, star_id);
   return statement.Run();
 }
 
 bool StarredURLDatabase::GetStarredEntry(StarID star_id, StarredEntry* entry) {
   DCHECK(entry && star_id);
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" STAR_FIELDS "FROM starred LEFT JOIN urls ON "
       "starred.url_id = urls.id WHERE starred.id=?"));
-  if (!statement)
-    return false;
-
   statement.BindInt64(0, star_id);
 
   if (statement.Step()) {
     FillInStarredEntry(statement, entry);
     return true;
   }
   return false;
 }
 
 StarID StarredURLDatabase::CreateStarredEntry(StarredEntry* entry) {
@@ skipping 37 matching lines @@
     default:
       NOTREACHED();
       break;
   }
   return entry->id;
 }
 
 UIStarID StarredURLDatabase::GetMaxFolderID() {
   sql::Statement max_folder_id_statement(GetDB().GetUniqueStatement(
       "SELECT MAX(group_id) FROM starred"));
-  if (!max_folder_id_statement) {
-    NOTREACHED() << GetDB().GetErrorMessage();
-    return 0;
-  }
+
   if (!max_folder_id_statement.Step()) {
-    NOTREACHED() << GetDB().GetErrorMessage();
     return 0;
   }
   return max_folder_id_statement.ColumnInt64(0);
 }
 
 bool StarredURLDatabase::BuildStarNodes(
     std::set<StarredURLDatabase::StarredNode*>* roots,
     std::set<StarID>* folders_with_duplicate_ids,
     std::set<StarredNode*>* unparented_urls,
     std::set<StarID>* empty_url_ids) {
@@ skipping 302 matching lines @@
   scoped_ptr<Value> encoded_bookmarks(
       encoder.Encode(&bookmark_bar_node, &other_node, &mobile_node));
   std::string content;
   base::JSONWriter::Write(encoded_bookmarks.get(), true, &content);
 
   return (file_util::WriteFile(path, content.c_str(),
                                static_cast<int>(content.length())) != -1);
 }
 
 }  // namespace history