Make Index own its own dir

Author: lalinsky

src/Index.zig

@@ -42,7 +42,7 @@ const Options = struct {
 options: Options,
 allocator: std.mem.Allocator,
 
-data_dir: std.fs.Dir,
+dir: std.fs.Dir,
 
 oplog: Oplog,
 
@@ -83,11 +83,11 @@ fn getMemorySegmentSize(segment: SharedPtr(MemorySegment)) usize {
     return segment.value.getSize();
 }
 
-pub fn init(allocator: std.mem.Allocator, dir: std.fs.Dir, options: Options) !Self {
-    var data_dir = try dir.makeOpenPath("data", .{ .iterate = true });
-    errdefer data_dir.close();
+pub fn init(allocator: std.mem.Allocator, parent_dir: std.fs.Dir, path: []const u8, options: Options) !Self {
+    var dir = try parent_dir.makeOpenPath(path, .{ .iterate = true });
+    errdefer dir.close();
 
-    var oplog = try Oplog.init(allocator, data_dir);
+    var oplog = try Oplog.init(allocator, dir);
     errdefer oplog.deinit();
 
     const memory_segments = try SegmentListManager(MemorySegment).init(
@@ -105,7 +105,7 @@ pub fn init(allocator: std.mem.Allocator, dir: std.fs.Dir, options: Options) !Se
     const file_segments = try SegmentListManager(FileSegment).init(
         allocator,
         .{
-            .dir = data_dir,
+            .dir = dir,
         },
         .{
             .min_segment_size = options.min_segment_size,
@@ -118,7 +118,7 @@ pub fn init(allocator: std.mem.Allocator, dir: std.fs.Dir, options: Options) !Se
     return .{
         .options = options,
         .allocator = allocator,
-        .data_dir = data_dir,
+        .dir = dir,
         .oplog = oplog,
         .segments_lock = .{},
         .memory_segments = memory_segments,
@@ -138,7 +138,7 @@ pub fn deinit(self: *Self) void {
     self.file_segments.deinit();
 
     self.oplog.deinit();
-    self.data_dir.close();
+    self.dir.close();
 }
 
 pub const PendingUpdate = struct {
@@ -211,7 +211,7 @@ fn cancelUpdate(self: *Self, pending_update: *PendingUpdate) void {
 }
 
 fn loadSegment(self: *Self, segment_id: SegmentId) !FileSegmentNode {
-    var node = try FileSegmentList.createSegment(self.allocator, .{ .dir = self.data_dir });
+    var node = try FileSegmentList.createSegment(self.allocator, .{ .dir = self.dir });
     errdefer FileSegmentList.destroySegment(self.allocator, &node);
 
     try node.value.open(segment_id);
@@ -223,7 +223,7 @@ fn loadSegments(self: *Self) !void {
     self.segments_lock.lock();
     defer self.segments_lock.unlock();
 
-    const segment_ids = filefmt.readIndexFile(self.data_dir, self.allocator) catch |err| {
+    const segment_ids = filefmt.readIndexFile(self.dir, self.allocator) catch |err| {
         if (err == error.FileNotFound) {
             if (self.options.create) {
                 try self.updateIndexFile(self.file_segments.segments.value);
@@ -254,7 +254,7 @@ fn doCheckpoint(self: *Self) !bool {
 
     // build new file segment
 
-    var target = try FileSegmentList.createSegment(self.allocator, .{ .dir = self.data_dir });
+    var target = try FileSegmentList.createSegment(self.allocator, .{ .dir = self.dir });
     errdefer FileSegmentList.destroySegment(self.allocator, &target);
 
     var reader = source.value.reader();
@@ -328,7 +328,7 @@ fn updateIndexFile(self: *Self, segments: *FileSegmentList) !void {
     var ids = try segments.getIds(self.allocator);
     defer ids.deinit(self.allocator);
 
-    try filefmt.writeIndexFile(self.data_dir, ids.items);
+    try filefmt.writeIndexFile(self.dir, ids.items);
 }
 
 fn maybeMergeFileSegments(self: *Self) !bool {

src/MultiIndex.zig

@@ -8,7 +8,6 @@ const Self = @This();
 
 pub const IndexRef = struct {
     index: Index,
-    dir: std.fs.Dir,
     references: usize = 0,
     last_used_at: i64 = std.math.minInt(i64),
 };
@@ -33,7 +32,6 @@ pub fn deinit(self: *Self) void {
     var iter = self.indexes.iterator();
     while (iter.next()) |entry| {
         entry.value_ptr.index.deinit();
-        entry.value_ptr.dir.close();
     }
     self.indexes.deinit();
 }
@@ -63,10 +61,7 @@ pub fn acquireIndex(self: *Self, id: u8, create: bool) !*IndexRef {
     var sub_dir_name_buf: [max_sub_dir_name_size]u8 = undefined;
     const sub_dir_name = try std.fmt.bufPrint(&sub_dir_name_buf, sub_dir_name_fmt, .{id});
 
-    result.value_ptr.dir = try self.dir.makeOpenPath(sub_dir_name, .{ .iterate = true });
-    errdefer result.value_ptr.dir.close();
-
-    result.value_ptr.index = try Index.init(self.allocator, result.value_ptr.dir, .{ .create = create });
+    result.value_ptr.index = try Index.init(self.allocator, self.dir, sub_dir_name, .{ .create = create });
     errdefer result.value_ptr.index.deinit();
 
     try result.value_ptr.index.open();
@@ -91,7 +86,6 @@ pub fn deleteIndex(self: *Self, id: u8) !void {
 
     if (self.indexes.getEntry(id)) |entry| {
         entry.value_ptr.index.deinit();
-        entry.value_ptr.dir.close();
         self.indexes.removeByPtr(entry.key_ptr);
     }
 

src/index_tests.zig

@@ -19,7 +19,7 @@ test "index does not exist" {
     var tmp_dir = std.testing.tmpDir(.{});
     defer tmp_dir.cleanup();
 
-    var index = try Index.init(std.testing.allocator, tmp_dir.dir, .{});
+    var index = try Index.init(std.testing.allocator, tmp_dir.dir, "idx", .{});
     defer index.deinit();
 
     const result = index.open();
@@ -30,7 +30,7 @@ test "index create, update and search" {
     var tmp_dir = std.testing.tmpDir(.{});
     defer tmp_dir.cleanup();
 
-    var index = try Index.init(std.testing.allocator, tmp_dir.dir, .{ .create = true });
+    var index = try Index.init(std.testing.allocator, tmp_dir.dir, "idx", .{ .create = true });
     defer index.deinit();
 
     try index.open();
@@ -69,7 +69,7 @@ test "index create, update, reopen and search" {
     var hashes: [100]u32 = undefined;
 
     {
-        var index = try Index.init(std.testing.allocator, tmp_dir.dir, .{ .create = true });
+        var index = try Index.init(std.testing.allocator, tmp_dir.dir, "idx", .{ .create = true });
         defer index.deinit();
 
         try index.open();
@@ -81,7 +81,7 @@ test "index create, update, reopen and search" {
     }
 
     {
-        var index = try Index.init(std.testing.allocator, tmp_dir.dir, .{ .create = false });
+        var index = try Index.init(std.testing.allocator, tmp_dir.dir, "idx", .{ .create = false });
         defer index.deinit();
 
         try index.open();
@@ -105,7 +105,7 @@ test "index many updates" {
     var hashes: [100]u32 = undefined;
 
     {
-        var index = try Index.init(std.testing.allocator, tmp_dir.dir, .{ .create = true });
+        var index = try Index.init(std.testing.allocator, tmp_dir.dir, "idx", .{ .create = true });
         defer index.deinit();
 
         try index.open();
@@ -118,7 +118,7 @@ test "index many updates" {
         }
     }
 
-    var index = try Index.init(std.testing.allocator, tmp_dir.dir, .{ .create = false });
+    var index = try Index.init(std.testing.allocator, tmp_dir.dir, "idx", .{ .create = false });
     defer index.deinit();
 
     try index.open();
@@ -146,7 +146,7 @@ test "index, multiple fingerprints with the same hashes" {
     var tmp_dir = std.testing.tmpDir(.{});
     defer tmp_dir.cleanup();
 
-    var index = try Index.init(std.testing.allocator, tmp_dir.dir, .{ .create = true });
+    var index = try Index.init(std.testing.allocator, tmp_dir.dir, "idx", .{ .create = true });
     defer index.deinit();
 
     try index.open();