Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6126)

Unified Diff: chrome/browser/history/download_database.cc

Issue 7237034: sql::MetaTable.next_download_id, DownloadManager::GetNextId() (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix merge Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/history/download_database.h ('k') | chrome/browser/history/history.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/download_database.cc
diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc
index 906ac83dd3f6fe0a865d7314ad2a43322c0eb3a6..ccaed51beb856c1c7447794ec2283bf63ea9db85 100644
--- a/chrome/browser/history/download_database.cc
+++ b/chrome/browser/history/download_database.cc
@@ -52,9 +52,14 @@ FilePath ColumnFilePath(sql::Statement& statement, int col) {
#endif
+// Key in the meta_table containing the next id to use for a new download in
+// this profile.
+static const char kNextDownloadId[] = "next_download_id";
+
} // namespace
-DownloadDatabase::DownloadDatabase() {
+DownloadDatabase::DownloadDatabase()
+ : next_id_(0) {
}
DownloadDatabase::~DownloadDatabase() {
@@ -73,6 +78,8 @@ bool DownloadDatabase::InitDownloadTable() {
"state INTEGER NOT NULL)"))
return false;
}
+ meta_table_.Init(&GetDB(), 0, 0);
+ meta_table_.GetValue(kNextDownloadId, &next_id_);
return true;
}
@@ -161,8 +168,12 @@ int64 DownloadDatabase::CreateDownload(
statement.BindInt64(4, info.total_bytes);
statement.BindInt(5, info.state);
- if (statement.Run())
- return GetDB().GetLastInsertRowId();
+ if (statement.Run()) {
+ int64 db_handle = GetDB().GetLastInsertRowId();
+ // TODO(benjhayden) if(info.id>next_id_){setvalue;next_id_=info.id;}
+ meta_table_.SetValue(kNextDownloadId, ++next_id_);
+ return db_handle;
+ }
return 0;
}
« no previous file with comments | « chrome/browser/history/download_database.h ('k') | chrome/browser/history/history.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698