Changeset 193657 in webkit

Timestamp:

Dec 7, 2015 3:07:03 PM (8 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: storage/indexeddb/cursor-continue-validity.html fails.
​https://bugs.webkit.org/show_bug.cgi?id=151961

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (At least one failing test now passes).

When an index cursor's iterator was invalidated, there were some cases where it did
not correctly find the next iterator to pick up where it left off.

• Modules/indexeddb/client/IDBCursorImpl.cpp:

(WebCore::IDBClient::IDBCursor::update):
(WebCore::IDBClient::IDBCursor::deleteFunction):

• Modules/indexeddb/server/IndexValueStore.cpp:

(WebCore::IDBServer::IndexValueStore::find):
(WebCore::IDBServer::IndexValueStore::loggingString):

• Modules/indexeddb/server/IndexValueStore.h:

LayoutTests:

• platform/mac-wk1/TestExpectations:
• storage/indexeddb/cursor-finished-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• LayoutTests/storage/indexeddb/cursor-finished-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/client/IDBCursorImpl.cpp (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/server/IndexValueStore.cpp (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/server/IndexValueStore.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-07  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: storage/indexeddb/cursor-continue-validity.html fails.
+        https://bugs.webkit.org/show_bug.cgi?id=151961
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+        * storage/indexeddb/cursor-finished-expected.txt:
+
 2015-12-07  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -111 +111 @@
 storage/indexeddb/createIndex-after-failure.html [ Failure ]
 storage/indexeddb/cursor-continue.html [ Failure ]
-storage/indexeddb/cursor-continue-validity.html [ Failure ]
 storage/indexeddb/cursor-continueprimarykey.html [ Failure ]
 storage/indexeddb/cursor-leak.html [ Failure ]

trunk/LayoutTests/storage/indexeddb/cursor-finished-expected.txt

@@ -50 +50 @@
 PASS code is DOMException.INVALID_STATE_ERR
 PASS ename is 'InvalidStateError'
-Exception message: An operation was called on an object on which it is not allowed or at a time when it is not allowed.
+Exception message: Failed to execute 'update' on 'IDBCursor': The cursor is being iterated or has iterated past its end.
 Expecting exception from savedCursor.advance(1)
 PASS Exception was thrown.
@@ -70 +70 @@
 PASS code is DOMException.INVALID_STATE_ERR
 PASS ename is 'InvalidStateError'
-Exception message: An operation was called on an object on which it is not allowed or at a time when it is not allowed.
+Exception message: Failed to execute 'delete' on 'IDBCursor': The cursor is being iterated or has iterated past its end.
 
 PASS successfullyParsed is true

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-07  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: storage/indexeddb/cursor-continue-validity.html fails.
+        https://bugs.webkit.org/show_bug.cgi?id=151961
+
+        Reviewed by Alex Christensen.
+
+        No new tests (At least one failing test now passes).
+
+        When an index cursor's iterator was invalidated, there were some cases where it did 
+        not correctly find the next iterator to pick up where it left off.
+
+        * Modules/indexeddb/client/IDBCursorImpl.cpp:
+        (WebCore::IDBClient::IDBCursor::update):
+        (WebCore::IDBClient::IDBCursor::deleteFunction):
+        
+        * Modules/indexeddb/server/IndexValueStore.cpp:
+        (WebCore::IDBServer::IndexValueStore::find):
+        (WebCore::IDBServer::IndexValueStore::loggingString):
+        * Modules/indexeddb/server/IndexValueStore.h:
+
 2015-12-07  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/client/IDBCursorImpl.cpp

@@ -134 +134 @@
     if (!m_gotValue) {
         ec.code = IDBDatabaseException::InvalidStateError;
+        ec.message = ASCIILiteral("Failed to execute 'update' on 'IDBCursor': The cursor is being iterated or has iterated past its end.");
         return nullptr;
     }
@@ -307 +308 @@
     if (!m_gotValue) {
         ec.code = IDBDatabaseException::InvalidStateError;
+        ec.message = ASCIILiteral("Failed to execute 'delete' on 'IDBCursor': The cursor is being iterated or has iterated past its end.");
         return nullptr;
     }

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

@@ -213 +213 @@
     ASSERT(record);
 
+    // If the main record iterator is not equal to the key we were looking for,
+    // we know the primary key record should be the first.
+    if (*iterator != key) {
+        auto primaryIterator = record->begin();
+        ASSERT(primaryIterator.isValid());
+
+        return { *this, iterator, primaryIterator };
+    }
+
     auto primaryIterator = record->find(primaryKey);
     if (primaryIterator.isValid())
@@ -375 +384 @@
 }
 
+#ifndef NDEBUG
+String IndexValueStore::loggingString() const
+{
+    String result;
+    for (auto& key : m_orderedKeys) {
+        result.append(makeString("Key: ", key.loggingString()));
+        result.append(makeString("  Entry has ", String::number(m_records.get(key)->getCount()), " entries"));
+    }
+    return result;
+}
+#endif
+
 } // namespace IDBServer
 } // namespace WebCore

trunk/Source/WebCore/Modules/indexeddb/server/IndexValueStore.h

@@ -99 +99 @@
     Iterator reverseFind(const IDBKeyData&, const IDBKeyData& primaryKey, CursorDuplicity);
 
+#ifndef NDEBUG
+    String loggingString() const;
+#endif
+
 private:
     std::set<IDBKeyData>::iterator lowestIteratorInRange(const IDBKeyRangeData&) const;