<!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>[195648] 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/195648">195648</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-26 18:25:58 -0800 (Tue, 26 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Key generator support for SQLite backend.
https://bugs.webkit.org/show_bug.cgi?id=153427
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (Existing failing tests now pass, others improved).
* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedGetKeyGeneratorValue):
(WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedSetKeyGeneratorValue):
(WebCore::IDBServer::SQLiteIDBBackingStore::generateKeyNumber):
(WebCore::IDBServer::SQLiteIDBBackingStore::revertGeneratedKeyNumber):
(WebCore::IDBServer::SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber):
* Modules/indexeddb/server/SQLiteIDBBackingStore.h:
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>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStoreh">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195647 => 195648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-27 02:16:57 UTC (rev 195647)
+++ trunk/LayoutTests/ChangeLog 2016-01-27 02:25:58 UTC (rev 195648)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-01-26 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Key generator support for SQLite backend.
+ https://bugs.webkit.org/show_bug.cgi?id=153427
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2016-01-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow canvas to use display-list drawing for testing
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (195647 => 195648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-27 02:16:57 UTC (rev 195647)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-01-27 02:25:58 UTC (rev 195648)
</span><span class="lines">@@ -470,7 +470,6 @@
</span><span class="cx"> storage/indexeddb/cursor-properties.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-reverse-bug.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-skip-deleted.html [ Failure ]
</span><del>-storage/indexeddb/cursor-update-value-argument-required.html [ Failure ]
</del><span class="cx"> storage/indexeddb/cursor-update.html [ Failure ]
</span><span class="cx"> storage/indexeddb/cursor-value.html [ Failure ]
</span><span class="cx"> storage/indexeddb/delete-range.html [ Failure ]
</span><span class="lines">@@ -489,12 +488,10 @@
</span><span class="cx"> storage/indexeddb/key-sort-order-across-types.html [ Failure ]
</span><span class="cx"> storage/indexeddb/key-sort-order-date.html [ Failure ]
</span><span class="cx"> storage/indexeddb/keypath-arrays.html [ Failure ]
</span><del>-storage/indexeddb/keypath-edges.html [ Failure ]
</del><span class="cx"> storage/indexeddb/keypath-fetch-key.html [ Failure ]
</span><span class="cx"> storage/indexeddb/keypath-intrinsic-properties.html [ Failure ]
</span><span class="cx"> storage/indexeddb/lazy-index-population.html [ Failure ]
</span><span class="cx"> storage/indexeddb/lazy-index-types.html [ Failure ]
</span><del>-storage/indexeddb/modern/autoincrement-abort.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/cursor-1.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/cursor-2.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/cursor-3.html [ Failure ]
</span><span class="lines">@@ -506,8 +503,6 @@
</span><span class="cx"> storage/indexeddb/modern/deleteindex-1.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/deleteindex-2.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/get-keyrange.html [ Failure ]
</span><del>-storage/indexeddb/modern/idbobjectstore-clear-1.html [ Failure ]
-storage/indexeddb/modern/idbobjectstore-clear-2.html [ Failure ]
</del><span class="cx"> storage/indexeddb/modern/idbobjectstore-delete-1.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/index-1.html [ Failure ]
</span><span class="cx"> storage/indexeddb/modern/index-2.html [ Failure ]
</span><span class="lines">@@ -526,17 +521,9 @@
</span><span class="cx"> storage/indexeddb/mozilla/cursor-mutation.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/cursor-update-updates-indexes.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mozilla/cursors.html [ Failure ]
</span><del>-storage/indexeddb/mozilla/delete-result.html [ Failure ]
-storage/indexeddb/mozilla/event-source.html [ Failure ]
</del><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/key-requirements.html [ Failure ]
</del><span class="cx"> storage/indexeddb/mozilla/object-cursors.html [ Failure ]
</span><del>-storage/indexeddb/mozilla/object-store-inline-autoincrement-key-added-on-put.html [ Failure ]
-storage/indexeddb/mozilla/object-store-remove-values.html [ Failure ]
-storage/indexeddb/mozilla/odd-result-order.html [ Failure ]
-storage/indexeddb/mozilla/put-get-values.html [ Failure ]
-storage/indexeddb/mozilla/readwrite-transactions.html [ Failure ]
</del><span class="cx"> storage/indexeddb/mozilla/remove-objectstore.html [ Failure ]
</span><span class="cx"> storage/indexeddb/mutating-cursor.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195647 => 195648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-27 02:16:57 UTC (rev 195647)
+++ trunk/Source/WebCore/ChangeLog 2016-01-27 02:25:58 UTC (rev 195648)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-01-26 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Key generator support for SQLite backend.
+ https://bugs.webkit.org/show_bug.cgi?id=153427
+
+ Reviewed by Alex Christensen.
+
+ No new tests (Existing failing tests now pass, others improved).
+
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedGetKeyGeneratorValue):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedSetKeyGeneratorValue):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::generateKeyNumber):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::revertGeneratedKeyNumber):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber):
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.h:
+
</ins><span class="cx"> 2016-01-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow canvas to use display-list drawing for testing
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (195647 => 195648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-27 02:16:57 UTC (rev 195647)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-01-27 02:25:58 UTC (rev 195648)
</span><span class="lines">@@ -1180,21 +1180,128 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IDBError SQLiteIDBBackingStore::generateKeyNumber(const IDBResourceIdentifier&, uint64_t, uint64_t&)
</del><ins>+IDBError SQLiteIDBBackingStore::uncheckedGetKeyGeneratorValue(int64_t objectStoreID, uint64_t& outValue)
</ins><span class="cx"> {
</span><del>- return { IDBDatabaseException::UnknownError, ASCIILiteral("Not implemented") };
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT currentKey FROM KeyGenerators WHERE objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK) {
+ LOG_ERROR("Could not retrieve currentKey from KeyGenerators table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Error getting current key generator value from database") };
+ }
+ int result = sql.step();
+ if (result != SQLITE_ROW) {
+ LOG_ERROR("Could not retreive key generator value for object store, but it should be there.");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Error finding current key generator value in database") };
+ }
+
+ int64_t value = sql.getColumnInt64(0);
+ if (value < 0)
+ return { IDBDatabaseException::ConstraintError, "Current key generator value from database is invalid" };
+
+ outValue = value;
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-IDBError SQLiteIDBBackingStore::revertGeneratedKeyNumber(const IDBResourceIdentifier&, uint64_t, uint64_t)
</del><ins>+IDBError SQLiteIDBBackingStore::uncheckedSetKeyGeneratorValue(int64_t objectStoreID, uint64_t value)
</ins><span class="cx"> {
</span><del>- return { IDBDatabaseException::UnknownError, ASCIILiteral("Not implemented") };
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO KeyGenerators VALUES (?, ?);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK
+ || sql.bindInt64(2, value) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
+ LOG_ERROR("Could not update key generator value (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
+ return { IDBDatabaseException::ConstraintError, "Error storing new key generator value in database" };
+ }
+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-IDBError SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier&, uint64_t, double)
</del><ins>+IDBError SQLiteIDBBackingStore::generateKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreID, uint64_t& generatedKey)
</ins><span class="cx"> {
</span><del>- return { IDBDatabaseException::UnknownError, ASCIILiteral("Not implemented") };
</del><ins>+ LOG(IndexedDB, "SQLiteIDBBackingStore::generateKeyNumber");
+
+ ASSERT(m_sqliteDB);
+ ASSERT(m_sqliteDB->isOpen());
+
+ // The IndexedDatabase spec defines the max key generator value as 2^53;
+ static uint64_t maxGeneratorValue = 0x20000000000000;
+
+ auto* transaction = m_transactions.get(transactionIdentifier);
+ if (!transaction || !transaction->inProgress()) {
+ LOG_ERROR("Attempt to generate key in database without an in-progress transaction");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to generate key in database without an in-progress transaction") };
+ }
+ if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+ LOG_ERROR("Attempt to generate key in a read-only transaction");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to generate key in a read-only transaction") };
+ }
+
+ uint64_t currentValue;
+ auto error = uncheckedGetKeyGeneratorValue(objectStoreID, currentValue);
+ if (!error.isNull())
+ return error;
+
+ if (currentValue > maxGeneratorValue)
+ return { IDBDatabaseException::ConstraintError, "Cannot generate new key value over 2^53 for object store operation" };
+
+ generatedKey = currentValue + 1;
+ return uncheckedSetKeyGeneratorValue(objectStoreID, generatedKey);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+IDBError SQLiteIDBBackingStore::revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreID, uint64_t newKeyNumber)
+{
+ LOG(IndexedDB, "SQLiteIDBBackingStore::revertGeneratedKeyNumber");
+
+ ASSERT(m_sqliteDB);
+ ASSERT(m_sqliteDB->isOpen());
+
+ auto* transaction = m_transactions.get(transactionIdentifier);
+ if (!transaction || !transaction->inProgress()) {
+ LOG_ERROR("Attempt to revert key generator value in database without an in-progress transaction");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to revert key generator value in database without an in-progress transaction") };
+ }
+ if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+ LOG_ERROR("Attempt to revert key generator value in a read-only transaction");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to revert key generator value in a read-only transaction") };
+ }
+
+ return uncheckedSetKeyGeneratorValue(objectStoreID, newKeyNumber);
+}
+
+IDBError SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreID, double newKeyNumber)
+{
+ LOG(IndexedDB, "SQLiteIDBBackingStore::maybeUpdateKeyGeneratorNumber");
+
+ ASSERT(m_sqliteDB);
+ ASSERT(m_sqliteDB->isOpen());
+
+ auto* transaction = m_transactions.get(transactionIdentifier);
+ if (!transaction || !transaction->inProgress()) {
+ LOG_ERROR("Attempt to update key generator value in database without an in-progress transaction");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to update key generator value in database without an in-progress transaction") };
+ }
+ if (transaction->mode() == IndexedDB::TransactionMode::ReadOnly) {
+ LOG_ERROR("Attempt to update key generator value in a read-only transaction");
+ return { IDBDatabaseException::UnknownError, ASCIILiteral("Attempt to update key generator value in a read-only transaction") };
+ }
+
+ uint64_t currentValue;
+ auto error = uncheckedGetKeyGeneratorValue(objectStoreID, currentValue);
+ if (!error.isNull())
+ return error;
+
+ if (newKeyNumber <= currentValue)
+ return { };
+
+ uint64_t newKeyInteger(newKeyNumber);
+ if (newKeyInteger <= uint64_t(newKeyNumber))
+ ++newKeyInteger;
+
+ ASSERT(newKeyInteger > uint64_t(newKeyNumber));
+
+ return uncheckedSetKeyGeneratorValue(objectStoreID, newKeyInteger);
+}
+
</ins><span class="cx"> IDBError SQLiteIDBBackingStore::openCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBCursorInfo& info, IDBGetResult& result)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_sqliteDB);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h (195647 => 195648)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h 2016-01-27 02:16:57 UTC (rev 195647)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h 2016-01-27 02:25:58 UTC (rev 195648)
</span><span class="lines">@@ -89,6 +89,8 @@
</span><span class="cx"> IDBError deleteRecord(SQLiteIDBTransaction&, int64_t objectStoreID, const IDBKeyData&);
</span><span class="cx"> IDBError uncheckedPutIndexRecord(int64_t objectStoreID, int64_t indexID, const IDBKeyData& keyValue, const IDBKeyData& indexKey);
</span><span class="cx"> IDBError uncheckedHasIndexRecord(int64_t indexID, const IDBKeyData&, bool& hasRecord);
</span><ins>+ IDBError uncheckedGetKeyGeneratorValue(int64_t objectStoreID, uint64_t& outValue);
+ IDBError uncheckedSetKeyGeneratorValue(int64_t objectStoreID, uint64_t value);
</ins><span class="cx">
</span><span class="cx"> IDBDatabaseIdentifier m_identifier;
</span><span class="cx"> std::unique_ptr<IDBDatabaseInfo> m_databaseInfo;
</span></span></pre>
</div>
</div>
</body>
</html>