<!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>[195697] 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/195697">195697</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-27 15:03:28 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Fix many Index tests.
https://bugs.webkit.org/show_bug.cgi?id=153561
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (Many failing tests now pass).
* Modules/indexeddb/server/MemoryIndex.cpp:
(WebCore::IDBServer::MemoryIndex::getResultForKeyRange):
* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedPutIndexKey):
(WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedPutIndexRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::getIndexRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::iterateCursor):
* Modules/indexeddb/server/SQLiteIDBCursor.h:
(WebCore::IDBServer::SQLiteIDBCursor::didComplete):
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="#trunkSourceWebCoreModulesindexeddbserverMemoryIndexcpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorh">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195696 => 195697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-27 22:57:10 UTC (rev 195696)
+++ trunk/LayoutTests/ChangeLog 2016-01-27 23:03:28 UTC (rev 195697)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-01-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: Fix many Index tests.
+ https://bugs.webkit.org/show_bug.cgi?id=153561
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+
+2016-01-27 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: Cursors are utterly broken in the SQLite backend.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153558
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195696 => 195697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-27 22:57:10 UTC (rev 195696)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-27 23:03:28 UTC (rev 195697)
</span><span class="lines">@@ -454,24 +454,15 @@
</span><span class="cx"> imported/w3c/indexeddb/writer-starvation.htm [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-advance.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-continue-validity.html [ Failure ]
</span><del>-storage/indexeddb/cursor-continue.html [ Failure ]
-storage/indexeddb/cursor-index-delete.html [ Failure ]
</del><span class="cx"> storage/indexeddb/cursor-primary-key-order.html [ Failure ]
</span><del>-storage/indexeddb/cursor-skip-deleted.html [ Failure ]
</del><span class="cx"> storage/indexeddb/cursor-update.html [ Failure ]
</span><span class="cx"> storage/indexeddb/delete-range.html [ Failure ]
</span><del>-storage/indexeddb/duplicates.html [ Failure ]
</del><span class="cx"> storage/indexeddb/get-keyrange.html [ Failure ]
</span><del>-storage/indexeddb/index-basics.html [ Failure ]
-storage/indexeddb/index-count.html [ Failure ]
-storage/indexeddb/index-cursor.html [ Failure ]
</del><span class="cx"> storage/indexeddb/index-duplicate-keypaths.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-multientry.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-population.html [ Failure ]
</span><span class="cx"> storage/indexeddb/index-unique.html [ Failure ]
</span><span class="cx"> storage/indexeddb/key-generator.html [ Failure ]
</span><del>-storage/indexeddb/keypath-arrays.html [ Failure ]
-storage/indexeddb/keypath-intrinsic-properties.html [ Failure ]
</del><span class="cx"> storage/indexeddb/lazy-index-population.html [ Failure ]
</span><span class="cx"> storage/indexeddb/lazy-index-types.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/cursor-3.html [ Failure ]
</span><span class="lines">@@ -481,38 +472,22 @@
</span><span class="cx"> storage/indexeddb/modern/deleteindex-2.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/get-keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/idbobjectstore-delete-1.html [ Failure ]
</span><del>-storage/indexeddb/modern/index-1.html [ Failure ]
-storage/indexeddb/modern/index-2.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/index-3.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/index-4.html [ Failure ]
</span><del>-storage/indexeddb/modern/index-cursor-1.html [ Failure ]
-storage/indexeddb/modern/index-cursor-2.html [ Failure ]
-storage/indexeddb/modern/index-cursor-3.html [ Failure ]
-storage/indexeddb/modern/index-get-count-basic.html [ Failure ]
</del><span class="cx"> storage/indexeddb/mozilla/cursor-mutation.html [ Failure ]
</span><del>-storage/indexeddb/mozilla/cursor-update-updates-indexes.html [ Failure ]
</del><span class="cx"> storage/indexeddb/mozilla/cursors.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/indexes.html [ Failure ]
</span><del>-storage/indexeddb/mozilla/object-cursors.html [ Failure ]
</del><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-basics.html [ Failure ]
</span><span class="cx"> storage/indexeddb/opencursor-key.html [ Failure ]
</span><del>-storage/indexeddb/optional-arguments.html [ Failure ]
</del><span class="cx">
</span><span class="cx"> # SQLite backend tests that timeout
</span><del>-crypto/subtle/rsa-indexeddb.html [ Skip ]
-imported/w3c/indexeddb/idbfactory_open12.htm [ Skip ]
-imported/w3c/indexeddb/idbobjectstore_openCursor_invalid.htm [ Skip ]
-storage/indexeddb/cursor-cast.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><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/pending-activity.html [ Skip ]
</del><span class="cx"> storage/indexeddb/prefetch-invalidation.html [ Skip ]
</span><del>-storage/indexeddb/prefetch-race.html [ Skip ]
-storage/indexeddb/request-result-cache.html [ Skip ]
</del><span class="cx"> storage/indexeddb/transaction-coordination-within-database.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> # SQLite backend tests that crash or ASSERT
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195696 => 195697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-27 22:57:10 UTC (rev 195696)
+++ trunk/Source/WebCore/ChangeLog 2016-01-27 23:03:28 UTC (rev 195697)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-01-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: Fix many Index tests.
+ https://bugs.webkit.org/show_bug.cgi?id=153561
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Many failing tests now pass).
+
+ * Modules/indexeddb/server/MemoryIndex.cpp:
+ (WebCore::IDBServer::MemoryIndex::getResultForKeyRange):
+
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedPutIndexKey):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedPutIndexRecord):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::getIndexRecord):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::iterateCursor):
+
+ * Modules/indexeddb/server/SQLiteIDBCursor.h:
+ (WebCore::IDBServer::SQLiteIDBCursor::didComplete):
+
+2016-01-27 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: Cursors are utterly broken in the SQLite backend.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153558
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryIndexcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.cpp (195696 => 195697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.cpp 2016-01-27 22:57:10 UTC (rev 195696)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndex.cpp 2016-01-27 23:03:28 UTC (rev 195697)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> IDBGetResult MemoryIndex::getResultForKeyRange(IndexedDB::IndexRecordType type, const IDBKeyRangeData& range) const
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "MemoryIndex::getResultForKeyRange");
</del><ins>+ LOG(IndexedDB, "MemoryIndex::getResultForKeyRange - %s", range.loggingString().utf8().data());
</ins><span class="cx">
</span><span class="cx"> if (!m_records)
</span><span class="cx"> return { };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (195696 => 195697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-27 22:57:10 UTC (rev 195696)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-27 23:03:28 UTC (rev 195697)
</span><span class="lines">@@ -838,10 +838,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (!info.multiEntry()) {
</span><span class="cx"> auto error = uncheckedPutIndexRecord(info.objectStoreIdentifier(), info.identifier(), key, indexKey.asOneKey());
</span><del>- if (!error.isNull()) {
</del><ins>+ if (!error.isNull())
</ins><span class="cx"> LOG_ERROR("Unable to put index record for newly created index");
</span><del>- return error;
- }
</del><ins>+
+ return error;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<IDBKeyData> indexKeys = indexKey.multiEntry();
</span><span class="lines">@@ -871,6 +871,8 @@
</span><span class="cx">
</span><span class="cx"> IDBError SQLiteIDBBackingStore::uncheckedPutIndexRecord(int64_t objectStoreID, int64_t indexID, const WebCore::IDBKeyData& keyValue, const WebCore::IDBKeyData& indexKey)
</span><span class="cx"> {
</span><ins>+ LOG(IndexedDB, "SQLiteIDBBackingStore::uncheckedPutIndexRecord - %s, %s", keyValue.loggingString().utf8().data(), indexKey.loggingString().utf8().data());
+
</ins><span class="cx"> RefPtr<SharedBuffer> indexKeyBuffer = serializeIDBKeyData(indexKey);
</span><span class="cx"> if (!indexKeyBuffer) {
</span><span class="cx"> LOG_ERROR("Unable to serialize index key to be stored in the database");
</span><span class="lines">@@ -1213,7 +1215,8 @@
</span><span class="cx">
</span><span class="cx"> IDBError SQLiteIDBBackingStore::getIndexRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreID, uint64_t indexID, IndexedDB::IndexRecordType type, const IDBKeyRangeData& range, IDBGetResult& getResult)
</span><span class="cx"> {
</span><del>- LOG(IndexedDB, "SQLiteIDBBackingStore::getIndexRecord");
</del><ins>+ LOG(IndexedDB, "SQLiteIDBBackingStore::getIndexRecord - %s", range.loggingString().utf8().data());
+
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1229,11 +1232,20 @@
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Cannot open cursor to perform index get in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (type == IndexedDB::IndexRecordType::Key)
- getResult = { cursor->currentPrimaryKey() };
</del><ins>+ if (cursor->didError()) {
+ LOG_ERROR("Cursor failed while looking up index record in database");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Cursor failed while looking up index record in database") };
+ }
+
+ if (cursor->didComplete())
+ getResult = { };
</ins><span class="cx"> else {
</span><del>- getResult = { SharedBuffer::create(cursor->currentValueBuffer().data(), cursor->currentValueBuffer().size()) };
- getResult.setKeyData(cursor->currentPrimaryKey());
</del><ins>+ if (type == IndexedDB::IndexRecordType::Key)
+ getResult = { cursor->currentPrimaryKey() };
+ else {
+ getResult = { SharedBuffer::create(cursor->currentValueBuffer().data(), cursor->currentValueBuffer().size()) };
+ getResult.setKeyData(cursor->currentPrimaryKey());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return { };
</span><span class="lines">@@ -1412,6 +1424,8 @@
</span><span class="cx">
</span><span class="cx"> IDBError SQLiteIDBBackingStore::iterateCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBResourceIdentifier& cursorIdentifier, const IDBKeyData& key, uint32_t count, IDBGetResult& result)
</span><span class="cx"> {
</span><ins>+ LOG(IndexedDB, "SQLiteIDBBackingStore::iterateCursor");
+
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h (195696 => 195697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h 2016-01-27 22:57:10 UTC (rev 195696)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.h 2016-01-27 23:03:28 UTC (rev 195697)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> bool advance(uint64_t count);
</span><span class="cx"> bool iterate(const IDBKeyData& targetKey);
</span><span class="cx">
</span><ins>+ bool didComplete() const { return m_completed; }
</ins><span class="cx"> bool didError() const { return m_errored; }
</span><span class="cx">
</span><span class="cx"> void objectStoreRecordsChanged();
</span></span></pre>
</div>
</div>
</body>
</html>