Check for expired deadline even within filesegment search

Author: lalinsky

src/FileSegment.zig

@@ -5,6 +5,7 @@ const assert = std.debug.assert;
 const common = @import("common.zig");
 const SearchResults = common.SearchResults;
 const KeepOrDelete = common.KeepOrDelete;
+const Deadline = @import("utils/Deadline.zig");
 
 const Item = @import("segment.zig").Item;
 const SegmentInfo = @import("segment.zig").SegmentInfo;
@@ -70,7 +71,7 @@ pub fn getBlockData(self: Self, block: usize) []const u8 {
     return self.blocks[block * self.block_size .. (block + 1) * self.block_size];
 }
 
-pub fn search(self: Self, sorted_hashes: []const u32, results: *SearchResults) !void {
+pub fn search(self: Self, sorted_hashes: []const u32, results: *SearchResults, deadline: Deadline) !void {
     var prev_block_no: usize = std.math.maxInt(usize);
     var prev_block_range_start: usize = 0;
 
@@ -86,7 +87,7 @@ pub fn search(self: Self, sorted_hashes: []const u32, results: *SearchResults) !
     // We want to find hash=7, lowerBound returns block=2 (9), but block=1 could still contain hash=6, so we go one back.
     // We want to find hash=10, lowerBound returns block=3 (EOF), but block=2 could still contain hash=6, so we go one back.
 
-    for (sorted_hashes) |hash| {
+    for (sorted_hashes, 1..) |hash, i| {
         var block_no = std.sort.lowerBound(u32, hash, self.index.items[prev_block_range_start..], {}, std.sort.asc(u32)) + prev_block_range_start;
         if (block_no > 0) {
             block_no -= 1;
@@ -100,10 +101,14 @@ pub fn search(self: Self, sorted_hashes: []const u32, results: *SearchResults) !
                 try filefmt.readBlock(block_data, &block_items, self.min_doc_id);
             }
             const matches = std.sort.equalRange(Item, Item{ .hash = hash, .id = 0 }, block_items.items, {}, Item.cmpByHash);
-            for (matches[0]..matches[1]) |i| {
-                try results.incr(block_items.items[i].id, self.info.version);
+            for (matches[0]..matches[1]) |j| {
+                try results.incr(block_items.items[j].id, self.info.version);
             }
         }
+
+        if (i % 10 == 0) {
+            try deadline.check();
+        }
     }
 }
 

src/MemorySegment.zig

@@ -46,7 +46,7 @@ pub fn deinit(self: *Self, delete_file: KeepOrDelete) void {
     self.items.deinit(self.allocator);
 }
 
-pub fn search(self: Self, sorted_hashes: []const u32, results: *SearchResults) !void {
+pub fn search(self: Self, sorted_hashes: []const u32, results: *SearchResults, deadline: Deadline) !void {
     var items = self.items.items;
     for (sorted_hashes) |hash| {
         const matches = std.sort.equalRange(Item, Item{ .hash = hash, .id = 0 }, items, {}, Item.cmpByHash);
@@ -55,6 +55,7 @@ pub fn search(self: Self, sorted_hashes: []const u32, results: *SearchResults) !
         }
         items = items[matches[1]..];
     }
+    _ = deadline;
 }
 
 pub fn getSize(self: Self) usize {

src/segment_list.zig

@@ -149,10 +149,8 @@ pub fn SegmentList(Segment: type) type {
 
         pub fn search(self: Self, hashes: []const u32, results: *SearchResults, deadline: Deadline) !void {
             for (self.nodes.items) |node| {
-                if (deadline.isExpired()) {
-                    return error.Timeout;
-                }
-                try node.value.search(hashes, results);
+                try deadline.check();
+                try node.value.search(hashes, results, deadline);
             }
             results.removeOutdatedResults(self);
         }

src/utils/Deadline.zig

@@ -16,3 +16,9 @@ pub fn setTimeout(self: *Self, timeout_ms: i64) void {
 pub fn isExpired(self: *const Self) bool {
     return self.deadline_ms > 0 and time.milliTimestamp() >= self.deadline_ms;
 }
+
+pub fn check(self: Self) !void {
+    if (self.isExpired()) {
+        return error.Timeout;
+    }
+}