Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix performance issue of depext under Docker/debian #4165

Merged
merged 2 commits into from
Apr 30, 2020
Merged

Fix performance issue of depext under Docker/debian #4165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4f5145
Fix performance issue of depext under Docker/debian
AltGr Apr 29, 2020
fc96d8f
Refine dpkg-query call some more
AltGr Apr 29, 2020
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
24 changes: 15 additions & 9 deletions src/state/opamSysInteract.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,14 @@ let packages_status packages =
in
installed, packages -- installed, OpamSysPkg.Set.empty
| "debian" ->
let str_pkgs =
OpamSysPkg.(Set.fold (fun p acc -> to_string p :: acc) packages [])
in
(* First query regular package *)
let lines =
(* discard stderr as just nagging *)
let _, lines =
run_command ~discard_err:true "dpkg-query"
("-l" :: (List.map OpamSysPkg.to_string
(OpamSysPkg.Set.elements packages)))
run_command ~discard_err:true "dpkg-query" ("-l" :: str_pkgs)
in
lines
in
Expand All @@ -158,14 +159,19 @@ let packages_status packages =
OpamSysPkg.Set.empty lines
in
let available =
let names_re =
let need_escape = Re.(compile (group (set "+."))) in
Printf.sprintf "^(%s)$"
(OpamStd.List.concat_map "|"
(Re.replace ~all:true need_escape ~f:(fun g -> "\\"^Re.Group.get g 1))
str_pkgs)
in
run_query_command "apt-cache" ["search"; names_re; "--names-only"] |>
List.fold_left (fun avail l ->
match OpamStd.String.split l ' ' with
| pkg::_
when OpamSysPkg.Set.mem (OpamSysPkg.of_string pkg) packages ->
OpamSysPkg.Set.add (OpamSysPkg.of_string pkg) avail
| _ -> avail)
match OpamStd.String.cut_at l ' ' with
| Some (pkg, _) -> OpamSysPkg.Set.add (OpamSysPkg.of_string pkg) avail
| None -> avail)
OpamSysPkg.Set.empty
(run_query_command "apt-cache" ["search"; ".*"])
in
let available = available -- installed in
let not_found = packages -- available -- installed in
Expand Down