Changeset 106830 in webkit

Timestamp:

Feb 6, 2012 12:00:24 PM (12 years ago)

Author:

jsbell@chromium.org

Message:

IndexedDB: Raise exception during add/put call if autoIncrement key insertion will fail
​https://bugs.webkit.org/show_bug.cgi?id=77374

Source/WebCore:

If a put request will use a key generator, try inserting a dummy key during the sync
put() call to check if the key insertion will succeed so an exception can be raised
early, rather than deferring to the asynchronous task.

Reviewed by Tony Chang.

Test: storage/indexeddb/keypath-edges.html

• storage/IDBObjectStoreBackendImpl.cpp:

(WebCore::IDBObjectStoreBackendImpl::put):

LayoutTests:

Reviewed by Tony Chang.

• storage/indexeddb/keypath-edges-expected.txt:
• storage/indexeddb/keypath-edges.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/keypath-edges-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/keypath-edges.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-06  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Raise exception during add/put call if autoIncrement key insertion will fail
+        https://bugs.webkit.org/show_bug.cgi?id=77374
+
+        Reviewed by Tony Chang.
+
+        * storage/indexeddb/keypath-edges-expected.txt:
+        * storage/indexeddb/keypath-edges.html:
+
 2012-02-06  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/LayoutTests/storage/indexeddb/keypath-edges-expected.txt

@@ -46 +46 @@
 store = transaction.objectStore('store-with-path-and-generator')
 
-Key path doesn't resolve to a value; should yield null, put request should raise error event
-store.put(null)
-PASS Error event raised: The generated key could not be inserted into the object using the keyPath.
-PASS event.target.errorCode is IDBDatabaseException.DATA_ERR
-PASS event.cancelable is true
-event.preventDefault()
+Key path doesn't resolve to a value; should yield null but insertion would fail, so put request should raise exception
+Expecting exception from store.put(null)
+PASS Exception was thrown.
+PASS code is IDBDatabaseException.DATA_ERR
+
+Key path doesn't resolve to a value; should yield null but insertion would fail, so put request should raise exception
+Expecting exception from store.put('string')
+PASS Exception was thrown.
+PASS code is IDBDatabaseException.DATA_ERR
 
 Key path doesn't resolve to a value; should yield null, key should be generated, put request should succeed

trunk/LayoutTests/storage/indexeddb/keypath-edges.html

@@ -89 +89 @@
 
     debug("");
-    debug("Key path doesn't resolve to a value; should yield null, put request should raise error event");
-    request = evalAndLog("store.put(null)");
-    request.onerror = function (e) {
-        testPassed("Error event raised: " + e.target.webkitErrorMessage);
-        shouldBe("event.target.errorCode", "IDBDatabaseException.DATA_ERR");
-        shouldBeTrue("event.cancelable");
-        evalAndLog("event.preventDefault()");
+    debug("Key path doesn't resolve to a value; should yield null but insertion would fail, so put request should raise exception");
+    evalAndExpectException("store.put(null)", "IDBDatabaseException.DATA_ERR");
+
+    debug("");
+    debug("Key path doesn't resolve to a value; should yield null but insertion would fail, so put request should raise exception");
+    evalAndExpectException("store.put('string')", "IDBDatabaseException.DATA_ERR");
+
+    debug("");
+    debug("Key path doesn't resolve to a value; should yield null, key should be generated, put request should succeed");
+    request = evalAndLog("store.put({})");
+    request.onerror = unexpectedErrorCallback;
+    request.onsuccess = function () {
+        testPassed("store.put succeeded");
 
         debug("");
-        debug("Key path doesn't resolve to a value; should yield null, key should be generated, put request should succeed");
-        request = evalAndLog("store.put({})");
+        debug("Key path resolves to a value that is invalid key; should yield 'invalid' key, should throw DATA_ERR");
+        evalAndExpectException("store.put({foo: null})", "IDBDatabaseException.DATA_ERR");
+
+        debug("");
+        debug("Key path resolves to a value that is valid key; should yield 'string' key, should succeed");
+        request = evalAndLog("store.put({foo: 'zoo'})");
         request.onerror = unexpectedErrorCallback;
         request.onsuccess = function () {
             testPassed("store.put succeeded");
 
-            debug("");
-            debug("Key path resolves to a value that is invalid key; should yield 'invalid' key, should throw DATA_ERR");
-            evalAndExpectException("store.put({foo: null})", "IDBDatabaseException.DATA_ERR");
-
-            debug("");
-            debug("Key path resolves to a value that is valid key; should yield 'string' key, should succeed");
-            request = evalAndLog("store.put({foo: 'zoo'})");
-            request.onerror = unexpectedErrorCallback;
-            request.onsuccess = function () {
-                testPassed("store.put succeeded");
-            };
         };
     };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Raise exception during add/put call if autoIncrement key insertion will fail
+        https://bugs.webkit.org/show_bug.cgi?id=77374
+
+        If a put request will use a key generator, try inserting a dummy key during the sync
+        put() call to check if the key insertion will succeed so an exception can be raised
+        early, rather than deferring to the asynchronous task.
+
+        Reviewed by Tony Chang.
+
+        Test: storage/indexeddb/keypath-edges.html
+
+        * storage/IDBObjectStoreBackendImpl.cpp:
+        (WebCore::IDBObjectStoreBackendImpl::put):
+
 2012-02-06  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp

@@ -154 +154 @@
                 return;
             }
+            if (autoIncrement && !keyPathKey) {
+                RefPtr<IDBKey> dummyKey = IDBKey::createNumber(-1);
+                RefPtr<SerializedScriptValue> valueAfterInjection = injectKeyIntoKeyPath(dummyKey, value, objectStore->m_keyPath);
+                if (!valueAfterInjection) {
+                    ec = IDBDatabaseException::DATA_ERR;
+                    return;
+                }
+            }
         }
         if (key && !key->valid()) {
@@ -209 +217 @@
                 RefPtr<IDBKey> autoIncKey = objectStore->genAutoIncrementKey();
                 if (hasKeyPath) {
-                    // FIXME: Add checks in put() to ensure this will always succeed (apart from I/O errors).
-                    // https://bugs.webkit.org/show_bug.cgi?id=77374
                     RefPtr<SerializedScriptValue> valueAfterInjection = injectKeyIntoKeyPath(autoIncKey, value, objectStore->m_keyPath);
+                    ASSERT(valueAfterInjection);
                     if (!valueAfterInjection) {
                         objectStore->resetAutoIncrementKeyCache();
-                        callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "The generated key could not be inserted into the object using the keyPath."));
+                        // Checks in put() ensure this should only happen if I/O error occurs.
+                        // FIXME: The Indexed Database specification does not have an error code dedicated to I/O errors.
+                        callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error inserting generated key into the object."));
                         return;
                     }