IndexedDB: Switched two Iterator::Seek calls to Transaction::Get.

content/browser/indexed_db/indexed_db_backing_store.cc

 // Copyright (c) 2013 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 "content/browser/indexed_db/indexed_db_backing_store.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
@@ skipping 2660 matching lines @@
     return leveldb::Status::OK();
   }
 
   BlobEntryKey blob_entry_key;
   StringPiece leveldb_key_piece(object_store_data_key);
   if (!BlobEntryKey::FromObjectStoreDataKey(&leveldb_key_piece,
                                             &blob_entry_key)) {
     NOTREACHED();
     return InternalInconsistencyStatus();
   }
-  scoped_ptr<LevelDBIterator> it = transaction()->CreateIterator();
   std::string encoded_key = blob_entry_key.Encode();
-  leveldb::Status s = it->Seek(encoded_key);
+  bool found;
+  std::string encoded_value;
+  leveldb::Status s = transaction()->Get(encoded_key, &encoded_value, &found);
   if (!s.ok())
     return s;
-  if (it->IsValid() && CompareKeys(it->Key(), encoded_key) == 0) {
-    if (!DecodeBlobData(it->Value().as_string(), &value->blob_info)) {
+  if (found) {
+    if (!DecodeBlobData(encoded_value, &value->blob_info)) {
       INTERNAL_READ_ERROR(GET_BLOB_INFO_FOR_RECORD);
       return InternalInconsistencyStatus();
     }
     std::vector<IndexedDBBlobInfo>::iterator iter;
     for (iter = value->blob_info.begin(); iter != value->blob_info.end();
          ++iter) {
       iter->set_file_path(
           backing_store_->GetBlobFileName(database_id, iter->key()));
       iter->set_mark_used_callback(
           backing_store_->active_blob_registry()->GetAddBlobRefCallback(
@@ skipping 1276 matching lines @@
 }
 
 bool IndexedDBBackingStore::Transaction::CollectBlobFilesToRemove() {
   if (backing_store_->is_incognito())
     return true;
 
   BlobChangeMap::const_iterator iter = blob_change_map_.begin();
   // Look up all old files to remove as part of the transaction, store their
   // names in blobs_to_remove_, and remove their old blob data entries.
   if (iter != blob_change_map_.end()) {
-    scoped_ptr<LevelDBIterator> db_iter = transaction_->CreateIterator();
     for (; iter != blob_change_map_.end(); ++iter) {
       BlobEntryKey blob_entry_key;
       StringPiece key_piece(iter->second->key());
       if (!BlobEntryKey::FromObjectStoreDataKey(&key_piece, &blob_entry_key)) {
         NOTREACHED();
         INTERNAL_WRITE_ERROR_UNTESTED(TRANSACTION_COMMIT_METHOD);
         transaction_ = NULL;
         return false;
       }
       if (database_id_ < 0)
         database_id_ = blob_entry_key.database_id();
       else
         DCHECK_EQ(database_id_, blob_entry_key.database_id());
       std::string blob_entry_key_bytes = blob_entry_key.Encode();
-      db_iter->Seek(blob_entry_key_bytes);
-      if (db_iter->IsValid() &&
-          !CompareKeys(db_iter->Key(), blob_entry_key_bytes)) {
+      bool found;
+      std::string blob_entry_value_bytes;
+      leveldb::Status s = transaction_->Get(
+          blob_entry_key_bytes, &blob_entry_value_bytes, &found);
+      if (s.ok() && found) {
         std::vector<IndexedDBBlobInfo> blob_info;
-        if (!DecodeBlobData(db_iter->Value().as_string(), &blob_info)) {
+        if (!DecodeBlobData(blob_entry_value_bytes, &blob_info)) {
           INTERNAL_READ_ERROR_UNTESTED(TRANSACTION_COMMIT_METHOD);
           transaction_ = NULL;
           return false;
         }
         std::vector<IndexedDBBlobInfo>::iterator blob_info_iter;
         for (blob_info_iter = blob_info.begin();
              blob_info_iter != blob_info.end();
              ++blob_info_iter)
           blobs_to_remove_.push_back(
               std::make_pair(database_id_, blob_info_iter->key()));
@@ skipping 280 matching lines @@
     int64_t size,
     base::Time last_modified)
     : is_file_(true),
       file_path_(file_path),
       key_(key),
       size_(size),
       last_modified_(last_modified) {
 }
 
 }  // namespace content