Simplify cleanup after merge

Author: lalinsky

src/FileSegment.zig

@@ -96,6 +96,10 @@ pub fn delete(self: *Self, dir: std.fs.Dir) void {
     };
 }
 
+pub fn cleanup(self: *Self, dir: std.fs.Dir) void {
+    self.delete(dir);
+}
+
 pub fn build(self: *Self, dir: std.fs.Dir, source: anytype) !void {
     var file_name_buf: [filefmt.max_file_name_size]u8 = undefined;
     const file_name = filefmt.buildSegmentFileName(&file_name_buf, source.segment.id);

src/Index.zig

@@ -146,16 +146,7 @@ fn prepareMemorySegmentMerge(self: *Self) !?MemorySegmentList.PreparedMerge {
 }
 
 fn finishMemorySegmentMerge(self: *Self, merge: MemorySegmentList.PreparedMerge) bool {
-    defer {
-        var iter = merge.sources.start;
-        while (true) {
-            const next_node = iter.next;
-            const is_end = iter == merge.sources.end;
-            self.memory_segments.destroySegment(iter);
-            if (is_end) break;
-            iter = next_node orelse break;
-        }
-    }
+    defer self.memory_segments.cleanupAfterMerge(merge, .{});
 
     self.segments_lock.lock();
     defer self.segments_lock.unlock();
@@ -459,17 +450,7 @@ fn finishFileSegmentMerge(self: *Self, merge: FileSegmentList.PreparedMerge) !vo
 
     try filefmt.writeIndexFile(self.data_dir, ids.items);
 
-    defer {
-        var iter = merge.sources.start;
-        while (true) {
-            const next_node = iter.next;
-            const is_end = iter == merge.sources.end;
-            iter.data.delete(self.data_dir);
-            self.file_segments.destroySegment(iter);
-            if (is_end) break;
-            iter = next_node orelse break;
-        }
-    }
+    defer self.file_segments.cleanupAfterMerge(merge, .{self.data_dir});
 
     self.segments_lock.lock();
     defer self.segments_lock.unlock();

src/MemorySegment.zig

@@ -101,6 +101,10 @@ pub fn build(self: *Self, changes: []const Change) !void {
     std.sort.pdq(Item, self.items.items, {}, Item.cmp);
 }
 
+pub fn cleanup(self: *Self) void {
+    _ = self;
+}
+
 pub fn merge(self: *Self, merger: *SegmentMerger(Self)) !void {
     self.id = merger.segment.id;
     self.max_commit_id = merger.segment.max_commit_id;

src/segment_list.zig

@@ -128,17 +128,27 @@ pub fn SegmentList(Segment: type) type {
             return .{ .sources = sources, .merger = merger, .target = target };
         }
 
+        pub fn cleanupAfterMerge(self: *Self, merge: PreparedMerge, cleanup_args: anytype) void {
+            var iter = merge.sources.start;
+            while (true) {
+                const next_node = iter.next;
+                const is_end = iter == merge.sources.end;
+                @call(.auto, Segment.cleanup, .{&iter.data} ++ cleanup_args);
+                self.destroySegment(iter);
+                if (is_end) break;
+                iter = next_node orelse break;
+            }
+        }
+
         pub fn applyMerge(self: *Self, merge: PreparedMerge) void {
             self.segments.insertBefore(merge.sources.start, merge.target);
             var iter = merge.sources.start;
             while (true) {
                 const next_node = iter.next;
+                const is_end = iter == merge.sources.end;
                 self.segments.remove(iter);
-                if (iter == merge.sources.end) {
-                    break;
-                } else {
-                    iter = next_node orelse break;
-                }
+                if (is_end) break;
+                iter = next_node orelse break;
             }
         }
     };