Provide API in RequestCoordinator to remove results by client ID.

components/offline_pages/background/request_queue_in_memory_store.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/background/request_queue_in_memory_store.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/offline_pages/background/save_page_request.h"
@@ skipping 20 matching lines @@
   if (iter != requests_.end())
     requests_.erase(iter);
   requests_.insert(std::make_pair(request.request_id(), request));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, UpdateStatus::UPDATED));
 }
 
 void RequestQueueInMemoryStore::RemoveRequests(
     const std::vector<int64_t>& request_ids,
     const RemoveCallback& callback) {
-  // In case the |request_ids| is empty, the result will be true, but the count
-  // of deleted pages will be empty.
   int count = 0;
   RequestsMap::iterator iter;
   for (auto request_id : request_ids) {
     iter = requests_.find(request_id);
     if (iter != requests_.end()) {
       requests_.erase(iter);
       ++count;
     }
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, true, count));
 }
 
+void RequestQueueInMemoryStore::RemoveRequestsByClientId(
+    const std::vector<ClientId>& client_ids,
+    const RemoveCallback& callback) {
+  int count = 0;
+
+  // Once for each client id in our list
+  for (auto client_id : client_ids) {

[fgorski, 2016/08/02 05:01:22]

const auto&

[Pete Williamson, 2016/08/02 23:27:17]

Done.

+    // Check it against each request in the store.
+    for (auto iter = requests_.begin();
+         iter != requests_.end();
+         ++iter) {

[fgorski, 2016/08/02 05:01:22]

(I am aware this is only used for testing, but consider the following)

There are at least 2 problems with this code:
* It does not work for non-unique ClientID
* It is O(m*n)

How about:
1. putting client IDs into a <set>
2. iterate over requests_ with a proper pre- and post- increment?

for (auto iter = requests_.begin(); iter != requests_.end(); ) {
  if (client_id_set.find(iter->second.client_id()) != client_id_set.end()) {
    requests_.erase(iter++);
    ++count;
  } else {
    ++iter;
  }
}

[Pete Williamson, 2016/08/02 23:27:17]

OK, but I had to add operator< to ClientID to make it work in a set.

[fgorski, 2016/08/03 03:29:41]

That is because it is backed by BST. Have you tried unordered_set?

[Pete Williamson, 2016/08/03 19:51:08]

I think it might be faster as an ordered set - using the ordering, it might be
able to search faster, we could (in theory, depending on implementation) end up
as O(M*log(N)) instead of O(M*N)

+      // Check against each incoming client ID, and delete if we have a match.
+      if ((*iter).second.client_id() == client_id) {
+        requests_.erase(iter);
+        // This delete will invalidate the iterator, so move on to the next
+        // entry.
+        ++count;
+        break;
+      }
+    }
+  }
+
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::Bind(callback, true, count));
+}
+
 void RequestQueueInMemoryStore::Reset(const ResetCallback& callback) {
   requests_.clear();
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 base::Bind(callback, true));
 }
 
 }  // namespace offline_pages