Changeset 152134 in webkit

Timestamp:

Jun 27, 2013 3:56:32 PM (11 years ago)

Author:

andersca@apple.com

Message:

Stop using deprecatedCharactersWithNullTermination in SQLite code
​https://bugs.webkit.org/show_bug.cgi?id=118146

Reviewed by Filip Pizlo.

Turns out SQLite uses UTF-8 internally so we might just as well use the SQLite functions
that take UTF-8 strings and do the conversion ourselves. This has the added advantage that we can
use String::utf8() which returns a null-terminated string.

Require a version of SQLite newer than 3.6.16 so we can remove two workarounds. 3.6.16 was released
4 years ago so supported port is likely to have it.

• platform/sql/SQLiteFileSystem.cpp:

(WebCore::SQLiteFileSystem::openDatabase):
Use sqlite3_open instead of sqlite3_open16.

• platform/sql/SQLiteFileSystem.h:

Fix parameter name capitalization.

• platform/sql/SQLiteStatement.cpp:

(WebCore::SQLiteStatement::prepare):
Use sqlite3_prepare_v2. Also, pass the length of the string (including the null character), since
that lets SQLite avoid a buffer copy. Remove a workaround for versions of SQLite older than 3.6.16.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/sql/SQLiteFileSystem.cpp (modified) (1 diff)
• platform/sql/SQLiteFileSystem.h (modified) (2 diffs)
• platform/sql/SQLiteStatement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-27  Anders Carlsson  <andersca@apple.com>
+
+        Stop using deprecatedCharactersWithNullTermination in SQLite code
+        https://bugs.webkit.org/show_bug.cgi?id=118146
+
+        Reviewed by Filip Pizlo.
+
+        Turns out SQLite uses UTF-8 internally so we might just as well use the SQLite functions
+        that take UTF-8 strings and do the conversion ourselves. This has the added advantage that we can
+        use String::utf8() which returns a null-terminated string.
+
+        Require a version of SQLite newer than 3.6.16 so we can remove two workarounds. 3.6.16 was released
+        4 years ago so supported port is likely to have it.
+
+        * platform/sql/SQLiteFileSystem.cpp:
+        (WebCore::SQLiteFileSystem::openDatabase):
+        Use sqlite3_open instead of sqlite3_open16.
+
+        * platform/sql/SQLiteFileSystem.h:
+        Fix parameter name capitalization.
+
+        * platform/sql/SQLiteStatement.cpp:
+        (WebCore::SQLiteStatement::prepare):
+        Use sqlite3_prepare_v2. Also, pass the length of the string (including the null character), since
+        that lets SQLite avoid a buffer copy. Remove a workaround for versions of SQLite older than 3.6.16.
+
 2013-06-27  Andrew Lo  <anlo@blackberry.com>
 

trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp

@@ -45 +45 @@
 }
 
-int SQLiteFileSystem::openDatabase(const String& fileName, sqlite3** database, bool)
+int SQLiteFileSystem::openDatabase(const String& filename, sqlite3** database, bool)
 {
-    // SQLite expects a null terminator on its UTF-16 strings.
-    String path = fileName;
-    return sqlite3_open16(path.deprecatedCharactersWithNullTermination(), database);
+    return sqlite3_open(filename.utf8().data(), database);
 }
 

trunk/Source/WebCore/platform/sql/SQLiteFileSystem.h

@@ -47 +47 @@
     // Opens a database file.
     //
-    // fileName - The name of the database file.
+    // filemame - The name of the database file.
     // database - The SQLite structure that represents the database stored
     //            in the given file.
@@ -53 +53 @@
     //                     Used by Chromium to determine if the DB file needs to be opened
     //                     using a custom VFS.
-    static int openDatabase(const String& fileName, sqlite3** database, bool forWebSQLDatabase);
+    static int openDatabase(const String& filename, sqlite3** database, bool forWebSQLDatabase);
 
     // Returns the file name for a database.

trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp

@@ -33 +33 @@
 #include <wtf/text/StringImpl.h>
 
+// SQLite 3.6.16 makes sqlite3_prepare_v2 automatically retry preparing the statement
+// once if the database scheme has changed. We rely on this behavior.
+#if SQLITE_VERSION_NUMBER < 3006016
+#error SQLite version 3.6.16 or newer is required
+#endif
+
 namespace WebCore {
-
-#if SQLITE_VERSION_NUMBER < 3003009
-
-// FIXME: This overload helps us compile with older versions of SQLite 3, but things like quotas will not work.
-static inline int sqlite3_prepare16_v2(sqlite3* db, const void* zSql, int nBytes, sqlite3_stmt** ppStmt, const void** pzTail)
-{
-    return sqlite3_prepare16(db, zSql, nBytes, ppStmt, pzTail);
-}
-
-#endif
 
 SQLiteStatement::SQLiteStatement(SQLiteDatabase& db, const String& sql)
@@ -68 +64 @@
         return SQLITE_INTERRUPT;
 
-    const void* tail = 0;
-    LOG(SQLDatabase, "SQL - prepare - %s", m_query.ascii().data());
-    String strippedQuery = m_query.stripWhiteSpace();
-    const UChar* nullTermed = strippedQuery.deprecatedCharactersWithNullTermination();
-    int error = sqlite3_prepare16_v2(m_database.sqlite3Handle(), nullTermed, -1, &m_statement, &tail);
-
-    // Starting with version 3.6.16, sqlite has a patch (http://www.sqlite.org/src/ci/256ec3c6af)
-    // that should make sure sqlite3_prepare16_v2 doesn't return a SQLITE_SCHEMA error.
-    // If we're using an older sqlite version, try to emulate the patch.
-    if (error == SQLITE_SCHEMA) {
-      sqlite3_finalize(m_statement);
-      error = sqlite3_prepare16_v2(m_database.sqlite3Handle(), m_query.deprecatedCharactersWithNullTermination(), -1, &m_statement, &tail);
-    }
+    CString query = m_query.stripWhiteSpace().utf8();
+    
+    LOG(SQLDatabase, "SQL - prepare - %s", query.data());
+
+    // Pass the length of the string including the null character to sqlite3_prepare_v2;
+    // this lets SQLite avoid an extra string copy.
+    size_t lengthIncludingNullCharacter = query.length() + 1;
+
+    const char* tail;
+    int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail);
 
     if (error != SQLITE_OK)
-        LOG(SQLDatabase, "sqlite3_prepare16 failed (%i)\n%s\n%s", error, m_query.ascii().data(), sqlite3_errmsg(m_database.sqlite3Handle()));
-    const UChar* ch = static_cast<const UChar*>(tail);
-    if (ch && *ch)
+        LOG(SQLDatabase, "sqlite3_prepare16 failed (%i)\n%s\n%s", error, query.data(), sqlite3_errmsg(m_database.sqlite3Handle()));
+
+    if (tail && *tail)
         error = SQLITE_ERROR;
+
 #ifndef NDEBUG
     m_isPrepared = error == SQLITE_OK;