Service Worker: Deleting db iterator before closing db.

content/browser/service_worker/service_worker_database.cc

 // Copyright 2014 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/service_worker/service_worker_database.h"
 
+#include <utility>
+
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 320 matching lines @@
 ServiceWorkerDatabase::GetOriginsWithRegistrations(std::set<GURL>* origins) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(origins->empty());
 
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
 
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(kUniqueOriginKey); itr->Valid(); itr->Next()) {
-    status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      origins->clear();
-      return status;
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(kUniqueOriginKey); itr->Valid(); itr->Next()) {
+      status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK) {
+        origins->clear();
+        break;
+      }
+
+      std::string origin_str;
+      if (!RemovePrefix(itr->key().ToString(), kUniqueOriginKey, &origin_str))
+        break;
+
+      GURL origin(origin_str);
+      if (!origin.is_valid()) {
+        status = STATUS_ERROR_CORRUPTED;
+        origins->clear();
+        break;
+      }
+
+      origins->insert(origin);
     }
-
-    std::string origin_str;
-    if (!RemovePrefix(itr->key().ToString(), kUniqueOriginKey, &origin_str))
-      break;
-
-    GURL origin(origin_str);
-    if (!origin.is_valid()) {
-      status = STATUS_ERROR_CORRUPTED;
-      HandleReadResult(FROM_HERE, status);
-      origins->clear();
-      return status;
-    }
-
-    origins->insert(origin);
   }
 
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status
 ServiceWorkerDatabase::GetOriginsWithForeignFetchRegistrations(
     std::set<GURL>* origins) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(origins->empty());
 
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
 
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(kForeignFetchOriginKey); itr->Valid(); itr->Next()) {
-    status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      origins->clear();
-      return status;
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(kForeignFetchOriginKey); itr->Valid(); itr->Next()) {
+      status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK) {
+        origins->clear();
+        break;
+      }
+
+      std::string origin_str;
+      if (!RemovePrefix(itr->key().ToString(), kForeignFetchOriginKey,
+                        &origin_str))
+        break;
+
+      GURL origin(origin_str);
+      if (!origin.is_valid()) {
+        status = STATUS_ERROR_CORRUPTED;
+        origins->clear();
+        break;
+      }
+
+      origins->insert(origin);
     }
-
-    std::string origin_str;
-    if (!RemovePrefix(itr->key().ToString(), kForeignFetchOriginKey,
-                      &origin_str))
-      break;
-
-    GURL origin(origin_str);
-    if (!origin.is_valid()) {
-      status = STATUS_ERROR_CORRUPTED;
-      HandleReadResult(FROM_HERE, status);
-      origins->clear();
-      return status;
-    }
-
-    origins->insert(origin);
   }
 
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetRegistrationsForOrigin(
     const GURL& origin,
     std::vector<RegistrationData>* registrations,
     std::vector<std::vector<ResourceRecord>>* opt_resources_list) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(registrations->empty());
 
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
 
   std::string prefix = CreateRegistrationKeyPrefix(origin);
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
-    status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      registrations->clear();
-      if (opt_resources_list)
-        opt_resources_list->clear();
-      return status;
-    }
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
+      status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK) {
+        registrations->clear();
+        if (opt_resources_list)
+          opt_resources_list->clear();
+        break;
+      }
 
-    if (!RemovePrefix(itr->key().ToString(), prefix, NULL))
-      break;
+      if (!RemovePrefix(itr->key().ToString(), prefix, NULL))
+        break;
 
-    RegistrationData registration;
-    status = ParseRegistrationData(itr->value().ToString(), &registration);
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      registrations->clear();
-      if (opt_resources_list)
-        opt_resources_list->clear();
-      return status;
-    }
-    registrations->push_back(registration);
+      RegistrationData registration;
+      status = ParseRegistrationData(itr->value().ToString(), &registration);
+      if (status != STATUS_OK) {
+        registrations->clear();
+        if (opt_resources_list)
+          opt_resources_list->clear();
+        break;
+      }
+      registrations->push_back(registration);
 
-    if (opt_resources_list) {
-      std::vector<ResourceRecord> resources;
-      status = ReadResourceRecords(registration.version_id, &resources);
-      if (status != STATUS_OK) {
-        HandleReadResult(FROM_HERE, status);
-        registrations->clear();
-        opt_resources_list->clear();
-        return status;
+      if (opt_resources_list) {
+        std::vector<ResourceRecord> resources;
+        status = ReadResourceRecords(registration.version_id, &resources);
+        if (status != STATUS_OK) {
+          registrations->clear();
+          opt_resources_list->clear();
+          break;
+        }
+        opt_resources_list->push_back(resources);
       }
-      opt_resources_list->push_back(resources);
     }
   }
 
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetAllRegistrations(
     std::vector<RegistrationData>* registrations) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(registrations->empty());
 
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
 
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(kRegKeyPrefix); itr->Valid(); itr->Next()) {
-    status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      registrations->clear();
-      return status;
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(kRegKeyPrefix); itr->Valid(); itr->Next()) {
+      status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK) {
+        registrations->clear();
+        break;
+      }
+
+      if (!RemovePrefix(itr->key().ToString(), kRegKeyPrefix, NULL))
+        break;
+
+      RegistrationData registration;
+      status = ParseRegistrationData(itr->value().ToString(), &registration);
+      if (status != STATUS_OK) {
+        registrations->clear();
+        break;
+      }
+      registrations->push_back(registration);
     }
-
-    if (!RemovePrefix(itr->key().ToString(), kRegKeyPrefix, NULL))
-      break;
-
-    RegistrationData registration;
-    status = ParseRegistrationData(itr->value().ToString(), &registration);
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      registrations->clear();
-      return status;
-    }
-    registrations->push_back(registration);
   }
 
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration(
     int64_t registration_id,
     const GURL& origin,
     RegistrationData* registration,
@@ skipping 355 matching lines @@
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(user_data->empty());
 
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
 
   std::string key_prefix = CreateHasUserDataKeyPrefix(user_data_name);
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(key_prefix); itr->Valid(); itr->Next()) {
-    status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      user_data->clear();
-      return status;
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(key_prefix); itr->Valid(); itr->Next()) {
+      status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK) {
+        user_data->clear();
+        break;
+      }
+
+      std::string registration_id_string;
+      if (!RemovePrefix(itr->key().ToString(), key_prefix,
+                        &registration_id_string)) {
+        break;
+      }
+
+      int64_t registration_id;
+      status = ParseId(registration_id_string, &registration_id);
+      if (status != STATUS_OK) {
+        user_data->clear();
+        break;
+      }
+
+      std::string value;
+      status = LevelDBStatusToStatus(
+          db_->Get(leveldb::ReadOptions(),
+                   CreateUserDataKey(registration_id, user_data_name), &value));
+      if (status != STATUS_OK) {
+        user_data->clear();
+        break;
+      }
+      user_data->push_back(std::make_pair(registration_id, value));
     }
-
-    std::string registration_id_string;
-    if (!RemovePrefix(itr->key().ToString(), key_prefix,
-                      &registration_id_string)) {
-      break;
-    }
-
-    int64_t registration_id;
-    status = ParseId(registration_id_string, &registration_id);
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      user_data->clear();
-      return status;
-    }
-
-    std::string value;
-    status = LevelDBStatusToStatus(
-        db_->Get(leveldb::ReadOptions(),
-                 CreateUserDataKey(registration_id, user_data_name), &value));
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      user_data->clear();
-      return status;
-    }
-    user_data->push_back(std::make_pair(registration_id, value));
   }
 
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::GetUncommittedResourceIds(
     std::set<int64_t>* ids) {
   return ReadResourceIds(kUncommittedResIdKeyPrefix, ids);
 }
@@ skipping 312 matching lines @@
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadResourceRecords(
     int64_t version_id,
     std::vector<ResourceRecord>* resources) {
   DCHECK(resources->empty());
 
   Status status = STATUS_OK;
   const std::string prefix = CreateResourceRecordKeyPrefix(version_id);
 
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
-    Status status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      resources->clear();
-      return status;
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
+      Status status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK) {
+        resources->clear();
+        break;
+      }
+
+      if (!RemovePrefix(itr->key().ToString(), prefix, NULL))
+        break;
+
+      ResourceRecord resource;
+      status = ParseResourceRecord(itr->value().ToString(), &resource);
+      if (status != STATUS_OK) {
+        resources->clear();
+        break;
+      }
+      resources->push_back(resource);
     }
-
-    if (!RemovePrefix(itr->key().ToString(), prefix, NULL))
-      break;
-
-    ResourceRecord resource;
-    status = ParseResourceRecord(itr->value().ToString(), &resource);
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      resources->clear();
-      return status;
-    }
-    resources->push_back(resource);
   }
 
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ParseResourceRecord(
     const std::string& serialized,
     ServiceWorkerDatabase::ResourceRecord* out) {
   DCHECK(out);
@@ skipping 48 matching lines @@
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteResourceRecords(
     int64_t version_id,
     std::vector<int64_t>* newly_purgeable_resources,
     leveldb::WriteBatch* batch) {
   DCHECK(batch);
 
   Status status = STATUS_OK;
   const std::string prefix = CreateResourceRecordKeyPrefix(version_id);
 
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
-    status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      return status;
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
+      status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK)
+        break;
+
+      const std::string key = itr->key().ToString();
+      std::string unprefixed;
+      if (!RemovePrefix(key, prefix, &unprefixed))
+        break;
+
+      int64_t resource_id;
+      status = ParseId(unprefixed, &resource_id);
+      if (status != STATUS_OK)
+        break;
+
+      // Remove a resource record.
+      batch->Delete(key);
+
+      // Currently resource sharing across versions and registrations is not
+      // supported, so we can purge this without caring about it.
+      PutPurgeableResourceIdToBatch(resource_id, batch);
+      newly_purgeable_resources->push_back(resource_id);
     }
-
-    const std::string key = itr->key().ToString();
-    std::string unprefixed;
-    if (!RemovePrefix(key, prefix, &unprefixed))
-      break;
-
-    int64_t resource_id;
-    status = ParseId(unprefixed, &resource_id);
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      return status;
-    }
-
-    // Remove a resource record.
-    batch->Delete(key);
-
-    // Currently resource sharing across versions and registrations is not
-    // supported, so we can purge this without caring about it.
-    PutPurgeableResourceIdToBatch(resource_id, batch);
-    newly_purgeable_resources->push_back(resource_id);
   }
 
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadResourceIds(
     const char* id_key_prefix,
     std::set<int64_t>* ids) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(id_key_prefix);
   DCHECK(ids->empty());
 
   Status status = LazyOpen(false);
   if (IsNewOrNonexistentDatabase(status))
     return STATUS_OK;
   if (status != STATUS_OK)
     return status;
 
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(id_key_prefix); itr->Valid(); itr->Next()) {
-    status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      ids->clear();
-      return status;
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(id_key_prefix); itr->Valid(); itr->Next()) {
+      status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK) {
+        ids->clear();
+        break;
+      }
+
+      std::string unprefixed;
+      if (!RemovePrefix(itr->key().ToString(), id_key_prefix, &unprefixed))
+        break;
+
+      int64_t resource_id;
+      status = ParseId(unprefixed, &resource_id);
+      if (status != STATUS_OK) {
+        ids->clear();
+        break;
+      }
+      ids->insert(resource_id);
     }
-
-    std::string unprefixed;
-    if (!RemovePrefix(itr->key().ToString(), id_key_prefix, &unprefixed))
-      break;
-
-    int64_t resource_id;
-    status = ParseId(unprefixed, &resource_id);
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      ids->clear();
-      return status;
-    }
-    ids->insert(resource_id);
   }
 
   HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteResourceIdsInBatch(
     const char* id_key_prefix,
     const std::set<int64_t>& ids,
     leveldb::WriteBatch* batch) {
@@ skipping 37 matching lines @@
 }
 
 ServiceWorkerDatabase::Status
 ServiceWorkerDatabase::DeleteUserDataForRegistration(
     int64_t registration_id,
     leveldb::WriteBatch* batch) {
   DCHECK(batch);
   Status status = STATUS_OK;
   const std::string prefix = CreateUserDataKeyPrefix(registration_id);
 
-  scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
-  for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
-    status = LevelDBStatusToStatus(itr->status());
-    if (status != STATUS_OK) {
-      HandleReadResult(FROM_HERE, status);
-      return status;
+  {
+    scoped_ptr<leveldb::Iterator> itr(db_->NewIterator(leveldb::ReadOptions()));
+    for (itr->Seek(prefix); itr->Valid(); itr->Next()) {
+      status = LevelDBStatusToStatus(itr->status());
+      if (status != STATUS_OK)
+        break;
+
+      const std::string key = itr->key().ToString();
+      std::string user_data_name;
+      if (!RemovePrefix(key, prefix, &user_data_name))
+        break;
+      batch->Delete(key);
+      batch->Delete(CreateHasUserDataKey(registration_id, user_data_name));
     }
+  }
 
-    const std::string key = itr->key().ToString();
-    std::string user_data_name;
-    if (!RemovePrefix(key, prefix, &user_data_name))
-      break;
-    batch->Delete(key);
-    batch->Delete(CreateHasUserDataKey(registration_id, user_data_name));
-  }
+  HandleReadResult(FROM_HERE, status);
   return status;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadDatabaseVersion(
     int64_t* db_version) {
   std::string value;
   Status status = LevelDBStatusToStatus(
       db_->Get(leveldb::ReadOptions(), kDatabaseVersionKey, &value));
   if (status == STATUS_ERROR_NOT_FOUND) {
     // The database hasn't been initialized yet.
@@ skipping 105 matching lines @@
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 bool ServiceWorkerDatabase::IsDatabaseInMemory() const {
   return path_.empty();
 }
 
 }  // namespace content