RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 10:07:40 +00:00
Code Issues Activity Actions

LibSQL: Replace Result<T, E> use with ErrorOr<T>

Browse source
This commit is contained in:
Andreas Kling 2021-11-07 14:07:23 +01:00
parent fbe8f185b5
commit 72f3fd824e
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ Heap::Heap(String file_name)
dbgln_if(SQL_DEBUG, "Heap file {} opened. Size = {}", file_name, size()); dbgln_if(SQL_DEBUG, "Heap file {} opened. Size = {}", file_name, size());
} }
Result<ByteBuffer, String> Heap::read_block(u32 block) ErrorOr<ByteBuffer> Heap::read_block(u32 block)
{ {
auto buffer_or_empty = m_write_ahead_log.get(block); auto buffer_or_empty = m_write_ahead_log.get(block);
if (buffer_or_empty.has_value()) if (buffer_or_empty.has_value())
@ -56,7 +56,7 @@ Result<ByteBuffer, String> Heap::read_block(u32 block)
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
auto ret = m_file->read(BLOCKSIZE); auto ret = m_file->read(BLOCKSIZE);
if (ret.is_empty()) if (ret.is_empty())
return String("Could not read block"); return Error::from_string_literal("Could not read block"sv);
dbgln_if(SQL_DEBUG, "{:02x} {:02x} {:02x} {:02x} {:02x} {:02x} {:02x} {:02x}", dbgln_if(SQL_DEBUG, "{:02x} {:02x} {:02x} {:02x} {:02x} {:02x} {:02x} {:02x}",
*ret.offset_pointer(0), *ret.offset_pointer(1), *ret.offset_pointer(0), *ret.offset_pointer(1),
*ret.offset_pointer(2), *ret.offset_pointer(3), *ret.offset_pointer(2), *ret.offset_pointer(3),

3
Userland/Libraries/LibSQL/Heap.h
View file

@ -8,7 +8,6 @@
#include <AK/Debug.h> #include <AK/Debug.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/Result.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibCore/File.h> #include <LibCore/File.h>
@ -36,7 +35,7 @@ public:
virtual ~Heap() override { flush(); } virtual ~Heap() override { flush(); }
u32 size() const { return m_end_of_file; } u32 size() const { return m_end_of_file; }
Result<ByteBuffer, String> read_block(u32); ErrorOr<ByteBuffer> read_block(u32);
bool write_block(u32, ByteBuffer&); bool write_block(u32, ByteBuffer&);
u32 new_record_pointer(); u32 new_record_pointer();
[[nodiscard]] bool has_block(u32 block) const { return block < size(); } [[nodiscard]] bool has_block(u32 block) const { return block < size(); }