<!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>[195787] 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/195787">195787</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-28 15:18:55 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Fix several more problems with object store changes during cursor iteration in SQLite backend.
https://bugs.webkit.org/show_bug.cgi?id=153616
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::clearObjectStore):
* Modules/indexeddb/server/SQLiteIDBCursor.cpp:
(WebCore::IDBServer::SQLiteIDBCursor::resetAndRebindStatement):
(WebCore::IDBServer::SQLiteIDBCursor::bindArguments):
* Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
(WebCore::IDBServer::UniqueIDBDatabaseTransaction::iterateCursor):
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="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195786 => 195787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-28 23:16:20 UTC (rev 195786)
+++ trunk/LayoutTests/ChangeLog 2016-01-28 23:18:55 UTC (rev 195787)
</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: Fix several more problems with object store changes during cursor iteration in SQLite backend.
+ https://bugs.webkit.org/show_bug.cgi?id=153616
+
+ 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 handle mutation during cursor iteration.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153614
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195786 => 195787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-28 23:16:20 UTC (rev 195786)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-28 23:18:55 UTC (rev 195787)
</span><span class="lines">@@ -454,11 +454,9 @@
</span><span class="cx"> imported/w3c/indexeddb/writer-starvation.htm [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-continue-validity.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-primary-key-order.html [ Failure ]
</span><del>-storage/indexeddb/cursor-update.html [ Failure ]
</del><span class="cx"> storage/indexeddb/get-keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-duplicate-keypaths.html [ Failure ]
</span><span class="cx"> storage/indexeddb/key-generator.html [ Failure ]
</span><del>-storage/indexeddb/modern/cursor-7.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/get-keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/index-3.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195786 => 195787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-28 23:16:20 UTC (rev 195786)
+++ trunk/Source/WebCore/ChangeLog 2016-01-28 23:18:55 UTC (rev 195787)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-01-28 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Fix several more problems with object store changes during cursor iteration in SQLite backend.
+ https://bugs.webkit.org/show_bug.cgi?id=153616
+
+ Reviewed by Alex Christensen.
+
+ No new tests (A few failing tests pass, a few get closer).
+
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::clearObjectStore):
+
+ * Modules/indexeddb/server/SQLiteIDBCursor.cpp:
+ (WebCore::IDBServer::SQLiteIDBCursor::resetAndRebindStatement):
+ (WebCore::IDBServer::SQLiteIDBCursor::bindArguments):
+
+ * Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabaseTransaction::iterateCursor):
+
</ins><span class="cx"> 2016-01-28 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup: Make DedicatedWorkerThread::create() an inline template method
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (195786 => 195787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-28 23:16:20 UTC (rev 195786)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-28 23:18:55 UTC (rev 195787)
</span><span class="lines">@@ -673,6 +673,8 @@
</span><span class="cx">
</span><span class="cx"> IDBError SQLiteIDBBackingStore::clearObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreID)
</span><span class="cx"> {
</span><ins>+ LOG(IndexedDB, "SQLiteIDBBackingStore::clearObjectStore - object store %" PRIu64, objectStoreID);
+
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -706,6 +708,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ transaction->notifyCursorsOfChanges(objectStoreID);
+
</ins><span class="cx"> return { };
</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 (195786 => 195787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2016-01-28 23:16:20 UTC (rev 195786)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2016-01-28 23:18:55 UTC (rev 195787)
</span><span class="lines">@@ -223,11 +223,30 @@
</span><span class="cx">
</span><span class="cx"> // Otherwise update the lower key or upper key used for the cursor range.
</span><span class="cx"> // This is so the cursor can pick up where we left off.
</span><del>- if (m_cursorDirection == IndexedDB::CursorDirection::Next || m_cursorDirection == IndexedDB::CursorDirection::NextNoDuplicate)
</del><ins>+ // We might also have to change the statement from closed to open so we don't refetch the current key a second time.
+ if (m_cursorDirection == IndexedDB::CursorDirection::Next || m_cursorDirection == IndexedDB::CursorDirection::NextNoDuplicate) {
</ins><span class="cx"> m_currentLowerKey = m_currentKey;
</span><del>- else
</del><ins>+ if (!m_keyRange.lowerOpen) {
+ m_keyRange.lowerOpen = true;
+ m_keyRange.lowerKey = m_currentLowerKey;
+ m_statement = nullptr;
+ m_currentRecordID = -1;
+ }
+ } else {
</ins><span class="cx"> m_currentUpperKey = m_currentKey;
</span><ins>+ if (!m_keyRange.upperOpen) {
+ m_keyRange.upperOpen = true;
+ m_keyRange.upperKey = m_currentUpperKey;
+ m_statement = nullptr;
+ m_currentRecordID = -1;
+ }
+ }
</ins><span class="cx">
</span><ins>+ if (!m_statement && !establishStatement()) {
+ LOG_ERROR("Unable to establish new statement for cursor iteration");
+ return;
+ }
+
</ins><span class="cx"> if (m_statement->reset() != SQLITE_OK) {
</span><span class="cx"> LOG_ERROR("Could not reset cursor statement to respond to object store changes");
</span><span class="cx"> return;
</span><span class="lines">@@ -238,6 +257,8 @@
</span><span class="cx">
</span><span class="cx"> bool SQLiteIDBCursor::bindArguments()
</span><span class="cx"> {
</span><ins>+ LOG(IndexedDB, "Cursor is binding lower key '%s' and upper key '%s'", m_currentLowerKey.loggingString().utf8().data(), m_currentUpperKey.loggingString().utf8().data());
+
</ins><span class="cx"> if (m_statement->bindInt64(1, m_boundID) != SQLITE_OK) {
</span><span class="cx"> LOG_ERROR("Could not bind id argument (bound ID)");
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp (195786 => 195787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp 2016-01-28 23:16:20 UTC (rev 195786)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseTransaction.cpp 2016-01-28 23:18:55 UTC (rev 195787)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<UniqueIDBDatabaseTransaction> protectedThis(this);
</span><span class="cx"> m_databaseConnection->database().iterateCursor(requestData, key, count, [this, protectedThis, requestData](const IDBError& error, const IDBGetResult& result) {
</span><del>- LOG(IndexedDB, "UniqueIDBDatabaseTransaction::openCursor (callback)");
</del><ins>+ LOG(IndexedDB, "UniqueIDBDatabaseTransaction::iterateCursor (callback)");
</ins><span class="cx">
</span><span class="cx"> if (error.isNull())
</span><span class="cx"> m_databaseConnection->connectionToClient().didIterateCursor(IDBResultData::iterateCursorSuccess(requestData.requestIdentifier(), result));
</span></span></pre>
</div>
</div>
</body>
</html>