RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 03:57:43 +00:00
Code Issues Activity Actions

LibSQL: Compute byte buffer offsets using size_t

Browse source 
Also compute specific offset indices rather than hard-coding them.
This commit is contained in:
Timothy Flynn 2022-10-28 18:30:43 -04:00 • committed by Linus Groh
parent 99a713aa5b
commit 3f8a4f69c6
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibSQL/Heap.cpp
View file

@ -109,7 +109,7 @@ ErrorOr<void> Heap::write_block(u32 block, ByteBuffer& buffer)
if (auto current_size = buffer.size(); current_size < BLOCKSIZE) {
TRY(buffer.try_resize(BLOCKSIZE));
memset(buffer.offset_pointer((int)current_size), 0, BLOCKSIZE - current_size);
memset(buffer.offset_pointer(current_size), 0, BLOCKSIZE - current_size);
}
dbgln_if(SQL_DEBUG, "{:hex-dump}", buffer.bytes().trim(8));
@ -175,13 +175,13 @@ ErrorOr<void> Heap::flush()
return {};
}
constexpr static StringView FILE_ID = "SerenitySQL "sv;
constexpr static int VERSION_OFFSET = 12;
constexpr static int SCHEMAS_ROOT_OFFSET = 16;
constexpr static int TABLES_ROOT_OFFSET = 20;
constexpr static int TABLE_COLUMNS_ROOT_OFFSET = 24;
constexpr static int FREE_LIST_OFFSET = 28;
constexpr static int USER_VALUES_OFFSET = 32;
constexpr static auto FILE_ID = "SerenitySQL "sv;
constexpr static auto VERSION_OFFSET = FILE_ID.length();
constexpr static auto SCHEMAS_ROOT_OFFSET = VERSION_OFFSET + sizeof(u32);
constexpr static auto TABLES_ROOT_OFFSET = SCHEMAS_ROOT_OFFSET + sizeof(u32);
constexpr static auto TABLE_COLUMNS_ROOT_OFFSET = TABLES_ROOT_OFFSET + sizeof(u32);
constexpr static auto FREE_LIST_OFFSET = TABLE_COLUMNS_ROOT_OFFSET + sizeof(u32);
constexpr static auto USER_VALUES_OFFSET = FREE_LIST_OFFSET + sizeof(u32);
ErrorOr<void> Heap::read_zero_block()
{