Downloads: Added transient flag to download item and download database

components/history/core/browser/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 "components/history/core/browser/download_database.h"
 
 #include <inttypes.h>
 
 #include <limits>
 #include <memory>
@@ skipping 259 matching lines @@
 }
 
 bool DownloadDatabase::MigrateDownloadSiteInstanceUrl() {
   return EnsureColumnExists("site_url", "VARCHAR NOT NULL DEFAULT ''");
 }
 
 bool DownloadDatabase::MigrateDownloadLastAccessTime() {
   return EnsureColumnExists("last_access_time", "INTEGER NOT NULL DEFAULT 0");
 }
 
+bool DownloadDatabase::MigrateDownloadTransient() {
+  return EnsureColumnExists("transient", "INTEGER NOT NULL DEFAULT 1");

[brettw, 2017/03/29 22:54:13]

Don't we want the default here to be 0 (not transient for existing items)?

[shaktisahu, 2017/03/29 23:46:47]

Corrected now. 

+}
+
 bool DownloadDatabase::InitDownloadTable() {
   const char kSchema[] =
       "CREATE TABLE downloads ("
       "id INTEGER PRIMARY KEY,"             // Primary key.
       "guid VARCHAR NOT NULL,"              // GUID.
       "current_path LONGVARCHAR NOT NULL,"  // Current disk location
       "target_path LONGVARCHAR NOT NULL,"   // Final disk location
       "start_time INTEGER NOT NULL,"        // When the download was started.
       "received_bytes INTEGER NOT NULL,"    // Total size downloaded.
       "total_bytes INTEGER NOT NULL,"       // Total size of the download.
       "state INTEGER NOT NULL,"             // 1=complete, 4=interrupted
       "danger_type INTEGER NOT NULL,"       // Danger type, validated.
       "interrupt_reason INTEGER NOT NULL,"  // DownloadInterruptReason
       "hash BLOB NOT NULL,"                 // Raw SHA-256 hash of contents.
       "end_time INTEGER NOT NULL,"          // When the download completed.
       "opened INTEGER NOT NULL,"            // 1 if it has ever been opened
                                             // else 0
       "last_access_time INTEGER NOT NULL,"  // The last time it was accessed.
+      "transient INTEGER NOT NULL,"         // 1 if it is transient, else 0.
       "referrer VARCHAR NOT NULL,"          // HTTP Referrer
       "site_url VARCHAR NOT NULL,"          // Site URL for initiating site
                                             // instance.
       "tab_url VARCHAR NOT NULL,"           // Tab URL for initiator.
       "tab_referrer_url VARCHAR NOT NULL,"  // Tag referrer URL for initiator.
       "http_method VARCHAR NOT NULL,"       // HTTP method.
       "by_ext_id VARCHAR NOT NULL,"         // ID of extension that started the
                                             // download
       "by_ext_name VARCHAR NOT NULL,"       // name of extension
       "etag VARCHAR NOT NULL,"              // ETag
@@ skipping 71 matching lines @@
   results->clear();
   std::set<uint32_t> ids;
 
   DownloadRowMap info_map;
 
   sql::Statement statement_main(GetDB().GetCachedStatement(
       SQL_FROM_HERE,
       "SELECT id, guid, current_path, target_path, mime_type, "
       "original_mime_type, start_time, received_bytes, total_bytes, state, "
       "danger_type, interrupt_reason, hash, end_time, opened, "
-      "last_access_time, referrer, site_url, tab_url, tab_referrer_url, "
-      "http_method, by_ext_id, by_ext_name, etag, last_modified "
-      "FROM downloads ORDER BY start_time"));
+      "last_access_time, transient, referrer, site_url, tab_url, "
+      "tab_referrer_url, http_method, by_ext_id, by_ext_name, etag, "
+      "last_modified FROM downloads ORDER BY start_time"));
 
   while (statement_main.Step()) {
     std::unique_ptr<DownloadRow> info(new DownloadRow());
     int column = 0;
 
     // SQLITE does not have unsigned integers, so explicitly handle negative
     // |id|s instead of casting them to very large uint32s, which would break
     // the max(id) logic in GetNextDownloadId().
     int64_t signed_id = statement_main.ColumnInt64(column++);
     bool valid = ConvertIntToDownloadId(signed_id, &(info->id));
@@ skipping 13 matching lines @@
     info->danger_type =
         IntToDownloadDangerType(statement_main.ColumnInt(column++));
     info->interrupt_reason =
         IntToDownloadInterruptReason(statement_main.ColumnInt(column++));
     statement_main.ColumnBlobAsString(column++, &info->hash);
     info->end_time =
         base::Time::FromInternalValue(statement_main.ColumnInt64(column++));
     info->opened = statement_main.ColumnInt(column++) != 0;
     info->last_access_time =
         base::Time::FromInternalValue(statement_main.ColumnInt64(column++));
+    info->transient = statement_main.ColumnInt(column++) != 0;
     info->referrer_url = GURL(statement_main.ColumnString(column++));
     info->site_url = GURL(statement_main.ColumnString(column++));
     info->tab_url = GURL(statement_main.ColumnString(column++));
     info->tab_referrer_url = GURL(statement_main.ColumnString(column++));
     info->http_method = statement_main.ColumnString(column++);
     info->by_ext_id = statement_main.ColumnString(column++);
     info->by_ext_name = statement_main.ColumnString(column++);
     info->etag = statement_main.ColumnString(column++);
     info->last_modified = statement_main.ColumnString(column++);
 
@@ skipping 97 matching lines @@
     return false;
   }
 
   sql::Statement statement(GetDB().GetCachedStatement(
       SQL_FROM_HERE,
       "UPDATE downloads "
       "SET current_path=?, target_path=?, "
       "mime_type=?, original_mime_type=?, "
       "received_bytes=?, state=?, "
       "danger_type=?, interrupt_reason=?, hash=?, end_time=?, total_bytes=?, "
-      "opened=?, last_access_time=?, by_ext_id=?, by_ext_name=?, etag=?, "
-      "last_modified=? WHERE id=?"));
+      "opened=?, last_access_time=?, transient=?, by_ext_id=?, by_ext_name=?, "
+      "etag=?, last_modified=? WHERE id=?"));
   int column = 0;
   BindFilePath(statement, data.current_path, column++);
   BindFilePath(statement, data.target_path, column++);
   statement.BindString(column++, data.mime_type);
   statement.BindString(column++, data.original_mime_type);
   statement.BindInt64(column++, data.received_bytes);
   statement.BindInt(column++, DownloadStateToInt(data.state));
   statement.BindInt(column++, DownloadDangerTypeToInt(data.danger_type));
   statement.BindInt(column++,
                     DownloadInterruptReasonToInt(data.interrupt_reason));
   statement.BindBlob(column++, data.hash.data(), data.hash.size());
   statement.BindInt64(column++, data.end_time.ToInternalValue());
   statement.BindInt64(column++, data.total_bytes);
   statement.BindInt(column++, (data.opened ? 1 : 0));
   statement.BindInt64(column++, data.last_access_time.ToInternalValue());
+  statement.BindInt(column++, (data.transient ? 1 : 0));
   statement.BindString(column++, data.by_ext_id);
   statement.BindString(column++, data.by_ext_name);
   statement.BindString(column++, data.etag);
   statement.BindString(column++, data.last_modified);
   statement.BindInt(column++, DownloadIdToInt(data.id));
 
   if (!statement.Run())
     return false;
 
   if (data.download_slice_info.size() == 0) {
@@ skipping 38 matching lines @@
   if (info.danger_type == DownloadDangerType::INVALID)
     return false;
 
   {
     sql::Statement statement_insert(GetDB().GetCachedStatement(
         SQL_FROM_HERE,
         "INSERT INTO downloads "
         "(id, guid, current_path, target_path, mime_type, original_mime_type, "
         " start_time, received_bytes, total_bytes, state, danger_type, "
         " interrupt_reason, hash, end_time, opened, last_access_time, "
-        " referrer, site_url, tab_url, tab_referrer_url, http_method, "
+        "transient, referrer, site_url, tab_url, tab_referrer_url, "
+        "http_method, "
         " by_ext_id, by_ext_name, etag, last_modified) "
         "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
         "        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
-        "        ?, ?, ?, ?, ?)"));
+        "        ?, ?, ?, ?, ?, ?)"));
 
     int column = 0;
     statement_insert.BindInt(column++, DownloadIdToInt(info.id));
     statement_insert.BindString(column++, info.guid);
     BindFilePath(statement_insert, info.current_path, column++);
     BindFilePath(statement_insert, info.target_path, column++);
     statement_insert.BindString(column++, info.mime_type);
     statement_insert.BindString(column++, info.original_mime_type);
     statement_insert.BindInt64(column++, info.start_time.ToInternalValue());
     statement_insert.BindInt64(column++, info.received_bytes);
     statement_insert.BindInt64(column++, info.total_bytes);
     statement_insert.BindInt(column++, DownloadStateToInt(info.state));
     statement_insert.BindInt(column++,
                              DownloadDangerTypeToInt(info.danger_type));
     statement_insert.BindInt(
         column++, DownloadInterruptReasonToInt(info.interrupt_reason));
     statement_insert.BindBlob(column++, info.hash.data(), info.hash.size());
     statement_insert.BindInt64(column++, info.end_time.ToInternalValue());
     statement_insert.BindInt(column++, info.opened ? 1 : 0);
     statement_insert.BindInt64(column++,
                                info.last_access_time.ToInternalValue());
+    statement_insert.BindInt(column++, info.transient ? 1 : 0);
     statement_insert.BindString(column++, info.referrer_url.spec());
     statement_insert.BindString(column++, info.site_url.spec());
     statement_insert.BindString(column++, info.tab_url.spec());
     statement_insert.BindString(column++, info.tab_referrer_url.spec());
     statement_insert.BindString(column++, info.http_method);
     statement_insert.BindString(column++, info.by_ext_id);
     statement_insert.BindString(column++, info.by_ext_name);
     statement_insert.BindString(column++, info.etag);
     statement_insert.BindString(column++, info.last_modified);
     if (!statement_insert.Run()) {
@@ skipping 138 matching lines @@
         "Download.DatabaseDownloadExistsForDownloadSlice", found);
     if (!found) {
       RemoveDownloadSlices(info.download_id);
       continue;
     }
     it->second->download_slice_info.push_back(info);
   }
 }
 
 }  // namespace history