<!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>[195541] 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/195541">195541</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-25 10:20:23 -0800 (Mon, 25 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Implement getIndexRecord in the SQLite backing store.
https://bugs.webkit.org/show_bug.cgi?id=153425
Reviewed by Darin Adler.
Source/WebCore:
No new tests (Some failures now pass, other failures progressed closer to passing).
* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::getIndexRecord):
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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195540 => 195541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-25 17:55:17 UTC (rev 195540)
+++ trunk/LayoutTests/ChangeLog 2016-01-25 18:20:23 UTC (rev 195541)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-25 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Implement getIndexRecord in the SQLite backing store.
+ https://bugs.webkit.org/show_bug.cgi?id=153425
+
+ Reviewed by Darin Adler.
+
+ * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2016-01-25 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Media "ended" event incorrectly fires when currentTime is set
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195540 => 195541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-25 17:55:17 UTC (rev 195540)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-25 18:20:23 UTC (rev 195541)
</span><span class="lines">@@ -252,6 +252,10 @@
</span><span class="cx"> fast/history/page-cache-indexed-opened-db.html [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/close-in-upgradeneeded.html [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/cursor-overloads.htm [ Failure ]
</span><ins>+imported/w3c/indexeddb/idbcursor-advance-continue-async.htm [ Failure ]
+imported/w3c/indexeddb/idbcursor-advance-invalid.htm [ Failure ]
+imported/w3c/indexeddb/idbcursor-advance.htm [ Failure ]
+imported/w3c/indexeddb/idbcursor-continue.htm [ Failure ]
</ins><span class="cx"> imported/w3c/indexeddb/idbcursor-direction-index-keyrange.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-direction-index.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-direction-objectstore-keyrange.htm [ Failure ]
</span><span class="lines">@@ -260,6 +264,7 @@
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-key.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-primarykey.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor-reused.htm [ Failure ]
</span><ins>+imported/w3c/indexeddb/idbcursor-source.htm [ Failure ]
</ins><span class="cx"> imported/w3c/indexeddb/idbcursor_advance_index.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor_advance_index2.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbcursor_advance_index3.htm [ Failure ]
</span><span class="lines">@@ -347,6 +352,7 @@
</span><span class="cx"> imported/w3c/indexeddb/idbfactory_open5.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbfactory_open6.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbfactory_open7.htm [ Failure ]
</span><ins>+imported/w3c/indexeddb/idbindex-multientry-big.htm [ Failure ]
</ins><span class="cx"> imported/w3c/indexeddb/idbindex-multientry.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbindex_count.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/idbindex_count2.htm [ Failure ]
</span><span class="lines">@@ -426,6 +432,7 @@
</span><span class="cx"> imported/w3c/indexeddb/keygenerator-constrainterror.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/keygenerator-overflow.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/keygenerator.htm [ Failure ]
</span><ins>+imported/w3c/indexeddb/keypath.htm [ Failure ]
</ins><span class="cx"> imported/w3c/indexeddb/keypath_maxsize.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/list_ordering.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/objectstore_keyorder.htm [ Failure ]
</span><span class="lines">@@ -439,6 +446,7 @@
</span><span class="cx"> imported/w3c/indexeddb/value.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/value_recursive.htm [ Failure ]
</span><span class="cx"> imported/w3c/indexeddb/writer-starvation.htm [ Failure ]
</span><ins>+storage/indexeddb/closed-cursor.html [ Failure ]
</ins><span class="cx"> storage/indexeddb/cursor-added-bug.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-advance.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-basics.html [ Failure ]
</span><span class="lines">@@ -534,39 +542,24 @@
</span><span class="cx"> storage/indexeddb/optional-arguments.html [ Failure ]
</span><span class="cx"> storage/indexeddb/prefetch-bugfix-108071.html [ Failure ]
</span><span class="cx"> storage/indexeddb/readonly.html [ Failure ]
</span><del>-storage/indexeddb/transaction-active-flag.html [ Failure ]
</del><span class="cx"> storage/indexeddb/transaction-rollback.html [ Failure ]
</span><span class="cx"> storage/indexeddb/value-undefined.html [ Failure ]
</span><span class="cx"> storage/indexeddb/values-odd-types.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # SQLite backend tests that timeout
</span><span class="cx"> crypto/subtle/rsa-indexeddb.html [ Skip ]
</span><del>-imported/w3c/indexeddb/idbcursor-advance-continue-async.htm [ Skip ]
-imported/w3c/indexeddb/idbcursor-advance-invalid.htm [ Skip ]
-imported/w3c/indexeddb/idbcursor-advance.htm [ Skip ]
-imported/w3c/indexeddb/idbcursor-continue.htm [ Skip ]
-imported/w3c/indexeddb/idbcursor-source.htm [ Skip ]
</del><span class="cx"> imported/w3c/indexeddb/idbfactory_open12.htm [ Skip ]
</span><del>-imported/w3c/indexeddb/idbindex-multientry-big.htm [ Skip ]
</del><span class="cx"> imported/w3c/indexeddb/idbobjectstore_openCursor_invalid.htm [ Skip ]
</span><del>-imported/w3c/indexeddb/keypath.htm [ Skip ]
-storage/indexeddb/closed-cursor.html [ Skip ]
</del><span class="cx"> storage/indexeddb/cursor-cast.html [ Skip ]
</span><del>-storage/indexeddb/deletedatabase-transaction.html [ Skip ]
-storage/indexeddb/modern/blocked-open-db-requests.html [ Skip ]
</del><span class="cx"> storage/indexeddb/modern/transaction-scheduler-1.html [ Skip ]
</span><span class="cx"> storage/indexeddb/modern/transaction-scheduler-2.html [ Skip ]
</span><del>-storage/indexeddb/modern/transaction-scheduler-4.html [ Skip ]
</del><span class="cx"> storage/indexeddb/modern/transaction-scheduler-5.html [ Skip ]
</span><span class="cx"> storage/indexeddb/modern/transaction-scheduler-6.html [ Skip ]
</span><del>-storage/indexeddb/noblobs.html [ Skip ]
</del><span class="cx"> storage/indexeddb/pending-activity.html [ Skip ]
</span><span class="cx"> storage/indexeddb/prefetch-invalidation.html [ Skip ]
</span><span class="cx"> storage/indexeddb/prefetch-race.html [ Skip ]
</span><del>-storage/indexeddb/primary-key-unique-to-objectstore.html [ Skip ]
</del><span class="cx"> storage/indexeddb/request-result-cache.html [ Skip ]
</span><span class="cx"> storage/indexeddb/transaction-coordination-within-database.html [ Skip ]
</span><del>-storage/indexeddb/transaction-ordering.html [ Skip ]
</del><span class="cx">
</span><span class="cx"> # SQLite backend tests that crash or ASSERT
</span><span class="cx"> storage/indexeddb/database-odd-names.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195540 => 195541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-25 17:55:17 UTC (rev 195540)
+++ trunk/Source/WebCore/ChangeLog 2016-01-25 18:20:23 UTC (rev 195541)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-25 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Implement getIndexRecord in the SQLite backing store.
+ https://bugs.webkit.org/show_bug.cgi?id=153425
+
+ Reviewed by Darin Adler.
+
+ No new tests (Some failures now pass, other failures progressed closer to passing).
+
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::getIndexRecord):
+
</ins><span class="cx"> 2016-01-25 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Media "ended" event incorrectly fires when currentTime is set
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (195540 => 195541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-25 17:55:17 UTC (rev 195540)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-25 18:20:23 UTC (rev 195541)
</span><span class="lines">@@ -1126,9 +1126,32 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBError SQLiteIDBBackingStore::getIndexRecord(const IDBResourceIdentifier&, uint64_t, uint64_t, IndexedDB::IndexRecordType, const IDBKeyRangeData&, IDBGetResult&)
</del><ins>+IDBError SQLiteIDBBackingStore::getIndexRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreID, uint64_t indexID, IndexedDB::IndexRecordType type, const IDBKeyRangeData& range, IDBGetResult& getResult)
</ins><span class="cx"> {
</span><del>- return { IDBDatabaseException::UnknownError, ASCIILiteral("Not implemented") };
</del><ins>+ LOG(IndexedDB, "SQLiteIDBBackingStore::getIndexRecord");
+ ASSERT(m_sqliteDB);
+ ASSERT(m_sqliteDB->isOpen());
+
+ auto* transaction = m_transactions.get(transactionIdentifier);
+ if (!transaction || !transaction->inProgress()) {
+ LOG_ERROR("Attempt to get an index record from database without an in-progress transaction");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to get an index record from database without an in-progress transaction") };
+ }
+
+ auto cursor = transaction->maybeOpenBackingStoreCursor(objectStoreID, indexID, range);
+ if (!cursor) {
+ LOG_ERROR("Cannot open cursor to perform index get in database");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Cannot open cursor to perform index get in database") };
+ }
+
+ if (type == IndexedDB::IndexRecordType::Key)
+ getResult = { cursor->currentPrimaryKey() };
+ else {
+ getResult = { SharedBuffer::create(cursor->currentValueBuffer().data(), cursor->currentValueBuffer().size()) };
+ getResult.setKeyData(cursor->currentPrimaryKey());
+ }
+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError SQLiteIDBBackingStore::getCount(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData& range, uint64_t& outCount)
</span></span></pre>
</div>
</div>
</body>
</html>