Changeset 86665 in webkit

Timestamp:

May 17, 2011, 3:12:12 AM (14 years ago)

Author:

hans@chromium.org

Message:

2011-05-12 Hans Wennborg <​hans@chromium.org>

Reviewed by Steve Block.

IndexedDB: Index population should ignore records without key for index
​https://bugs.webkit.org/show_bug.cgi?id=60697

Test that we can create a new index for which not all current records
have a key.

• storage/indexeddb/index-basics-expected.txt:
• storage/indexeddb/index-basics.html:

2011-05-12 Hans Wennborg <​hans@chromium.org>

Reviewed by Steve Block.

IndexedDB: Index population should ignore records without key for index
​https://bugs.webkit.org/show_bug.cgi?id=60697

When populating a new index, records which do not have a key on the
index's key path should be ignored.

• storage/IDBObjectStoreBackendImpl.cpp:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/index-basics-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/index-basics.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-12  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Steve Block.
+
+        IndexedDB: Index population should ignore records without key for index
+        https://bugs.webkit.org/show_bug.cgi?id=60697
+
+        Test that we can create a new index for which not all current records
+        have a key.
+
+        * storage/indexeddb/index-basics-expected.txt:
+        * storage/indexeddb/index-basics.html:
+
 2011-05-17  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/LayoutTests/storage/indexeddb/index-basics-expected.txt

@@ -28 +28 @@
 PASS 'get' in indexObject is true
 store.add({x: 'value', y: 'zzz', z: 2.72}, 'key')
-event.target.source.add({x: 'value2', y: 'zzz2', z: 2.71}, 'key2')
+event.target.source.add({x: 'value2', y: 'zzz2', z: 2.71, foobar: 12}, 'key2')
 store.createIndex('indexWhileAddIsInFlight', 'x')
+store.createIndex('indexWithWeirdKeyPath', 'foobar')
 indexObject.getKey('value')
 PASS event.target.result is "key"

trunk/LayoutTests/storage/indexeddb/index-basics.html

@@ -69 +69 @@
 function addMore()
 {
-    request = evalAndLog("event.target.source.add({x: 'value2', y: 'zzz2', z: 2.71}, 'key2')");
+    request = evalAndLog("event.target.source.add({x: 'value2', y: 'zzz2', z: 2.71, foobar: 12}, 'key2')");
     request.onsuccess = getData;
     request.onerror = unexpectedErrorCallback;
     window.indexObject4 = evalAndLog("store.createIndex('indexWhileAddIsInFlight', 'x')");
+    window.indexObject5 = evalAndLog("store.createIndex('indexWithWeirdKeyPath', 'foobar')");
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-12  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Steve Block.
+
+        IndexedDB: Index population should ignore records without key for index
+        https://bugs.webkit.org/show_bug.cgi?id=60697
+
+        When populating a new index, records which do not have a key on the
+        index's key path should be ignored.
+
+        * storage/IDBObjectStoreBackendImpl.cpp:
+
 2011-05-17  Young Han Lee  <joybro@company100.net>
 

trunk/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp

@@ -351 +351 @@
         RefPtr<IDBKey> indexKey = fetchKeyFromKeyPath(objectValue.get(), m_indexKeyPath);
 
+        if (!indexKey)
+            return true;
         if (!m_backingStore.putIndexDataForRecord(m_databaseId, m_objectStoreId, m_indexId, *indexKey, recordIdentifier))
             return false;