Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-07 13:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibDatabase+RequestServer: Store ByteString data as a BLOB

Browse source 
We currently store ByteString as TEXT, but that is interpreted by SQLite
as UTF-8. All string-related operations will try to operate on the text
as if it is stored with UTF-8. We should use BLOB instead, which does
not make any encoding assumptions.

The only user of ByteString in the database currently is the HTTP disk
cache. So we bump its version here to remove existing data. Again, we
will want to handle changes like this more gracefully eventually.
This commit is contained in:
Timothy Flynn 2025-11-07 07:20:26 -05:00 • committed by Tim Flynn
parent 1c2c9a859a
commit d5c00a493c
Notes: github-actions[bot] 2025-11-12 14:09:10 +00:00
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Libraries/LibDatabase/Database.cpp
View file

@ -119,9 +119,11 @@ void Database::apply_placeholder(StatementID statement_id, int index, ValueType
{
auto* statement = prepared_statement(statement_id);
if constexpr (IsOneOf<ValueType, String, ByteString>) {
if constexpr (IsSame<ValueType, String>) {
StringView string { value };
SQL_MUST(sqlite3_bind_text(statement, index, string.characters_without_null_termination(), static_cast<int>(string.length()), SQLITE_TRANSIENT));
} else if constexpr (IsSame<ValueType, ByteString>) {
SQL_MUST(sqlite3_bind_blob(statement, index, value.characters(), static_cast<int>(value.length()), SQLITE_TRANSIENT));
} else if constexpr (IsSame<ValueType, UnixDateTime>) {
apply_placeholder(statement_id, index, value.offset_to_epoch().to_milliseconds());
} else if constexpr (IsIntegral<ValueType>) {
@ -148,8 +150,9 @@ ValueType Database::result_column(StatementID statement_id, int column)
auto const* text = reinterpret_cast<char const*>(sqlite3_column_text(statement, column));
return MUST(String::from_utf8(StringView { text, strlen(text) }));
} else if constexpr (IsSame<ValueType, ByteString>) {
auto const* text = reinterpret_cast<char const*>(sqlite3_column_text(statement, column));
return ByteString { text, strlen(text) };
auto length = sqlite3_column_bytes(statement, column);
auto const* text = sqlite3_column_blob(statement, column);
return ByteString { reinterpret_cast<char const*>(text), static_cast<size_t>(length) };
} else if constexpr (IsSame<ValueType, UnixDateTime>) {
auto milliseconds = result_column<sqlite3_int64>(statement_id, column);
return UnixDateTime::from_milliseconds_since_epoch(milliseconds);

2
Services/RequestServer/Cache/Version.h
View file

@ -11,6 +11,6 @@
namespace RequestServer {
// Increment this version when a breaking change is made to the cache index or cache entry formats.
static constexpr inline u32 CACHE_VERSION = 2u;
static constexpr inline u32 CACHE_VERSION = 3u;
}