Revert of IndexedDB: Optimize range deletion operations (e.g. clearing a store)

content/browser/indexed_db/indexed_db_backing_store.cc

Index: content/browser/indexed_db/indexed_db_backing_store.cc
diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc
index 29934dc7c94e5b22ca6ed9a50dd4720ab839b083..ff549bbaaa137614e37efb46e097efa13047fc85 100644
--- a/content/browser/indexed_db/indexed_db_backing_store.cc
+++ b/content/browser/indexed_db/indexed_db_backing_store.cc
@@ -699,8 +699,20 @@
 Status DeleteRangeBasic(LevelDBTransaction* transaction,
                         const std::string& begin,
                         const std::string& end,
-                        bool upper_open) {
-  return transaction->RemoveRange(begin, end, upper_open);
+                        bool upper_open,
+                        size_t* delete_count) {
+  DCHECK(delete_count);
+  std::unique_ptr<LevelDBIterator> it = transaction->CreateIterator();
+  Status s;
+  *delete_count = 0;
+  for (s = it->Seek(begin); s.ok() && it->IsValid() &&
+                            (upper_open ? CompareKeys(it->Key(), end) < 0
+                                        : CompareKeys(it->Key(), end) <= 0);
+       s = it->Next()) {
+    if (transaction->Remove(it->Key()))
+      (*delete_count)++;
+  }
+  return s;
 }
 
 Status DeleteBlobsInRange(IndexedDBBackingStore::Transaction* transaction,
@@ -1988,6 +2000,7 @@
   LevelDBTransaction* leveldb_transaction = transaction->transaction();
 
   base::string16 object_store_name;
+  size_t delete_count = 0;
   bool found = false;
   Status s = GetString(leveldb_transaction, ObjectStoreMetaDataKey::Encode(
                                                 database_id, object_store_id,
@@ -2011,7 +2024,8 @@
   s = DeleteRangeBasic(
       leveldb_transaction,
       ObjectStoreMetaDataKey::Encode(database_id, object_store_id, 0),
-      ObjectStoreMetaDataKey::EncodeMaxKey(database_id, object_store_id), true);
+      ObjectStoreMetaDataKey::EncodeMaxKey(database_id, object_store_id), true,
+      &delete_count);
 
   if (s.ok()) {
     leveldb_transaction->Remove(
@@ -2020,14 +2034,16 @@
     s = DeleteRangeBasic(
         leveldb_transaction,
         IndexFreeListKey::Encode(database_id, object_store_id, 0),
-        IndexFreeListKey::EncodeMaxKey(database_id, object_store_id), true);
+        IndexFreeListKey::EncodeMaxKey(database_id, object_store_id), true,
+        &delete_count);
   }
 
   if (s.ok()) {
     s = DeleteRangeBasic(
         leveldb_transaction,
         IndexMetaDataKey::Encode(database_id, object_store_id, 0, 0),
-        IndexMetaDataKey::EncodeMaxKey(database_id, object_store_id), true);
+        IndexMetaDataKey::EncodeMaxKey(database_id, object_store_id), true,
+        &delete_count);
   }
 
   if (!s.ok()) {
@@ -2174,8 +2190,9 @@
       KeyPrefix(database_id, object_store_id).Encode();
   const std::string stop_key =
       KeyPrefix(database_id, object_store_id + 1).Encode();
-  Status s =
-      DeleteRangeBasic(transaction->transaction(), start_key, stop_key, true);
+  size_t delete_count = 0;
+  Status s = DeleteRangeBasic(transaction->transaction(), start_key, stop_key,
+                              true, &delete_count);
   if (!s.ok()) {
     INTERNAL_WRITE_ERROR(CLEAR_OBJECT_STORE);
     return s;
@@ -2211,8 +2228,11 @@
     IndexedDBBackingStore::Transaction* transaction,
     int64_t database_id,
     int64_t object_store_id,
-    const IndexedDBKeyRange& key_range) {
+    const IndexedDBKeyRange& key_range,
+    size_t* exists_delete_count) {
+  DCHECK(exists_delete_count);
   Status s;
+  *exists_delete_count = 0;
   std::unique_ptr<IndexedDBBackingStore::Cursor> start_cursor =
       OpenObjectStoreCursor(transaction, database_id, object_store_id,
                             key_range, blink::WebIDBCursorDirectionNext, &s);
@@ -2249,7 +2269,9 @@
                          false);
   if (!s.ok())
     return s;
-  s = DeleteRangeBasic(transaction->transaction(), start_key, stop_key, false);
+  size_t data_delete_count = 0;
+  s = DeleteRangeBasic(transaction->transaction(), start_key, stop_key, false,
+                       &data_delete_count);
   if (!s.ok())
     return s;
   start_key =
@@ -2257,7 +2279,9 @@
   stop_key =
       ExistsEntryKey::Encode(database_id, object_store_id, end_cursor->key());
 
-  s = DeleteRangeBasic(transaction->transaction(), start_key, stop_key, false);
+  s = DeleteRangeBasic(transaction->transaction(), start_key, stop_key, false,
+                       exists_delete_count);
+  DCHECK_EQ(data_delete_count, *exists_delete_count);
   return s;
 }
 
@@ -3005,12 +3029,13 @@
     return InvalidDBKeyStatus();
   LevelDBTransaction* leveldb_transaction = transaction->transaction();
 
+  size_t delete_count = 0;
   const std::string index_meta_data_start =
       IndexMetaDataKey::Encode(database_id, object_store_id, index_id, 0);
   const std::string index_meta_data_end =
       IndexMetaDataKey::EncodeMaxKey(database_id, object_store_id, index_id);
   Status s = DeleteRangeBasic(leveldb_transaction, index_meta_data_start,
-                              index_meta_data_end, true);
+                              index_meta_data_end, true, &delete_count);
 
   if (s.ok()) {
     const std::string index_data_start =
@@ -3018,7 +3043,7 @@
     const std::string index_data_end =
         IndexDataKey::EncodeMaxKey(database_id, object_store_id, index_id);
     s = DeleteRangeBasic(leveldb_transaction, index_data_start, index_data_end,
-                         true);
+                         true, &delete_count);
   }
 
   if (!s.ok())