<!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>[170327] 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/170327">170327</a></dd>
<dt>Author</dt> <dd>jpfau@apple.com</dd>
<dt>Date</dt> <dd>2014-06-23 15:38:47 -0700 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Database process crashes when multiple transactions attempt to run at once
https://bugs.webkit.org/show_bug.cgi?id=134139
Reviewed by David Kilzer.
Source/WebCore:
Ensure that only one transaction can be running at a time.
Test: storage/indexeddb/transaction-overlapping.html
* Modules/indexeddb/IDBTransactionCoordinator.cpp:
(WebCore::IDBTransactionCoordinator::canRunTransaction):
LayoutTests:
* storage/indexeddb/transaction-overlapping-expected.txt: Added.
* storage/indexeddb/transaction-overlapping.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionCoordinatorcpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbtransactionoverlappingexpectedtxt">trunk/LayoutTests/storage/indexeddb/transaction-overlapping-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbtransactionoverlappinghtml">trunk/LayoutTests/storage/indexeddb/transaction-overlapping.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170326 => 170327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-23 22:12:49 UTC (rev 170326)
+++ trunk/LayoutTests/ChangeLog 2014-06-23 22:38:47 UTC (rev 170327)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-06-19 Jeffrey Pfau <jpfau@apple.com>
+
+ Database process crashes when multiple transactions attempt to run at once
+ https://bugs.webkit.org/show_bug.cgi?id=134139
+
+ Reviewed by David Kilzer.
+
+ * storage/indexeddb/transaction-overlapping-expected.txt: Added.
+ * storage/indexeddb/transaction-overlapping.html: Added.
+
</ins><span class="cx"> 2014-06-23 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a test case failing on WK1 after r170296.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbtransactionoverlappingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/transaction-overlapping-expected.txt (0 => 170327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/transaction-overlapping-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/transaction-overlapping-expected.txt 2014-06-23 22:38:47 UTC (rev 170327)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Check that transactions that may overlap complete properly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "transaction-overlapping.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
+
+prepareDatabase():
+db = event.target.result
+store = db.createObjectStore('store')
+store.put('value', 'key')
+
+runParallelTransactions():
+db = event.target.result
+
+transaction1 = db.transaction('store', 'readonly')
+transaction2 = db.transaction('store', 'readonly')
+transaction1GetSuccess = 0
+transaction2GetSuccess = 0
+
+onTransactionComplete():
+first transaction complete, still waiting...
+
+onTransactionComplete():
+PASS transaction1GetSuccess is non-zero.
+PASS transaction2GetSuccess is non-zero.
+db.close()
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbtransactionoverlappinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/transaction-overlapping.html (0 => 170327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/transaction-overlapping.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/transaction-overlapping.html 2014-06-23 22:38:47 UTC (rev 170327)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<script src="resources/shared.js"></script>
+</head>
+<body>
+<script>
+description("Check that transactions that may overlap complete properly.");
+
+indexedDBTest(prepareDatabase, runParallelTransactions);
+
+function prepareDatabase(evt)
+{
+ preamble(evt);
+ evalAndLog("db = event.target.result");
+ evalAndLog("store = db.createObjectStore('store')");
+ evalAndLog("store.put('value', 'key')");
+}
+
+function runParallelTransactions(evt)
+{
+ preamble(evt);
+ evalAndLog("db = event.target.result");
+ debug("");
+ evalAndLog("transaction1 = db.transaction('store', 'readonly')");
+ transaction1.onabort = unexpectedAbortCallback;
+ transaction1.oncomplete = onTransactionComplete;
+ evalAndLog("transaction2 = db.transaction('store', 'readonly')");
+ transaction1.onabort = unexpectedAbortCallback;
+ transaction2.oncomplete = onTransactionComplete;
+
+ evalAndLog("transaction1GetSuccess = 0");
+ evalAndLog("transaction2GetSuccess = 0");
+
+ function doTransaction1Get() {
+ // NOTE: No logging since execution order is not deterministic.
+ request = transaction1.objectStore('store').get('key');
+ request.onerror = unexpectedErrorCallback;
+ request.onsuccess = function() {
+ ++transaction1GetSuccess;
+ if (!transaction2GetSuccess && transaction1GetSuccess < 10)
+ doTransaction1Get();
+ };
+ }
+
+ function doTransaction2Get() {
+ // NOTE: No logging since execution order is not deterministic.
+ request = transaction2.objectStore('store').get('key');
+ request.onerror = unexpectedErrorCallback;
+ request.onsuccess = function() {
+ ++transaction2GetSuccess;
+ if (!transaction1GetSuccess && transaction2GetSuccess < 10)
+ doTransaction2Get();
+ };
+ }
+
+ doTransaction1Get();
+ doTransaction2Get();
+}
+
+transactionCompletionCount = 0;
+function onTransactionComplete(evt)
+{
+ preamble(evt);
+
+ ++transactionCompletionCount;
+ if (transactionCompletionCount < 2) {
+ debug("first transaction complete, still waiting...");
+ return;
+ }
+
+ shouldBeNonZero("transaction1GetSuccess");
+ shouldBeNonZero("transaction2GetSuccess");
+
+ evalAndLog("db.close()");
+ finishJSTest();
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170326 => 170327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-23 22:12:49 UTC (rev 170326)
+++ trunk/Source/WebCore/ChangeLog 2014-06-23 22:38:47 UTC (rev 170327)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-06-19 Jeffrey Pfau <jpfau@apple.com>
+
+ Database process crashes when multiple transactions attempt to run at once
+ https://bugs.webkit.org/show_bug.cgi?id=134139
+
+ Reviewed by David Kilzer.
+
+ Ensure that only one transaction can be running at a time.
+
+ Test: storage/indexeddb/transaction-overlapping.html
+
+ * Modules/indexeddb/IDBTransactionCoordinator.cpp:
+ (WebCore::IDBTransactionCoordinator::canRunTransaction):
+
</ins><span class="cx"> 2014-06-23 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Make the state restore from HistoryItem more precise and reliable
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.cpp (170326 => 170327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.cpp 2014-06-23 22:12:49 UTC (rev 170326)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionCoordinator.cpp 2014-06-23 22:38:47 UTC (rev 170327)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(LEVELDB)
</ins><span class="cx"> static bool doScopesOverlap(const HashSet<int64_t>& scope1, const HashSet<int64_t>& scope2)
</span><span class="cx"> {
</span><span class="cx"> for (HashSet<int64_t>::const_iterator it = scope1.begin(); it != scope1.end(); ++it) {
</span><span class="lines">@@ -113,10 +114,13 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> bool IDBTransactionCoordinator::canRunTransaction(IDBTransactionBackend* transaction)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_queuedTransactions.contains(transaction));
</span><ins>+
+#if USE(LEVELDB)
</ins><span class="cx"> switch (transaction->mode()) {
</span><span class="cx"> case IndexedDB::TransactionMode::VersionChange:
</span><span class="cx"> ASSERT(m_queuedTransactions.size() == 1);
</span><span class="lines">@@ -140,6 +144,9 @@
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><ins>+#else
+ return !m_startedTransactions.size();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>