<!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>[207209] branches/safari-602-branch</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/207209">207209</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 01:41:48 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206280">r206280</a>. rdar://problem/28476953</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp">branches/safari-602-branch/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsstorageindexeddbmodernmultipleobjectstoreindexcursorcollisionexpectedtxt">branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsstorageindexeddbmodernmultipleobjectstoreindexcursorcollisionprivateexpectedtxt">branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsstorageindexeddbmodernmultipleobjectstoreindexcursorcollisionprivatehtml">branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private.html</a></li>
<li><a href="#branchessafari602branchLayoutTestsstorageindexeddbmodernmultipleobjectstoreindexcursorcollisionhtml">branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision.html</a></li>
<li><a href="#branchessafari602branchLayoutTestsstorageindexeddbmodernresourcesmultipleobjectstoreindexcursorcollisionjs">branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/resources/multiple-objectstore-index-cursor-collision.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207208 => 207209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-12 08:41:44 UTC (rev 207208)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-12 08:41:48 UTC (rev 207209)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206280. rdar://problem/28476953
+
+ 2016-09-22 Brady Eidson <beidson@apple.com>
+
+ IDBIndex.openCursor() matches indices on multiple object stores.
+ <rdar://problem/28434463> and https://bugs.webkit.org/show_bug.cgi?id=158833
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-expected.txt: Added.
+ * storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private-expected.txt: Added.
+ * storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private.html: Added.
+ * storage/indexeddb/modern/multiple-objectstore-index-cursor-collision.html: Added.
+ * storage/indexeddb/modern/resources/multiple-objectstore-index-cursor-collision.js: Added.
+
+2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r205861. rdar://problem/28409523
</span><span class="cx">
</span><span class="cx"> 2016-09-12 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsstorageindexeddbmodernmultipleobjectstoreindexcursorcollisionexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-expected.txt (0 => 207209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-expected.txt 2016-10-12 08:41:48 UTC (rev 207209)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+db deleted
+Creating db
+Enumerating ObjectStore 'schools' by primary key
+key: 1, primaryKey: 1, value: {"name":"Stockholm University","city":"Stockholm","id":1}
+key: 2, primaryKey: 2, value: {"name":"Uppsala University","city":"Uppsala","id":2}
+key: 3, primaryKey: 3, value: {"name":"Chalmers","city":"Gothenburg","id":3}
+Enumerating index 'city' on 'schools'
+key: Gothenburg, primaryKey: 3, value: {"name":"Chalmers","city":"Gothenburg","id":3}
+key: Stockholm, primaryKey: 1, value: {"name":"Stockholm University","city":"Stockholm","id":1}
+key: Uppsala, primaryKey: 2, value: {"name":"Uppsala University","city":"Uppsala","id":2}
+Enumerating ObjectStore 'students' by primary key
+key: 1, primaryKey: 1, value: {"name":"Adam Anderson","id":1}
+key: 2, primaryKey: 2, value: {"name":"Bertil Bengtson","id":2}
+Enumerating index 'name' on 'students'
+key: Adam Anderson, primaryKey: 1, value: {"name":"Adam Anderson","id":1}
+key: Bertil Bengtson, primaryKey: 2, value: {"name":"Bertil Bengtson","id":2}
+Done.
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsstorageindexeddbmodernmultipleobjectstoreindexcursorcollisionprivateexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private-expected.txt (0 => 207209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private-expected.txt 2016-10-12 08:41:48 UTC (rev 207209)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+db deleted
+Creating db
+Enumerating ObjectStore 'schools' by primary key
+key: 1, primaryKey: 1, value: {"name":"Stockholm University","city":"Stockholm","id":1}
+key: 2, primaryKey: 2, value: {"name":"Uppsala University","city":"Uppsala","id":2}
+key: 3, primaryKey: 3, value: {"name":"Chalmers","city":"Gothenburg","id":3}
+Enumerating index 'city' on 'schools'
+key: Gothenburg, primaryKey: 3, value: {"name":"Chalmers","city":"Gothenburg","id":3}
+key: Stockholm, primaryKey: 1, value: {"name":"Stockholm University","city":"Stockholm","id":1}
+key: Uppsala, primaryKey: 2, value: {"name":"Uppsala University","city":"Uppsala","id":2}
+Enumerating ObjectStore 'students' by primary key
+key: 1, primaryKey: 1, value: {"name":"Adam Anderson","id":1}
+key: 2, primaryKey: 2, value: {"name":"Bertil Bengtson","id":2}
+Enumerating index 'name' on 'students'
+key: Adam Anderson, primaryKey: 1, value: {"name":"Adam Anderson","id":1}
+key: Bertil Bengtson, primaryKey: 2, value: {"name":"Bertil Bengtson","id":2}
+Done.
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsstorageindexeddbmodernmultipleobjectstoreindexcursorcollisionprivatehtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private.html (0 => 207209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private.html 2016-10-12 08:41:48 UTC (rev 207209)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<html>
+<head>
+<script>
+enablePrivateBrowsing = true;
+</script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/multiple-objectstore-index-cursor-collision.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsstorageindexeddbmodernmultipleobjectstoreindexcursorcollisionhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision.html (0 => 207209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/multiple-objectstore-index-cursor-collision.html 2016-10-12 08:41:48 UTC (rev 207209)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/multiple-objectstore-index-cursor-collision.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsstorageindexeddbmodernresourcesmultipleobjectstoreindexcursorcollisionjs"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/resources/multiple-objectstore-index-cursor-collision.js (0 => 207209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/resources/multiple-objectstore-index-cursor-collision.js (rev 0)
+++ branches/safari-602-branch/LayoutTests/storage/indexeddb/modern/resources/multiple-objectstore-index-cursor-collision.js 2016-10-12 08:41:48 UTC (rev 207209)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+const log = txt => document.writeln(`${txt}<br/>`);
+log("Deleting db");
+indexedDB.deleteDatabase("db").onsuccess = ()=> {
+ log("db deleted");
+ let req = indexedDB.open("db", 1);
+ req.onupgradeneeded = e => {
+ log ("Creating db");
+ let db = req.transaction.db;
+ let schools = db.createObjectStore('schools', { keyPath: 'id', autoIncrement: true });
+ schools.createIndex ('city', 'city');
+ schools.add({name: 'Stockholm University', city: 'Stockholm'});
+ schools.add({name: 'Uppsala University', city: 'Uppsala'});
+ schools.add({name: 'Chalmers', city: 'Gothenburg'});
+ let students = db.createObjectStore('students', { keyPath: 'id', autoIncrement: true });
+ students.createIndex ('name', 'name');
+ students.add({name: 'Adam Anderson'});
+ students.add({name: 'Bertil Bengtson'});
+ }
+ req.onsuccess = ()=> {
+ let db = req.result;
+ let tx = db.transaction(['schools', 'students'], 'readonly');
+ dump(tx.objectStore('schools'), ()=> {
+ dump(tx.objectStore('schools').index('city'), ()=> {
+ dump(tx.objectStore('students'), ()=>{
+ dump(tx.objectStore('students').index('name'), ()=>{
+ log("Done.");
+ finishJSTest();
+ })
+ });
+ });
+ });
+ }
+}
+
+function dump (idx, done) {
+ log (idx instanceof IDBObjectStore ?
+ `Enumerating ObjectStore '${idx.name}' by primary key` :
+ `Enumerating index '${idx.name}' on '${idx.objectStore.name}'`);
+ idx.openCursor().onsuccess = e => {
+ let cursor = e.target.result;
+ if (cursor) {
+ log(`key: ${cursor.key}, primaryKey: ${cursor.primaryKey}, value: ${JSON.stringify(cursor.value)}`);
+ cursor.continue();
+ } else {
+ done();
+ }
+ }
+}
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207208 => 207209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-12 08:41:44 UTC (rev 207208)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-12 08:41:48 UTC (rev 207209)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206280. rdar://problem/28476953
+
+ 2016-09-22 Brady Eidson <beidson@apple.com>
+
+ IDBIndex.openCursor() matches indices on multiple object stores.
+ <rdar://problem/28434463> and https://bugs.webkit.org/show_bug.cgi?id=158833
+
+ Reviewed by Alex Christensen.
+
+ Tests: storage/indexeddb/modern/multiple-objectstore-index-cursor-collision-private.html
+ storage/indexeddb/modern/multiple-objectstore-index-cursor-collision.html
+
+ * Modules/indexeddb/server/SQLiteIDBCursor.cpp:
+ (WebCore::IDBServer::buildIndexStatement): Need to include the object store id in the statement for
+ index cursors, otherwise there will be collisions amongst multiple object stores that happen to
+ share primary keys.
+ (WebCore::IDBServer::SQLiteIDBCursor::bindArguments):
+
+2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r205861. rdar://problem/28409523
</span><span class="cx">
</span><span class="cx"> 2016-09-12 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp (207208 => 207209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2016-10-12 08:41:44 UTC (rev 207208)
+++ branches/safari-602-branch/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2016-10-12 08:41:48 UTC (rev 207209)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> {
</span><span class="cx"> StringBuilder builder;
</span><span class="cx">
</span><del>- builder.appendLiteral("SELECT rowid, key, value FROM IndexRecords WHERE indexID = ? AND key ");
</del><ins>+ builder.appendLiteral("SELECT rowid, key, value FROM IndexRecords WHERE indexID = ? AND objectStoreID = ? AND key ");
</ins><span class="cx"> if (!keyRange.lowerKey.isNull() && !keyRange.lowerOpen)
</span><span class="cx"> builder.appendLiteral(">=");
</span><span class="cx"> else
</span><span class="lines">@@ -260,19 +260,26 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "Cursor is binding lower key '%s' and upper key '%s'", m_currentLowerKey.loggingString().utf8().data(), m_currentUpperKey.loggingString().utf8().data());
</span><span class="cx">
</span><del>- if (m_statement->bindInt64(1, m_boundID) != SQLITE_OK) {
</del><ins>+ int currentBindArgument = 1;
+
+ if (m_statement->bindInt64(currentBindArgument++, m_boundID) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not bind id argument (bound ID)");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_indexID != IDBIndexInfo::InvalidId && m_statement->bindInt64(currentBindArgument++, m_objectStoreID) != SQLITE_OK) {
+ LOG_ERROR("Could not bind object store id argument for an index cursor");
+ return false;
+ }
+
</ins><span class="cx"> RefPtr<SharedBuffer> buffer = serializeIDBKeyData(m_currentLowerKey);
</span><del>- if (m_statement->bindBlob(2, buffer->data(), buffer->size()) != SQLITE_OK) {
</del><ins>+ if (m_statement->bindBlob(currentBindArgument++, buffer->data(), buffer->size()) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not create cursor statement (lower key)");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> buffer = serializeIDBKeyData(m_currentUpperKey);
</span><del>- if (m_statement->bindBlob(3, buffer->data(), buffer->size()) != SQLITE_OK) {
</del><ins>+ if (m_statement->bindBlob(currentBindArgument++, buffer->data(), buffer->size()) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not create cursor statement (upper key)");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>