Skip to content
Merged
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
9 changes: 5 additions & 4 deletions lib/db_store.ml
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,9 @@ module Make (Raw : S.STORE) = struct
in
aux id

let prune_batch ?(log=ignore) t ~before limit =
let items = Dao.lru t.dao ~before limit in
let prune_lru ?(log=ignore) t ~before =
let items = Dao.lru t.dao ~before 1 in
let n = List.length items in
Log.info (fun f -> f "Pruning %d items (of %d requested)" n limit);
items |> Lwt_list.iter_s (fun id ->
log id;
Raw.delete t.raw id >|= fun () ->
Expand All @@ -155,16 +154,18 @@ module Make (Raw : S.STORE) = struct
Lwt.return n

let prune ?log t ~before limit =
Log.info (fun f -> f "Pruning %d items" limit);
let rec aux acc limit =
if limit = 0 then Lwt.return acc (* Pruned everything we wanted to *)
else (
prune_batch ?log t ~before limit >>= function
prune_lru ?log t ~before >>= function
| 0 -> Lwt.return acc (* Nothing left to prune *)
| n -> aux (acc + n) (limit - n)
)
in
aux 0 limit >>= fun n ->
Raw.complete_deletes t.raw >>= fun () ->
Log.info (fun f -> f "Pruned %d items" n);
Lwt.return n

let wrap raw =
Expand Down