<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195784] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195784">195784</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-28 14:52:05 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: SQLite backend doesn't handle mutation during cursor iteration.
https://bugs.webkit.org/show_bug.cgi?id=153614
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (A few failing tests pass, a few get closer).
* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::deleteRange): Call notifyCursorsOfChanges.
(WebCore::IDBServer::SQLiteIDBBackingStore::addRecord): Ditto.
* Modules/indexeddb/server/SQLiteIDBCursor.cpp:
(WebCore::IDBServer::SQLiteIDBCursor::SQLiteIDBCursor):
(WebCore::IDBServer::SQLiteIDBCursor::~SQLiteIDBCursor):
* Modules/indexeddb/server/SQLiteIDBCursor.h:
* Modules/indexeddb/server/SQLiteIDBTransaction.cpp:
(WebCore::IDBServer::SQLiteIDBTransaction::maybeOpenBackingStoreCursor): Remember these transient backing
store cursors so they can be notified of changes.
(WebCore::IDBServer::SQLiteIDBTransaction::closeCursor): Handle removing the cursor from the right set.
(WebCore::IDBServer::SQLiteIDBTransaction::notifyCursorsOfChanges):
* Modules/indexeddb/server/SQLiteIDBTransaction.h:
LayoutTests:
* platform/mac-wk1/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorh">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBTransactionh">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195783 => 195784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-28 22:40:02 UTC (rev 195783)
+++ trunk/LayoutTests/ChangeLog 2016-01-28 22:52:05 UTC (rev 195784)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-01-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: SQLite backend doesn't handle mutation during cursor iteration.
+ https://bugs.webkit.org/show_bug.cgi?id=153614
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+
+2016-01-28 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: SQLite backend doesn't support deleting ranges with more than one key.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153604
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195783 => 195784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-28 22:40:02 UTC (rev 195783)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-28 22:52:05 UTC (rev 195784)
</span><span class="lines">@@ -461,8 +461,6 @@
</span><span class="cx"> storage/indexeddb/modern/cursor-7.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/get-keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/index-3.html [ Failure ]
</span><del>-storage/indexeddb/mozilla/cursor-mutation.html [ Failure ]
-storage/indexeddb/mozilla/cursors.html [ Failure ]
</del><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # SQLite backend tests that timeout
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195783 => 195784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-28 22:40:02 UTC (rev 195783)
+++ trunk/Source/WebCore/ChangeLog 2016-01-28 22:52:05 UTC (rev 195784)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-01-28 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: SQLite backend doesn't handle mutation during cursor iteration.
+ https://bugs.webkit.org/show_bug.cgi?id=153614
+
+ Reviewed by Alex Christensen.
+
+ No new tests (A few failing tests pass, a few get closer).
+
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::deleteRange): Call notifyCursorsOfChanges.
+ (WebCore::IDBServer::SQLiteIDBBackingStore::addRecord): Ditto.
+
+ * Modules/indexeddb/server/SQLiteIDBCursor.cpp:
+ (WebCore::IDBServer::SQLiteIDBCursor::SQLiteIDBCursor):
+ (WebCore::IDBServer::SQLiteIDBCursor::~SQLiteIDBCursor):
+ * Modules/indexeddb/server/SQLiteIDBCursor.h:
+
+ * Modules/indexeddb/server/SQLiteIDBTransaction.cpp:
+ (WebCore::IDBServer::SQLiteIDBTransaction::maybeOpenBackingStoreCursor): Remember these transient backing
+ store cursors so they can be notified of changes.
+ (WebCore::IDBServer::SQLiteIDBTransaction::closeCursor): Handle removing the cursor from the right set.
+ (WebCore::IDBServer::SQLiteIDBTransaction::notifyCursorsOfChanges):
+ * Modules/indexeddb/server/SQLiteIDBTransaction.h:
+
+2016-01-28 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: SQLite backend doesn't support deleting ranges with more than one key.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153604
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (195783 => 195784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-28 22:40:02 UTC (rev 195783)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-28 22:52:05 UTC (rev 195784)
</span><span class="lines">@@ -1055,6 +1055,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ transaction->notifyCursorsOfChanges(objectStoreID);
+
</ins><span class="cx"> return error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1144,6 +1146,8 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: If there was an error indexing this record, remove it.
</span><span class="cx">
</span><ins>+ transaction->notifyCursorsOfChanges(objectStoreInfo.identifier());
+
</ins><span class="cx"> return error;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp (195783 => 195784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2016-01-28 22:40:02 UTC (rev 195783)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2016-01-28 22:52:05 UTC (rev 195784)
</span><span class="lines">@@ -83,10 +83,17 @@
</span><span class="cx"> , m_indexID(indexID ? indexID : IDBIndexMetadata::InvalidId)
</span><span class="cx"> , m_cursorDirection(IndexedDB::CursorDirection::Next)
</span><span class="cx"> , m_keyRange(range)
</span><ins>+ , m_backingStoreCursor(true)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_objectStoreID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SQLiteIDBCursor::~SQLiteIDBCursor()
+{
+ if (m_backingStoreCursor)
+ m_transaction->closeCursor(*this);
+}
+
</ins><span class="cx"> void SQLiteIDBCursor::currentData(IDBGetResult& result)
</span><span class="cx"> {
</span><span class="cx"> if (m_completed) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h (195783 => 195784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h 2016-01-28 22:40:02 UTC (rev 195783)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h 2016-01-28 22:52:05 UTC (rev 195784)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> SQLiteIDBCursor(SQLiteIDBTransaction&, const IDBCursorInfo&);
</span><span class="cx"> SQLiteIDBCursor(SQLiteIDBTransaction&, uint64_t objectStoreID, uint64_t indexID, const IDBKeyRangeData&);
</span><span class="cx">
</span><ins>+ ~SQLiteIDBCursor();
+
</ins><span class="cx"> const IDBResourceIdentifier& identifier() const { return m_cursorIdentifier; }
</span><span class="cx"> SQLiteIDBTransaction* transaction() const { return m_transaction; }
</span><span class="cx">
</span><span class="lines">@@ -109,6 +111,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_completed { false };
</span><span class="cx"> bool m_errored { false };
</span><ins>+
+ bool m_backingStoreCursor { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.cpp (195783 => 195784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.cpp 2016-01-28 22:40:02 UTC (rev 195783)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.cpp 2016-01-28 22:52:05 UTC (rev 195784)
</span><span class="lines">@@ -104,7 +104,12 @@
</span><span class="cx"> ASSERT(m_sqliteTransaction);
</span><span class="cx"> ASSERT(m_sqliteTransaction->inProgress());
</span><span class="cx">
</span><del>- return SQLiteIDBCursor::maybeCreateBackingStoreCursor(*this, objectStoreID, indexID, range);
</del><ins>+ auto cursor = SQLiteIDBCursor::maybeCreateBackingStoreCursor(*this, objectStoreID, indexID, range);
+
+ if (cursor)
+ m_backingStoreCursors.add(cursor.get());
+
+ return cursor;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SQLiteIDBCursor* SQLiteIDBTransaction::maybeOpenCursor(const IDBCursorInfo& info)
</span><span class="lines">@@ -128,6 +133,12 @@
</span><span class="cx">
</span><span class="cx"> void SQLiteIDBTransaction::closeCursor(SQLiteIDBCursor& cursor)
</span><span class="cx"> {
</span><ins>+ auto backingStoreTake = m_backingStoreCursors.take(&cursor);
+ if (backingStoreTake) {
+ ASSERT(!m_cursors.contains(cursor.identifier()));
+ return;
+ }
+
</ins><span class="cx"> ASSERT(m_cursors.contains(cursor.identifier()));
</span><span class="cx">
</span><span class="cx"> m_backingStore.unregisterCursor(cursor);
</span><span class="lines">@@ -140,6 +151,11 @@
</span><span class="cx"> if (i.value->objectStoreID() == objectStoreID)
</span><span class="cx"> i.value->objectStoreRecordsChanged();
</span><span class="cx"> }
</span><ins>+
+ for (auto* cursor : m_backingStoreCursors) {
+ if (cursor->objectStoreID() == objectStoreID)
+ cursor->objectStoreRecordsChanged();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SQLiteIDBTransaction::clearCursors()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.h (195783 => 195784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.h 2016-01-28 22:40:02 UTC (rev 195783)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBTransaction.h 2016-01-28 22:52:05 UTC (rev 195784)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "IDBTransactionInfo.h"
</span><span class="cx"> #include "IndexedDB.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -79,6 +80,7 @@
</span><span class="cx"> SQLiteIDBBackingStore& m_backingStore;
</span><span class="cx"> std::unique_ptr<SQLiteTransaction> m_sqliteTransaction;
</span><span class="cx"> HashMap<IDBResourceIdentifier, std::unique_ptr<SQLiteIDBCursor>> m_cursors;
</span><ins>+ HashSet<SQLiteIDBCursor*> m_backingStoreCursors;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IDBServer
</span></span></pre>
</div>
</div>
</body>
</html>