Changeset 195783 in webkit

Timestamp:

Jan 28, 2016 2:40:02 PM (8 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: SQLite backend doesn't support deleting ranges with more than one key.
​https://bugs.webkit.org/show_bug.cgi?id=153604

Reviewed by Andy Estes.

Source/WebCore:

No new tests (A few failing tests pass, a few get closer).

• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:

(WebCore::IDBServer::SQLiteIDBBackingStore::deleteRange):

LayoutTests:

• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-28  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: SQLite backend doesn't support deleting ranges with more than one key.
+        https://bugs.webkit.org/show_bug.cgi?id=153604
+
+        Reviewed by Andy Estes.
+
+        * platform/mac-wk1/TestExpectations:
+
 2016-01-28  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -456 +456 @@
 storage/indexeddb/cursor-primary-key-order.html [ Failure ]
 storage/indexeddb/cursor-update.html [ Failure ]
-storage/indexeddb/delete-range.html [ Failure ]
 storage/indexeddb/get-keyrange.html [ Failure ]
 storage/indexeddb/index-duplicate-keypaths.html [ Failure ]
@@ -462 +461 @@
 storage/indexeddb/modern/cursor-7.html [ Failure ]
 storage/indexeddb/modern/get-keyrange.html [ Failure ]
-storage/indexeddb/modern/idbobjectstore-delete-1.html [ Failure ]
 storage/indexeddb/modern/index-3.html [ Failure ]
 storage/indexeddb/mozilla/cursor-mutation.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-28  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: SQLite backend doesn't support deleting ranges with more than one key.
+        https://bugs.webkit.org/show_bug.cgi?id=153604
+
+        Reviewed by Andy Estes.
+
+        No new tests (A few failing tests pass, a few get closer).
+
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+        (WebCore::IDBServer::SQLiteIDBBackingStore::deleteRange):
+
 2016-01-28  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp

@@ -1030 +1030 @@
     }
 
-    // FIXME: Once cursor support is in place, use a cursor to delete every record in the range.
-    LOG_ERROR("Currently unable to delete all records in a multi-key range");
-    return { IDBDatabaseException::UnknownError, ASCIILiteral("Currently unable to delete all records in a multi-key range") };
+    auto cursor = transaction->maybeOpenBackingStoreCursor(objectStoreID, 0, keyRange);
+    if (!cursor) {
+        LOG_ERROR("Cannot open cursor to delete range of records from the database");
+        return { IDBDatabaseException::UnknownError, ASCIILiteral("Cannot open cursor to delete range of records from the database") };
+    }
+
+    Vector<IDBKeyData> keys;
+    while (!cursor->didComplete() && !cursor->didError()) {
+        keys.append(cursor->currentKey());
+        cursor->advance(1);
+    }
+
+    if (cursor->didError()) {
+        LOG_ERROR("Cursor failed while accumulating range of records from the database");
+        return { IDBDatabaseException::UnknownError, ASCIILiteral("Cursor failed while accumulating range of records from the database") };
+    }
+
+    IDBError error;
+    for (auto& key : keys) {
+        error = deleteRecord(*transaction, objectStoreID, key);
+        if (!error.isNull()) {
+            LOG_ERROR("deleteRange: Error deleting keys in range");
+            break;
+        }
+    }
+
+    return error;
 }