Database usage adjustment for .../history

chrome/browser/history/in_memory_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/in_memory_database.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 51 matching lines @@
   return true;
 }
 
 bool InMemoryDatabase::InitFromDisk(const FilePath& history_name) {
   if (!InitDB())
     return false;
 
   // Attach to the history database on disk.  (We can't ATTACH in the middle of
   // a transaction.)
   sql::Statement attach(GetDB().GetUniqueStatement("ATTACH ? AS history"));
-  if (!attach) {
-    NOTREACHED() << "Unable to attach to history database.";
-    return false;
-  }
 #if defined(OS_POSIX)
   attach.BindString(0, history_name.value());
 #else
   attach.BindString(0, WideToUTF8(history_name.value()));
 #endif
   if (!attach.Run()) {
     NOTREACHED() << GetDB().GetErrorMessage();

[Scott Hess - ex-Googler, 2012/01/03 23:41:57]

If there was an error, shouldn't it already have been logged and NOTREACHED?

[Greg Billock, 2012/01/04 19:20:20]

Yes. Fixed. This may have merged in on me, or I just missed it.

     return false;
   }
 
   // Copy URL data to memory.
   base::TimeTicks begin_load = base::TimeTicks::Now();
   if (!db_.Execute(
       "INSERT INTO urls SELECT * FROM history.urls WHERE typed_count > 0")) {
     // Unable to get data from the history database. This is OK, the file may
     // just not exist yet.
   }
   base::TimeTicks end_load = base::TimeTicks::Now();
   UMA_HISTOGRAM_MEDIUM_TIMES("History.InMemoryDBPopulate",
                              end_load - begin_load);
   UMA_HISTOGRAM_COUNTS("History.InMemoryDBItemCount", db_.GetLastChangeCount());
 
   {
     // This calculation should be fast (since it's on an in-memory DB with
     // an average of only 35 rows).
     sql::Statement visit_count(db_.GetUniqueStatement(
         "SELECT sum(visit_count) FROM urls"));
-    if (visit_count && visit_count.Step()) {
+    if (visit_count.Step()) {
       UMA_HISTOGRAM_COUNTS("History.InMemoryTypedUrlVisitCount",
                            visit_count.ColumnInt(0));
     }
   }
 
   // Insert keyword search related URLs.
   begin_load = base::TimeTicks::Now();
   if (!db_.Execute(
       "INSERT INTO urls SELECT u.id, u.url, u.title, u.visit_count, "
       "u.typed_count, u.last_visit_time, u.hidden, u.favicon_id "
@@ skipping 34 matching lines @@
   CreateKeywordSearchTermsIndices();
 
   return true;
 }
 
 sql::Connection& InMemoryDatabase::GetDB() {
   return db_;
 }
 
 }  // namespace history