Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(bincode): file_id config #379

Merged
merged 6 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/accountsdb/accounts_file.zig
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ pub const FileId = enum(Int) {

pub const Int = u32;

pub const BincodeConfig = .{
.serializer = serialize,
.deserializer = deserialize,
};

pub inline fn fromInt(int: u32) FileId {
return @enumFromInt(int);
}
Expand Down Expand Up @@ -49,6 +54,24 @@ pub const FileId = enum(Int) {
std.options.fmt_max_depth,
);
}

fn serialize(
writer: anytype,
data: anytype,
params: sig.bincode.Params,
) anyerror!void {
try sig.bincode.write(writer, @as(usize, data.toInt()), params);
}

fn deserialize(
_: std.mem.Allocator,
reader: anytype,
params: sig.bincode.Params,
) anyerror!FileId {
const int = try sig.bincode.readInt(u64, reader, params);
if (int > std.math.maxInt(FileId.Int)) return error.IdOverflow;
return FileId.fromInt(@intCast(int));
}
};

/// an account thats stored in an AccountFile
Expand Down
15 changes: 1 addition & 14 deletions src/accountsdb/snapshots.zig
Original file line number Diff line number Diff line change
Expand Up @@ -930,20 +930,7 @@ pub const AccountFileInfo = struct {
/// amount of bytes used
length: usize,

pub const @"!bincode-config:id": bincode.FieldConfig(FileId) = .{
.serializer = idSerializer,
.deserializer = idDeserializer,
};

fn idSerializer(writer: anytype, data: anytype, params: bincode.Params) anyerror!void {
try bincode.write(writer, @as(usize, data.toInt()), params);
}

fn idDeserializer(_: std.mem.Allocator, reader: anytype, params: bincode.Params) anyerror!FileId {
const int = try bincode.readInt(usize, reader, params);
if (int > std.math.maxInt(FileId.Int)) return error.IdOverflow;
return FileId.fromInt(@intCast(int));
}
pub const @"!bincode-config:id" = FileId.BincodeConfig;

/// Analogous to [AppendVecError](https://github.com/anza-xyz/agave/blob/91a4ecfff78423433cc0001362cea8fed860dcb9/accounts-db/src/append_vec.rs#L74)
pub const ValidateError = error{
Expand Down
Loading