<!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>[209117] 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/209117">209117</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-11-29 20:37:03 -0800 (Tue, 29 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/209096">r209096</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/209104">r209104</a>, and <a href="http://trac.webkit.org/projects/webkit/changeset/209114">r209114</a>.
Caused over 200 layout test failures on the bots
Reverted changesets:
"IndexedDB 2.0: Cache and reuse SQLiteStatements in the SQLite
backend."
https://bugs.webkit.org/show_bug.cgi?id=164974
http://trac.webkit.org/changeset/209096
"Followup to:"
https://bugs.webkit.org/show_bug.cgi?id=164974
http://trac.webkit.org/changeset/209104
"REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/209104">r209104</a>): storage/indexeddb/modern/gc-closes-
database(-private).html timeout."
https://bugs.webkit.org/show_bug.cgi?id=165186
http://trac.webkit.org/changeset/209114</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionh">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h</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 (209116 => 209117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-30 04:26:20 UTC (rev 209116)
+++ trunk/LayoutTests/ChangeLog 2016-11-30 04:37:03 UTC (rev 209117)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-11-29 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, rolling out r209096, r209104, and r209114.
+
+ Caused over 200 layout test failures on the bots
+
+ Reverted changesets:
+
+ "IndexedDB 2.0: Cache and reuse SQLiteStatements in the SQLite
+ backend."
+ https://bugs.webkit.org/show_bug.cgi?id=164974
+ http://trac.webkit.org/changeset/209096
+
+ "Followup to:"
+ https://bugs.webkit.org/show_bug.cgi?id=164974
+ http://trac.webkit.org/changeset/209104
+
+ "REGRESSION (r209104): storage/indexeddb/modern/gc-closes-
+ database(-private).html timeout."
+ https://bugs.webkit.org/show_bug.cgi?id=165186
+ http://trac.webkit.org/changeset/209114
+
</ins><span class="cx"> 2016-11-29 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Localization
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (209116 => 209117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-11-30 04:26:20 UTC (rev 209116)
+++ trunk/LayoutTests/TestExpectations 2016-11-30 04:37:03 UTC (rev 209117)
</span><span class="lines">@@ -995,7 +995,3 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/164797 js/dom/domjit-function-get-element-by-id-licm.html [ Pass Timeout ]
</span><span class="cx"> webkit.org/b/164797 js/dom/domjit-function-get-element-by-id-changed.html [ Pass Timeout ]
</span><del>-
-
-webkit.org/b/165186 storage/indexeddb/modern/gc-closes-database.html [ Skip ]
-webkit.org/b/165186 storage/indexeddb/modern/gc-closes-database-private.html [ Skip ]
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209116 => 209117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-30 04:26:20 UTC (rev 209116)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 04:37:03 UTC (rev 209117)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-11-29 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, rolling out r209096, r209104, and r209114.
+
+ Caused over 200 layout test failures on the bots
+
+ Reverted changesets:
+
+ "IndexedDB 2.0: Cache and reuse SQLiteStatements in the SQLite
+ backend."
+ https://bugs.webkit.org/show_bug.cgi?id=164974
+ http://trac.webkit.org/changeset/209096
+
+ "Followup to:"
+ https://bugs.webkit.org/show_bug.cgi?id=164974
+ http://trac.webkit.org/changeset/209104
+
+ "REGRESSION (r209104): storage/indexeddb/modern/gc-closes-
+ database(-private).html timeout."
+ https://bugs.webkit.org/show_bug.cgi?id=165186
+ http://trac.webkit.org/changeset/209114
+
</ins><span class="cx"> 2016-11-29 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Localization
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (209116 => 209117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-11-30 04:26:20 UTC (rev 209116)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2016-11-30 04:37:03 UTC (rev 209117)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> RefPtr<IDBOpenDBRequest> m_openDBRequest;
</span><span class="cx">
</span><span class="cx"> Deque<RefPtr<IDBClient::TransactionOperation>> m_pendingTransactionOperationQueue;
</span><del>- Deque<RefPtr<IDBClient::TransactionOperation>> m_transactionOperationsInProgressQueue;
</del><ins>+ Deque<IDBClient::TransactionOperation*> m_transactionOperationsInProgressQueue;
</ins><span class="cx"> Deque<std::pair<RefPtr<IDBClient::TransactionOperation>, IDBResultData>> m_completedOnServerQueue;
</span><span class="cx"> Deque<RefPtr<IDBClient::TransactionOperation>> m_abortQueue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (209116 => 209117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-11-30 04:26:20 UTC (rev 209116)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2016-11-30 04:37:03 UTC (rev 209117)
</span><span class="lines">@@ -490,25 +490,25 @@
</span><span class="cx">
</span><span class="cx"> if (!m_sqliteDB->executeCommand("CREATE TABLE IDBDatabaseInfo (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, value TEXT NOT NULL ON CONFLICT FAIL);")) {
</span><span class="cx"> LOG_ERROR("Could not create IDBDatabaseInfo table in database (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_sqliteDB->executeCommand("CREATE TABLE ObjectStoreInfo (id INTEGER PRIMARY KEY NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT FAIL, name TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT FAIL, keyPath BLOB NOT NULL ON CONFLICT FAIL, autoInc INTEGER NOT NULL ON CONFLICT FAIL, maxIndexID INTEGER NOT NULL ON CONFLICT FAIL);")) {
</span><span class="cx"> LOG_ERROR("Could not create ObjectStoreInfo table in database (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_sqliteDB->executeCommand("CREATE TABLE IndexInfo (id INTEGER NOT NULL ON CONFLICT FAIL, name TEXT NOT NULL ON CONFLICT FAIL, objectStoreID INTEGER NOT NULL ON CONFLICT FAIL, keyPath BLOB NOT NULL ON CONFLICT FAIL, isUnique INTEGER NOT NULL ON CONFLICT FAIL, multiEntry INTEGER NOT NULL ON CONFLICT FAIL);")) {
</span><span class="cx"> LOG_ERROR("Could not create IndexInfo table in database (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_sqliteDB->executeCommand("CREATE TABLE KeyGenerators (objectStoreID INTEGER NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE, currentKey INTEGER NOT NULL ON CONFLICT FAIL);")) {
</span><span class="cx"> LOG_ERROR("Could not create KeyGenerators table in database (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx"> || sql.bindInt(1, currentMetadataVersion) != SQLITE_OK
</span><span class="cx"> || sql.step() != SQLITE_DONE) {
</span><span class="cx"> LOG_ERROR("Could not insert database metadata version into IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> || sql.bindText(1, m_identifier.databaseName()) != SQLITE_OK
</span><span class="cx"> || sql.step() != SQLITE_DONE) {
</span><span class="cx"> LOG_ERROR("Could not insert database name into IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> || sql.bindText(1, String::number(0)) != SQLITE_OK
</span><span class="cx"> || sql.step() != SQLITE_DONE) {
</span><span class="cx"> LOG_ERROR("Could not insert default version into IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_sqliteDB->executeCommand(ASCIILiteral("INSERT INTO IDBDatabaseInfo VALUES ('MaxObjectStoreID', 1);"))) {
</span><span class="cx"> LOG_ERROR("Could not insert default version into IDBDatabaseInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx"> m_sqliteDB = std::make_unique<SQLiteDatabase>();
</span><span class="cx"> if (!m_sqliteDB->open(dbFilename)) {
</span><span class="cx"> LOG_ERROR("Failed to open SQLite database at path '%s'", dbFilename.utf8().data());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_sqliteDB)
</span><span class="lines">@@ -733,19 +733,19 @@
</span><span class="cx">
</span><span class="cx"> if (!ensureValidRecordsTable()) {
</span><span class="cx"> LOG_ERROR("Error creating or migrating Records table in database");
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error creating or migrating Records table in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!ensureValidIndexRecordsTable()) {
</span><span class="cx"> LOG_ERROR("Error creating or migrating Index Records table in database");
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error creating or migrating Index Records table in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!ensureValidBlobTables()) {
</span><span class="cx"> LOG_ERROR("Error creating or confirming Blob Records tables in database");
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error creating or confirming Blob Records tables in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -755,7 +755,7 @@
</span><span class="cx">
</span><span class="cx"> if (!databaseInfo) {
</span><span class="cx"> LOG_ERROR("Unable to establish IDB database at path '%s'", dbFilename.utf8().data());
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to establish IDB database file") };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -862,14 +862,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::CreateObjectStoreInfo, ASCIILiteral("INSERT INTO ObjectStoreInfo VALUES (?, ?, ?, ?, ?);"));
- if (!sql
- || sql->bindInt64(1, info.identifier()) != SQLITE_OK
- || sql->bindText(2, info.name()) != SQLITE_OK
- || sql->bindBlob(3, keyPathBlob->data(), keyPathBlob->size()) != SQLITE_OK
- || sql->bindInt(4, info.autoIncrement()) != SQLITE_OK
- || sql->bindInt64(5, info.maxIndexID()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO ObjectStoreInfo VALUES (?, ?, ?, ?, ?);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, info.identifier()) != SQLITE_OK
+ || sql.bindText(2, info.name()) != SQLITE_OK
+ || sql.bindBlob(3, keyPathBlob->data(), keyPathBlob->size()) != SQLITE_OK
+ || sql.bindInt(4, info.autoIncrement()) != SQLITE_OK
+ || sql.bindInt64(5, info.maxIndexID()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not add object store '%s' to ObjectStoreInfo table (%i) - %s", info.name().utf8().data(), m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not create object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -876,10 +876,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::CreateObjectStoreKeyGenerator, ASCIILiteral("INSERT INTO KeyGenerators VALUES (?, 0);"));
- if (!sql
- || sql->bindInt64(1, info.identifier()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO KeyGenerators VALUES (?, 0);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, info.identifier()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not seed initial key generator value for ObjectStoreInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not seed initial key generator value for object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -909,10 +909,10 @@
</span><span class="cx">
</span><span class="cx"> // Delete the ObjectStore record
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreInfo, ASCIILiteral("DELETE FROM ObjectStoreInfo WHERE id = ?;"));
- if (!sql
- || sql->bindInt64(1, objectStoreIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM ObjectStoreInfo WHERE id = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete object store id %" PRIi64 " from ObjectStoreInfo table (%i) - %s", objectStoreIdentifier, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not delete object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -920,10 +920,10 @@
</span><span class="cx">
</span><span class="cx"> // Delete the ObjectStore's key generator record if there is one.
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreKeyGenerator, ASCIILiteral("DELETE FROM KeyGenerators WHERE objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, objectStoreIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM KeyGenerators WHERE objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete object store from KeyGenerators table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not delete key generator for deleted object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -931,10 +931,10 @@
</span><span class="cx">
</span><span class="cx"> // Delete all associated records
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreRecords, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, objectStoreIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete records for object store %" PRIi64 " (%i) - %s", objectStoreIdentifier, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not delete records for deleted object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -942,10 +942,10 @@
</span><span class="cx">
</span><span class="cx"> // Delete all associated Indexes
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreIndexInfo, ASCIILiteral("DELETE FROM IndexInfo WHERE objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, objectStoreIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexInfo WHERE objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete index from IndexInfo table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not delete IDBIndex for deleted object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -953,10 +953,10 @@
</span><span class="cx">
</span><span class="cx"> // Delete all associated Index records
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreIndexRecords, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, objectStoreIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete index records(%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not delete IDBIndex records for deleted object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -964,9 +964,9 @@
</span><span class="cx">
</span><span class="cx"> // Delete all unused Blob URL records.
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreBlobRecords, ASCIILiteral("DELETE FROM BlobRecords WHERE objectStoreRow NOT IN (SELECT recordID FROM Records)"));
- if (!sql
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM BlobRecords WHERE objectStoreRow NOT IN (SELECT recordID FROM Records)"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete Blob URL records(%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not delete stored blob records for deleted object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -1000,11 +1000,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::RenameObjectStore, ASCIILiteral("UPDATE ObjectStoreInfo SET name = ? WHERE id = ?;"));
- if (!sql
- || sql->bindText(1, newName) != SQLITE_OK
- || sql->bindInt64(2, objectStoreIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("UPDATE ObjectStoreInfo SET name = ? WHERE id = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindText(1, newName) != SQLITE_OK
+ || sql.bindInt64(2, objectStoreIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not update name for object store id %" PRIi64 " in ObjectStoreInfo table (%i) - %s", objectStoreIdentifier, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not rename object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -1033,10 +1033,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::ClearObjectStoreRecords, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not clear records from object store id %" PRIi64 " (%i) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to clear object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -1043,10 +1043,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::ClearObjectStoreIndexRecords, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete records from index record store id %" PRIi64 " (%i) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to delete index records while clearing object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -1079,15 +1079,15 @@
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to serialize IDBKeyPath to create index in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto* sql = cachedStatement(SQL::CreateIndexInfo, ASCIILiteral("INSERT INTO IndexInfo VALUES (?, ?, ?, ?, ?, ?);"));
- if (!sql
- || sql->bindInt64(1, info.identifier()) != SQLITE_OK
- || sql->bindText(2, info.name()) != SQLITE_OK
- || sql->bindInt64(3, info.objectStoreIdentifier()) != SQLITE_OK
- || sql->bindBlob(4, keyPathBlob->data(), keyPathBlob->size()) != SQLITE_OK
- || sql->bindInt(5, info.unique()) != SQLITE_OK
- || sql->bindInt(6, info.multiEntry()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO IndexInfo VALUES (?, ?, ?, ?, ?, ?);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, info.identifier()) != SQLITE_OK
+ || sql.bindText(2, info.name()) != SQLITE_OK
+ || sql.bindInt64(3, info.objectStoreIdentifier()) != SQLITE_OK
+ || sql.bindBlob(4, keyPathBlob->data(), keyPathBlob->size()) != SQLITE_OK
+ || sql.bindInt(5, info.unique()) != SQLITE_OK
+ || sql.bindInt(6, info.multiEntry()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not add index '%s' to IndexInfo table (%i) - %s", info.name().utf8().data(), m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to create index in database") };
</span><span class="cx"> }
</span><span class="lines">@@ -1108,11 +1108,11 @@
</span><span class="cx">
</span><span class="cx"> IDBError error = updateOneIndexForAddRecord(info, key, valueBuffer);
</span><span class="cx"> if (!error.isNull()) {
</span><del>- auto* sql = cachedStatement(SQL::DeleteIndexInfo, ASCIILiteral("DELETE FROM IndexInfo WHERE id = ? AND objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, info.identifier()) != SQLITE_OK
- || sql->bindInt64(2, info.objectStoreIdentifier()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</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) {
</ins><span class="cx"> LOG_ERROR("Index creation failed due to uniqueness constraint failure, but there was an error deleting the Index record from the database");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Index creation failed due to uniqueness constraint failure, but there was an error deleting the Index record from the database") };
</span><span class="cx"> }
</span><span class="lines">@@ -1143,16 +1143,16 @@
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to serialize IDBKey to check for index record in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto* sql = cachedStatement(SQL::HasIndexRecord, ASCIILiteral("SELECT rowid FROM IndexRecords WHERE indexID = ? AND objectStoreID = ? AND key = CAST(? AS TEXT);"));
- if (!sql
- || sql->bindInt64(1, info.identifier()) != SQLITE_OK
- || sql->bindInt64(2, info.objectStoreIdentifier()) != SQLITE_OK
- || sql->bindBlob(3, indexKeyBuffer->data(), indexKeyBuffer->size()) != SQLITE_OK) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT rowid FROM IndexRecords WHERE indexID = ? AND objectStoreID = ? AND key = CAST(? AS TEXT);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, info.identifier()) != SQLITE_OK
+ || sql.bindInt64(2, info.objectStoreIdentifier()) != SQLITE_OK
+ || sql.bindBlob(3, indexKeyBuffer->data(), indexKeyBuffer->size()) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Error checking for index record in database");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error checking for index record in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int sqlResult = sql->step();
</del><ins>+ int sqlResult = sql.step();
</ins><span class="cx"> if (sqlResult == SQLITE_OK || sqlResult == SQLITE_DONE)
</span><span class="cx"> return { };
</span><span class="cx">
</span><span class="lines">@@ -1220,13 +1220,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::PutIndexRecord, ASCIILiteral("INSERT INTO IndexRecords VALUES (?, ?, CAST(? AS TEXT), CAST(? AS TEXT));"));
- if (!sql
- || sql->bindInt64(1, indexID) != SQLITE_OK
- || sql->bindInt64(2, objectStoreID) != SQLITE_OK
- || sql->bindBlob(3, indexKeyBuffer->data(), indexKeyBuffer->size()) != SQLITE_OK
- || sql->bindBlob(4, valueBuffer->data(), valueBuffer->size()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO IndexRecords VALUES (?, ?, CAST(? AS TEXT), CAST(? AS TEXT));"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, indexID) != SQLITE_OK
+ || sql.bindInt64(2, objectStoreID) != SQLITE_OK
+ || sql.bindBlob(3, indexKeyBuffer->data(), indexKeyBuffer->size()) != SQLITE_OK
+ || sql.bindBlob(4, valueBuffer->data(), valueBuffer->size()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not put index record for index %" PRIi64 " in object store %" PRIi64 " in Records table (%i) - %s", indexID, objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error putting index record into database") };
</span><span class="cx"> }
</span><span class="lines">@@ -1255,11 +1255,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteIndexInfo, ASCIILiteral("DELETE FROM IndexInfo WHERE id = ? AND objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, indexIdentifier) != SQLITE_OK
- || sql->bindInt64(2, objectStoreIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexInfo WHERE id = ? AND objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, indexIdentifier) != SQLITE_OK
+ || sql.bindInt64(2, objectStoreIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete index id %" PRIi64 " from IndexInfo table (%i) - %s", objectStoreIdentifier, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error deleting index from database") };
</span><span class="cx"> }
</span><span class="lines">@@ -1266,11 +1266,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteIndexRecords, ASCIILiteral("DELETE FROM IndexRecords WHERE indexID = ? AND objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, indexIdentifier) != SQLITE_OK
- || sql->bindInt64(2, objectStoreIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexRecords WHERE indexID = ? AND objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, indexIdentifier) != SQLITE_OK
+ || sql.bindInt64(2, objectStoreIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete index records for index id %" PRIi64 " from IndexRecords table (%i) - %s", indexIdentifier, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error deleting index records from database") };
</span><span class="cx"> }
</span><span class="lines">@@ -1310,12 +1310,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::RenameIndex, ASCIILiteral("UPDATE IndexInfo SET name = ? WHERE objectStoreID = ? AND id = ?;"));
- if (!sql
- || sql->bindText(1, newName) != SQLITE_OK
- || sql->bindInt64(2, objectStoreIdentifier) != SQLITE_OK
- || sql->bindInt64(3, indexIdentifier) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("UPDATE IndexInfo SET name = ? WHERE objectStoreID = ? AND id = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindText(1, newName) != SQLITE_OK
+ || sql.bindInt64(2, objectStoreIdentifier) != SQLITE_OK
+ || sql.bindInt64(3, indexIdentifier) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not update name for index id (%" PRIi64 ", %" PRIi64 ") in IndexInfo table (%i) - %s", objectStoreIdentifier, indexIdentifier, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Could not rename index") };
</span><span class="cx"> }
</span><span class="lines">@@ -1346,15 +1346,15 @@
</span><span class="cx"> LOG_ERROR("Unable to serialize IDBKey to check for existence in object store");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to serialize IDBKey to check for existence in object store") };
</span><span class="cx"> }
</span><del>- auto* sql = cachedStatement(SQL::KeyExistsInObjectStore, ASCIILiteral("SELECT key FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT) LIMIT 1;"));
- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK
- || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT key FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT) LIMIT 1;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK
+ || sql.bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not get record from object store %" PRIi64 " from Records table (%i) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to check for existence of IDBKey in object store") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int sqlResult = sql->step();
</del><ins>+ int sqlResult = sql.step();
</ins><span class="cx"> if (sqlResult == SQLITE_OK || sqlResult == SQLITE_DONE)
</span><span class="cx"> return { };
</span><span class="cx">
</span><span class="lines">@@ -1375,17 +1375,17 @@
</span><span class="cx"> // Gather the set of blob URLs and filenames that are no longer in use.
</span><span class="cx"> HashSet<String> removedBlobFilenames;
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::GetUnusedBlobFilenames, ASCIILiteral("SELECT fileName FROM BlobFiles WHERE blobURL NOT IN (SELECT blobURL FROM BlobRecords)"));
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT fileName FROM BlobFiles WHERE blobURL NOT IN (SELECT blobURL FROM BlobRecords)"));
</ins><span class="cx">
</span><del>- if (!sql) {
</del><ins>+ if (sql.prepare() != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Error deleting stored blobs (%i) (Could not gather unused blobURLs) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error deleting stored blobs") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int result = sql->step();
</del><ins>+ int result = sql.step();
</ins><span class="cx"> while (result == SQLITE_ROW) {
</span><del>- removedBlobFilenames.add(sql->getColumnText(0));
- result = sql->step();
</del><ins>+ removedBlobFilenames.add(sql.getColumnText(0));
+ result = sql.step();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result != SQLITE_DONE) {
</span><span class="lines">@@ -1396,10 +1396,10 @@
</span><span class="cx">
</span><span class="cx"> // Remove the blob records that are no longer in use.
</span><span class="cx"> if (!removedBlobFilenames.isEmpty()) {
</span><del>- auto* sql = cachedStatement(SQL::DeleteUnusedBlobs, ASCIILiteral("DELETE FROM BlobFiles WHERE blobURL NOT IN (SELECT blobURL FROM BlobRecords)"));
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM BlobFiles WHERE blobURL NOT IN (SELECT blobURL FROM BlobRecords)"));
</ins><span class="cx">
</span><del>- if (!sql
- || sql->step() != SQLITE_DONE) {
</del><ins>+ if (sql.prepare() != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Error deleting stored blobs (%i) (Could not delete blobFile records) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error deleting stored blobs") };
</span><span class="cx"> }
</span><span class="lines">@@ -1430,16 +1430,16 @@
</span><span class="cx"> // Get the record ID
</span><span class="cx"> int64_t recordID;
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::GetObjectStoreRecordID, ASCIILiteral("SELECT recordID FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT);"));
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT recordID FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT);"));
</ins><span class="cx">
</span><del>- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK
- || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK) {
</del><ins>+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK
+ || sql.bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not delete record from object store %" PRIi64 " (%i) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to delete record from object store") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int result = sql->step();
</del><ins>+ int result = sql.step();
</ins><span class="cx">
</span><span class="cx"> // If there's no record ID, there's no record to delete.
</span><span class="cx"> if (result == SQLITE_DONE)
</span><span class="lines">@@ -1450,7 +1450,7 @@
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to delete record from object store") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- recordID = sql->getColumnInt64(0);
</del><ins>+ recordID = sql.getColumnInt64(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (recordID < 1) {
</span><span class="lines">@@ -1460,11 +1460,11 @@
</span><span class="cx">
</span><span class="cx"> // Delete the blob records for this object store record.
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteBlobRecord, ASCIILiteral("DELETE FROM BlobRecords WHERE objectStoreRow = ?;"));
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM BlobRecords WHERE objectStoreRow = ?;"));
</ins><span class="cx">
</span><del>- if (!sql
- || sql->bindInt64(1, recordID) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, recordID) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete record from object store %" PRIi64 " (%i) (Could not delete BlobRecords records) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to delete record from object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -1476,12 +1476,12 @@
</span><span class="cx">
</span><span class="cx"> // Delete record from object store
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreRecord, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT);"));
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT);"));
</ins><span class="cx">
</span><del>- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK
- || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK
+ || sql.bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete record from object store %" PRIi64 " (%i) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to delete record from object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -1489,12 +1489,12 @@
</span><span class="cx">
</span><span class="cx"> // Delete record from indexes store
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreIndexRecord, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ? AND value = CAST(? AS TEXT);"));
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ? AND value = CAST(? AS TEXT);"));
</ins><span class="cx">
</span><del>- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK
- || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK
+ || sql.bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not delete record from indexes for object store %" PRIi64 " (%i) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to delete index entries for object store record") };
</span><span class="cx"> }
</span><span class="lines">@@ -1606,12 +1606,12 @@
</span><span class="cx"> if (!error.isNull() && anyRecordsSucceeded) {
</span><span class="cx"> RefPtr<SharedBuffer> keyBuffer = serializeIDBKeyData(key);
</span><span class="cx">
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreIndexRecord, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ? AND value = CAST(? AS TEXT);"));
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("DELETE FROM IndexRecords WHERE objectStoreID = ? AND value = CAST(? AS TEXT);"));
</ins><span class="cx">
</span><del>- if (!sql
- || sql->bindInt64(1, info.identifier()) != SQLITE_OK
- || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ 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) {
</ins><span class="cx"> LOG_ERROR("Adding one Index record failed, but failed to remove all others that previously succeeded");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Adding one Index record failed, but failed to remove all others that previously succeeded") };
</span><span class="cx"> }
</span><span class="lines">@@ -1647,12 +1647,12 @@
</span><span class="cx">
</span><span class="cx"> int64_t recordID = 0;
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::AddObjectStoreRecord, ASCIILiteral("INSERT INTO Records VALUES (?, CAST(? AS TEXT), ?, NULL);"));
- if (!sql
- || sql->bindInt64(1, objectStoreInfo.identifier()) != SQLITE_OK
- || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
- || sql->bindBlob(3, value.data().data()->data(), value.data().data()->size()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO Records VALUES (?, CAST(? AS TEXT), ?, NULL);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreInfo.identifier()) != SQLITE_OK
+ || sql.bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
+ || sql.bindBlob(3, value.data().data()->data(), value.data().data()->size()) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Could not put record for object store %" PRIi64 " in Records table (%i) - %s", objectStoreInfo.identifier(), m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to store record in object store") };
</span><span class="cx"> }
</span><span class="lines">@@ -1663,11 +1663,11 @@
</span><span class="cx"> auto error = updateAllIndexesForAddRecord(objectStoreInfo, keyData, value.data());
</span><span class="cx">
</span><span class="cx"> if (!error.isNull()) {
</span><del>- auto* sql = cachedStatement(SQL::DeleteObjectStoreRecord, ASCIILiteral("DELETE FROM Records WHERE objectStoreID = ? AND key = CAST(? AS TEXT);"));
- if (!sql
- || sql->bindInt64(1, objectStoreInfo.identifier()) != SQLITE_OK
- || sql->bindBlob(2, keyBuffer->data(), keyBuffer->size()) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ 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) {
</ins><span class="cx"> LOG_ERROR("Indexing new object store record failed, but unable to remove the object store record itself");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Indexing new object store record failed, but unable to remove the object store record itself") };
</span><span class="cx"> }
</span><span class="lines">@@ -1680,11 +1680,11 @@
</span><span class="cx"> for (size_t i = 0; i < blobURLs.size(); ++i) {
</span><span class="cx"> auto& url = blobURLs[i];
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::AddBlobRecord, ASCIILiteral("INSERT INTO BlobRecords VALUES (?, ?);"));
- if (!sql
- || sql->bindInt64(1, recordID) != SQLITE_OK
- || sql->bindText(2, url) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO BlobRecords VALUES (?, ?);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, recordID) != SQLITE_OK
+ || sql.bindText(2, url) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Unable to record Blob record in database");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to record Blob record in database") };
</span><span class="cx"> }
</span><span class="lines">@@ -1693,14 +1693,14 @@
</span><span class="cx">
</span><span class="cx"> // If we already have a file for this blobURL, nothing left to do.
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::BlobFilenameForBlobURL, ASCIILiteral("SELECT fileName FROM BlobFiles WHERE blobURL = ?;"));
- if (!sql
- || sql->bindText(1, url) != SQLITE_OK) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT fileName FROM BlobFiles WHERE blobURL = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindText(1, url) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Unable to examine Blob filenames in database");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to examine Blob filenames in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int result = sql->step();
</del><ins>+ int result = sql.step();
</ins><span class="cx"> if (result != SQLITE_ROW && result != SQLITE_DONE) {
</span><span class="cx"> LOG_ERROR("Unable to examine Blob filenames in database");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to examine Blob filenames in database") };
</span><span class="lines">@@ -1713,11 +1713,11 @@
</span><span class="cx"> // We don't already have a file for this blobURL, so commit our file as a unique filename
</span><span class="cx"> String storedFilename = String::format("%" PRId64 ".blob", potentialFileNameInteger);
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::AddBlobFilename, ASCIILiteral("INSERT INTO BlobFiles VALUES (?, ?);"));
- if (!sql
- || sql->bindText(1, url) != SQLITE_OK
- || sql->bindText(2, storedFilename) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("INSERT INTO BlobFiles VALUES (?, ?);"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindText(1, url) != SQLITE_OK
+ || sql.bindText(2, storedFilename) != SQLITE_OK
+ || sql.step() != SQLITE_DONE) {
</ins><span class="cx"> LOG_ERROR("Unable to record Blob file record in database");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to record Blob file record in database") };
</span><span class="cx"> }
</span><span class="lines">@@ -1737,14 +1737,14 @@
</span><span class="cx">
</span><span class="cx"> HashSet<String> blobURLSet;
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::GetBlobURL, ASCIILiteral("SELECT blobURL FROM BlobRecords WHERE objectStoreRow = ?"));
- if (!sql
- || sql->bindInt64(1, objectStoreRecord) != SQLITE_OK) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT blobURL FROM BlobRecords WHERE objectStoreRow = ?"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreRecord) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not prepare statement to fetch blob URLs for object store record (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to look up blobURL records in object store by key range") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int sqlResult = sql->step();
</del><ins>+ int sqlResult = sql.step();
</ins><span class="cx"> if (sqlResult == SQLITE_OK || sqlResult == SQLITE_DONE) {
</span><span class="cx"> // There are no blobURLs in the database for this object store record.
</span><span class="cx"> return { };
</span><span class="lines">@@ -1751,8 +1751,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (sqlResult == SQLITE_ROW) {
</span><del>- blobURLSet.add(sql->getColumnText(0));
- sqlResult = sql->step();
</del><ins>+ blobURLSet.add(sql.getColumnText(0));
+ sqlResult = sql.step();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (sqlResult != SQLITE_DONE) {
</span><span class="lines">@@ -1764,14 +1764,14 @@
</span><span class="cx"> ASSERT(!blobURLSet.isEmpty());
</span><span class="cx"> String databaseDirectory = fullDatabaseDirectory();
</span><span class="cx"> for (auto& blobURL : blobURLSet) {
</span><del>- auto* sql = cachedStatement(SQL::BlobFilenameForBlobURL, ASCIILiteral("SELECT fileName FROM BlobFiles WHERE blobURL = ?;"));
- if (!sql
- || sql->bindText(1, blobURL) != SQLITE_OK) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT fileName FROM BlobFiles WHERE blobURL = ?"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindText(1, blobURL) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not prepare statement to fetch blob filename for object store record (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to look up blobURL records in object store by key range") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sql->step() != SQLITE_ROW) {
</del><ins>+ if (sql.step() != SQLITE_ROW) {
</ins><span class="cx"> LOG_ERROR("Entry for blob filename for blob url %s does not exist (%i) - %s", blobURL.utf8().data(), m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to look up blobURL records in object store by key range") };
</span><span class="cx"> }
</span><span class="lines">@@ -1778,7 +1778,7 @@
</span><span class="cx">
</span><span class="cx"> blobURLs.append(blobURL);
</span><span class="cx">
</span><del>- String fileName = sql->getColumnText(0);
</del><ins>+ String fileName = sql.getColumnText(0);
</ins><span class="cx"> blobFilePaths.append(pathByAppendingComponent(databaseDirectory, fileName));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1819,33 +1819,37 @@
</span><span class="cx"> int64_t recordID = 0;
</span><span class="cx"> ThreadSafeDataBuffer resultBuffer;
</span><span class="cx"> {
</span><del>- static NeverDestroyed<ASCIILiteral> lowerOpenUpperOpen("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerOpenUpperClosed("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerClosedUpperOpen("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerClosedUpperClosed("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
</del><ins>+ static NeverDestroyed<const ASCIILiteral> lowerOpenUpperOpen("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerOpenUpperClosed("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerClosedUpperOpen("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerClosedUpperClosed("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
</ins><span class="cx">
</span><del>- SQLiteStatement* sql = nullptr;
</del><ins>+ const ASCIILiteral* query = nullptr;
+
</ins><span class="cx"> if (keyRange.lowerOpen) {
</span><span class="cx"> if (keyRange.upperOpen)
</span><del>- sql = cachedStatement(SQL::GetValueRecordsLowerOpenUpperOpen, lowerOpenUpperOpen.get());
</del><ins>+ query = &lowerOpenUpperOpen.get();
</ins><span class="cx"> else
</span><del>- sql = cachedStatement(SQL::GetValueRecordsLowerOpenUpperClosed, lowerOpenUpperClosed.get());
</del><ins>+ query = &lowerOpenUpperClosed.get();
</ins><span class="cx"> } else {
</span><span class="cx"> if (keyRange.upperOpen)
</span><del>- sql = cachedStatement(SQL::GetValueRecordsLowerClosedUpperOpen, lowerClosedUpperOpen.get());
</del><ins>+ query = &lowerClosedUpperOpen.get();
</ins><span class="cx"> else
</span><del>- sql = cachedStatement(SQL::GetValueRecordsLowerClosedUpperClosed, lowerClosedUpperClosed.get());
</del><ins>+ query = &lowerClosedUpperClosed.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK
- || sql->bindBlob(2, lowerBuffer->data(), lowerBuffer->size()) != SQLITE_OK
- || sql->bindBlob(3, upperBuffer->data(), upperBuffer->size()) != SQLITE_OK) {
</del><ins>+ ASSERT(query);
+
+ SQLiteStatement sql(*m_sqliteDB, *query);
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK
+ || sql.bindBlob(2, lowerBuffer->data(), lowerBuffer->size()) != SQLITE_OK
+ || sql.bindBlob(3, upperBuffer->data(), upperBuffer->size()) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not get key range record from object store %" PRIi64 " from Records table (%i) - %s", objectStoreID, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to look up record in object store by key range") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int sqlResult = sql->step();
</del><ins>+ int sqlResult = sql.step();
</ins><span class="cx">
</span><span class="cx"> if (sqlResult == SQLITE_OK || sqlResult == SQLITE_DONE) {
</span><span class="cx"> // There was no record for the key in the database.
</span><span class="lines">@@ -1858,10 +1862,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<uint8_t> buffer;
</span><del>- sql->getColumnBlobAsVector(0, buffer);
</del><ins>+ sql.getColumnBlobAsVector(0, buffer);
</ins><span class="cx"> resultBuffer = ThreadSafeDataBuffer::adoptVector(buffer);
</span><span class="cx">
</span><del>- recordID = sql->getColumnInt64(1);
</del><ins>+ recordID = sql.getColumnInt64(1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(recordID);
</span><span class="lines">@@ -1881,38 +1885,38 @@
</span><span class="cx"> return getAllRecordsData.indexIdentifier ? getAllIndexRecords(transactionIdentifier, getAllRecordsData, result) : getAllObjectStoreRecords(transactionIdentifier, getAllRecordsData, result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SQLiteStatement* SQLiteIDBBackingStore::cachedStatementForGetAllObjectStoreRecords(const IDBGetAllRecordsData& getAllRecordsData)
</del><ins>+static const ASCIILiteral& queryForGetAllObjectStoreRecords(const IDBGetAllRecordsData& getAllRecordsData)
</ins><span class="cx"> {
</span><del>- static NeverDestroyed<ASCIILiteral> lowerOpenUpperOpenKey("SELECT key FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerOpenUpperClosedKey("SELECT key FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerClosedUpperOpenKey("SELECT key FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerClosedUpperClosedKey("SELECT key FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerOpenUpperOpenValue("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerOpenUpperClosedValue("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerClosedUpperOpenValue("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
- static NeverDestroyed<ASCIILiteral> lowerClosedUpperClosedValue("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
</del><ins>+ static NeverDestroyed<const ASCIILiteral> lowerOpenUpperOpenKey("SELECT key FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerOpenUpperClosedKey("SELECT key FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerClosedUpperOpenKey("SELECT key FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerClosedUpperClosedKey("SELECT key FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerOpenUpperOpenValue("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerOpenUpperClosedValue("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key > CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerClosedUpperOpenValue("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key < CAST(? AS TEXT) ORDER BY key;");
+ static NeverDestroyed<const ASCIILiteral> lowerClosedUpperClosedValue("SELECT value, ROWID FROM Records WHERE objectStoreID = ? AND key >= CAST(? AS TEXT) AND key <= CAST(? AS TEXT) ORDER BY key;");
</ins><span class="cx">
</span><span class="cx"> if (getAllRecordsData.getAllType == IndexedDB::GetAllType::Keys) {
</span><span class="cx"> if (getAllRecordsData.keyRangeData.lowerOpen) {
</span><span class="cx"> if (getAllRecordsData.keyRangeData.upperOpen)
</span><del>- return cachedStatement(SQL::GetAllKeyRecordsLowerOpenUpperOpen, lowerOpenUpperOpenKey.get());
- return cachedStatement(SQL::GetAllKeyRecordsLowerOpenUpperClosed, lowerOpenUpperClosedKey.get());
</del><ins>+ return lowerOpenUpperOpenKey.get();
+ return lowerOpenUpperClosedKey.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (getAllRecordsData.keyRangeData.upperOpen)
</span><del>- return cachedStatement(SQL::GetAllKeyRecordsLowerClosedUpperOpen, lowerClosedUpperOpenKey.get());
- return cachedStatement(SQL::GetAllKeyRecordsLowerClosedUpperClosed, lowerClosedUpperClosedKey.get());
</del><ins>+ return lowerClosedUpperOpenKey.get();
+ return lowerClosedUpperClosedKey.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (getAllRecordsData.keyRangeData.lowerOpen) {
</span><span class="cx"> if (getAllRecordsData.keyRangeData.upperOpen)
</span><del>- return cachedStatement(SQL::GetValueRecordsLowerOpenUpperOpen, lowerOpenUpperOpenValue.get());
- return cachedStatement(SQL::GetValueRecordsLowerOpenUpperClosed, lowerOpenUpperClosedValue.get());
</del><ins>+ return lowerOpenUpperOpenValue.get();
+ return lowerOpenUpperClosedValue.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (getAllRecordsData.keyRangeData.upperOpen)
</span><del>- return cachedStatement(SQL::GetValueRecordsLowerClosedUpperOpen, lowerClosedUpperOpenValue.get());
- return cachedStatement(SQL::GetValueRecordsLowerClosedUpperClosed, lowerClosedUpperClosedValue.get());
</del><ins>+ return lowerClosedUpperOpenValue.get();
+ return lowerClosedUpperClosedValue.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBError SQLiteIDBBackingStore::getAllObjectStoreRecords(const IDBResourceIdentifier& transactionIdentifier, const IDBGetAllRecordsData& getAllRecordsData, IDBGetAllResult& result)
</span><span class="lines">@@ -1946,11 +1950,11 @@
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Unable to serialize upper IDBKey in lookup range") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto* sql = cachedStatementForGetAllObjectStoreRecords(getAllRecordsData);
- if (!sql
- || sql->bindInt64(1, getAllRecordsData.objectStoreIdentifier) != SQLITE_OK
- || sql->bindBlob(2, lowerBuffer->data(), lowerBuffer->size()) != SQLITE_OK
- || sql->bindBlob(3, upperBuffer->data(), upperBuffer->size()) != SQLITE_OK) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, queryForGetAllObjectStoreRecords(getAllRecordsData));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, getAllRecordsData.objectStoreIdentifier) != SQLITE_OK
+ || sql.bindBlob(2, lowerBuffer->data(), lowerBuffer->size()) != SQLITE_OK
+ || sql.bindBlob(3, upperBuffer->data(), upperBuffer->size()) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not get key range record from object store %" PRIi64 " from Records table (%i) - %s", getAllRecordsData.objectStoreIdentifier, m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Failed to look up record in object store by key range") };
</span><span class="cx"> }
</span><span class="lines">@@ -1963,16 +1967,16 @@
</span><span class="cx"> else
</span><span class="cx"> targetResults = std::numeric_limits<uint32_t>::max();
</span><span class="cx">
</span><del>- int sqlResult = sql->step();
</del><ins>+ int sqlResult = sql.step();
</ins><span class="cx"> uint32_t returnedResults = 0;
</span><span class="cx">
</span><span class="cx"> while (sqlResult == SQLITE_ROW && returnedResults < targetResults) {
</span><span class="cx"> if (getAllRecordsData.getAllType == IndexedDB::GetAllType::Values) {
</span><span class="cx"> Vector<uint8_t> buffer;
</span><del>- sql->getColumnBlobAsVector(0, buffer);
</del><ins>+ sql.getColumnBlobAsVector(0, buffer);
</ins><span class="cx"> ThreadSafeDataBuffer resultBuffer = ThreadSafeDataBuffer::adoptVector(buffer);
</span><span class="cx">
</span><del>- auto recordID = sql->getColumnInt64(1);
</del><ins>+ auto recordID = sql.getColumnInt64(1);
</ins><span class="cx">
</span><span class="cx"> ASSERT(recordID);
</span><span class="cx"> Vector<String> blobURLs, blobFilePaths;
</span><span class="lines">@@ -1986,7 +1990,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> Vector<uint8_t> keyData;
</span><span class="cx"> IDBKeyData key;
</span><del>- sql->getColumnBlobAsVector(0, keyData);
</del><ins>+ sql.getColumnBlobAsVector(0, keyData);
</ins><span class="cx">
</span><span class="cx"> if (!deserializeIDBKeyData(keyData.data(), keyData.size(), key)) {
</span><span class="cx"> LOG_ERROR("Unable to deserialize key data from database while getting all key records");
</span><span class="lines">@@ -1997,7 +2001,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ++returnedResults;
</span><del>- sqlResult = sql->step();
</del><ins>+ sqlResult = sql.step();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (sqlResult == SQLITE_OK || sqlResult == SQLITE_DONE || sqlResult == SQLITE_ROW) {
</span><span class="lines">@@ -2122,19 +2126,19 @@
</span><span class="cx">
</span><span class="cx"> IDBError SQLiteIDBBackingStore::uncheckedGetKeyGeneratorValue(int64_t objectStoreID, uint64_t& outValue)
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::GetKeyGeneratorValue, ASCIILiteral("SELECT currentKey FROM KeyGenerators WHERE objectStoreID = ?;"));
- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK) {
</del><ins>+ SQLiteStatement sql(*m_sqliteDB, ASCIILiteral("SELECT currentKey FROM KeyGenerators WHERE objectStoreID = ?;"));
+ if (sql.prepare() != SQLITE_OK
+ || sql.bindInt64(1, objectStoreID) != SQLITE_OK) {
</ins><span class="cx"> LOG_ERROR("Could not retrieve currentKey from KeyGenerators table (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error getting current key generator value from database") };
</span><span class="cx"> }
</span><del>- int result = sql->step();
</del><ins>+ int result = sql.step();
</ins><span class="cx"> if (result != SQLITE_ROW) {
</span><span class="cx"> LOG_ERROR("Could not retreive key generator value for object store, but it should be there.");
</span><span class="cx"> return { IDBDatabaseException::UnknownError, ASCIILiteral("Error finding current key generator value in database") };
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int64_t value = sql->getColumnInt64(0);
</del><ins>+ int64_t value = sql.getColumnInt64(0);
</ins><span class="cx"> if (value < 0)
</span><span class="cx"> return { IDBDatabaseException::ConstraintError, "Current key generator value from database is invalid" };
</span><span class="cx">
</span><span class="lines">@@ -2144,11 +2148,11 @@
</span><span class="cx">
</span><span class="cx"> IDBError SQLiteIDBBackingStore::uncheckedSetKeyGeneratorValue(int64_t objectStoreID, uint64_t value)
</span><span class="cx"> {
</span><del>- auto* sql = cachedStatement(SQL::SetKeyGeneratorValue, ASCIILiteral("INSERT INTO KeyGenerators VALUES (?, ?);"));
- if (!sql
- || sql->bindInt64(1, objectStoreID) != SQLITE_OK
- || sql->bindInt64(2, value) != SQLITE_OK
- || sql->step() != SQLITE_DONE) {
</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) {
</ins><span class="cx"> LOG_ERROR("Could not update key generator value (%i) - %s", m_sqliteDB->lastError(), m_sqliteDB->lastErrorMsg());
</span><span class="cx"> return { IDBDatabaseException::ConstraintError, "Error storing new key generator value in database" };
</span><span class="cx"> }
</span><span class="lines">@@ -2352,7 +2356,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_sqliteDB) {
</span><span class="cx"> m_sqliteDB->close();
</span><del>- closeSQLiteDB();
</del><ins>+ m_sqliteDB = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SQLiteFileSystem::deleteDatabaseFile(dbFilename);
</span><span class="lines">@@ -2366,36 +2370,6 @@
</span><span class="cx"> m_cursors.remove(cursor.identifier());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SQLiteStatement* SQLiteIDBBackingStore::cachedStatement(SQLiteIDBBackingStore::SQL sql, const char* statement)
-{
- if (sql >= SQL::Count) {
- LOG_ERROR("Invalid SQL statement ID passed to cachedStatement()");
- return nullptr;
- }
-
- if (m_cachedStatements[static_cast<size_t>(sql)]) {
- if (m_cachedStatements[static_cast<size_t>(sql)]->reset() == SQLITE_OK)
- return m_cachedStatements[static_cast<size_t>(sql)].get();
- m_cachedStatements[static_cast<size_t>(sql)] = nullptr;
- }
-
- if (m_sqliteDB) {
- m_cachedStatements[static_cast<size_t>(sql)] = std::make_unique<SQLiteStatement>(*m_sqliteDB, statement);
- if (m_cachedStatements[static_cast<size_t>(sql)]->prepare() != SQLITE_OK)
- m_cachedStatements[static_cast<size_t>(sql)] = nullptr;
- }
-
- return m_cachedStatements[static_cast<size_t>(sql)].get();
-}
-
-void SQLiteIDBBackingStore::closeSQLiteDB()
-{
- for (size_t i = 0; i < static_cast<int>(SQL::Count); ++i)
- m_cachedStatements[i] = nullptr;
-
- m_sqliteDB = nullptr;
-}
-
</del><span class="cx"> } // namespace IDBServer
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h (209116 => 209117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h 2016-11-30 04:26:20 UTC (rev 209116)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h 2016-11-30 04:37:03 UTC (rev 209117)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx">
</span><span class="cx"> class IndexKey;
</span><span class="cx"> class SQLiteDatabase;
</span><del>-class SQLiteStatement;
</del><span class="cx">
</span><span class="cx"> namespace IDBServer {
</span><span class="cx">
</span><span class="lines">@@ -117,56 +116,6 @@
</span><span class="cx"> IDBError getAllObjectStoreRecords(const IDBResourceIdentifier& transactionIdentifier, const IDBGetAllRecordsData&, IDBGetAllResult& outValue);
</span><span class="cx"> IDBError getAllIndexRecords(const IDBResourceIdentifier& transactionIdentifier, const IDBGetAllRecordsData&, IDBGetAllResult& outValue);
</span><span class="cx">
</span><del>- void closeSQLiteDB();
-
- enum class SQL : size_t {
- CreateObjectStoreInfo,
- CreateObjectStoreKeyGenerator,
- DeleteObjectStoreInfo,
- DeleteObjectStoreKeyGenerator,
- DeleteObjectStoreRecords,
- DeleteObjectStoreIndexInfo,
- DeleteObjectStoreIndexRecords,
- DeleteObjectStoreBlobRecords,
- RenameObjectStore,
- ClearObjectStoreRecords,
- ClearObjectStoreIndexRecords,
- CreateIndexInfo,
- DeleteIndexInfo,
- HasIndexRecord,
- PutIndexRecord,
- DeleteIndexRecords,
- RenameIndex,
- KeyExistsInObjectStore,
- GetUnusedBlobFilenames,
- DeleteUnusedBlobs,
- GetObjectStoreRecordID,
- DeleteBlobRecord,
- DeleteObjectStoreRecord,
- DeleteObjectStoreIndexRecord,
- AddObjectStoreRecord,
- AddBlobRecord,
- BlobFilenameForBlobURL,
- AddBlobFilename,
- GetBlobURL,
- GetKeyGeneratorValue,
- SetKeyGeneratorValue,
- GetAllKeyRecordsLowerOpenUpperOpen,
- GetAllKeyRecordsLowerOpenUpperClosed,
- GetAllKeyRecordsLowerClosedUpperOpen,
- GetAllKeyRecordsLowerClosedUpperClosed,
- GetValueRecordsLowerOpenUpperOpen,
- GetValueRecordsLowerOpenUpperClosed,
- GetValueRecordsLowerClosedUpperOpen,
- GetValueRecordsLowerClosedUpperClosed,
- Count
- };
-
- SQLiteStatement* cachedStatement(SQL, const char*);
- SQLiteStatement* cachedStatementForGetAllObjectStoreRecords(const IDBGetAllRecordsData&);
-
- std::unique_ptr<SQLiteStatement> m_cachedStatements[static_cast<int>(SQL::Count)];
-
</del><span class="cx"> JSC::VM& vm();
</span><span class="cx"> JSC::JSGlobalObject& globalObject();
</span><span class="cx"> void initializeVM();
</span></span></pre>
</div>
</div>
</body>
</html>