<!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>[185129] trunk/Source/WebCore</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/185129">185129</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-02 15:14:23 -0700 (Tue, 02 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use UUIDs for WebSQL database filenames instead of a sequential number
https://bugs.webkit.org/show_bug.cgi?id=145571
Reviewed by Dan Bernstein.
This is a first step towards getting rid of the iOS specific code path where we truncate
database files instead of deleting them (in order to avoid file corruption).
* Modules/webdatabase/DatabaseTracker.cpp:
(WebCore::generateDatabaseFileName):
(WebCore::DatabaseTracker::fullPathForDatabaseNoLock):
* platform/sql/SQLiteFileSystem.cpp:
(WebCore::SQLiteFileSystem::getFileNameForNewDatabase): Deleted.
* platform/sql/SQLiteFileSystem.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteFileSystemcpp">trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteFileSystemh">trunk/Source/WebCore/platform/sql/SQLiteFileSystem.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185128 => 185129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-02 22:11:32 UTC (rev 185128)
+++ trunk/Source/WebCore/ChangeLog 2015-06-02 22:14:23 UTC (rev 185129)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-02 Anders Carlsson <andersca@apple.com>
+
+ Use UUIDs for WebSQL database filenames instead of a sequential number
+ https://bugs.webkit.org/show_bug.cgi?id=145571
+
+ Reviewed by Dan Bernstein.
+
+ This is a first step towards getting rid of the iOS specific code path where we truncate
+ database files instead of deleting them (in order to avoid file corruption).
+
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ (WebCore::generateDatabaseFileName):
+ (WebCore::DatabaseTracker::fullPathForDatabaseNoLock):
+ * platform/sql/SQLiteFileSystem.cpp:
+ (WebCore::SQLiteFileSystem::getFileNameForNewDatabase): Deleted.
+ * platform/sql/SQLiteFileSystem.h:
+
</ins><span class="cx"> 2015-06-02 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in GraphicsContext3D::getInternalFramebufferSize
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (185128 => 185129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-06-02 22:11:32 UTC (rev 185128)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2015-06-02 22:14:23 UTC (rev 185129)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "SecurityOriginHash.h"
</span><span class="cx"> #include "SQLiteFileSystem.h"
</span><span class="cx"> #include "SQLiteStatement.h"
</span><ins>+#include "UUID.h"
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -358,6 +359,16 @@
</span><span class="cx"> return SQLiteFileSystem::appendDatabaseFileNameToPath(m_databaseDirectoryPath.isolatedCopy(), origin->databaseIdentifier());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String generateDatabaseFileName()
+{
+ StringBuilder stringBuilder;
+
+ stringBuilder.append(createCanonicalUUIDString());
+ stringBuilder.appendLiteral(".db");
+
+ return stringBuilder.toString();
+}
+
</ins><span class="cx"> String DatabaseTracker::fullPathForDatabaseNoLock(SecurityOrigin* origin, const String& name, bool createIfNotExists)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_databaseGuard.tryLock());
</span><span class="lines">@@ -393,7 +404,8 @@
</span><span class="cx"> }
</span><span class="cx"> statement.finalize();
</span><span class="cx">
</span><del>- String fileName = SQLiteFileSystem::getFileNameForNewDatabase(originPath, name, originIdentifier, &m_database);
</del><ins>+ String fileName = generateDatabaseFileName();
+
</ins><span class="cx"> if (!addDatabase(origin, name, fileName))
</span><span class="cx"> return String();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteFileSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp (185128 => 185129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp 2015-06-02 22:11:32 UTC (rev 185128)
+++ trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp 2015-06-02 22:14:23 UTC (rev 185129)
</span><span class="lines">@@ -53,32 +53,6 @@
</span><span class="cx"> return sqlite3_open(fileSystemRepresentation(filename).data(), database);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String SQLiteFileSystem::getFileNameForNewDatabase(const String& dbDir, const String&,
- const String&, SQLiteDatabase* db)
-{
- // try to get the next sequence number from the given database
- // if we can't get a number, return an empty string
- SQLiteStatement sequenceStatement(*db, "SELECT seq FROM sqlite_sequence WHERE name='Databases';");
- if (sequenceStatement.prepare() != SQLITE_OK)
- return String();
- int result = sequenceStatement.step();
- int64_t seq = 0;
- if (result == SQLITE_ROW)
- seq = sequenceStatement.getColumnInt64(0);
- else if (result != SQLITE_DONE)
- return String();
- sequenceStatement.finalize();
-
- // increment the number until we can use it to form a file name that doesn't exist
- String fileName;
- do {
- ++seq;
- fileName = pathByAppendingComponent(dbDir, String::format("%016" PRIx64 ".db", seq));
- } while (fileExists(fileName));
-
- return String::format("%016" PRIx64 ".db", seq);
-}
-
</del><span class="cx"> String SQLiteFileSystem::appendDatabaseFileNameToPath(const String& path, const String& fileName)
</span><span class="cx"> {
</span><span class="cx"> return pathByAppendingComponent(path, fileName);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteFileSystemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteFileSystem.h (185128 => 185129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteFileSystem.h 2015-06-02 22:11:32 UTC (rev 185128)
+++ trunk/Source/WebCore/platform/sql/SQLiteFileSystem.h 2015-06-02 22:14:23 UTC (rev 185129)
</span><span class="lines">@@ -54,15 +54,6 @@
</span><span class="cx"> // using a custom VFS.
</span><span class="cx"> static int openDatabase(const String& filename, sqlite3** database, bool forWebSQLDatabase);
</span><span class="cx">
</span><del>- // Returns the file name for a database.
- //
- // dbDir - The directory where all databases are stored.
- // dbName - The name of the database.
- // originIdentifier - The origin that wants to use this database.
- // db - A database with a number generator used to create unique file names.
- static String getFileNameForNewDatabase(const String& dbDir, const String& dbName,
- const String& originIdentifier, SQLiteDatabase* db);
-
</del><span class="cx"> // Creates an absolute file path given a directory and a file name.
</span><span class="cx"> //
</span><span class="cx"> // path - The directory.
</span></span></pre>
</div>
</div>
</body>
</html>