<!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>[195838] 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/195838">195838</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-29 13:22:40 -0800 (Fri, 29 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: storage/indexeddb/modern/index-3.html fails.
https://bugs.webkit.org/show_bug.cgi?id=153661
Reviewed by Tim Horton.
Source/WebCore:
No new tests (1 failing test now passes, others get closer).
When indexing a new record fails due to uniqueness constraints, remove all traces of the record.
* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::createIndex):
(WebCore::IDBServer::SQLiteIDBBackingStore::updateAllIndexesForAddRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::addRecord):
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 (195837 => 195838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-29 21:00:24 UTC (rev 195837)
+++ trunk/LayoutTests/ChangeLog 2016-01-29 21:22:40 UTC (rev 195838)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-29 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: storage/indexeddb/modern/index-3.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=153661
+
+ Reviewed by Tim Horton.
+
+ * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2015-12-22 Pranjal Jumde <pjumde@apple.com>
</span><span class="cx">
</span><span class="cx"> Test to check for stack recursion when indexed propertyNames defined using Object.defineProperty are deleted.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195837 => 195838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-29 21:00:24 UTC (rev 195837)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-29 21:22:40 UTC (rev 195838)
</span><span class="lines">@@ -259,7 +259,6 @@
</span><span class="cx"> storage/indexeddb/cursor-primary-key-order.html [ Failure ]
</span><span class="cx"> storage/indexeddb/get-keyrange.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/get-keyrange.html [ Failure ]
</span><del>-storage/indexeddb/modern/index-3.html [ Failure ]
</del><span class="cx">
</span><span class="cx"> # SQLite backend tests that timeout
</span><span class="cx"> storage/indexeddb/modern/transaction-scheduler-1.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195837 => 195838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-29 21:00:24 UTC (rev 195837)
+++ trunk/Source/WebCore/ChangeLog 2016-01-29 21:22:40 UTC (rev 195838)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-29 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: storage/indexeddb/modern/index-3.html fails.
+ https://bugs.webkit.org/show_bug.cgi?id=153661
+
+ Reviewed by Tim Horton.
+
+ No new tests (1 failing test now passes, others get closer).
+
+ When indexing a new record fails due to uniqueness constraints, remove all traces of the record.
+
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::createIndex):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::updateAllIndexesForAddRecord):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::addRecord):
+
</ins><span class="cx"> 2016-01-29 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] Check vertex array bounds before permitting a glDrawArrays to execute
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (195837 => 195838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-29 21:00:24 UTC (rev 195837)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-29 21:22:40 UTC (rev 195838)
</span><span class="lines">@@ -763,7 +763,15 @@
</span><span class="cx">
</span><span class="cx"> IDBError error = updateOneIndexForAddRecord(info, key, valueBuffer);
</span><span class="cx"> if (!error.isNull()) {
</span><del>- // FIXME: Remove this newly added index.
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexInfo WHERE id = ? AND objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, info.identifier()) != SQLITE_OK
+ || sql.bindInt64(2, info.objectStoreIdentifier()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
+ LOG_ERROR("Index creation failed due to uniqueness constraint failure, but there was an error deleting the Index record from the database");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Index creation failed due to uniqueness constraint failure, but there was an error deleting the Index record from the database") };
+ }
+
</ins><span class="cx"> return error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1090,8 +1098,7 @@
</span><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> IDBError error;
</span><del>- Vector<std::pair<uint64_t, IndexKey>> changedIndexRecords;
-
</del><ins>+ bool anyRecordsSucceeded = false;
</ins><span class="cx"> for (auto& index : info.indexMap().values()) {
</span><span class="cx"> IndexKey indexKey;
</span><span class="cx"> generateIndexKeyForValue(*m_globalObject->globalExec(), index, jsValue, indexKey);
</span><span class="lines">@@ -1103,11 +1110,23 @@
</span><span class="cx"> if (!error.isNull())
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- changedIndexRecords.append(std::make_pair(index.identifier(), indexKey));
</del><ins>+ anyRecordsSucceeded = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: If any of the index puts failed, revert the ones that went through (changedIndexRecords).
</del><ins>+ if (!error.isNull() && anyRecordsSucceeded) {
+ RefPtr<SharedBuffer> keyBuffer = serializeIDBKeyData(key);
</ins><span class="cx">
</span><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ? AND value = CAST(? AS TEXT);"));
+
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, info.identifier()) != SQLITE_OK
+ || sql.bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
+ LOG_ERROR("Adding one Index record failed, but failed to remove all others that previously succeeded");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Adding one Index record failed, but failed to remove all others that previously succeeded") };
+ }
+ }
+
</ins><span class="cx"> return error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1148,7 +1167,16 @@
</span><span class="cx">
</span><span class="cx"> auto error = updateAllIndexesForAddRecord(objectStoreInfo, keyData, value);
</span><span class="cx">
</span><del>- // FIXME: If there was an error indexing this record, remove it.
</del><ins>+ if (!error.isNull()) {
+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreInfo.identifier()) != SQLITE_OK
+ || sql.bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
+ LOG_ERROR("Indexing new object store record failed, but unable to remove the object store record itself");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Indexing new object store record failed, but unable to remove the object store record itself") };
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> transaction->notifyCursorsOfChanges(objectStoreInfo.identifier());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>