Changeset 106705 in webkit

Timestamp:

Feb 3, 2012, 4:16:45 PM (15 years ago)

Author:

jsbell@chromium.org

Message:

IndexedDB: Key generators not rolled back if insertion fails or is aborted
​https://bugs.webkit.org/show_bug.cgi?id=77060

Reviewed by Tony Chang.

Source/WebCore:

Test: storage/indexeddb/key-generator.html

• storage/IDBObjectStoreBackendImpl.cpp:

(WebCore::IDBObjectStoreBackendImpl::put): Add abort task to reset cache.
(WebCore::IDBObjectStoreBackendImpl::revertAutoIncrementKeyCache):
(WebCore):
(WebCore::IDBObjectStoreBackendImpl::putInternal): Reset cache on error.

• storage/IDBObjectStoreBackendImpl.h:

(IDBObjectStoreBackendImpl):

LayoutTests:

• storage/indexeddb/key-generator-expected.txt: Added.
• storage/indexeddb/key-generator.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/key-generator-expected.txt (added)
• LayoutTests/storage/indexeddb/key-generator.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp (modified) (4 diffs)
• Source/WebCore/storage/IDBObjectStoreBackendImpl.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-03  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Key generators not rolled back if insertion fails or is aborted
+        https://bugs.webkit.org/show_bug.cgi?id=77060
+
+        Reviewed by Tony Chang.
+
+        * storage/indexeddb/key-generator-expected.txt: Added.
+        * storage/indexeddb/key-generator.html: Added.
+
 2012-02-03  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Key generators not rolled back if insertion fails or is aborted
+        https://bugs.webkit.org/show_bug.cgi?id=77060
+
+        Reviewed by Tony Chang.
+
+        Test: storage/indexeddb/key-generator.html
+
+        * storage/IDBObjectStoreBackendImpl.cpp:
+        (WebCore::IDBObjectStoreBackendImpl::put): Add abort task to reset cache.
+        (WebCore::IDBObjectStoreBackendImpl::revertAutoIncrementKeyCache):
+        (WebCore):
+        (WebCore::IDBObjectStoreBackendImpl::putInternal): Reset cache on error.
+        * storage/IDBObjectStoreBackendImpl.h:
+        (IDBObjectStoreBackendImpl):
+
 2012-02-03  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp

@@ -179 +179 @@
     }
 
-    if (!transaction->scheduleTask(createCallbackTask(&IDBObjectStoreBackendImpl::putInternal, objectStore, value, key, putMode, callbacks, transaction)))
-        ec = IDBDatabaseException::TRANSACTION_INACTIVE_ERR;
+    if (!transaction->scheduleTask(
+            createCallbackTask(&IDBObjectStoreBackendImpl::putInternal, objectStore, value, key, putMode, callbacks, transaction),
+            // FIXME: One of these per put() is overkill, since it's simply a cache invalidation.
+            createCallbackTask(&IDBObjectStoreBackendImpl::revertAutoIncrementKeyCache, objectStore)))
+        ec = IDBDatabaseException::TRANSACTION_INACTIVE_ERR;
+}
+
+void IDBObjectStoreBackendImpl::revertAutoIncrementKeyCache(ScriptExecutionContext*, PassRefPtr<IDBObjectStoreBackendImpl> objectStore)
+{
+    objectStore->resetAutoIncrementKeyCache();
 }
 
@@ -205 +213 @@
                     RefPtr<SerializedScriptValue> valueAfterInjection = injectKeyIntoKeyPath(autoIncKey, value, objectStore->m_keyPath);
                     if (!valueAfterInjection) {
+                        objectStore->resetAutoIncrementKeyCache();
                         callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "The generated key could not be inserted into the object using the keyPath."));
                         return;
@@ -222 +231 @@
     RefPtr<IDBBackingStore::ObjectStoreRecordIdentifier> recordIdentifier = objectStore->m_backingStore->createInvalidRecordIdentifier();
     if (putMode == AddOnly && objectStore->m_backingStore->keyExistsInObjectStore(objectStore->m_databaseId, objectStore->id(), *key, recordIdentifier.get())) {
+        objectStore->resetAutoIncrementKeyCache();
         callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::CONSTRAINT_ERR, "Key already exists in the object store."));
         return;
@@ -238 +248 @@
 
         if ((!index->multiEntry() || indexKey->type() != IDBKey::ArrayType) && !index->addingKeyAllowed(indexKey.get(), key.get())) {
+            objectStore->resetAutoIncrementKeyCache();
             callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::CONSTRAINT_ERR, "One of the derived (from a keyPath) keys for an index does not satisfy its uniqueness requirements."));
             return;
         }
 
-       if (index->multiEntry() && indexKey->type() == IDBKey::ArrayType) {
+        if (index->multiEntry() && indexKey->type() == IDBKey::ArrayType) {
            for (size_t j = 0; j < indexKey->array().size(); ++j) {
                 if (!index->addingKeyAllowed(indexKey->array()[j].get(), key.get())) {
+                    objectStore->resetAutoIncrementKeyCache();
                     callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::CONSTRAINT_ERR, "One of the derived (from a keyPath) keys for an index does not satisfy its uniqueness requirements."));
                     return;

trunk/Source/WebCore/storage/IDBObjectStoreBackendImpl.h

@@ -101 +101 @@
     static void removeIndexFromMap(ScriptExecutionContext*, PassRefPtr<IDBObjectStoreBackendImpl>, PassRefPtr<IDBIndexBackendImpl>);
     static void addIndexToMap(ScriptExecutionContext*, PassRefPtr<IDBObjectStoreBackendImpl>, PassRefPtr<IDBIndexBackendImpl>);
+    static void revertAutoIncrementKeyCache(ScriptExecutionContext*, PassRefPtr<IDBObjectStoreBackendImpl>);
 
     RefPtr<IDBBackingStore> m_backingStore;