Changeset 115902 in webkit

Timestamp:

May 2, 2012, 4:03:42 PM (13 years ago)

Author:

jsbell@chromium.org

Message:

IndexedDB: Handle generated keys up to 2^{53
​https://bugs.webkit.org/show_bug.cgi?id=85114}

Source/WebCore:

The spec defines the behavior for generated keys up to 2^{53
(the maximum integer storable as an ECMAScript number) and
the error case when going beyond that. Ensure that we can
handle values up to that point and generate errors beyond.}

Reviewed by Tony Chang.

Test: storage/indexeddb/key-generator.html

• Modules/indexeddb/IDBBackingStore.h:

(IDBBackingStore):

• Modules/indexeddb/IDBLevelDBBackingStore.cpp:

(WebCore::IDBLevelDBBackingStore::nextAutoIncrementNumber):

• Modules/indexeddb/IDBLevelDBBackingStore.h:

(IDBLevelDBBackingStore):

• Modules/indexeddb/IDBObjectStoreBackendImpl.cpp:

(WebCore::IDBObjectStoreBackendImpl::putInternal):
(WebCore::IDBObjectStoreBackendImpl::genAutoIncrementKey):

• Modules/indexeddb/IDBObjectStoreBackendImpl.h:

(IDBObjectStoreBackendImpl):

LayoutTests:

Reviewed by Tony Chang.

• storage/indexeddb/key-generator-expected.txt:
• storage/indexeddb/resources/key-generator.js:

(get defineTest):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/key-generator-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/resources/key-generator.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBBackingStore.h (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.h (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-02  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Handle generated keys up to 2^53
+        https://bugs.webkit.org/show_bug.cgi?id=85114
+
+        Reviewed by Tony Chang.
+
+        * storage/indexeddb/key-generator-expected.txt:
+        * storage/indexeddb/resources/key-generator.js:
+        (get defineTest):
+
 2012-05-02  Zhenyao Mo  <zmo@google.com>
 

trunk/LayoutTests/storage/indexeddb/key-generator-expected.txt

@@ -143 +143 @@
 PASS Got "d" for key: 2
 db.close()
+
+Verify that keys above 2^53 result in errors.
+request = indexedDB.deleteDatabase('key-generator')
+request = indexedDB.open('key-generator')
+db = request.result
+request = db.setVersion('1')
+trans = request.result
+trans1 = db.transaction(['store'], IDBTransaction.READ_WRITE)
+store_t1 = trans1.objectStore('store')
+store_t1.put('a')
+request = store.get(1)
+store_t1.put('b', 9007199254740992)
+request = store.get(9007199254740992)
+store_t1.put('c')
+store_t1.put('d', 2)
+request = store.get(2)
+PASS Got "a" for key: 1
+PASS Got "b" for key: 9007199254740992
+Error event fired auto-incrementing past 2^53 (as expected)
+PASS event.target.errorCode is IDBDatabaseException.DATA_ERR
+event.preventDefault()
+PASS Got "d" for key: 2
+db.close()
 PASS successfullyParsed is true
 

trunk/LayoutTests/storage/indexeddb/resources/key-generator.js

@@ -204 +204 @@
 );
 
+defineTest(
+    'Verify that keys above 2^53 result in errors.',
+    function (db, trans) {
+        db.createObjectStore('store', { autoIncrement: true });
+    },
+
+    function (db, callback) {
+        evalAndLog("trans1 = db.transaction(['store'], IDBTransaction.READ_WRITE)");
+        evalAndLog("store_t1 = trans1.objectStore('store')");
+        evalAndLog("store_t1.put('a')");
+        check(store_t1, 1, 'a');
+        evalAndLog("store_t1.put('b', 9007199254740992)");
+        check(store_t1, 9007199254740992, 'b');
+        request = evalAndLog("store_t1.put('c')");
+        request.onsuccess = unexpectedSuccessCallback;
+        request.onerror = function () {
+            debug("Error event fired auto-incrementing past 2^53 (as expected)");
+            shouldBe("event.target.errorCode", "IDBDatabaseException.DATA_ERR");
+            evalAndLog("event.preventDefault()");
+        };
+        evalAndLog("store_t1.put('d', 2)");
+        check(store_t1, 2, 'd');
+
+        trans1.oncomplete = callback;
+    }
+);
+
 test();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-02  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Handle generated keys up to 2^53
+        https://bugs.webkit.org/show_bug.cgi?id=85114
+
+        The spec defines the behavior for generated keys up to 2^53
+        (the maximum integer storable as an ECMAScript number) and
+        the error case when going beyond that. Ensure that we can
+        handle values up to that point and generate errors beyond.
+
+        Reviewed by Tony Chang.
+
+        Test: storage/indexeddb/key-generator.html
+
+        * Modules/indexeddb/IDBBackingStore.h:
+        (IDBBackingStore):
+        * Modules/indexeddb/IDBLevelDBBackingStore.cpp:
+        (WebCore::IDBLevelDBBackingStore::nextAutoIncrementNumber):
+        * Modules/indexeddb/IDBLevelDBBackingStore.h:
+        (IDBLevelDBBackingStore):
+        * Modules/indexeddb/IDBObjectStoreBackendImpl.cpp:
+        (WebCore::IDBObjectStoreBackendImpl::putInternal):
+        (WebCore::IDBObjectStoreBackendImpl::genAutoIncrementKey):
+        * Modules/indexeddb/IDBObjectStoreBackendImpl.h:
+        (IDBObjectStoreBackendImpl):
+
 2012-05-02  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.h

@@ -68 +68 @@
     virtual void clearObjectStore(int64_t databaseId, int64_t objectStoreId) = 0;
     virtual void deleteObjectStoreRecord(int64_t databaseId, int64_t objectStoreId, const ObjectStoreRecordIdentifier*) = 0;
-    virtual double nextAutoIncrementNumber(int64_t databaseId, int64_t objectStoreId) = 0;
+    virtual int64_t nextAutoIncrementNumber(int64_t databaseId, int64_t objectStoreId) = 0;
     virtual bool keyExistsInObjectStore(int64_t databaseId, int64_t objectStoreId, const IDBKey&, ObjectStoreRecordIdentifier* foundRecordIdentifier) = 0;
 

trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp

@@ -603 +603 @@
 }
 
-double IDBLevelDBBackingStore::nextAutoIncrementNumber(int64_t databaseId, int64_t objectStoreId)
+int64_t IDBLevelDBBackingStore::nextAutoIncrementNumber(int64_t databaseId, int64_t objectStoreId)
 {
     ASSERT(m_currentTransaction);
@@ -611 +611 @@
     OwnPtr<LevelDBIterator> it = m_currentTransaction->createIterator();
 
-    int maxNumericKey = 0;
-
-    // FIXME: Be more efficient: seek to something after the object store data, then reverse.
+    int64_t maxNumericKey = 0;
+
+    // FIXME: This does a forward scan over all keys. Improve it.
+    // Since all dates > all numbers, create Date(-Infinity) and seek backwards.
 
     for (it->seek(startKey); it->isValid() && compareKeys(it->key(), stopKey) < 0; it->next()) {

trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.h

@@ -59 +59 @@
     virtual void clearObjectStore(int64_t databaseId, int64_t objectStoreId);
     virtual void deleteObjectStoreRecord(int64_t databaseId, int64_t objectStoreId, const ObjectStoreRecordIdentifier*);
-    virtual double nextAutoIncrementNumber(int64_t databaseId, int64_t objectStoreId);
+    virtual int64_t nextAutoIncrementNumber(int64_t databaseId, int64_t objectStoreId);
     virtual bool keyExistsInObjectStore(int64_t databaseId, int64_t objectStoreId, const IDBKey&, ObjectStoreRecordIdentifier* foundRecordIdentifier);
 

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp

@@ -256 +256 @@
             if (!key) {
                 RefPtr<IDBKey> autoIncKey = objectStore->genAutoIncrementKey();
+                if (!autoIncKey->valid()) {
+                    callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "Maximum key generator value reached."));
+                    return;
+                }
                 if (hasKeyPath) {
                     RefPtr<SerializedScriptValue> valueAfterInjection = injectKeyIntoKeyPath(autoIncKey, value, objectStore->m_keyPath);
@@ -680 +684 @@
 PassRefPtr<IDBKey> IDBObjectStoreBackendImpl::genAutoIncrementKey()
 {
+    const int64_t kMaxGeneratorValue = 9007199254740992; // Maximum integer storable as ECMAScript number.
+    if (m_autoIncrementNumber > kMaxGeneratorValue)
+        return IDBKey::createInvalid();
     if (m_autoIncrementNumber > 0)
         return IDBKey::createNumber(m_autoIncrementNumber++);
 
-    m_autoIncrementNumber = static_cast<int>(m_backingStore->nextAutoIncrementNumber(m_databaseId, id()));
+    m_autoIncrementNumber = m_backingStore->nextAutoIncrementNumber(m_databaseId, id());
+    if (m_autoIncrementNumber > kMaxGeneratorValue)
+        return IDBKey::createInvalid();
     return IDBKey::createNumber(m_autoIncrementNumber++);
 }

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.h

@@ -116 +116 @@
     typedef HashMap<String, RefPtr<IDBIndexBackendImpl> > IndexMap;
     IndexMap m_indexes;
-    int m_autoIncrementNumber;
+    int64_t m_autoIncrementNumber;
 };