[Offline pages] OPMStoreSQL implementation of Add disabling updates

components/offline_pages/offline_page_metadata_store_sql.cc

 // Copyright 2016 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/offline_pages/offline_page_metadata_store_sql.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
@@ skipping 164 matching lines @@
   base::string16 title = statement->ColumnString16(10);
 
   OfflinePageItem item(url, id, client_id, path, file_size, creation_time);
   item.last_access_time = last_access_time;
   item.access_count = access_count;
   item.expiration_time = expiration_time;
   item.title = title;
   return item;
 }
 
+bool Insert(sql::Connection* db, const OfflinePageItem& item) {
+  // Using 'INSERT OR FAIL' or 'INSERT OR ABORT' in the query below causes debug
+  // builds to DLOG.
+  const char kSql[] =
+      "INSERT OR IGNORE INTO " OFFLINE_PAGES_TABLE_NAME
+      " (offline_id, online_url, client_namespace, client_id, file_path, "

[dewittj, 2016/09/15 14:58:26]

Can we parametrize this  so that there's no chance that InsertOrReplace will get
out of sync with Insert?

[fgorski, 2016/09/15 16:53:47]

No, and you will see why in the patch that follows.

+      "file_size, creation_time, last_access_time, access_count, "
+      "expiration_time, title)"
+      " VALUES "
+      " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+  sql::Statement statement(db->GetCachedStatement(SQL_FROM_HERE, kSql));
+  statement.BindInt64(0, item.offline_id);
+  statement.BindString(1, item.url.spec());
+  statement.BindString(2, item.client_id.name_space);
+  statement.BindString(3, item.client_id.id);
+  statement.BindString(4, GetUTF8StringFromPath(item.file_path));
+  statement.BindInt64(5, item.file_size);
+  statement.BindInt64(6, item.creation_time.ToInternalValue());
+  statement.BindInt64(7, item.last_access_time.ToInternalValue());
+  statement.BindInt(8, item.access_count);
+  statement.BindInt64(9, item.expiration_time.ToInternalValue());
+  statement.BindString16(10, item.title);
+  return statement.Run() && db->GetLastChangeCount() > 0;

[dewittj, 2016/09/15 14:58:26]

This function should return ItemActionStatus, so that statement.Run() == false
can be separated from LastChangeCount == 0.

[fgorski, 2016/09/15 16:53:47]

Done.

+}
+
 bool InsertOrReplace(sql::Connection* db, const OfflinePageItem& item) {
   const char kSql[] =
       "INSERT OR REPLACE INTO " OFFLINE_PAGES_TABLE_NAME
       " (offline_id, online_url, client_namespace, client_id, file_path, "
       "file_size, creation_time, last_access_time, access_count, "
       "expiration_time, title)"
       " VALUES "
       " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
   sql::Statement statement(db->GetCachedStatement(SQL_FROM_HERE, kSql));
@@ skipping 78 matching lines @@
     NotifyLoadResult(runner, callback,
                      OfflinePageMetadataStore::STORE_LOAD_FAILED, result);
   }
 }
 
 void AddOfflinePageSync(sql::Connection* db,
                         scoped_refptr<base::SingleThreadTaskRunner> runner,
                         const OfflinePageItem& offline_page,
                         const OfflinePageMetadataStore::AddCallback& callback) {
   // TODO(fgorski): Only insert should happen here.
-  InsertOrReplace(db, offline_page);
-  runner->PostTask(FROM_HERE,
-                   base::Bind(callback, OfflinePageMetadataStore::SUCCESS));
+  bool success = Insert(db, offline_page);
+  runner->PostTask(
+      FROM_HERE,
+      base::Bind(callback, success ? OfflinePageMetadataStore::SUCCESS
+                                   : OfflinePageMetadataStore::ALREADY_EXISTS));
 }
 
 void UpdateOfflinePagesSync(
     sql::Connection* db,
     scoped_refptr<base::SingleThreadTaskRunner> runner,
     const std::vector<OfflinePageItem>& pages,
     const OfflinePageMetadataStore::UpdateCallback& callback) {
   // TODO(fgorski): Update the callback to provide information about all items
   // and not just a high level boolean.
   sql::Transaction transaction(db);
@@ skipping 172 matching lines @@
   DCHECK(db_.get());
   if (!db_.get()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   base::Bind(callback));
     return false;
   }
   return true;
 }
 
 }  // namespace offline_pages