IndexedDB: Replace passing identically-sized vectors with pairs

Avoid the antipattern of passing vectors-that-must-be-the-same-size.
Use a tuple (well, a pair) instead.

R=tsepez@chromium.org,alecflett@chromium.org
BUG=334314

Review URL: https://codereview.chromium.org/138703002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245383 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/indexed_db/indexed_db_database.cc

@@ -698,7 +698,6 @@ struct IndexedDBDatabase::PutOperationParams {
   scoped_ptr<IndexedDBKey> key;
   IndexedDBDatabase::PutMode put_mode;
   scoped_refptr<IndexedDBCallbacks> callbacks;
-  std::vector<int64> index_ids;
   std::vector<IndexKeys> index_keys;
 
   DISALLOW_COPY_AND_ASSIGN(PutOperationParams);
@@ -710,7 +709,6 @@ void IndexedDBDatabase::Put(int64 transaction_id,
                             scoped_ptr<IndexedDBKey> key,
                             PutMode put_mode,
                             scoped_refptr<IndexedDBCallbacks> callbacks,
-                            const std::vector<int64>& index_ids,
                             const std::vector<IndexKeys>& index_keys) {
   IDB_TRACE("IndexedDBDatabase::Put");
   IndexedDBTransaction* transaction = GetTransaction(transaction_id);
@@ -728,7 +726,6 @@ void IndexedDBDatabase::Put(int64 transaction_id,
   params->key = key.Pass();
   params->put_mode = put_mode;
   params->callbacks = callbacks;
-  params->index_ids = index_ids;
   params->index_keys = index_keys;
   transaction->ScheduleTask(base::Bind(
       &IndexedDBDatabase::PutOperation, this, base::Passed(&params)));
@@ -738,7 +735,6 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,
                                      IndexedDBTransaction* transaction) {
   IDB_TRACE("IndexedDBDatabase::PutOperation");
   DCHECK_NE(transaction->mode(), indexed_db::TRANSACTION_READ_ONLY);
-  DCHECK_EQ(params->index_ids.size(), params->index_keys.size());
   bool key_was_generated = false;
 
   DCHECK(metadata_.object_stores.find(params->object_store_id) !=
@@ -799,7 +795,6 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,
                                                 object_store,
                                                 *key,
                                                 key_was_generated,
-                                                params->index_ids,
                                                 params->index_keys,
                                                 &index_writers,
                                                 &error_message,
@@ -864,7 +859,6 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,
 void IndexedDBDatabase::SetIndexKeys(int64 transaction_id,
                                      int64 object_store_id,
                                      scoped_ptr<IndexedDBKey> primary_key,
-                                     const std::vector<int64>& index_ids,
                                      const std::vector<IndexKeys>& index_keys) {
   IDB_TRACE("IndexedDBDatabase::SetIndexKeys");
   IndexedDBTransaction* transaction = GetTransaction(transaction_id);
@@ -909,7 +903,6 @@ void IndexedDBDatabase::SetIndexKeys(int64 transaction_id,
                                                 object_store_metadata,
                                                 *primary_key,
                                                 false,
-                                                index_ids,
                                                 index_keys,
                                                 &index_writers,
                                                 &error_message,

content/browser/indexed_db/indexed_db_database.h

@@ -8,6 +8,7 @@
 #include <list>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -44,7 +45,9 @@ class CONTENT_EXPORT IndexedDBDatabase
     CURSOR_UPDATE
   };
 
-  typedef std::vector<IndexedDBKey> IndexKeys;
+  // An index and corresponding set of keys
+  typedef std::pair<int64, std::vector<IndexedDBKey> > IndexKeys;
+
   // Identifier is pair of (origin url, database name).
   typedef std::pair<GURL, base::string16> Identifier;
 
@@ -130,12 +133,10 @@ class CONTENT_EXPORT IndexedDBDatabase
            scoped_ptr<IndexedDBKey> key,
            PutMode mode,
            scoped_refptr<IndexedDBCallbacks> callbacks,
-           const std::vector<int64>& index_ids,
            const std::vector<IndexKeys>& index_keys);
   void SetIndexKeys(int64 transaction_id,
                     int64 object_store_id,
                     scoped_ptr<IndexedDBKey> primary_key,
-                    const std::vector<int64>& index_ids,
                     const std::vector<IndexKeys>& index_keys);
   void SetIndexesReady(int64 transaction_id,
                        int64 object_store_id,

content/browser/indexed_db/indexed_db_dispatcher_host.cc

@@ -531,16 +531,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnPut(
       parent_, params.ipc_thread_id, params.ipc_callbacks_id));
 
   int64 host_transaction_id = parent_->HostTransactionId(params.transaction_id);
-  if (params.index_ids.size() != params.index_keys.size()) {
-    connection->database()->Abort(
-        host_transaction_id,
-        IndexedDBDatabaseError(
-            blink::WebIDBDatabaseExceptionUnknownError,
-            "Malformed IPC message: index_ids.size() != index_keys.size()"));
-    parent_->BadMessageReceived();
-    return;
-  }
-
   // TODO(alecflett): Avoid a copy here.
   std::string value_copy(params.value);
   connection->database()->Put(
@@ -550,7 +540,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnPut(
       make_scoped_ptr(new IndexedDBKey(params.key)),
       static_cast<IndexedDBDatabase::PutMode>(params.put_mode),
       callbacks,
-      params.index_ids,
       params.index_keys);
   TransactionIDToSizeMap* map =
       &parent_->database_dispatcher_host_->transaction_size_map_;
@@ -569,21 +558,10 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnSetIndexKeys(
     return;
 
   int64 host_transaction_id = parent_->HostTransactionId(params.transaction_id);
-  if (params.index_ids.size() != params.index_keys.size()) {
-    connection->database()->Abort(
-        host_transaction_id,
-        IndexedDBDatabaseError(
-            blink::WebIDBDatabaseExceptionUnknownError,
-            "Malformed IPC message: index_ids.size() != index_keys.size()"));
-    parent_->BadMessageReceived();
-    return;
-  }
-
   connection->database()->SetIndexKeys(
       host_transaction_id,
       params.object_store_id,
       make_scoped_ptr(new IndexedDBKey(params.primary_key)),
-      params.index_ids,
       params.index_keys);
 }
 

content/browser/indexed_db/indexed_db_index_writer.cc

@@ -38,13 +38,14 @@ bool IndexWriter::VerifyIndexKeys(
     const IndexedDBKey& primary_key,
     base::string16* error_message) const {
   *can_add_keys = false;
-  for (size_t i = 0; i < index_keys_.size(); ++i) {
+  DCHECK_EQ(index_id, index_keys_.first);
+  for (size_t i = 0; i < index_keys_.second.size(); ++i) {
     bool ok = AddingKeyAllowed(backing_store,
                                transaction,
                                database_id,
                                object_store_id,
                                index_id,
-                               (index_keys_)[i],
+                               (index_keys_.second)[i],
                                primary_key,
                                can_add_keys);
     if (!ok)
@@ -70,12 +71,13 @@ void IndexWriter::WriteIndexKeys(
     int64 database_id,
     int64 object_store_id) const {
   int64 index_id = index_metadata_.id;
-  for (size_t i = 0; i < index_keys_.size(); ++i) {
+  DCHECK_EQ(index_id, index_keys_.first);
+  for (size_t i = 0; i < index_keys_.second.size(); ++i) {
     bool ok = backing_store->PutIndexDataForRecord(transaction,
                                                    database_id,
                                                    object_store_id,
                                                    index_id,
-                                                   index_keys_[i],
+                                                   index_keys_.second[i],
                                                    record_identifier);
     // This should have already been verified as a valid write during
     // verify_index_keys.
@@ -122,29 +124,27 @@ bool MakeIndexWriters(
     const IndexedDBObjectStoreMetadata& object_store,
     const IndexedDBKey& primary_key,  // makes a copy
     bool key_was_generated,
-    const std::vector<int64>& index_ids,
     const std::vector<IndexedDBDatabase::IndexKeys>& index_keys,
     ScopedVector<IndexWriter>* index_writers,
     base::string16* error_message,
     bool* completed) {
-  DCHECK_EQ(index_ids.size(), index_keys.size());
   *completed = false;
 
-  std::map<int64, IndexedDBDatabase::IndexKeys> index_key_map;
-  for (size_t i = 0; i < index_ids.size(); ++i)
-    index_key_map[index_ids[i]] = index_keys[i];
-
-  for (IndexedDBObjectStoreMetadata::IndexMap::const_iterator it =
-           object_store.indexes.begin();
-       it != object_store.indexes.end();
+  for (std::vector<IndexedDBDatabase::IndexKeys>::const_iterator it =
+           index_keys.begin();
+       it != index_keys.end();
        ++it) {
-    const IndexedDBIndexMetadata& index = it->second;
+    IndexedDBObjectStoreMetadata::IndexMap::const_iterator found =
+        object_store.indexes.find(it->first);
+    if (found == object_store.indexes.end())
+      continue;
+    const IndexedDBIndexMetadata& index = found->second;
+    IndexedDBDatabase::IndexKeys keys = *it;
 
-    IndexedDBDatabase::IndexKeys keys = index_key_map[it->first];
     // If the object_store is using auto_increment, then any indexes with an
     // identical key_path need to also use the primary (generated) key as a key.
     if (key_was_generated && (index.key_path == object_store.key_path))
-      keys.push_back(primary_key);
+      keys.second.push_back(primary_key);
 
     scoped_ptr<IndexWriter> index_writer(new IndexWriter(index, keys));
     bool can_add_keys = false;

content/browser/indexed_db/indexed_db_index_writer.h

@@ -65,7 +65,6 @@ bool MakeIndexWriters(
     const IndexedDBObjectStoreMetadata& metadata,
     const IndexedDBKey& primary_key,
     bool key_was_generated,
-    const std::vector<int64>& index_ids,
     const std::vector<IndexedDBDatabase::IndexKeys>& index_keys,
     ScopedVector<IndexWriter>* index_writers,
     base::string16* error_message,

content/child/indexed_db/indexed_db_dispatcher.cc

@@ -4,6 +4,8 @@
 
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 
+#include <utility>
+
 #include "base/format_macros.h"
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
@@ -346,19 +348,17 @@ void IndexedDBDispatcher::RequestIDBDatabasePut(
   params.key = key;
   params.put_mode = put_mode;
 
-  COMPILE_ASSERT(sizeof(params.index_ids[0]) == sizeof(index_ids[0]),
-                 Cant_copy);
-  params.index_ids
-      .assign(index_ids.data(), index_ids.data() + index_ids.size());
-
-  params.index_keys.resize(index_keys.size());
-  for (size_t i = 0; i < index_keys.size(); ++i) {
-    params.index_keys[i].resize(index_keys[i].size());
+  DCHECK_EQ(index_ids.size(), index_keys.size());
+  params.index_keys.resize(index_ids.size());
+  for (size_t i = 0, len = index_ids.size(); i < len; ++i) {
+    params.index_keys[i].first = index_ids[i];
+    params.index_keys[i].second.resize(index_keys[i].size());
     for (size_t j = 0; j < index_keys[i].size(); ++j) {
-      params.index_keys[i][j] =
+      params.index_keys[i].second[j] =
           IndexedDBKey(IndexedDBKeyBuilder::Build(index_keys[i][j]));
     }
   }
+
   Send(new IndexedDBHostMsg_DatabasePut(params));
 }
 

content/child/indexed_db/webidbdatabase_impl.cc

@@ -137,18 +137,18 @@ void WebIDBDatabaseImpl::setIndexKeys(
   params.transaction_id = transaction_id;
   params.object_store_id = object_store_id;
   params.primary_key = IndexedDBKeyBuilder::Build(primary_key);
-  COMPILE_ASSERT(sizeof(params.index_ids[0]) == sizeof(index_ids[0]),
-                 Cant_copy);
-  params.index_ids.assign(index_ids.data(),
-                          index_ids.data() + index_ids.size());
 
-  params.index_keys.resize(index_keys.size());
-  for (size_t i = 0; i < index_keys.size(); ++i) {
-    params.index_keys[i].resize(index_keys[i].size());
+  DCHECK_EQ(index_ids.size(), index_keys.size());
+  params.index_keys.resize(index_ids.size());
+  for (size_t i = 0, len = index_ids.size(); i < len; ++i) {
+    params.index_keys[i].first = index_ids[i];
+    params.index_keys[i].second.resize(index_keys[i].size());
     for (size_t j = 0; j < index_keys[i].size(); ++j) {
-      params.index_keys[i][j] = IndexedDBKeyBuilder::Build(index_keys[i][j]);
+      params.index_keys[i].second[j] =
+          IndexedDBKey(IndexedDBKeyBuilder::Build(index_keys[i][j]));
     }
   }
+
   thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseSetIndexKeys(params));
 }
 

content/common/indexed_db/indexed_db_messages.h

@@ -4,6 +4,7 @@
 
 // Message definition file, included multiple times, hence no include guard.
 
+#include <utility>
 #include <vector>
 
 #include "content/common/indexed_db/indexed_db_key.h"
@@ -25,6 +26,9 @@ IPC_ENUM_TRAITS(blink::WebIDBDatabase::TaskType)
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBDataLoss, blink::WebIDBDataLossTotal)
 
+// An index id, and corresponding set of keys to insert.
+typedef std::pair<int64, std::vector<content::IndexedDBKey> > IndexKeys;
+
 // Used to enumerate indexed databases.
 IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryGetDatabaseNames_Params)
   // The response should have these ids.
@@ -130,12 +134,8 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabasePut_Params)
   IPC_STRUCT_MEMBER(content::IndexedDBKey, key)
   // Whether this is an add or a put.
   IPC_STRUCT_MEMBER(blink::WebIDBDatabase::PutMode, put_mode)
-  // The names of the indexes used below.
-  IPC_STRUCT_MEMBER(std::vector<int64>, index_ids)
-  // The keys for each index, such that each inner vector corresponds
-  // to each index named in index_names, respectively.
-  IPC_STRUCT_MEMBER(std::vector<std::vector<content::IndexedDBKey> >,
-                    index_keys)
+  // The index ids and the list of keys for each index.
+  IPC_STRUCT_MEMBER(std::vector<IndexKeys>, index_keys)
 IPC_STRUCT_END()
 
 // Used to open both cursors and object cursors in IndexedDB.
@@ -201,11 +201,8 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseSetIndexKeys_Params)
   IPC_STRUCT_MEMBER(int64, object_store_id)
   // The object store key that we're setting index keys for.
   IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key)
-  // The indexes that we're setting keys on.
-  IPC_STRUCT_MEMBER(std::vector<int64>, index_ids)
-  // A list of index keys for each index.
-  IPC_STRUCT_MEMBER(std::vector<std::vector<content::IndexedDBKey> >,
-                    index_keys)
+  // The index ids and the list of keys for each index.
+  IPC_STRUCT_MEMBER(std::vector<IndexKeys>, index_keys)
 IPC_STRUCT_END()
 
 // Used to create an index.
@@ -504,4 +501,3 @@ IPC_MESSAGE_CONTROL2(IndexedDBHostMsg_DatabaseCommit,
 // WebIDBDatabase::~WebIDBCursor() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_CursorDestroyed,
                      int32 /* ipc_cursor_id */)
-