Make DownloadHistory observe manager, items

chrome/browser/history/download_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 "chrome/browser/history/download_database.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 58 matching lines @@
 DownloadDatabase::DownloadDatabase()
     : owning_thread_set_(false),
       owning_thread_(0),
       next_id_(0),
       next_db_handle_(0) {
 }
 
 DownloadDatabase::~DownloadDatabase() {
 }
 
-void DownloadDatabase::CheckThread() {
-  if (owning_thread_set_) {
-    DCHECK(owning_thread_ == base::PlatformThread::CurrentId());
-  } else {
-    owning_thread_ = base::PlatformThread::CurrentId();
-    owning_thread_set_ = true;
-  }
-}
-
 bool DownloadDatabase::EnsureColumnExists(
     const std::string& name, const std::string& type) {
   std::string add_col = "ALTER TABLE downloads ADD COLUMN " + name + " " + type;
   return GetDB().DoesColumnExist("downloads", name.c_str()) ||
          GetDB().Execute(add_col.c_str());
 }
 
 bool DownloadDatabase::InitDownloadTable() {
-  CheckThread();
   GetMetaTable().GetValue(kNextDownloadId, &next_id_);
   if (GetDB().DoesTableExist("downloads")) {
     return EnsureColumnExists("end_time", "INTEGER NOT NULL DEFAULT 0") &&
            EnsureColumnExists("opened", "INTEGER NOT NULL DEFAULT 0");
   } else {
     return GetDB().Execute(kSchema);
   }
 }
 
 bool DownloadDatabase::DropDownloadTable() {
-  CheckThread();
   return GetDB().Execute("DROP TABLE downloads");
 }
 
 void DownloadDatabase::QueryDownloads(
     std::vector<DownloadPersistentStoreInfo>* results) {
-  CheckThread();
   results->clear();
   if (next_db_handle_ < 1)
     next_db_handle_ = 1;
   std::set<DownloadID> db_handles;
 
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT id, full_path, url, start_time, received_bytes, "
         "total_bytes, state, end_time, opened "
       "FROM downloads "
       "ORDER BY start_time"));
@@ skipping 14 matching lines @@
       next_db_handle_ = info.db_handle + 1;
     if (!db_handles.insert(info.db_handle).second) {
       // info.db_handle was already in db_handles. The database is corrupt.
       base::debug::Alias(&info.db_handle);
       DCHECK(false);
     }
   }
 }
 
 bool DownloadDatabase::UpdateDownload(const DownloadPersistentStoreInfo& data) {
-  CheckThread();
   DCHECK(data.db_handle > 0);
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "UPDATE downloads "
       "SET received_bytes=?, state=?, end_time=?, opened=? WHERE id=?"));
   statement.BindInt64(0, data.received_bytes);
   statement.BindInt(1, data.state);
   statement.BindInt64(2, data.end_time.ToTimeT());
   statement.BindInt(3, (data.opened ? 1 : 0));
   statement.BindInt64(4, data.db_handle);
 
   return statement.Run();
 }
 
 bool DownloadDatabase::UpdateDownloadPath(const FilePath& path,
                                           DownloadID db_handle) {
-  CheckThread();
   DCHECK(db_handle > 0);
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "UPDATE downloads SET full_path=? WHERE id=?"));
   BindFilePath(statement, path, 0);
   statement.BindInt64(1, db_handle);
 
   return statement.Run();
 }
 
 bool DownloadDatabase::CleanUpInProgressEntries() {
-  CheckThread();
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "UPDATE downloads SET state=? WHERE state=?"));
   statement.BindInt(0, DownloadItem::CANCELLED);
   statement.BindInt(1, DownloadItem::IN_PROGRESS);
 
   return statement.Run();
 }
 
 int64 DownloadDatabase::CreateDownload(
     const DownloadPersistentStoreInfo& info) {
-  CheckThread();
 
   if (next_db_handle_ == 0) {
     // This is unlikely. All current known tests and users already call
     // QueryDownloads() before CreateDownload().
     std::vector<DownloadPersistentStoreInfo> results;
     QueryDownloads(&results);
     CHECK_NE(0, next_db_handle_);
   }
 
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
@@ skipping 16 matching lines @@
 
   if (statement.Run()) {
     // TODO(benjhayden) if(info.id>next_id_){setvalue;next_id_=info.id;}
     GetMetaTable().SetValue(kNextDownloadId, ++next_id_);
 
     return db_handle;
   }
   return 0;
 }
 
-void DownloadDatabase::RemoveDownload(DownloadID db_handle) {
-  CheckThread();
-
-  sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
-      "DELETE FROM downloads WHERE id=?"));
-  statement.BindInt64(0, db_handle);
-
-  statement.Run();
-}
-
-bool DownloadDatabase::RemoveDownloadsBetween(base::Time delete_begin,
-                                              base::Time delete_end) {
-  CheckThread();
-  time_t start_time = delete_begin.ToTimeT();
-  time_t end_time = delete_end.ToTimeT();
-
-  int num_downloads_deleted = -1;
-  {
-    sql::Statement count(GetDB().GetCachedStatement(SQL_FROM_HERE,
-        "SELECT count(*) FROM downloads WHERE start_time >= ? "
-        "AND start_time < ? AND (State = ? OR State = ? OR State = ?)"));
-    count.BindInt64(0, start_time);
-    count.BindInt64(
-        1,
-        end_time ? end_time : std::numeric_limits<int64>::max());
-    count.BindInt(2, DownloadItem::COMPLETE);
-    count.BindInt(3, DownloadItem::CANCELLED);
-    count.BindInt(4, DownloadItem::INTERRUPTED);
-    if (count.Step())
-      num_downloads_deleted = count.ColumnInt(0);
+void DownloadDatabase::RemoveDownloads(const std::set<DownloadID>& handles) {
+  base::TimeTicks started_removing = base::TimeTicks::Now();
+  for (std::set<DownloadID>::const_iterator it = handles.begin();
+       it != handles.end(); ++it) {
+    sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
+        "DELETE FROM downloads WHERE id=?"));
+    statement.BindInt64(0, *it);
+    statement.Run();
   }
-
-
-  bool success = false;
-  base::TimeTicks started_removing = base::TimeTicks::Now();
-  {
-    // This does not use an index. We currently aren't likely to have enough
-    // downloads where an index by time will give us a lot of benefit.
-    sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
-        "DELETE FROM downloads WHERE start_time >= ? AND start_time < ? "
-        "AND (State = ? OR State = ? OR State = ?)"));
-    statement.BindInt64(0, start_time);
-    statement.BindInt64(
-        1,
-        end_time ? end_time : std::numeric_limits<int64>::max());
-    statement.BindInt(2, DownloadItem::COMPLETE);
-    statement.BindInt(3, DownloadItem::CANCELLED);
-    statement.BindInt(4, DownloadItem::INTERRUPTED);
-
-    success = statement.Run();
-  }
-
-  base::TimeTicks finished_removing = base::TimeTicks::Now();
-
+  int num_downloads_deleted = handles.size();  // TODO(benjhayden) measure
   if (num_downloads_deleted >= 0) {
+    base::TimeTicks finished_removing = base::TimeTicks::Now();
     UMA_HISTOGRAM_COUNTS("Download.DatabaseRemoveDownloadsCount",
                          num_downloads_deleted);
     base::TimeDelta micros = (1000 * (finished_removing - started_removing));
     UMA_HISTOGRAM_TIMES("Download.DatabaseRemoveDownloadsTime", micros);
     if (num_downloads_deleted > 0) {
       UMA_HISTOGRAM_TIMES("Download.DatabaseRemoveDownloadsTimePerRecord",
                           (1000 * micros) / num_downloads_deleted);
     }
   }
-
-  return success;
 }
 
 }  // namespace history