Service Worker: Delay stale resource cleanup

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 <string>
 
 #include "base/file_util.h"
 #include "base/location.h"
@@ skipping 955 matching lines @@
 
   Status status = LazyOpen(true);
   if (status != STATUS_OK)
     return status;
 
   for (std::set<int64>::const_iterator itr = ids.begin();
        itr != ids.end(); ++itr) {
     // Value should be empty.
     batch->Put(CreateResourceIdKey(id_key_prefix, *itr), "");
   }
+  BumpNextResourceIdIfNeeded(ids, batch);

[michaeln, 2014/07/09 02:36:10]

lions and tigers and bears, thnx for fixing this

[nhiroki, 2014/07/09 03:43:10]

Great catch! Thank you :)

   return STATUS_OK;
 }
 
 ServiceWorkerDatabase::Status ServiceWorkerDatabase::DeleteResourceIds(
     const char* id_key_prefix,
     const std::set<int64>& ids) {
   leveldb::WriteBatch batch;
   Status status = DeleteResourceIdsInBatch(id_key_prefix, ids, &batch);
   if (status != STATUS_OK)
     return status;
@@ skipping 61 matching lines @@
 
 void ServiceWorkerDatabase::BumpNextRegistrationIdIfNeeded(
     int64 used_id, leveldb::WriteBatch* batch) {
   DCHECK(batch);
   if (next_avail_registration_id_ <= used_id) {
     next_avail_registration_id_ = used_id + 1;
     batch->Put(kNextRegIdKey, base::Int64ToString(next_avail_registration_id_));
   }
 }
 
+void ServiceWorkerDatabase::BumpNextResourceIdIfNeeded(
+    const std::set<int64>& used_ids,
+    leveldb::WriteBatch* batch) {
+  DCHECK(batch);
+  int64 old_id = next_avail_resource_id_;
+  for (std::set<int64>::const_iterator itr = used_ids.begin();

[nhiroki, 2014/07/09 03:43:10]

IIUC, std::set is always sorted and the last element should be the biggest one.

[falken, 2014/07/09 04:31:14]

Ah, looks right. Switched to look at the last element.

+       itr != used_ids.end();
+       ++itr) {
+    if (next_avail_resource_id_ <= *itr)
+      next_avail_resource_id_ = *itr + 1;
+  }
+
+  if (next_avail_resource_id_ != old_id)
+    batch->Put(kNextResIdKey, base::Int64ToString(next_avail_resource_id_));
+}
+
 void ServiceWorkerDatabase::BumpNextVersionIdIfNeeded(
     int64 used_id, leveldb::WriteBatch* batch) {
   DCHECK(batch);
   if (next_avail_version_id_ <= used_id) {
     next_avail_version_id_ = used_id + 1;
     batch->Put(kNextVerIdKey, base::Int64ToString(next_avail_version_id_));
   }
 }
 
 bool ServiceWorkerDatabase::IsOpen() {
@@ skipping 30 matching lines @@
 
 void ServiceWorkerDatabase::HandleWriteResult(
     const tracked_objects::Location& from_here,
     Status status) {
   if (status != STATUS_OK)
     Disable(from_here, status);
   ServiceWorkerMetrics::CountWriteDatabaseResult(status);
 }
 
 }  // namespace content