<!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>[277667] 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/277667">277667</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-05-18 11:59:29 -0700 (Tue, 18 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use UTF-8 internally from Strings inside SQLiteStatement
https://bugs.webkit.org/show_bug.cgi?id=225890

Reviewed by Darin Adler.

Use UTF-8 internally from Strings inside SQLiteStatement. Our SQLite databases use UTF-8
internally for text encoding (since we open the database with sqlite3_open_v2() and not
sqlite3_open16()).

Previously, we were providing UTF-16 strings to SQLite, which meant it had to convert it
internally to UTF-8. Also, whenever we were requesting a string from SQLite, it had to
convert it from UTF-8 to UTF-16 before returning it to us. Our String constructed from
returned from SQLiteStatement would also be 16-bit encoded, even if all ASCII so we were
potentially wasting memory too.

We now provide UTF-8 to SQLite by using StringView::utf8(). We also request UTF-8 strings
from SQLite and rely on String::fromUTF8() to convert it to a WTF::String. For all ASCII
characters, this means we'll end up with a 8-bit String and save memory.

* platform/sql/SQLiteStatement.cpp:
(WebCore::SQLiteStatement::bindText):
(WebCore::SQLiteStatement::getColumnName):
(WebCore::SQLiteStatement::getColumnText):
* platform/sql/SQLiteStatement.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCookieJarDBcpp">trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteStatementcpp">trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsqlSQLiteStatementh">trunk/Source/WebCore/platform/sql/SQLiteStatement.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (277666 => 277667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-18 18:48:48 UTC (rev 277666)
+++ trunk/Source/WebCore/ChangeLog      2021-05-18 18:59:29 UTC (rev 277667)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2021-05-18  Chris Dumez  <cdumez@apple.com>
+
+        Use UTF-8 internally from Strings inside SQLiteStatement
+        https://bugs.webkit.org/show_bug.cgi?id=225890
+
+        Reviewed by Darin Adler.
+
+        Use UTF-8 internally from Strings inside SQLiteStatement. Our SQLite databases use UTF-8
+        internally for text encoding (since we open the database with sqlite3_open_v2() and not
+        sqlite3_open16()).
+
+        Previously, we were providing UTF-16 strings to SQLite, which meant it had to convert it
+        internally to UTF-8. Also, whenever we were requesting a string from SQLite, it had to
+        convert it from UTF-8 to UTF-16 before returning it to us. Our String constructed from
+        returned from SQLiteStatement would also be 16-bit encoded, even if all ASCII so we were
+        potentially wasting memory too.
+
+        We now provide UTF-8 to SQLite by using StringView::utf8(). We also request UTF-8 strings
+        from SQLite and rely on String::fromUTF8() to convert it to a WTF::String. For all ASCII
+        characters, this means we'll end up with a 8-bit String and save memory.
+
+        * platform/sql/SQLiteStatement.cpp:
+        (WebCore::SQLiteStatement::bindText):
+        (WebCore::SQLiteStatement::getColumnName):
+        (WebCore::SQLiteStatement::getColumnText):
+        * platform/sql/SQLiteStatement.h:
+
</ins><span class="cx"> 2021-05-18  Said Abou-Hallawa  <said@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Allow logging minimal info about uploading media files
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCookieJarDBcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp (277666 => 277667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp       2021-05-18 18:48:48 UTC (rev 277666)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarDB.cpp  2021-05-18 18:59:29 UTC (rev 277667)
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx">         statement.bindNull(2);
</span><span class="cx">     } else {
</span><span class="cx">         statement.bindText(1, registrableDomain.string());
</span><del>-        statement.bindText(2, String("*.") + registrableDomain.string());
</del><ins>+        statement.bindText(2, makeString("*.", registrableDomain.string()));
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return statement.step() == SQLITE_ROW;
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">     if (CookieUtil::isIPAddress(requestHost) || !requestHost.contains('.') || registrableDomain.isEmpty())
</span><span class="cx">         pstmt->bindNull(6);
</span><span class="cx">     else
</span><del>-        pstmt->bindText(6, String("*.") + registrableDomain.string());
</del><ins>+        pstmt->bindText(6, makeString("*.", registrableDomain.string()));
</ins><span class="cx"> 
</span><span class="cx">     Vector<Cookie> results;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteStatementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp (277666 => 277667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp    2021-05-18 18:48:48 UTC (rev 277666)
+++ trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp       2021-05-18 18:59:29 UTC (rev 277667)
</span><span class="lines">@@ -110,22 +110,17 @@
</span><span class="cx">     return bindBlob(index, characters, text.length() * sizeof(UChar));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-int SQLiteStatement::bindText(int index, const String& text)
</del><ins>+int SQLiteStatement::bindText(int index, StringView text)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(index > 0);
</span><span class="cx">     ASSERT(static_cast<unsigned>(index) <= bindParameterCount());
</span><span class="cx"> 
</span><del>-    // String::characters() returns 0 for the empty string, which SQLite
-    // treats as a null, so we supply a non-null pointer for that case.
-    auto upconvertedCharacters = StringView(text).upconvertedCharacters();
-    UChar anyCharacter = 0;
-    const UChar* characters;
-    if (text.isEmpty() && !text.isNull())
-        characters = &anyCharacter;
-    else
-        characters = upconvertedCharacters;
</del><ins>+    // Fast path when the input text is all ASCII.
+    if (text.is8Bit() && text.isAllASCII())
+        return sqlite3_bind_text(m_statement, index, text.length() ? reinterpret_cast<const char*>(text.characters8()) : "", text.length(), SQLITE_TRANSIENT);
</ins><span class="cx"> 
</span><del>-    return sqlite3_bind_text16(m_statement, index, characters, sizeof(UChar) * text.length(), SQLITE_TRANSIENT);
</del><ins>+    auto utf8Text = text.utf8();
+    return sqlite3_bind_text(m_statement, index, utf8Text.data(), utf8Text.length(), SQLITE_TRANSIENT);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int SQLiteStatement::bindInt(int index, int integer)
</span><span class="lines">@@ -192,7 +187,7 @@
</span><span class="cx">         return String();
</span><span class="cx">     if (columnCount() <= col)
</span><span class="cx">         return String();
</span><del>-    return String(reinterpret_cast<const UChar*>(sqlite3_column_name16(m_statement, col)));
</del><ins>+    return String::fromUTF8(sqlite3_column_name(m_statement, col));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> SQLValue SQLiteStatement::getColumnValue(int col)
</span><span class="lines">@@ -207,18 +202,16 @@
</span><span class="cx">     // "(mostly) ignored"
</span><span class="cx">     sqlite3_value* value = sqlite3_column_value(m_statement, col);
</span><span class="cx">     switch (sqlite3_value_type(value)) {
</span><del>-        case SQLITE_INTEGER:    // SQLValue and JS don't represent integers, so use FLOAT -case
-        case SQLITE_FLOAT:
-            return sqlite3_value_double(value);
-        case SQLITE_BLOB:       // SQLValue and JS don't represent blobs, so use TEXT -case
-        case SQLITE_TEXT: {
-            const UChar* string = reinterpret_cast<const UChar*>(sqlite3_value_text16(value));
-            return StringImpl::create8BitIfPossible(string);
-        }
-        case SQLITE_NULL:
-            return nullptr;
-        default:
-            break;
</del><ins>+    case SQLITE_INTEGER: // SQLValue and JS don't represent integers, so use FLOAT -case
+    case SQLITE_FLOAT:
+        return sqlite3_value_double(value);
+    case SQLITE_BLOB: // SQLValue and JS don't represent blobs, so use TEXT -case
+    case SQLITE_TEXT:
+        return String::fromUTF8(sqlite3_value_text(value), sqlite3_value_bytes(value));
+    case SQLITE_NULL:
+        return nullptr;
+    default:
+        break;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -232,7 +225,7 @@
</span><span class="cx">         return String();
</span><span class="cx">     if (columnCount() <= col)
</span><span class="cx">         return String();
</span><del>-    return String(reinterpret_cast<const UChar*>(sqlite3_column_text16(m_statement, col)), sqlite3_column_bytes16(m_statement, col) / sizeof(UChar));
</del><ins>+    return String::fromUTF8(sqlite3_column_text(m_statement, col), sqlite3_column_bytes(m_statement, col));
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> double SQLiteStatement::getColumnDouble(int col)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsqlSQLiteStatementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/sql/SQLiteStatement.h (277666 => 277667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/sql/SQLiteStatement.h      2021-05-18 18:48:48 UTC (rev 277666)
+++ trunk/Source/WebCore/platform/sql/SQLiteStatement.h 2021-05-18 18:59:29 UTC (rev 277667)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">     
</span><span class="cx">     WEBCORE_EXPORT int bindBlob(int index, const void* blob, int size);
</span><span class="cx">     WEBCORE_EXPORT int bindBlob(int index, const String&);
</span><del>-    WEBCORE_EXPORT int bindText(int index, const String&);
</del><ins>+    WEBCORE_EXPORT int bindText(int index, StringView);
</ins><span class="cx">     WEBCORE_EXPORT int bindInt(int index, int);
</span><span class="cx">     WEBCORE_EXPORT int bindInt64(int index, int64_t);
</span><span class="cx">     WEBCORE_EXPORT int bindDouble(int index, double);
</span></span></pre>
</div>
</div>

</body>
</html>