paoda
/
hamt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: allocate root table on heap 

In the future we might want to resize the root table to support more
than log2(Context.Digest) nodes
This commit is contained in:
Rekai Nyangadzayi Musuka 2023-04-20 16:12:36 -05:00
parent a7dd848a05
commit e86749fbe6
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -30,7 +30,7 @@ test {
const Pair = StringTrie.Pair; const Pair = StringTrie.Pair;
const allocator = std.testing.allocator; const allocator = std.testing.allocator;
var trie = StringTrie.init(); var trie = try StringTrie.init(allocator);
defer trie.deinit(allocator); defer trie.deinit(allocator);
try trie.insert(allocator, "hello", {}); try trie.insert(allocator, "hello", {});

24
src/trie.zig
View File

@ -17,14 +17,18 @@ pub fn HashArrayMappedTrie(comptime K: type, comptime V: type, comptime Context:
const table_size = @typeInfo(Digest).Int.bits; const table_size = @typeInfo(Digest).Int.bits;
const t = @intCast(Log2Int(Digest), @typeInfo(Log2Int(Digest)).Int.bits); const t = @intCast(Log2Int(Digest), @typeInfo(Log2Int(Digest)).Int.bits);
root: [table_size]?*Node, root: []?*Node,
const Node = union(enum) { kv: Pair, table: Table }; const Node = union(enum) { kv: Pair, table: Table };
const Table = struct { map: Digest = 0, base: [*]Node }; const Table = struct { map: Digest = 0, base: [*]Node };
pub const Pair = struct { key: K, value: V }; pub const Pair = struct { key: K, value: V };
pub fn init() Self { pub fn init(allocator: Allocator) !Self {
return Self{ .root = [_]?*Node{null} ** table_size }; // TODO: Add ability to have a larger root node (for quicker lookup times)
const root = try allocator.alloc(?*Node, table_size);
std.mem.set(?*Node, root, null);
return Self{ .root = root };
} }
pub fn deinit(self: *Self, allocator: Allocator) void { pub fn deinit(self: *Self, allocator: Allocator) void {
@ -34,6 +38,8 @@ pub fn HashArrayMappedTrie(comptime K: type, comptime V: type, comptime Context:
_deinit(allocator, node); _deinit(allocator, node);
allocator.destroy(node); allocator.destroy(node);
} }
allocator.free(self.root);
} }
fn _deinit(allocator: Allocator, node: *Node) void { fn _deinit(allocator: Allocator, node: *Node) void {
@ -294,20 +300,22 @@ const StringContext = struct {
const StringTrie = HashArrayMappedTrie([]const u8, void, StringContext); const StringTrie = HashArrayMappedTrie([]const u8, void, StringContext);
test "trie init" { test "trie init" {
_ = StringTrie.init(); const allocator = std.testing.allocator;
var trie = try StringTrie.init(allocator);
defer trie.deinit(allocator);
} }
test "init and deinit" { test "init and deinit" {
const allocator = std.testing.allocator; const allocator = std.testing.allocator;
var trie = StringTrie.init(); var trie = try StringTrie.init(allocator);
defer trie.deinit(allocator); defer trie.deinit(allocator);
} }
test "trie insert" { test "trie insert" {
const allocator = std.testing.allocator; const allocator = std.testing.allocator;
var trie = StringTrie.init(); var trie = try StringTrie.init(allocator);
defer trie.deinit(allocator); defer trie.deinit(allocator);
try trie.insert(allocator, "hello", {}); try trie.insert(allocator, "hello", {});
@ -318,7 +326,7 @@ test "trie search" {
const Pair = StringTrie.Pair; const Pair = StringTrie.Pair;
const allocator = std.testing.allocator; const allocator = std.testing.allocator;
var trie = StringTrie.init(); var trie = try StringTrie.init(allocator);
defer trie.deinit(allocator); defer trie.deinit(allocator);
try std.testing.expectEqual(@as(?Pair, null), trie.search("sdvx")); try std.testing.expectEqual(@as(?Pair, null), trie.search("sdvx"));
@ -336,7 +344,7 @@ test "README.md example" {
const Pair = StringTrie.Pair; const Pair = StringTrie.Pair;
const allocator = std.testing.allocator; const allocator = std.testing.allocator;
var trie = StringTrie.init(); var trie = try StringTrie.init(allocator);
defer trie.deinit(allocator); defer trie.deinit(allocator);
try trie.insert(allocator, "hello", {}); try trie.insert(allocator, "hello", {});